summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoc HD <doc.divxm@gmail.com>2017-08-05 14:13:25 +0300
committerdoc HD <doc.divxm@gmail.com>2017-08-05 14:13:25 +0300
commit570640f89459aab3a0a7b5be15313f4ceea3ca16 (patch)
treeee384e534379321c596ef91f0cf79d0e5e53a6d7
parent73bae4ec101207f48efefe8a27e07908861df4cd (diff)
DeskClock: Fix mismerge after 6.0.1_r79mm6.0
Change-Id: I6a3b11f120b3b2090df1db4a616981c7a3b19655
-rw-r--r--res/values/cm_strings.xml24
1 files changed, 23 insertions, 1 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0afaa0ee0..282367ba3 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -55,9 +55,31 @@
<!-- No profile selected label -->
<string name="profile_no_selected">No profile selected</string>
-
<string name="alarm_modification_service_desc">A service to allow manipulation of alarms by third parties.</string>
+ <!-- Color Picker -->
+ <string name="dialog_color_picker">Color Picker</string>
+ <string name="press_color_to_apply">Press on color below to apply</string>
+ <string name="arrow_right">→</string>
+ <string name="arrow_down">↓</string>
+ <string name="hex">Hex:</string>
+ <string name="hex_hint">#ff000000</string>
+ <string name="set">Set</string>
+ <string name="color_default">Default</string>
+
+ <!-- Label for the digital clock time color settings -->
+ <string name="clock_time_color_title">Time color</string>
+ <!-- Label for the digital clock time color settings summary -->
+ <string name="clock_time_color_summary">Set the time color of the digital clock widget.</string>
+ <!-- Label for the digital clock date color settings -->
+ <string name="clock_date_color_title">Date color</string>
+ <!-- Label for the digital clock date color settings summary -->
+ <string name="clock_date_color_summary">Set the date color of the digital clock widget.</string>
+ <!-- Label for the digital clock alarm color settings -->
+ <string name="clock_alarm_color_title">Alarm color</string>
+ <!-- Label for the digital clock alarm color settings summary -->
+ <string name="clock_alarm_color_summary">Set the alarm color of the digital clock widget.</string>
+
<string name="power_on_text">Power on device?</string>
<string name="power_on_yes_text">Yes</string>
<string name="power_on_no_text">No</string>