Merge branch 'master' into uta/rainbow
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 1 Sep 2016 17:37:49 +0000 (20:37 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 1 Sep 2016 17:37:49 +0000 (20:37 +0300)
# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java
# platform/platform-resources-en/src/messages/ApplicationBundle.properties

1  2 
platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java
platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
platform/platform-resources-en/src/messages/ApplicationBundle.properties

index 6157051844d0b62d7da7ad91789114a1da77b0c4,ca9248b6cbc782ebfd799b8d6ab754d674782d60..19e8e77af381b755500e6d3fb5b115af2fa3b6c3
@@@ -39,13 -39,13 +39,12 @@@ class UsedColors 
      }
    }
  
 -  static int getOrAddColorIndex(@NotNull final UserDataHolderEx context,
 -                                @NotNull final String name,
 -                                @NotNull RainbowHighlighter rainbowHighlighter) {
 -    int colorsCount = rainbowHighlighter.getColorsCount();
 +  public static int getOrAddColorIndex(@NotNull final UserDataHolderEx context,
 +                                       @NotNull final String name,
 +                                       int colorsCount) {
-     Object data = context.getUserData(USED_COLOR);
      int colorIndex;
      while (true) {
+       Object data = context.getUserData(USED_COLOR);
        Object newColors;
        if (data == null) {
          colorIndex = hashColor(name, colorsCount);
index 437d8e23a340f8e643eff41cc19547a21f3cdbe2,5c7ec4049d306d7b2416ecabec909dc256264d5a..8fa5a4e63a04f342c169a06a5b8ffaab6b6c2b21
@@@ -743,15 -743,10 +743,23 @@@ remote.desktop.detected.title=Remote de
  remote.desktop.detected.message=Animation disabled
  checkbox.line.comment.add.space=Add a space at comment start
  
 -quarantine.error.message=Error cleaning quarantine status
+ quarantine.dialog.title=Quarantined Folder Detected
+ quarantine.dialog.message=OS marked this folder as 'quarantined', probably because you've downloaded it from web.\
+  Opening files from this folder in external browser might not work as expected. Do you want to clean quarantined status for this folder?
+ quarantine.clean.progress=Cleaning quarantined status for {0}
+ quarantine.error.group=Quarantine Cleaner
+ quarantine.error.title=Warning
++quarantine.error.message=Error cleaning quarantine status
++
 +rainbow.option.panel.display.name=Semantic highlighting
 +label.override.gradient=<html>Override gradient:</html>
 +label.inherited.gradient=<html>Inherited from <a href="{0}">{1}</a> gradient:</html>
 +label.inherited.gradient.tooltip=<html>''{0}->Override gradient'' from<br>''{1}'' section</html>
 +checkbox.stop.1=Stop #1
 +checkbox.stop.2=Stop #2
 +checkbox.stop.3=Stop #3
 +checkbox.stop.4=Stop #4
 +checkbox.stop.5=Stop #5
 +checkbox.rainbow=<html>Unique color for each parameter<br>and local variable<br><font color=gray><sub>Chosen from generated gradient</sub></font></html>
 +label.rainbow.inheritance=<html><div style="text-align:right" vertical-align="top">''{0}->Unique color''<br>of <a href="{1}">{2}</html>
 +label.rainbow.inheritance.tooltip=<html>''{0}->Unique color'' from<br>''{1}'' section</html>