Commit Graph

65 Commits

Author SHA1 Message Date
Eric Fischer
45d893c523 Import revised translations.
Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
2011-01-12 17:05:49 -08:00
Eric Fischer
332af2fdf5 Import revised translations.
Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
2010-12-23 14:18:00 -08:00
Eric Fischer
7ea34ac8c8 Import revised translations.
Change-Id: Ic03653ba9e447830ec3d4b3ae5d9c7b4472d6170
2010-12-14 13:59:18 -08:00
Eric Fischer
ada96a72af Import revised translations.
Change-Id: I58f1a7d3da4c09ad3e00a94bc5353393b99f7d6d
2010-12-09 16:08:56 -08:00
Eric Fischer
dd9f69a25c Import revised translations.
Change-Id: Ifa67354329fd9a3c44ae870fc063df8048c2f7c8
2010-12-01 15:18:42 -08:00
Eric Fischer
5931c0d667 Import revised translations.
Change-Id: Ib13eef88a2489cc34caaa727680334f18489a3dc
2010-11-29 15:17:31 -08:00
Eric Fischer
3b046f5759 Import revised translations.
Change-Id: I2f6d6220057db8eb6fb8126ebec9e209d4eade36
2010-11-17 11:41:10 -08:00
Eric Fischer
9dfa60c33e Import revised translations.
Change-Id: I8ff3fdad70919d2937c3a897b5698e45078d0227
2010-11-09 17:42:54 -08:00
Eric Fischer
9446b7fe50 Import revised translations.
Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
2010-10-27 14:36:03 -07:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
2010-09-30 11:54:31 +09:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09:00
Eric Fischer
b9e77aacd1 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
2010-09-27 12:21:49 -07:00
Eric Fischer
5dc3028f28 Import revised translations.
Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
2010-09-24 12:28:13 -07:00
Eric Fischer
b2fa8719a4 Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
2010-09-24 10:26:20 -07:00
Eric Fischer
4a8608af64 Import revised translations.
Change-Id: I518b97a1bb56438dddf7ea42b836d298f65b1c87
2010-09-10 15:46:25 -07:00
Eric Fischer
be45f642ca Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
2010-09-10 13:07:48 -07:00
Eric Fischer
8f32a38393 Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
2010-09-03 17:42:59 -07:00
Eric Fischer
ce4e0ede2a Import revised translations
Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
2010-08-30 13:40:26 -07:00
Eric Fischer
92669a512a Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
2010-08-27 17:17:47 -07:00
Eric Fischer
4216902ba3 Import revised translations.
Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
2010-08-17 16:56:21 -07:00
Eric Fischer
f8a91b535b Import revised translations. DO NOT MERGE
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
2010-08-17 16:45:27 -07:00
Eric Fischer
f10101c9c6 Import revised translations.
Change-Id: I0b805e4c7d2cedf70ec4ca5309f2a8073010fa51
2010-08-05 16:09:45 -07:00
Eric Fischer
4d9d75a424 Import revised translations. DO NOT MERGE
Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
2010-08-04 10:45:20 -07:00
Irfan Sheriff
ca61c25578 am a4966840: am de3e5665: Add phase2 authentication settings
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken

* commit 'a496684019497395b71c6d460501197a74e21e0e':
  Add phase2 authentication settings
2010-06-03 11:14:40 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Kenny Root
6d40987098 Import revised translations
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
2010-04-29 16:01:54 -07:00
Kenny Root
19b4bdca55 am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo
Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken

* commit '9fef437e04edd18f6406a49095403a1b71becf58':
  Import revised translations
2010-04-28 09:47:07 -07:00
Kenny Root
eab62faea7 Import revised translations
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
2010-04-28 09:20:52 -07:00
Kenny Root
9789ca7df0 am ee381422: Merge "Import revised translations" into froyo
Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken

* commit 'ee3814226706eb0600928c573254997c4ac148b9':
  Import revised translations
2010-04-15 06:43:16 -07:00
Kenny Root
398213ec34 Import revised translations
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
2010-04-14 20:34:50 -07:00
Kenny Root
bb2ddbba63 am c0b5624c: Import revised translations
Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken

* commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b':
  Import revised translations
2010-03-30 09:46:20 -07:00
Kenny Root
c0b5624ccc Import revised translations
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
2010-03-30 09:33:49 -07:00
Oscar Montemayor
6f72be68c1 DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
2010-03-26 18:45:05 -07:00
Kenny Root
c42bee0702 Import revised translations
Change-Id: I0f81ee1b861fa5df40700baccc29e2e6c52a39d1
2010-03-17 22:15:56 -07:00
Eric Fischer
a15d03fccc Import new translations. 2010-02-26 17:33:15 -08:00
Amith Yamasani
992f10240d Refactor settings hierarchy and clump all volumes in one dialog.
Bug:2362077 Bug:2312836 Bug:2166486

Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
2010-01-25 14:58:34 -08:00
Eric Fischer
ac052113c8 Update with latest translations. 2010-01-07 16:00:11 -08:00
Tammo Spalink
19a94f1bf3 am 45bbba85: am f239f3e0: Merge change Iec5461bc into eclair-mr2
Merge commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e'

* commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e':
  Remove OEM-specific bits from RadioInfo.
2009-10-18 20:20:12 -07:00
Tammo Spalink
a5f4c8f8c9 Remove OEM-specific bits from RadioInfo.
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.

Addresses issue:
http://buganizer/issue?id=1645706

Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
2009-10-16 10:24:18 +08:00
Eric Fischer
1d75440144 Reimport translations.
Change-Id: I0127a0ad80f0736263d4e5dd01371184f2e16cdf
2009-10-13 16:43:35 -07:00
Eric Fischer
1b21ba1738 Import revised translations. DO NOT MERGE 2009-10-13 16:07:48 -07:00
Eric Fischer
909a945031 Import revised translations. DO NOT MERGE 2009-09-17 14:35:43 -07:00
Jaikumar Ganesh
5f23cb39a1 Modify settings for 2.1
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
2009-09-11 12:00:14 -07:00
Eric Fischer
140fb90a5c Import revised translations. DO NOT MERGE 2009-09-08 16:55:50 -07:00
Mitsuru Oshima
1f1c67aae5 Removing translated text for compatibility option, which has been moved to SpareParts 2009-07-20 17:50:04 -07:00
Eric Fischer
9046c92ab0 Import new translations 2009-07-13 15:49:57 -07:00
Mike Lockwood
d13308674b Remove Network Location" opt-in dialog from "Security and Settings"
This dialog is being moved to the Network Location Provider itself.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-07 20:11:39 -04:00
Eric Fischer
741ce5855f AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.

Automated import of CL 144912
2009-04-07 13:55:06 -07:00
Eric Fischer
6e811f2209 AI 143685: am: CL 143547 Import revised translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 143685
2009-03-31 11:11:17 -07:00