Rename runtime-string-concat option into 'string-concat'

compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java

@@ -111,7 +111,7 @@ public class JVMConfigurationKeys {
     public static final CompilerConfigurationKey<Boolean> EMIT_JVM_TYPE_ANNOTATIONS =
             CompilerConfigurationKey.create("Emit JVM type annotations in bytecode");
 
-    public static final CompilerConfigurationKey<JvmRuntimeStringConcat> RUNTIME_STRING_CONCAT =
+    public static final CompilerConfigurationKey<JvmStringConcat> STRING_CONCAT =
             CompilerConfigurationKey.create("Specifies string concatenation scheme");
 
     public static final CompilerConfigurationKey<List<String>> KLIB_PATHS =

compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmStringConcat.kt

@@ -5,16 +5,16 @@
 
 package org.jetbrains.kotlin.config
 
-enum class JvmRuntimeStringConcat {
-    DISABLE,
-    ENABLE, // makeConcatWithConstants
-    INDY; // makeConcat
+enum class JvmStringConcat(val description: String) {
+    INLINE("inline"),
+    INDY_WITH_CONSTANTS("indy-with-constants"), // makeConcatWithConstants
+    INDY("indy"); // makeConcat
 
     val isDynamic
-        get() = this != DISABLE
+        get() = this != INLINE
 
     companion object {
         @JvmStatic
-        fun fromString(string: String) = values().find { it.name == string.toUpperCase() }
+        fun fromString(string: String) = values().find { it.description == string }
     }
 }