From 98d0a90a6c375163f76fca5fead395914b1673b5 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 19 Dec 2011 12:50:47 +1300
Subject: [PATCH] Pull current colours etc from CDSREFACTOR branch.

Conflicts:

	res/values/unlocalisable_strings.xml
---
 res/values/unlocalisable_strings.xml | 71 ++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 39 deletions(-)
 rewrite res/values/unlocalisable_strings.xml (92%)

diff --git a/res/values/unlocalisable_strings.xml b/res/values/unlocalisable_strings.xml
dissimilarity index 92%
index 63a73bc..b34a794 100644
--- a/res/values/unlocalisable_strings.xml
+++ b/res/values/unlocalisable_strings.xml
@@ -1,39 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Strings that should be localised belong in strings.xml -->
-<resources>
-<string name="applyButton">applyButton</string>
-<string name="cancelButton">cancelButton</string>
-
-<string name="appName">aCal</string>
-<string name="appNameTasks">aCalTasks</string>
-<string name="appActivityMonthView">aCal - Month View</string>
-<string name="appActivityYearView">aCal - Year View</string>
-<string name="appActivityWeekView">aCal - Week View</string>
-<string name="AcalAccountType">com.morphoss.acal.AcalAccount</string>
-
-<dimen name="MonthDayTextSize">14sp</dimen>
-<color name="MonthDayFG">#001060</color>
-<color name="MonthDayInMonthBG">#A0DDDDDD</color>
-
-<color name="MonthDayOutMonthBG">#80AAAAAA</color>
-
-<color name="MonthDayHighlightFG">#FFC00000</color>
-<color name="MonthDayHighlightBG">#00FFFFFF</color>
-<dimen name="MonthDayHighlightTextSize">18sp</dimen>
-
-<color name="MonthDayHighlightBox">#FFE77720</color>
-<color name="MonthDayTodayBox">#FF10D747</color>
-
-<color name="DayEventFG">#103090</color>
-<color name="DayEventBG">#50FFFFFF</color>
-<dimen name="DayEventTextSize">14sp</dimen>
-
-<color name="WeekViewMultiDayBG">#F0F0F0</color>
-<color name="WeekViewMultiDayBorder">#333333</color>
-<color name="WeekViewSidebarBG">#F0F0F0</color>
-<color name="WeekViewSidebarBorder">#333333</color>
-<color name="WeekViewDayGridBorder">#AAAAAA</color>
-<color name="WeekViewDayGridWorkTimeBG">#90F6F6D0</color>
-<color name="OverdueTask">#FFFF8060</color>
-<color name="CompletedTask">#FF60FFB0</color>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Strings that should be localised belong in strings.xml -->
+<resources>
+	<string name="applyButton">applyButton</string>
+	<string name="cancelButton">cancelButton</string>
+	<string name="appName">aCal</string>
+	<string name="appNameTasks">aCalTasks</string>
+	<string name="appActivityMonthView">aCal - Month View</string>
+	<string name="appActivityYearView">aCal - Year View</string>
+	<string name="appActivityWeekView">aCal - Week View</string>
+	<string name="AcalAccountType">com.morphoss.acal.AcalAccount</string>
+	<dimen name="MonthDayTextSize">14sp</dimen>
+	<color name="MonthDayFG">#001060</color>
+	<color name="MonthDayInMonthBG">#A0DDDDDD</color>
+	<color name="MonthDayOutMonthBG">#80AAAAAA</color>
+	<color name="MonthDayHighlightFG">#FFC00000</color>
+	<color name="MonthDayHighlightBG">#00FFFFFF</color>
+	<dimen name="MonthDayHighlightTextSize">18sp</dimen>
+	<color name="MonthDayHighlightBox">#FFE77720</color>
+	<color name="MonthDayTodayBox">#FF10D747</color>
+	<color name="DayEventFG">#103090</color>
+	<color name="DayEventBG">#50FFFFFF</color>
+	<dimen name="DayEventTextSize">14sp</dimen>
+	<color name="WeekViewMultiDayBG">#F0F0F0</color>
+	<color name="WeekViewMultiDayBorder">#333333</color>
+	<color name="WeekViewSidebarBG">#F0F0F0</color>
+	<color name="WeekViewSidebarBorder">#333333</color>
+	<color name="WeekViewDayGridBorder">#AAAAAA</color>
+	<color name="WeekViewDayGridWorkTimeBG">#90F6F6D0</color>
+	<color name="OverdueTask">#FFE03010</color>
+	<color name="CompletedTask">#FF007010</color>
+</resources>
\ No newline at end of file
-- 
2.11.4.GIT