Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_Trebuchet into cm-12.1

2 files changed, 40 insertions, 0 deletions

diff --git a/res/values-en-rAU/cm_arrays.xml b/res/values-en-rAU/cm_arrays.xml
new file mode 100644
index 000000000..370085304
--- /dev/null
+++ b/res/values-en-rAU/cm_arrays.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <string-array name="transition_effect_entries">
+    <item>None</item>
+    <item>Zoom in</item>
+    <item>Zoom out</item>
+    <item>Rotate up</item>
+    <item>Rotate down</item>
+    <item>Cube in</item>
+    <item>Cube out</item>
+    <item>Stack</item>
+    <item>Accordion</item>
+    <item>Flip</item>
+    <item>Cylinder in</item>
+    <item>Cylinder out</item>
+    <item>Carousel</item>
+    <item>Overview</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 4b4145c2c..bb88aa4ec 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -43,4 +43,9 @@
   <string name="icon_labels_hide">Hide</string>
   <string name="protected_app_settings">Protected apps</string>
   <string name="dialog_confirm">Confirm</string>
+  <string name="drawer_type">Layout</string>
+  <string name="drawer_type_drawer">Vertical</string>
+  <string name="drawer_type_pager">Paged</string>
+  <string name="setting_state_disabled">DISABLED</string>
+  <string name="search_activity_not_found">A search activity could not be found!</string>
 </resources>