nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
32533 commits 1 branch 0 tags 363 MiB
Commit graph

3353 commits

Author SHA1 Message Date
Tadashi G. Takaoka
081a4177e4 am c140938d: am bfcd98ed: Use fragment for input preference screen 
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
  Use fragment for input preference screen
 2014-07-28 12:14:19 +00:00
Tadashi G. Takaoka
4dba300e50 am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option 
* commit '26a2986581410536a98e1c311214dc90d9934546':
  Make "Show correction suggestions" as a binary option
 2014-07-28 12:14:18 +00:00
Tadashi G. Takaoka
bfcd98edc7 Use fragment for input preference screen 
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.

Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
 2014-07-27 16:06:52 +09:00
Tadashi G. Takaoka
ab661e3ef8 Make "Show correction suggestions" as a binary option 
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.

Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
 2014-07-27 14:47:07 +09:00
Jean Chalard
76ad259764 Merge "Improve the russian dictionary." into lmp-dev 2014-07-25 11:19:20 +00:00
Jean Chalard
ae41058659 Improve the russian dictionary. 
Deleted: 38 words
Probability adjusted: 11 words
Added: 1299 words

[Category diff]
+1      15
-1       0
+2       0
-2       0
+3       0
-3       0
+4       0
-4       0
+5       0
-5       3
+6       1
-6       0
+7       0
-7      13

[Weighted category diff]
+1      15
-1       0
+2       0
-2       0
+3       0
-3       0
+4       0
-4       0
+5       0
-5       3
+6       1
-6       0
+7       0
-7      13

Change-Id: I1a6513954d60b30738cb849578ce535c5e05eb1a
 2014-07-29 13:31:23 +09:00
Baligh Uddin
2dc3a51001 Merge "Import translations. DO NOT MERGE" 2014-07-24 20:48:02 +00:00
Tadashi G. Takaoka
456cc99678 am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly 
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
  Remove unnecessary DebugSettingsActivity, use fragment directly
 2014-07-24 20:01:00 +00:00
Baligh Uddin
9ac0f0838b Import translations. DO NOT MERGE 
Change-Id: Id8eadce808d946a7674f41826ab4aa086ac818e7
Auto-generated-cl: translation import
 2014-07-24 09:40:19 -07:00
Jean Chalard
a9c12692ed [SD10] Add script checks for Lao and Khmer 
Bug: 15840116
Change-Id: Id72b739e73cb3e72f56e1872ad9d60469555e193
 2014-07-30 12:02:37 +09:00
Tadashi G. Takaoka
e14c680078 Update Material icons and backgrounds 
Bug: 16143083
Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
 2014-07-29 11:32:04 +09:00
Tadashi G. Takaoka
9bdcb13160 Use fragment for advanced preference screen 
Bug: 16522808
Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
 2014-07-28 19:24:41 +09:00
Tadashi G. Takaoka
99295c8c5f Refactor Debug settings to use SubScreenFragment 
Bug: 16522808
Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
 2014-07-28 19:16:42 +09:00
Tadashi G. Takaoka
00b49cad9c Use fragment for text correction preference screen 
Bug: 16522808
Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
 2014-07-28 17:48:49 +09:00
Tadashi G. Takaoka
3c8a075a58 Use fragment for gesture typing preference screen 
Bug: 16522808
Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
 2014-07-28 17:45:41 +09:00
Tadashi G. Takaoka
6b71530017 Use fragment for multi lingual preference screen 
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
 2014-07-28 17:20:16 +09:00
Tadashi G. Takaoka
a270ac4a61 Remove unnecessary DebugSettingsActivity, use fragment directly 
This CL must be checked in together with I1db2e848ab.

Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
 2014-07-23 17:09:46 -07:00
Baligh Uddin
129f05867f Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
8fc6b5a820 Import translations. DO NOT MERGE 
Change-Id: I8916526987bd2008b85222124bf465114e4d592c
Auto-generated-cl: translation import
 2014-07-22 17:43:50 +00:00
Baligh Uddin
58ad6c4805 Import translations. DO NOT MERGE 
Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6
Auto-generated-cl: translation import
 2014-07-22 17:39:41 +00:00
Baligh Uddin
9f147c1337 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
e13e675cdc Import translations. DO NOT MERGE 
Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a
Auto-generated-cl: translation import
 2014-07-22 17:44:02 +00:00
Baligh Uddin
f1e3f9df51 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:29:55 +00:00
Baligh Uddin
c1d2124a3e Import translations. DO NOT MERGE 
Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5
Auto-generated-cl: translation import
 2014-07-22 17:44:08 +00:00
Baligh Uddin
05a2e8dea5 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
f9efaad468 Import translations. DO NOT MERGE 
Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500
Auto-generated-cl: translation import
 2014-07-22 17:44:19 +00:00
Baligh Uddin
ef29c1cd61 Import translations. DO NOT MERGE 
Change-Id: I844a25e74c1cd451523248ae0d09ba9d40c3d09d
Auto-generated-cl: translation import
 2014-07-22 17:44:14 +00:00
Tadashi G. Takaoka
ec8d08af28 am 34da7494: Merge "Update Hindi Compact keyboard layout" into lmp-dev 
* commit '34da7494374d44b37d051c6c1a967d6c243ac5a7':
  Update Hindi Compact keyboard layout
 2014-07-21 18:28:32 +00:00
Tadashi G. Takaoka
9c6abf3ece am 639c93f4: Remove unused Key.keyLabelFlags\' values 
* commit '639c93f43bc51a8328d7dc11a09a3bd77974aeae':
  Remove unused Key.keyLabelFlags' values
 2014-07-21 18:28:30 +00:00
Tadashi G. Takaoka
f6785ea588 am de1ab73e: Use Theme.DeviceDefault theme 
* commit 'de1ab73efbe3520059647924857a2d7b82e2fbe7':
  Use Theme.DeviceDefault theme
 2014-07-21 18:28:17 +00:00
Tadashi G. Takaoka
34da749437 Merge "Update Hindi Compact keyboard layout" into lmp-dev 2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka
254c5c1e4b Update Hindi Compact keyboard layout 
Bug: 13779052
Change-Id: I350e5521b41d2a0b1cc17b6d4a48e6a816db916c
 2014-07-19 16:43:35 -07:00
Tadashi G. Takaoka
639c93f43b Remove unused Key.keyLabelFlags' values 
Change-Id: Iae3cd6674448f258ee0a4bf2966bf3c347876b4f
 2014-07-19 12:31:50 -07:00
Tadashi G. Takaoka
de1ab73efb Use Theme.DeviceDefault theme 
For API 21 (and later), Theme.DeviceDefault.Light is specified.

This CL must be checked in together with Ic91f28df81.

Bug: 11866784
Bug: 13888366
Bug: 15781377
Change-Id: I01b288473128fc2491d3663e90cab56d0ba2d704
 2014-07-18 15:30:30 -07:00
Baligh Uddin
a7783b288c Remove deprecated locales 
Change-Id: Ia01c8414b688db7d771880dfbd115c76a1dd9019
 2014-07-18 11:43:07 -07:00
Baligh Uddin
8279b9d4a9 Remove deprecated locales - DO NOT MERGE 
Change-Id: I8c1efe2343eea40faf7a690518c500af86c1c323
 2014-07-20 02:27:29 +00:00
Baligh Uddin
352a7285ad Will have to fix the CL. 
Revert "Remove deprecated locales"

This reverts commit 6a1af17d44.

Change-Id: I3f4379d14a45ab80a5ad467fa65607ae5b3e6e26
 2014-07-18 17:48:37 +00:00
Baligh Uddin
6a1af17d44 Remove deprecated locales 
Change-Id: Idc79704b1e4e7113f92ad425e6e2d363182a9969
 2014-07-17 15:43:15 -07:00
Tadashi G. Takaoka
7f58115a86 Update Material theme colors 
Bug: 15782668
Bug: 15436349
Change-Id: Idbf98933e60531dbddb9450c6dbe7c4e2492cbd5
 2014-07-16 14:33:23 -07:00
Tadashi G. Takaoka
39ae9ee06b Mark Theme name text as translatable="false" 
Bug: 16226064
Change-Id: Ice28fc20680889a4053c5d20c88dd744a0f7297e
 2014-07-15 22:54:43 -07:00
Tadashi G. Takaoka
ecfc6f347a Fix wrong shift key icon in Material Light theme 
Bug: 16208129
Change-Id: I34ba531bcdd9b18b3b84c78cf0cd9cae439ecd5d
 2014-07-12 13:39:17 +09:00
Tadashi G. Takaoka
63fc159550 Merge "Update Material theme colors" 2014-07-10 21:46:42 +00:00
Tadashi G. Takaoka
509d9be21f Update Material theme colors 
This CL also fixes a bug of pressed state color of suggestions strip
in Material Light theme.

Bug: 16208167
Change-Id: I4315893bd129f65f34c863b003c8b2cfab4d2d84
 2014-07-11 13:09:18 +09:00
Tadashi G. Takaoka
b3bd025b1a Increase CHAR LIMIT of settings title 
Bug: 16080988
Change-Id: I8638a26370bbe2abf5dfcd9f40200b57264f5c0b
 2014-07-11 11:37:16 +09:00
Tadashi G. Takaoka
4607e763a4 Update Material icons and key pressed state background 
Bug: 16143083
Bug: 15678940
Bug: 15680164
Change-Id: I9f2527a8a536aab05d961e619e3940603024385c
 2014-07-10 22:40:06 +09:00
Tadashi G. Takaoka
facfd28a47 Merge "Add some virama combinations and tall-a for Myanmar" 2014-07-09 17:22:29 +00:00
Tadashi G. Takaoka
f9f409530c Add Material Light theme 
Bug: 15782668
Change-Id: Id2ae47cfb2065d73f13701b9c6a041129dfd08ae
 2014-07-10 07:43:04 +09:00
Tadashi G. Takaoka
46394af7b9 Update Material Dark theme 
Bug: 15782668
Change-Id: If3f2439fe9dcd2c05514e73861777337b42273c4
 2014-07-09 23:43:45 +09:00
Tadashi G. Takaoka
b657c053c4 Add some virama combinations and tall-a for Myanmar 
Bug: 7963632
Change-Id: I478ecdc3b7409ccd8dc729da28ad4816a2eda75e
 2014-07-09 17:41:56 +09:00
Tadashi G. Takaoka
d5f32b38f5 Add Telugu keyboard 
Bug: 10028759
Change-Id: Id1bf030a9928124ead695aa7bf76db48ca58de4b
 2014-07-09 02:36:15 +09:00
Tadashi G. Takaoka
03aa084ccd Add Kannada keyboard 
Bug: 10029252
Change-Id: Ia03ff886f9e62a2fe228fe59b504b033eead7631
 2014-07-09 01:44:04 +09:00
Tadashi G. Takaoka
59e795ca3f Add Malayalam keyboard 
Bug: 10417006
Change-Id: Ieb03fe1f08c85417b5d9ad4d62c8a5bc6d0632bc
 2014-07-08 23:42:01 +09:00
Tadashi G. Takaoka
a315903fb1 Remove unnecessary autoXScale flag 
Change-Id: I4385a53e9e8ec1e3902aafd4113d339ad7471b6f
 2014-07-08 22:07:08 +09:00
Tadashi G. Takaoka
074e9812ee Merge "Add Tamil keyboard" 2014-07-02 19:52:36 +00:00
Tadashi G. Takaoka
b5696b4f67 Add Tamil keyboard 
Bug: 9978106
Change-Id: I226e640fe453076063121176121ed5923d1ccfa1
 2014-07-08 18:05:07 +09:00
Tadashi G. Takaoka
af2e0a5697 Update Bengali keyboard to add a few vowel signs 
Bug: 10028755
Change-Id: Ia0b8624470c5b0667a3d7267d3cf8d4c937b0b0c
 2014-07-08 18:29:56 +09:00
Tadashi G. Takaoka
9cb19b1bca Merge "Remove unused keyPreviewIcon attributes" 2014-07-02 21:09:42 +00:00
Tadashi G. Takaoka
6efe9ae1c0 Remove unused keyPreviewIcon attributes 
This CL also removes unused tabKeyPreview icon.

Change-Id: Ia69ba9c3d7c67ccb8983275bed262292eb422db2
 2014-07-08 17:36:11 +09:00
Baligh Uddin
34c7c7cc55 Merge "Import translations. DO NOT MERGE" 2014-07-07 17:47:39 +00:00
Baligh Uddin
344c12013c Import translations. DO NOT MERGE 
Change-Id: I659b81a251775d27ef5f2d8c4b74f91c72af6370
Auto-generated-cl: translation import
 2014-07-07 06:59:36 -07:00
Baligh Uddin
20d2e277b8 Merge "Import translations. DO NOT MERGE" 2014-07-06 02:28:07 +00:00
Baligh Uddin
388ddba649 Import translations. DO NOT MERGE 
Change-Id: I9e4be44e89eac47733b39f5e46c10c6bf2611153
Auto-generated-cl: translation import
 2014-07-07 07:04:12 -07:00
Tadashi G. Takaoka
0205fb220d Add Bengali keyboard layout 
This is a preliminary keyboard layout.

Bug: 10028755
Change-Id: I365fb8e942a60d4b690a4af95fcd35bf73fffbe4
 2014-07-04 20:59:37 +09:00
Keisuke Kuroyanagi
b8a9479b57 Move phrase gesture from additional features to public. 
Bug: 15758242
Change-Id: I703dc2703afdf9402c5d2ac27411b74ece993dba
 2014-07-08 16:36:06 +09:00
Baligh Uddin
c810480721 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:00:08 +00:00
Baligh Uddin
7a31afa277 Import translations. DO NOT MERGE 
Change-Id: Ie4c06dda7d56da6248ec84abddb44d592e678e90
Auto-generated-cl: translation import
 2014-07-07 06:43:07 -07:00
Baligh Uddin
fd3cb59abb Merge "Import translations. DO NOT MERGE" 2014-07-02 20:00:08 +00:00
Baligh Uddin
08c29dfdce Import translations. DO NOT MERGE 
Change-Id: I82c82756275887836f29c6bdc4f00504cf71e3a0
Auto-generated-cl: translation import
 2014-07-07 06:45:33 -07:00
Baligh Uddin
3baa61cdd3 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin
1bf3dd898c Import translations. DO NOT MERGE 
Change-Id: I2305910609685ccd29c71d73f96e47e484ec6847
Auto-generated-cl: translation import
 2014-07-07 06:47:22 -07:00
Baligh Uddin
54f5f42720 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:11:01 +00:00
Baligh Uddin
cde7ceb645 Import translations. DO NOT MERGE 
Change-Id: Ifb6b83b1a84b4103193cf3e4fb84b0d52081e980
Auto-generated-cl: translation import
 2014-07-07 06:49:51 -07:00
Baligh Uddin
9a98a4ce0d Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin
0d452c9406 Import translations. DO NOT MERGE 
Change-Id: I5908c36d3c83f44e330a9f83240c4ecb91f96b48
Auto-generated-cl: translation import
 2014-07-07 06:52:48 -07:00
Tadashi G. Takaoka
92ac2aa8ed Move fontNormal flag from Key to Row 
Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
 2014-07-07 18:58:01 +09:00
Tadashi G. Takaoka
9eb6804270 Merge "Fix Sinhala keyboard for tablet device" 2014-07-02 20:35:42 +00:00
Tadashi G. Takaoka
649de3f544 Fix Sinhala keyboard for tablet device 
This CL introduces fontDefault flag to keyLabelFlags of Key attribute
to reset font specification to keyTypeface attribute.

This is a followup of I065824f3fa.

Bug: 6911143
Change-Id: I33bd4a23aaea73e2b17175ddd39053ec915d5451
 2014-07-07 16:57:11 +09:00
Tadashi G. Takaoka
59016206ab Fix Sinhala keyboard layout 
This CL modifes the following points.
- add digit hint letters on the 1st row.
- remove digit more keys from shifted layout.
- use normal font for Sinhala letters.
- use auto X scale flag to fix Sinhala letters on a key top.

Bug: 6911143
Change-Id: I082ea38529399dce7d99c980e2be07c35d2e912d
 2014-07-07 15:36:08 +09:00
Tadashi G. Takaoka
7f102e389d Merge "Use smaller text size for 5-rows keyboard" 2014-07-02 19:52:36 +00:00
Tadashi G. Takaoka
940393292e Use smaller text size for 5-rows keyboard 
Change-Id: I065824f3fab941560980d3d9387730e4c25eb12b
 2014-07-07 16:35:09 +09:00
Jean Chalard
3f7ddde4e6 Merge "Update dictionaries" 2014-06-26 23:19:11 +00:00
Jean Chalard
bb0d93c4b0 Update dictionaries 
>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1403847862 <=> 1404131686
  version : 48 <=> 49
Body :
Added: apurate 50
Added: bondi 50
Added: chamuyar 50
Added: conocela 50
Added: conocelo 50
Added: conoceme 50
Added: conocenos 50
Added: conocete 50
Added: copate 50
Added: creele 50
Added: creeme 50
Added: creenos 50
Added: creete 50
Added: creiste 50
Added: creés 50
Added: dale 50
Added: dame 50
Added: danos 50
Added: decile 50
Added: decime 50
Added: decinos 50
Added: estate 50
Added: hablale 50
Added: hablales 50
Added: hablame 50
Added: hablanos 50
Added: hablate 50
Added: hablá 50
Added: hacele 50
Added: haceme 50
Added: hacenos 50
Added: hacete 50
Added: hacés 50
Added: llegás 50
Added: llevale 50
Added: llevame 50
Added: llevanos 50
Added: llevate 50
Added: llevá 50
Added: llevás 50
Added: parecé 50
Added: parecés 50
Added: pasala 50
Added: pasale 50
Added: pasales 50
Added: pasalo 50
Added: pasame 50
Added: pasanos 50
Added: pasate 50
Added: pasás 50
Added: podés 50
Added: ponele 50
Added: poneme 50
Added: ponenos 50
Added: ponete 50
Added: quedá 50
Added: querela 50
Added: querelo 50
Added: quereme 50
Added: querenos 50
Added: querete 50
Added: querés 50
Added: rascate 50
Added: sabelo 50
Added: sabés 50
Added: tenele 50
Added: teneme 50
Added: tenenos 50
Added: tenete 50
Added: tenés 50

>>> java/res/raw/main_es.dict
Header :
  date : 1403847862 <=> 1404131686
  version : 48 <=> 49
Body :
Same changes

Bug: 8010862
Change-Id: I98fc8542e21e35a7c80b332148c461144425e61a
 2014-07-01 18:19:30 +09:00
Jean Chalard
0dab3171d4 [SD9] Add armenian and georgian scripts 
Bug: 15840116
Change-Id: I91719e4fc2e3fe29320e4cb8b1a2f8f93c44cc4d
 2014-07-01 15:01:41 +09:00
Jean Chalard
a86e4a2e3b [SD8] Add scripts for layouts that are already implemented 
Bug: 15840116
Change-Id: I82b94fb89f18c6f7d88193231e132fbc2ac66685
 2014-07-01 15:01:22 +09:00
Baligh Uddin
09e3684144 Merge "Import translations. DO NOT MERGE" 2014-06-30 14:43:31 +00:00
Baligh Uddin
4feea9786f Import translations. DO NOT MERGE 
Change-Id: Ia31613a90afebc810811e603cfdee621c8d47b9c
Auto-generated-cl: translation import
 2014-06-30 04:09:39 -07:00
Baligh Uddin
fce0f55d27 Merge "Import translations. DO NOT MERGE" 2014-06-27 15:56:14 +00:00
Baligh Uddin
bb8749ba52 Merge "Import translations. DO NOT MERGE" 2014-06-30 14:43:31 +00:00
Baligh Uddin
35f1bec7f7 Merge "Import translations. DO NOT MERGE" 2014-06-30 14:43:31 +00:00
Baligh Uddin
7e59cf8a42 Import translations. DO NOT MERGE 
Change-Id: Ib559baf38fac9b3389b7cc0ed3714f52d4c2300f
Auto-generated-cl: translation import
 2014-06-30 04:08:23 -07:00
Baligh Uddin
1e6c40cb91 Import translations. DO NOT MERGE 
Change-Id: Ia7837134acb9381094219fe410b5fa4840bd3400
Auto-generated-cl: translation import
 2014-06-30 04:07:46 -07:00
Baligh Uddin
53824ce737 Import translations. DO NOT MERGE 
Change-Id: Ie644aea041d7b76637651958b612671f694c21f7
Auto-generated-cl: translation import
 2014-06-30 04:06:31 -07:00
Baligh Uddin
3a14b17f1f Merge "Import translations. DO NOT MERGE" 2014-06-27 16:52:20 +00:00
Baligh Uddin
7db3ec389e Import translations. DO NOT MERGE 
Change-Id: Id284e91e7646cf2eac64540a1ec8f7f99b8bd8d1
Auto-generated-cl: translation import
 2014-06-30 04:08:55 -07:00
Baligh Uddin
967936306e Merge "Import translations. DO NOT MERGE" 2014-06-27 15:56:14 +00:00
Baligh Uddin
34b0eb443a Merge "Import translations. DO NOT MERGE" 2014-06-28 00:04:48 +00:00
Baligh Uddin
0a29626661 Merge "Import translations. DO NOT MERGE" 2014-06-28 00:04:48 +00:00
Baligh Uddin
4a61232f8b Merge "Import translations. DO NOT MERGE" 2014-06-28 00:04:48 +00:00
Baligh Uddin
2e2ba693e9 Merge "Import translations. DO NOT MERGE" 2014-06-27 15:56:14 +00:00
Baligh Uddin
d258241d35 Import translations. DO NOT MERGE 
Change-Id: I0f0e7af0c8697932912fbf8681af86683d82925e
Auto-generated-cl: translation import
 2014-06-30 04:12:10 -07:00
Baligh Uddin
a4c19c241e Import translations. DO NOT MERGE 
Change-Id: I31e29f587071c9c8a3d167efbf111c1aa3011b3e
Auto-generated-cl: translation import
 2014-06-30 04:13:11 -07:00
Baligh Uddin
a45889fc21 Import translations. DO NOT MERGE 
Change-Id: I6c420e3dd4a97a1b7590c52bdd60c54e6e00f4de
Auto-generated-cl: translation import
 2014-06-26 18:13:23 -07:00
Baligh Uddin
0e2c6a01bc Import translations. DO NOT MERGE 
Change-Id: I2403c927d69e510a4ca2053041d80bfd9777471e
Auto-generated-cl: translation import
 2014-06-26 18:10:08 -07:00
Baligh Uddin
141957bac5 Import translations. DO NOT MERGE 
Change-Id: I4c6ef95873ed739c15f4ebee4d0aadb1186437d5
Auto-generated-cl: translation import
 2014-06-26 18:07:13 -07:00
Baligh Uddin
eec3183d20 Import translations. DO NOT MERGE 
Change-Id: I664e4afdb71b6b040ac34dc1d47b5e75e3888e88
Auto-generated-cl: translation import
 2014-06-26 18:03:02 -07:00
Jean Chalard
593009bc9f Merge "[SD2] Add support for a new tag Feature in KeyboardLayoutSet" 2014-06-26 23:14:30 +00:00
Mikhail Naganov
938bb4a4d5 Revert "Use Settings app's theme for L and later" 
This reverts commit 80c47b2f79.

Change-Id: I69619bd9856d4133794597a0cf81cc121e3a7887
 2014-06-27 12:56:17 +00:00
Jean Chalard
aca2ef85e1 [SD2] Add support for a new tag Feature in KeyboardLayoutSet 
Bug: 15840116
Change-Id: I3abbe4ce1ae573e9c5f1a8a96dc0056e8889d507
 2014-06-27 20:51:48 +09:00
Tadashi G. Takaoka
80c47b2f79 Use Settings app's theme for L and later 
This CL must be checked in together with I506b9ae6ea.

Bug: 11866784
Change-Id: I00aa90618642758c783f7c92f162dc2ee16659a6
 2014-06-27 10:18:18 +00:00
Tadashi G. Takaoka
8f70552a21 Add preliminary subtypes disabled for L-preview 
Bug: 13966540
Bug: 13779052
Bug: 10028772
Bug: 7963632
Change-Id: Ieec809f2d391e90b1ec547a3a89e929db47a5ed1
 2014-06-27 16:26:23 +09:00
Tadashi G. Takaoka
5a9ccbbef1 Merge "Add Sinhala keyboard layout" 2014-06-26 23:14:30 +00:00
Tadashi G. Takaoka
00da6ee5e8 Add Sinhala keyboard layout 
Bug: 6911143
Change-Id: I9ff87ece3e68381c0e9855106e7320c227f09965
 2014-06-27 16:16:30 +09:00
Jean Chalard
a70b710c9d Update the Spanish dictionary 
>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1403153360 <=> 1403847862
  version : 47 <=> 48
Body :
Added: bañate 30
Added: correte 30
Added: duchate 30
Added: mostrame 40
Added: muestrame 40
Added: prestame 40
Added: sos 100

>>> java/res/raw/main_es.dict
Header :
  date : 1403153360 <=> 1403847862
  version : 47 <=> 48
Body :
Added: bañate 30
Added: correte 30
Added: duchate 30
Added: mostrame 40
Added: muestrame 40
Added: prestame 40
Added: sos 100

Bug: 8010862
Change-Id: I0a478b5fd5edfadea420f306dc9b2d98876c246e
 2014-06-27 14:56:29 +09:00
Baligh Uddin
de7ec1c612 Merge "Import translations. DO NOT MERGE" 2014-06-25 01:41:07 +00:00
Baligh Uddin
9c9e160959 Merge "Import translations. DO NOT MERGE" 2014-06-25 01:36:21 +00:00
Baligh Uddin
c1d0475778 Merge "Import translations. DO NOT MERGE" 2014-06-25 01:41:07 +00:00
Baligh Uddin
4190a731d3 Merge "Import translations. DO NOT MERGE" 2014-06-25 01:41:07 +00:00
Baligh Uddin
32fd6258ed Merge "Import translations. DO NOT MERGE" 2014-06-25 01:41:07 +00:00
Baligh Uddin
8516d66b0b Import translations. DO NOT MERGE 
Change-Id: I6d824eeea4f280e95759941ec1a578fb1eb2bfd8
Auto-generated-cl: translation import
 2014-06-23 16:49:52 -07:00
Baligh Uddin
5a59674811 Import translations. DO NOT MERGE 
Change-Id: Ie50a708fba21fb8a1e15198a0c245a31f591c7a7
Auto-generated-cl: translation import
 2014-06-23 16:46:57 -07:00
Baligh Uddin
aa7c761131 Import translations. DO NOT MERGE 
Change-Id: I2657bfd35dc8a68d9597b0e56ffc191e990f7a15
Auto-generated-cl: translation import
 2014-06-23 16:44:25 -07:00
Baligh Uddin
a1e724d379 Import translations. DO NOT MERGE 
Change-Id: I5652dc8b608a121e61f0ec09761d06b510eeaf31
Auto-generated-cl: translation import
 2014-06-23 16:42:54 -07:00
Baligh Uddin
ddacf14449 Import translations. DO NOT MERGE 
Change-Id: Idaf037b28db1442b074f2dea4ab59ebdfd9fd9d4
Auto-generated-cl: translation import
 2014-06-23 16:40:42 -07:00
Tadashi G. Takaoka
058c6c6491 Reorganize Keyboard settings screen 
This CL must be checked in together with Ie45df15b18.

Bug: 11866784
Change-Id: I44d6ceb45108be135e3eaa361f4ee2c83f04fb57
 2014-06-23 18:46:09 -07:00
Ken Wakasa
ffc843550c Merge "Revert "Reorganize Keyboard settings screen"" 2014-06-19 22:58:18 +00:00
Ken Wakasa
e6a57bc82e Revert "Reorganize Keyboard settings screen" 
This reverts commit 339929ba16.

Bug: 11866784
Bug: 13888366
Bug: 15781377

This doesn't build with LOCAL_SDK_VERSION := 19 for UnbundledLatinImeGoogle.

Change-Id: Idf8bd335b076152265f245f578dadf651e291878
 2014-06-23 11:20:25 +00:00
Tadashi G. Takaoka
339929ba16 Reorganize Keyboard settings screen 
This CL must be checked in together with I6ebfbeb4e8.

Bug: 11866784
Bug: 15781377
Bug: 13888366
Change-Id: I57d47ab174d03121a604fd0dbf553795de0ab9b8
 2014-06-22 22:37:26 -07:00
Tadashi G. Takaoka
294afba81f Merge "Reorganize Keyboard settings screen" 2014-06-21 03:15:09 +00:00
Tadashi G. Takaoka
496fd77850 Merge "Custom view for key preview popup" 2014-06-20 21:00:34 +00:00
Tadashi G. Takaoka
615f431465 Custom view for key preview popup 
Bug: 15143928
Change-Id: I12411b9b5b9611ec089e4967def9b5c19a2367c7
 2014-06-23 01:07:59 -07:00
Jean Chalard
75bc45cb12 Update dictionaries 
>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1401802362 <=> 1403153360
  version : 45 <=> 47
Body :
Added: grandísimo 30

>>> java/res/raw/main_es.dict
Header :
  date : 1401802362 <=> 1403153360
  version : 45 <=> 47
Body :
Added: grandísimo 30

Bug: 15719556
Change-Id: Ifaa97d40d52a278e41f4dd1292781494d4eb939b
 2014-06-23 16:56:00 +09:00
Adam Lesinski
753d43a299 Do not generate ids in the android package 
A new AAPT change will have AAPT fail when an app tries
to add resources to an external package such as android.

Change-Id: I02e31481b5ea2d13a27b5b06fc4d0f8777551572
 2014-06-19 16:00:16 -07:00
Baligh Uddin
bf13ed7ee1 Merge "Import translations. DO NOT MERGE" 2014-06-17 21:43:29 +00:00
Baligh Uddin
99dfbec7df Import translations. DO NOT MERGE 
Change-Id: I841ec06f6139c801c485f6266cf33bc134989c8c
Auto-generated-cl: translation import
 2014-06-18 18:48:24 -07:00
Baligh Uddin
2d7531e84f Import translations. DO NOT MERGE 
Change-Id: I9b6feb04d2c2b974fd96a45e74016f892401e099
Auto-generated-cl: translation import
 2014-06-18 18:44:05 -07:00
Baligh Uddin
6cd52660eb Import translations. DO NOT MERGE 
Change-Id: Ic5e3ad6078f654fcde156216016a87e5226dabca
Auto-generated-cl: translation import
 2014-06-13 21:06:00 -07:00
Tadashi G. Takaoka
68b8a2d86c Make accessibility long press timeout longer 
The previous time out was 1500 milliseconds that wasn't enough for
announcing some accented letters, for example "Ü". This CL makes the
time out to 3000 milliseconds.

BUG: 15582951
Change-Id: I9bf864389c359e3b9abfe5000b897cf742a8dbe7
 2014-06-13 13:02:24 +09:00
Baligh Uddin
6b655de1a6 Merge "Import translations. DO NOT MERGE" 2014-06-10 17:21:28 +00:00
Baligh Uddin
5092fe6315 Merge "Import translations. DO NOT MERGE" 2014-06-10 17:21:23 +00:00
Tadashi G. Takaoka
5bf7418fad am 278b9071: Rename keyboard theme Quantum to Material 
* commit '278b9071ab036f20d29dc651ddd79136c5f84e33':
  Rename keyboard theme Quantum to Material
 2014-06-10 11:18:43 +00:00
Keisuke Kuroyanagi
f36da2fdba Merge "Make dump dictionary settings easily extensible." 2014-06-10 11:08:38 +00:00
Keisuke Kuroyanagi
a20432479d Make dump dictionary settings easily extensible. 
This adds "Dump contextual dictionary".

Bug: 14161647
Change-Id: I41a6d6e131d9d8c300ac0120d903d46d88bb3346
 2014-06-10 19:59:19 +09:00
Jean Chalard
267a8614a0 Update dictionaries 
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1400639634 <=> 1402373154
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1400750526 <=> 1402373154
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1400639659 <=> 1402373178
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> java/res/raw/main_en.dict
Header :
  date : 1400639659 <=> 1402373178
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

Bug: 15347469
Change-Id: I35cb410bdb7b641f2f0d4d9bb19a17e3f4eb9c0b
 2014-06-10 14:08:32 +09:00
Baligh Uddin
5f5b5bf6bb Import translations. DO NOT MERGE 
Change-Id: I12199bc91f977541d1ca0293bf02ab4f7716041b
Auto-generated-cl: translation import
 2014-06-09 17:27:48 -07:00
Baligh Uddin
47b956e37a Import translations. DO NOT MERGE 
Change-Id: I619995358078fd20eb65070a85c78d483521760b
Auto-generated-cl: translation import
 2014-06-09 17:22:26 -07:00
Tadashi G. Takaoka
874a600dc8 Add audio and haptic feedback for Emoji and Suggestions 
Bug: 15378862
Change-Id: Ia14929bd9eb63ad5735cae0ad98ad0e2ad301128
 2014-06-10 09:15:59 +09:00
Tadashi G. Takaoka
f3c852efad Set content descrition of words in suggestions strip 
Bug: 14849593
Change-Id: If020e2352c8e950ce87dc4711c39b8a6a41f66fc
 2014-06-09 21:40:36 +09:00
Tadashi G. Takaoka
24fab555f9 Refactor KeyCodeDescriptionMapper class a bit 
This CL adds getDescriptionForCode() method.

Bug: 15500282
Change-Id: I3bb92c8f356ea623fc992c924506b11e09256e98
 2014-06-09 16:28:30 +09:00
Tadashi G. Takaoka
278b9071ab Rename keyboard theme Quantum to Material 
Bug: 15467097
Change-Id: Id909723cd979ccd24740b034720591c9b1bcc2b1
 2014-06-09 11:37:45 +09:00
Baligh Uddin
86a28db7f9 Merge "Import translations. DO NOT MERGE" 2014-06-07 04:21:24 +00:00
Baligh Uddin
42e341386d Merge "Import translations. DO NOT MERGE" 2014-06-07 04:21:20 +00:00
Alan Viverette
3f736107e2 Material theme 
BUG: 15467097
Change-Id: I1b6ed80d85e4c3c8913d4a9e08c519379cb3c6e0
 2014-06-06 15:22:57 -07:00
Alan Viverette
ceb6e38c15 DO NOT MERGE Material theme 
BUG: 15467097
Change-Id: I1b6ed80d85e4c3c8913d4a9e08c519379cb3c6e0
 2014-06-06 14:15:07 -07:00
Tadashi G. Takaoka
d66d16f650 Update shift key backgrounds for LXX_Dark 
Bug: 15310025
Change-Id: I2fa267e5c448e28435f4737666a03b40f1f4a4d5
(cherry picked from commit 0621dd1d3c)
 2014-06-06 07:48:43 +00:00
Tadashi G. Takaoka
3ca65c8fd5 Remove unused supportsSwitchingToShortcutIme attribute 
Change-Id: I51c5247ac925a158facb79057f704b763b903552
 2014-06-06 13:11:57 +09:00
Baligh Uddin
5703eef9ca Import translations. DO NOT MERGE 
Change-Id: Ia9a21cce0283a85dda9cd2fc82e694bf5aa44d00
Auto-generated-cl: translation import
 2014-06-04 16:34:29 -07:00
Baligh Uddin
3e7e294fe3 Import translations. DO NOT MERGE 
Change-Id: Ice980abcc56dc1f432b574ef19e6e082a2cef239
Auto-generated-cl: translation import
 2014-06-04 16:32:28 -07:00
Tadashi G. Takaoka
aea429200e Support more suggestions accessibility mode 
Bug: 12491371
Change-Id: Ib01452b6a2a53faa591b05e62014f356e0511308
 2014-06-04 19:45:38 +09:00
Tadashi G. Takaoka
62316d7e82 Support more keys accessibility mode 
Bug: 12491371
Change-Id: Ib1fc8affbccfbaca3424ecdc2812f47047106aa2
 2014-06-04 19:13:41 +09:00
Yohei Yukawa
5a3a7e3d8a Merge "Add a preference item for metrics logging" 2014-06-04 05:07:03 +00:00
Baligh Uddin
f72ef2e5cf Merge "Import translations. DO NOT MERGE" 2014-06-04 05:00:15 +00:00
Baligh Uddin
755442bf52 Merge "Import translations. DO NOT MERGE" 2014-06-04 05:00:09 +00:00
Tadashi G. Takaoka
6e00de046a Merge "Reorder keys around the spacebar" 2014-06-04 04:04:28 +00:00
Yohei Yukawa
28c7b262aa Add a preference item for metrics logging 
BUG: 14324207
Change-Id: Idc8582655bc73cb24e416e8ba78470209b2ff702
 2014-06-04 13:02:42 +09:00
Tadashi G. Takaoka
dc62c711aa Reorder keys around the spacebar 
This CL reorders keys around the spacebar.
- On phone's symbols and symbols shift layout, the comma key is moved
  to the left of the spacebar to aligned with main layout.
- On tablet's layout, the comma key is moved to the left of the
  spacebar on all layout to aligned with the same layout of
  phone's. Also the comma key has "settings" as more keys.
- In Arabic and Perisan, the comma key of tablet already has some more keys
  This CL remove "/" and add "settings" instead.

Bug: 15281451
Change-Id: I6e0e75e4d4abfb1f356e7499be91424c7c57c58b
 2014-06-04 00:45:25 +09:00
Jean Chalard
ff3e488e1e Enrich the Spanish dictionary. 
Enrich the dictionary with many words generated from stems
extracted from the dictionary and rules written by hand.
This adds 45,619 words to the dictionary. Hopefully, almost none
of them is incorrect, though a lot are not very common.

Bug: 8010862
Change-Id: I51c7ebd16ff859ec1e765b0604dd1cfca159ab08
 2014-06-03 22:48:19 +09:00
Tadashi G. Takaoka
0621dd1d3c Update shift key backgrounds for LXX_Dark 
Bug: 15310025
Change-Id: I2fa267e5c448e28435f4737666a03b40f1f4a4d5
 2014-06-03 16:34:35 +09:00
Baligh Uddin
9b3b126352 Import translations. DO NOT MERGE 
Change-Id: Iffe895ca4827bb7e1addf1087c74c9023d2f130f
Auto-generated-cl: translation import
 2014-06-02 17:47:25 -07:00
Baligh Uddin
4e42d5690f Import translations. DO NOT MERGE 
Change-Id: I5af9740ea071063bb48738abe258a61d7e06ddae
Auto-generated-cl: translation import
 2014-06-02 17:42:13 -07:00
Tadashi G. Takaoka
d0b79cc12a Add verbalization of symbols that are unsupported by TTS/TalkBack 
Bug: 13336905
Change-Id: Iefd117fa7b30b8ba240590b13b03d7044fd37ede
 2014-06-02 17:02:38 +09:00
Tadashi G. Takaoka
509d07c764 am 61a8a66c: Merge "Workaround to draw spacebar icon of emoji palettes" into lmp-preview-dev 
* commit '61a8a66ccac1de7e146344dd77c8be84aa8daf33':
  Workaround to draw spacebar icon of emoji palettes
 2014-05-30 15:03:10 +00:00
Tadashi G. Takaoka
dc1d4455fe am ee4cc67e: Update shift key icon for LXX_Dark 
* commit 'ee4cc67e260a1d2397abd83820f72906c1871751':
  Update shift key icon for LXX_Dark
 2014-05-30 15:03:09 +00:00
Tadashi G. Takaoka
61a8a66cca Merge "Workaround to draw spacebar icon of emoji palettes" into lmp-preview-dev 2014-05-30 14:59:22 +00:00
Tadashi G. Takaoka
3558505bee Workaround to draw spacebar icon of emoji palettes 
Bug: 15321822
Change-Id: Iab7cef83ffdf91c877c3ed2e59d412496b516e1c
 2014-05-30 22:53:24 +09:00
Tadashi G. Takaoka
ee4cc67e26 Update shift key icon for LXX_Dark 
Bug: 15310025
Change-Id: I20bde50a2e751a5cd9871debd5ed1df0334c78e2
 2014-05-30 22:03:08 +09:00
Tadashi G. Takaoka
9c45e178c7 am ba8836a9: Merge "Update action key backgrounds for LXX_Dark" into lmp-preview-dev 
* commit 'ba8836a926a566a1c9f8a11c79dd0e06d0fb0485':
  Update action key backgrounds for LXX_Dark
 2014-05-30 11:24:10 +00:00
Tadashi G. Takaoka
ce8da614a6 am db2d6a20: Merge "Update enter and send icons for LXX_Dark" into lmp-preview-dev 
* commit 'db2d6a202125bff92be495408babbb0c86bfb398':
  Update enter and send icons for LXX_Dark
 2014-05-30 11:24:09 +00:00
Tadashi G. Takaoka
c96eddaa6e am 3d5a72eb: Update spacebar icon of LXX_Dark 
* commit '3d5a72ebe20b4cab415c43c8022427b7618d8519':
  Update spacebar icon of LXX_Dark
 2014-05-30 11:24:08 +00:00
Tadashi G. Takaoka
ba8836a926 Merge "Update action key backgrounds for LXX_Dark" into lmp-preview-dev 2014-05-30 11:01:25 +00:00
Tadashi G. Takaoka
523b55ac52 Update action key backgrounds for LXX_Dark 
Bug: 15295839
Change-Id: I77206c88c38a31193db97ce42c9d00fc25c7ff58
 2014-05-30 19:57:30 +09:00
Tadashi G. Takaoka
db2d6a2021 Merge "Update enter and send icons for LXX_Dark" into lmp-preview-dev 2014-05-30 10:56:10 +00:00
Tadashi G. Takaoka
0b0fbe752a Update enter and send icons for LXX_Dark 
Bug: 15298065
Bug: 15327280
Change-Id: I4dfade1afe3578e29daba777567f81d4ec782956
 2014-05-30 19:28:46 +09:00
Tadashi G. Takaoka
3d5a72ebe2 Update spacebar icon of LXX_Dark 
This CL does't fix Bug: 15321822 though.

Bug: 15298065
Bug: 15321822
Change-Id: Ie6ab1e230c1657317dc06193da598f04f682f521
 2014-05-30 19:03:57 +09:00
Tadashi G. Takaoka
d9190f8e8f am cdc7273b: Update action key background 
* commit 'cdc7273b44b7d5fc5a1c848fb68960cee02c4f99':
  Update action key background
 2014-05-29 13:09:29 +00:00
Tadashi G. Takaoka
cdc7273b44 Update action key background 
Bug: 15295839
Change-Id: Ia4af33b00bf361d088981df907468b4a61c1a076
 2014-05-29 21:38:59 +09:00
Tadashi G. Takaoka
51ee5a47b8 Remove LatinImeLogger and UsabilityStudyLogUtils 
This CL must be checked in together with Ie52007dc5c.

Bug: 15318007
Change-Id: Ie665f296e43b5485ae8ba7e949aa262794ee0dcc
 2014-05-29 18:03:03 +09:00
Tadashi G. Takaoka
bbf556e8e1 Remove researcher logger 
This CL must be checked in together with I5cc76807e3.

Bug: 15318007
Change-Id: I61423c3377ddc299fb332e742d6626c2e47145bb
 2014-05-29 15:10:28 +09:00
Geoff Mendal
7a4f9b67c0 Merge "Import translations. DO NOT MERGE" 2014-05-29 00:04:20 +00:00
Geoff Mendal
6784e3946e Merge "Import translations. DO NOT MERGE" 2014-05-29 00:03:44 +00:00
Geoff Mendal
4cbde10ef4 Import translations. DO NOT MERGE 
Change-Id: Ifd7419b2fda706b5035060348ed63d894f843a2e
Auto-generated-cl: translation import
 2014-05-28 17:03:38 -07:00
Geoff Mendal
2ab1d14a30 Import translations. DO NOT MERGE 
Change-Id: Ib6d03976824f13a9932473c440b476f950f92ef7
Auto-generated-cl: translation import
 2014-05-28 17:02:16 -07:00
Geoff Mendal
bba73206e1 Import translations. DO NOT MERGE 
Change-Id: If37d804345c2a1611af5019c36b0cf6c21e04c0e
Auto-generated-cl: translation import
 2014-05-28 16:58:49 -07:00
Tadashi G. Takaoka
388dcd76b6 am 342eca74: Merge "Update shift, next, and previous icon of LXX_Dark" into lmp-preview-dev 
* commit '342eca7444e40d98310b61cc52b648cc7a3a98a9':
  Update shift, next, and previous icon of LXX_Dark
 2014-05-28 10:09:45 +00:00
Tadashi G. Takaoka
661b5d0e02 am 4f28e16c: Update enter icon of LXX_Dark 
* commit '4f28e16ce52080c3411a4ab10fa6628260fd5740':
  Update enter icon of LXX_Dark
 2014-05-28 10:09:44 +00:00
Tadashi G. Takaoka
918fe83693 am 91e69980: Use action key background for enter key 
* commit '91e69980bebc37a37f5d176450d952ba394cb303':
  Use action key background for enter key
 2014-05-28 10:09:28 +00:00
Tadashi G. Takaoka
342eca7444 Merge "Update shift, next, and previous icon of LXX_Dark" into lmp-preview-dev 2014-05-28 10:04:45 +00:00
Tadashi G. Takaoka
ad8486c97f Update shift, next, and previous icon of LXX_Dark 
Bug: 15298065
Change-Id: Id5cd6c989ac1e64389f060f692b578a2ceec0db8
 2014-05-28 18:50:40 +09:00
Tadashi G. Takaoka
4f28e16ce5 Update enter icon of LXX_Dark 
Bug: 15295910
Change-Id: I37d8c184ab500f4b4ffa57a6abe5516cb671ce29
 2014-05-28 18:42:10 +09:00
Tadashi G. Takaoka
91e69980be Use action key background for enter key 
This CL also use an action key background for the emoji key only on
phone becase the emoji key share the same position with other action
keys. The emoji key on tablet keeps using the functional key
background.

Bug: 15296851
Change-Id: I7b8550c61f19548f463a782342bdc0f496433a2a
 2014-05-28 14:59:26 +09:00
Baligh Uddin
e53f418829 Merge "Import translations. DO NOT MERGE" 2014-05-27 21:10:47 +00:00