am 509b510e: Merge commit \'9b22c4f9\' into fix-merge-conflict
* commit '509b510ee16b6b478cd8acf97087245e496872de':
Toro: Add overlay to use network mode 7 for cdma/lte
diff --git a/overlay/frameworks/base/core/res/res/values-sv/strings.xml b/overlay/frameworks/base/core/res/res/values-sv/strings.xml
new file mode 100644
index 0000000..563f1d5
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-sv/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="permlab_readCellBroadcasts" msgid="257903761622214155">"läsa meddelanden vid nödsituationer"</string>
+ <string name="permdesc_readCellBroadcasts" msgid="7941871237993413028">"Appen tillåts läsa SMS som skickas till din enhet vid nödsituationer. På vissa platser skickas SMS för att varna för nödsituationer. Skadliga appar kan påverka enhetens prestanda eller funktionalitet när du får ett meddelande om en nödsituation via SMS."</string>
+</resources>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-sv/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-sv/strings.xml
new file mode 100644
index 0000000..71ba818
--- /dev/null
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label" msgid="6309526071996236065">"Meddelanden vid nödsituationer"</string>
+ <string name="sms_cb_settings" msgid="5286863780117877871">"Inställningar för meddelanden vid nödsituationer"</string>
+</resources>
diff --git a/overlay/packages/apps/Mms/res/values-sv/strings.xml b/overlay/packages/apps/Mms/res/values-sv/strings.xml
new file mode 100644
index 0000000..7c09841
--- /dev/null
+++ b/overlay/packages/apps/Mms/res/values-sv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="menu_cell_broadcasts" msgid="3849716369345119724">"Meddelanden vid nödsituationer"</string>
+</resources>
diff --git a/overlay/packages/apps/Phone/res/values-sv/strings.xml b/overlay/packages/apps/Phone/res/values-sv/strings.xml
new file mode 100644
index 0000000..e3b7100
--- /dev/null
+++ b/overlay/packages/apps/Phone/res/values-sv/strings.xml
@@ -0,0 +1,20 @@
+<?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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="cell_broadcast_sms" msgid="4858486679238468646">"SMS vid nödsituatuationer"</string>
+</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sv/strings.xml b/overlay/packages/apps/Settings/res/values-sv/strings.xml
new file mode 100644
index 0000000..debeae0
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2012 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="cell_broadcast_settings" msgid="8300334390405628150">"Meddelanden vid nödsituationer"</string>
+</resources>
