Merge "build Torch for Fascinate, Mesmerize, and Showcase devices" into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 8395d71..82c0832 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -72,6 +72,8 @@
* Polish: Maciej Rozbicki
* Korean: Inseok Lee
* Traditional Chinese: Ladios Jonquil
+* Slovak: Juraj Janecek
+* Czech: Ondrej Zima
CHANGELOG
---------
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
new file mode 100644
index 0000000..84c41b6
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="lockscreen_carrier_default"></string>
+ <string name="power_dialog">Tabletoptionen</string>
+ <string name="reboot_system">Neu starten</string>
+ <string name="shutdown_confirm">Tablet wird heruntergefahren.</string>
+ <string name="reboot_confirm">Ihr Tablet wird neu gestartet.</string>
+ <string name="global_actions">Tabletoptionen</string>
+</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
new file mode 100644
index 0000000..f7f40be
--- /dev/null
+++ b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="about_settings">Über das Tablet</string>
+</resources>
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index 47dae3d..65e844c 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/anzu
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index 8a67fbb..817ab07 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/hallon
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio