Skip to content

Commit

Permalink
Merge branch 'cyanogen' into gingerbread
Browse files Browse the repository at this point in the history
  • Loading branch information
@tpruvot
tpruvot committed May 11, 2012
2 parents 6b2a139 + abd850b commit 3e92533
Show file tree
Hide file tree
Showing 18 changed files with 922 additions and 59 deletions.
4 changes: 1 addition & 3 deletions DefyParts/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cyanogenmod.defyparts"
android:sharedUserId="android.uid.system"
android:versionCode="1"
android:versionName="1.0" >
android:sharedUserId="android.uid.system">

<uses-permission android:name="android.permission.REBOOT" />

Expand Down
49 changes: 49 additions & 0 deletions DefyParts/res/layout/dialog_baseband_selection.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->

<ScrollView android:layout_width="300.0sp"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">

<LinearLayout android:orientation="vertical"
android:padding="8.0dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<Spinner android:id="@+id/region"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:entries="@array/baseband_region_entries"
android:prompt="@string/baseband_region" />

<Spinner android:id="@+id/country"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:prompt="@string/baseband_country" />

<Spinner android:id="@+id/baseband"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:prompt="@string/baseband_version" />

<TextView android:id="@+id/frequencies"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8.0dip" />

</LinearLayout>

</ScrollView>
34 changes: 31 additions & 3 deletions DefyParts/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,41 @@

<string name="other_settings_title">Andere Einstellungen</string>
<string name="compass_calibrate">Kompasskalibrierung</string>
<string name="baseband_switcher">Baseband-Auswahl</string>
<string name="baseband_selection">Baseband-Auswahl</string>
<string name="kineto_support">Kineto-Unterstützung</string>
<string name="kineto_support_summary">Kineto-Anwendung (\'Wifi Calling\') aktivieren</string>

<string name="kineto_reboot_prompt_title">Neustart nötig</string>
<string name="kineto_reboot_prompt_message">Um die Änderung des Anwendungszustandes abzuschließen, muss das Telefon neu gestartet werden.\n\nMöchten Sie jetzt neu starten?</string>
<string name="reboot_prompt_title">Neustart nötig</string>
<string name="reboot_prompt_message">Um die geänderten Einstellungen anzuwenden, muss das Telefon neu gestartet werden.\n\nMöchten Sie jetzt neu starten?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>

<string name="region_europe">Europa</string>
<string name="region_america">Amerika</string>
<string name="region_asia">Asien</string>
<string name="region_africa">Afrika</string>
<string name="region_australia">Australien</string>

<string name="country_central_europe">Mitteleuropa</string>
<string name="country_france">Frankreich</string>
<string name="country_great_britain">Großbritannien</string>
<string name="country_italy">Italien</string>
<string name="country_poland">Polen</string>
<string name="country_usa">USA</string>
<string name="country_brasil">Brasilien</string>
<string name="country_argentina">Argentinien</string>
<string name="country_colombia">Kolumbien</string>
<string name="country_china">China</string>
<string name="country_south_korea">Südkorea</string>
<string name="country_hongkong_taiwan">Hongkong, Taiwan</string>
<string name="country_south_east_asia">Südostasien</string>
<string name="country_arabia">Arabien</string>
<string name="country_south_africa">Südafrika</string>

<string name="baseband_selection_summary">Auswahl des Telefon-Basebands\nMomentan gewählt: %1$s %2$s</string>
<string name="baseband_region">Region</string>
<string name="baseband_country">Land</string>
<string name="baseband_version">Version</string>
<string name="baseband_frequencies">Frequenz: %1$s MHz</string>
<string name="unknown">Unbekannt</string>
</resources>
38 changes: 34 additions & 4 deletions DefyParts/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,42 @@

<string name="other_settings_title">Autres paramètres</string>
<string name="compass_calibrate">Calibration boussole</string>
<string name="baseband_switcher">Fréquences GSM (Baseband)</string>
<string name="baseband_selection">Fréquences GSM (Baseband)</string>
<string name="kineto_support">Support des appels Wifi</string>
<string name="kineto_support_summary">Activer l\'application T-Mobile pour les appels téléphoniques via Wifi.</string>
<string name="kineto_support_summary">Activer l\'application T-Mobile pour les appels téléphoniques via Wifi</string>

<string name="reboot_prompt_title">Redémarrage requis</string>
<string name="reboot_prompt_message">Un redémarrage est nécessaire pour appliquer la modification.\n\nRedémarrer maintenant ?</string>

<string name="region_europe">Europe</string>
<string name="region_america">Amérique</string>
<string name="region_asia">Asie</string>
<string name="region_africa">Afrique</string>
<string name="region_australia">Australie</string>

<string name="country_central_europe">Europe centrale</string>
<string name="country_france">France</string>
<string name="country_great_britain">Grande Bretagne</string>
<string name="country_italy">Italie</string>
<string name="country_poland">Pologne</string>
<string name="country_usa">USA</string>
<string name="country_brasil">Brésil</string>
<string name="country_argentina">Argentine</string>
<string name="country_colombia">Colombie</string>
<string name="country_china">Chine</string>
<string name="country_south_korea">Corée du Sud</string>
<string name="country_hongkong_taiwan">Hongkong, Taiwan</string>
<string name="country_south_east_asia">Asie du Sud-Est</string>
<string name="country_arabia">Arabie</string>
<string name="country_south_africa">Afrique du Sud</string>

<string name="baseband_selection_summary">Sélectionner la bande de fréquences\nSélection: %1$s %2$s</string>
<string name="baseband_region">Région</string>
<string name="baseband_country">Pays</string>
<string name="baseband_version">Version</string>
<string name="baseband_frequencies">Fréquences: %1$s MHz</string>
<string name="unknown">Inconnu</string>

<string name="kineto_reboot_prompt_title">Nécessite un redémarrage</string>
<string name="kineto_reboot_prompt_message">Pour activer ou désactiver l\'application, un redémarrage est nécessaire.\n\nRedémarrer maintenant?</string>
<string name="yes">Oui</string>
<string name="no">Non</string>

Expand Down
69 changes: 69 additions & 0 deletions DefyParts/res/values-ja/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Defy設定</string>

<string name="general_settings_title">一般的な設定</string>

<string name="charge_led_mode_title">充電中のLEDモード</string>
<string name="charge_led_mode_summary">充電中のLEDモードを調整する</string>
<string name="charge_led_mode_white">白LED</string>
<string name="charge_led_mode_rgb">混合LED (赤/緑)</string>
<string name="charge_led_mode_off">オフ</string>

<string name="button_brightness_scale_title">ボタン輝度</string>
<string name="button_brightness_scale_summary">ボタンの輝度を下げる . 特にマニュアル輝度を使用してる場合に有効</string>

<string name="touch_points_title">マルチタッチ ポイント</string>
<string name="touch_points_summary">システムで登録済みのマルチタッチ ポイントを調整</string>
<string name="touch_point_entry_2points">2ポイント (デフォルト)</string>
<string name="touch_point_entry_3points">3ポイント</string>
<string name="touch_point_entry_4points">4ポイント</string>
<string name="touch_point_entry_5points">5ポイント</string>
<string name="touch_point_entry_8points">8ポイント</string>

<string name="touch_point_warning_title">警告</string>
<string name="touch_point_warning_message">マルチタッチ ポイント数を増やすと反応が遅くなるかもしれません.\n本当に設定を変更しますか？</string>

<string name="audio_settings_title">オーディオ設定</string>
<string name="audio_effects">オーディオとDSP</string>

<string name="other_settings_title">他の設定</string>
<string name="compass_calibrate">コンパスの設定</string>
<string name="baseband_selection">ベースバンドの選択</string>
<string name="kineto_support">Wifi通話のサポート</string>
<string name="kineto_support_summary">T-Mobile Wifi通話アプリを有効にする</string>

<string name="reboot_prompt_title">再起動が必要</string>
<string name="reboot_prompt_message">設定の変更を適用するためには再起動が必要です.\n\n今すぐ再起動しますか？</string>
<string name="yes">はい</string>
<string name="no">いいえ</string>

<string name="region_europe">ヨーロッパ</string>
<string name="region_america">アメリカ</string>
<string name="region_asia">アジア</string>
<string name="region_africa">アフリカ</string>
<string name="region_australia">オーストラリア</string>

<string name="country_central_europe">中央ヨーロッパ</string>
<string name="country_france">フランス</string>
<string name="country_great_britain">イギリス</string>
<string name="country_italy">イタリア</string>
<string name="country_poland">ポーランド</string>
<string name="country_usa">アメリカ</string>
<string name="country_brasil">ブラジル</string>
<string name="country_argentina">アルゼンチン</string>
<string name="country_colombia">コロンビア</string>
<string name="country_china">中国</string>
<string name="country_south_korea">韓国</string>
<string name="country_hongkong_taiwan">香港, 台湾</string>
<string name="country_south_east_asia">東南アジア</string>
<string name="country_arabia">アラビア</string>
<string name="country_south_africa">南アフリカ</string>

<string name="baseband_selection_summary">お住まいの地域に最適なベースバンドを選択して下さい\n現在の設定: %1$s %2$s</string>
<string name="baseband_region">地域</string>
<string name="baseband_country">国</string>
<string name="baseband_version">バージョン</string>
<string name="baseband_frequencies">周波数帯域: %1$s MHz</string>
<string name="unknown">不明</string>
</resources>
3 changes: 1 addition & 2 deletions DefyParts/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
<string name="kineto_support">Звонки через WiFi</string>
<string name="kineto_support_summary">Активировать приложение для звонков через WiFi</string>

<string name="kineto_reboot_prompt_title">Требуется перезагрузка</string>
<string name="kineto_reboot_prompt_message">Для применения параметров необходимо перезагрузить устройство.\n\nВыполнить перезагрузку?</string>
<string name="reboot_prompt_title">Требуется перезагрузка</string>
<string name="yes">Да</string>
<string name="no">Нет</string>

Expand Down
1 change: 0 additions & 1 deletion DefyParts/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@

<string name="other_settings_title">其它设置</string>
<string name="compass_calibrate">指南针校准</string>
<string name="baseband_switcher">基带切换</string>
</resources>
Loading

0 comments on commit 3e92533

Please sign in to comment.