Add i18n translate for alarms
@@ -6482,6 +6482,40 @@ no\ system\ tag\ matches[%s]\ for\ resourceType[%s] = no system tag matches[{0}]
# args: tag
no\ system\ tag\ matches\ %s = no system tag matches {0}
+<<<<<<< 6a149d306c0fa86ef72ec907c2e9f6b363445438
# at: src/zstack/./tag/src/main/java/org/zstack/tag/TagManagerImpl.java:816
# args: tag
tag[%s]\ is\ only\ for\ admin = tag[{0}] is only for admin
+=======
+# at: src/main/java/org/zstack/vmware/VCenterManagerImpl.java:3318
+# args: vm.getConfig().getName(),hvo.getManagementIp()
+Checking\ compatibility\ with\ vm\ %s\ failed\ on\ host\ %s = Checking compatibility with vm {0} failed on host {1}
+
+# at: src/main/java/org/zstack/zwatch/alarm/AlarmStatus.java:16
+# args:
+InsufficientData = InsufficientData
+
+# at: src/main/java/org/zstack/zwatch/alarm/AlarmStatus.java:14
+# args:
+Alarm = Alarm
+
+# at: src/main/java/org/zstack/zwatch/alarm/AlarmStatus.java:12
+# args:
+OK = OK
+
+# at: src/main/java/org/zstack/zwatch/ruleengine/ComparisonOperator.java:35
+# args:
+LessThanOrEqualTo = LessThanOrEqualTo
+
+# at: src/main/java/org/zstack/zwatch/ruleengine/ComparisonOperator.java:33
+# args:
+LessThan = LessThan
+
+# at: src/main/java/org/zstack/zwatch/ruleengine/ComparisonOperator.java:31
+# args:
+GreaterThan = GreaterThan
+
+# at: src/main/java/org/zstack/zwatch/ruleengine/ComparisonOperator.java:29
+# args:
+GreaterThanOrEqualTo = GreaterThanOrEqualTo
+>>>>>>> Add translation for alarm terms
