Merge "Changelog: Add Blade changes and fix a typo" into gingerbread
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml
new file mode 100644
index 0000000..f436bec
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- On the keyguard screen, it shows the carrier the phone is connected to. This is displayed if the phone is not connected to a carrier.-->
+ <string name="lockscreen_carrier_default"></string>
+
+ <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+ <string name="power_dialog">Opzioni tablet</string>
+
+ <!-- Button to reboot the phone, within the Phone Options dialog -->
+ <string name="reboot_system">Riavvia tablet</string>
+
+ <!-- Shutdown Confirmation Dialog. When the user chooses to power off the phone, there will be a confirmation dialog. This is the message. -->
+ <string name="shutdown_confirm">Il tablet verrà spento.</string>
+
+ <!-- Reboot Confirmation Dialog. When the user chooses to reboot the phone, there will be a confirmation dialog. This is the message. -->
+ <string name="reboot_confirm">Il tablet verrà riavviato.</string>
+
+ <!-- Title of the Global Actions Dialog -->
+ <string name="global_actions">Opzioni tablet</string>
+</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
new file mode 100755
index 0000000..ddae548
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="power_dialog">Confirações do tablet</string>
+ <string name="reboot_system">Reiniciar tablet</string>
+ <string name="shutdown_confirm">Seu tablet irá desligar.</string>
+ <string name="reboot_confirm">Seu tablet irá reiniciar.</string>
+ <string name="global_actions">Configurações do tablet</string>
+</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml
new file mode 100644
index 0000000..7e4afc4
--- /dev/null
+++ b/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+ <string name="about_settings">Info sul tablet</string>
+
+</resources>
+
diff --git a/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml
new file mode 100644
index 0000000..d2a22f4
--- /dev/null
+++ b/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+ <string name="about_settings">Sobre tablet</string>
+
+</resources>
+
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index b29b583..f6ccd40 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -14,8 +14,9 @@
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/harmony
-
+PRODUCT_PACKAGE_OVERLAYS += \
+ vendor/cyanogen/overlay/tablet \
+ vendor/cyanogen/overlay/harmony
#
# Set ro.modversion
#
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
index 46977a5..403cfcb 100644
--- a/products/cyanogen_vega.mk
+++ b/products/cyanogen_vega.mk
@@ -17,7 +17,9 @@
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Vega BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vega
+PRODUCT_PACKAGE_OVERLAYS += \
+ vendor/cyanogen/overlay/tablet \
+ vendor/cyanogen/overlay/vega
#
# Set ro.modversion