summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
| | | | | | | | | | | | | | | | | | | | Change-Id: I31055b1f7d52718773adef01fa16365be3931d15 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEYing Wang2012-07-1650-87/+355
| | | | | | | | | | | | | | | | | | | | Change-Id: I91f57e5dbf11a05e21b5c9f90cc8b3fb000ceaab Auto-generated-cl: translation import
* | | | am b2a16b92: am ea819b07: Merge "Implement issue #6819955: Add button to ↵Dianne Hackborn2012-07-132-0/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | take bug report." into jb-dev * commit 'b2a16b9202f6daa609d152ffc2fd273088fbb1ac': Implement issue #6819955: Add button to take bug report.
| * | | am ea819b07: Merge "Implement issue #6819955: Add button to take bug ↵Dianne Hackborn2012-07-132-0/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | report." into jb-dev * commit 'ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6': Implement issue #6819955: Add button to take bug report.
| | * | Merge "Implement issue #6819955: Add button to take bug report." into jb-devDianne Hackborn2012-07-132-0/+15
| | |\ \
| | | * | Implement issue #6819955: Add button to take bug report.Dianne Hackborn2012-07-132-0/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
| * | | | am 4b25c5ad: Import translations. DO NOT MERGEYing Wang2012-07-1349-180/+273
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4b25c5ad8236feab94956d4626fe5c1409e5b989': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEYing Wang2012-07-1349-180/+273
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5 Auto-generated-cl: translation import
| * | | am 62acae4f: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-07-121-41/+41
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '62acae4f85c937e2f0a883a47b2819f122b84675': Import translations. DO NOT MERGE
| | * | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-07-121-41/+41
| | |\ \
| | | * | Import translations. DO NOT MERGEYing Wang2012-07-121-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEYing Wang2012-07-1350-209/+301
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25f8e8923c50377df9a517538e6b76bafac4af9a Auto-generated-cl: translation import
* | | | | am e8b25302: am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-122-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e8b2530260abc74e570ae266b49bade240f14913': Display FCC id for LTE in Settings.
| * | | | am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-122-0/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103': Display FCC id for LTE in Settings.
| | * | | Display FCC id for LTE in Settings.John Wang2012-07-112-0/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID. bug:4965501 Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
| * | | am efc229b3: Import translations. DO NOT MERGEYing Wang2012-07-101-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'efc229b3c3c969eef1d32d62435741228b96aeb9': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEYing Wang2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e Auto-generated-cl: translation import
| * | | am 051619c0: Import translations. DO NOT MERGEYing Wang2012-07-091-3/+3
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit '051619c06338f776fd361c313b515c676fb74331': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-091-3/+3
| | | | | | | | | | | | | | | Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17 Auto-generated-cl: translation import
| * | am 39aade5b: Import translations. DO NOT MERGEYing Wang2012-07-035-13/+13
| |\ \ | | |/ | | | | | | | | | * commit '39aade5b4e6b134bbd3962dc14efc4a9571bb8ab': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-035-13/+13
| | | | | | | | | | | | | | | Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-121-41/+41
| | | | | | | | | | | | | | | Change-Id: I7e9254f65e3c315c5f60414d1ac209622634ec36 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-112-3/+3
| | | | | | | | | | | | | | | Change-Id: Iba8d713f8a137400874a02e1741499fb7248937c Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-102-3/+3
| | | | | | | | | | | | | | | Change-Id: If2979386d0d62cd5077ab1b4225b600d49a88fb2 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-0949-3/+104
| | | | | | | | | | | | | | | Change-Id: Idf87c5d0c99bf4c9214b1d6a41ee19a9224b6f05 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-07-035-13/+13
|\ \ \
| * | | Import translations. DO NOT MERGEYing Wang2012-07-035-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I47f714a1547115d65d08bda8a681f052ebc16d77 Auto-generated-cl: translation import
* | | | am 51cc655c: am 2fad853b: Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '51cc655ccdb8c78759095c709967a2185f2f61d8': Limit length of SSID input string to 32
| * | | am 2fad853b: Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '2fad853bf7282676ee3f2ec87630de5fdbcb236b': Limit length of SSID input string to 32
| | * \ \ Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
| | |\ \ \
| | | * | | Limit length of SSID input string to 32Kenneth Westin2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limits the UI text box of the SSID field to 32 characters (which is standard) from previously being unlimited in the UI but constrained in the driver implementation. See IEEE 802.11-1999 7.3.2.1 Service Set Identity (SSID) element. Change-Id: I17573ee338ed744a2bc0258ee2c0f382c1a5c931
* | | | | | am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot ↵Irfan Sheriff2012-07-031-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | on/off" * commit '7c8363eb11b61f712e982b161a2267c2731df6fa': wifi: update text displayed during hotspot on/off
| * | | | am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f': wifi: update text displayed during hotspot on/off
| | * | | Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-0/+4
| | |\ \ \
| | | * | | wifi: update text displayed during hotspot on/offVishal Mahaveer2012-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the string used during hotspot on/off Change-Id: I89f54f6c02ae26dd39b3cfdcd7587cf59ba81ca1 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| | * | | | Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"Jean-Baptiste Queru2012-06-131-2/+2
| | |\ \ \ \
| | | * | | | Settings: Fixed German translation for turning WLAN/Bluetooth onMarcus Bauer2012-05-271-2/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch, the question "WLAN aktivieren?" would show after you turned it on, and while it is loading; this patch merely addresses this issue and changes it to "WLAN wird aktiviert", which is consistent with the message showing up when turning it off. Likewise for turning Bluetooth on. Change-Id: Ic91143836a85751c39839daae720ac03b174bfde
| * | | | | am a1146f83: Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292 Auto-generated-cl: translation import
| * | | | | am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2921-93/+47
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2921-93/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5 Auto-generated-cl: translation import
| * | | | | am 3cc385b8: Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51 Auto-generated-cl: translation import
| * | | | | am c812fe4c: Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2921-93/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16afd7e6e7465bbd23cb0d2076bc13a9edffcd59 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib511e1cdf515c855ea235886b6c801a902136ba4 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a59e4f258f041a175e9fd05a60da9c21daabf40
* | | | | | resolved conflicts for merge of 8f12b128 to masterJake Hamby2012-06-252-1/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df