Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of cdb9e971 to master

Browse Source
This commit is contained in:
Eric Fischer
2009-07-28 11:27:07 -07:00
parent b3c82efb47 cdb9e971d9
commit f7573bd2b7
17 changed files with 11 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SettingsProvider/res/values-cs/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"mobil,bluetooth,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-cs/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Paměť pro nastavení"</string>
<string name="app_label" msgid="4567566098528588863">"Paměť pro nastavení"</string>
</resources>

22
packages/SettingsProvider/res/values-de/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"Mobilfunk, Bluetooth, WLAN"</string>
<string name="def_location_providers_allowed">"GPS"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-de/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Einstellungsspeicher"</string>
<string name="app_label" msgid="4567566098528588863">"Einstellungsspeicher"</string>
</resources>

22
packages/SettingsProvider/res/values-es/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"móvil,bluetooth,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-es/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Almacenamiento de configuración"</string>
<string name="app_label" msgid="4567566098528588863">"Almacenamiento de configuración"</string>
</resources>

22
packages/SettingsProvider/res/values-fr/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"cellulaire, Bluetooth, Wi-Fi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-fr/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Stockage des paramètres"</string>
<string name="app_label" msgid="4567566098528588863">"Stockage des paramètres"</string>
</resources>

22
packages/SettingsProvider/res/values-it/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"cellulare,bluetooth,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-it/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Archiviazione impostazioni"</string>
<string name="app_label" msgid="4567566098528588863">"Archiviazione impostazioni"</string>
</resources>

22
packages/SettingsProvider/res/values-nl/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"mobiel,bluetooth,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-nl/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Opslagruimte voor instellingen"</string>
<string name="app_label" msgid="4567566098528588863">"Opslagruimte voor instellingen"</string>
</resources>

22
packages/SettingsProvider/res/values-pl/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"komórka,bluetooth,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-pl/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"Pamięć ustawień"</string>
<string name="app_label" msgid="4567566098528588863">"Pamięć ustawień"</string>
</resources>

22
packages/SettingsProvider/res/values-zh-rTW/defaults.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="def_airplane_mode_radios">"手機,藍牙,wifi"</string>
<string name="def_location_providers_allowed">"gps"</string>
<!-- no translation found for def_backup_transport (6764822064303377157) -->
<skip />
</resources>

2
packages/SettingsProvider/res/values-zh-rTW/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label">"設定儲存空間"</string>
<string name="app_label" msgid="4567566098528588863">"設定儲存空間"</string>
</resources>

6
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -21,7 +21,7 @@
<integer name="def_screen_off_timeout">60000</integer>
<bool name="def_airplane_mode_on">false</bool>
<!-- Comma-separated list of bluetooth, wifi, and cell. -->
<string name="def_airplane_mode_radios">cell,bluetooth,wifi</string>
<string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi</string>
<bool name="def_auto_time">true</bool>
<bool name="def_accelerometer_rotation">true</bool>
<!-- Default screen brightness, from 0 to 255. 102 is 40%. -->
@@ -35,7 +35,7 @@
Network location is off by default because it requires
user opt-in via Setup Wizard or Settings.
-->
<string name="def_location_providers_allowed">gps</string>
<string name="def_location_providers_allowed" translatable="false">gps</string>
<bool name="assisted_gps_enabled">true</bool>
<!-- 0 == mobile, 1 == wifi. -->
<integer name="def_network_preference">1</integer>
@@ -44,5 +44,5 @@
<bool name="def_networks_available_notification_on">true</bool>
<bool name="def_backup_enabled">false</bool>
<string name="def_backup_transport"></string>
<string name="def_backup_transport" translatable="false"></string>
</resources>