Jean Chalard
e30c05800f
Preemptive anti-deadlock device
...
We don't know of any actual bug in the implementation of the
pool that may result in a deadlock, but this still implements
a means out of a deadlock if one ever arises anyway. It's
meant to improve the resilience of the spell checker.
Bug: 5441027
Change-Id: I689491090792dbb89110ee56631965c5bb2dc712
2012-08-14 17:04:14 +09:00
Jean Chalard
5d6b8e1818
Fix a bug that would prevent spell checking
...
java.lang.ArrayIndexOutOfBoundsException:
[I offset=0 length=528 src.length=512
com.android.inputmethod.keyboard.ProximityInfo
.setProximityInfoNative(Native Method)
com.android.inputmethod.keyboard.ProximityInfo
.createSpellCheckerProximityInfo(ProximityInfo.java:85)
com.android.inputmethod.latin.spellcheck.AndroidSpellCheckerService
.createDictAndProximity(AndroidSpellCheckerService.java:411)
The array was too small with respect with the passed size.
Change-Id: I7777d7aecd17375d3fbf82854a66eb7a5a289ce6
2012-08-14 14:45:17 +09:00
Baligh Uddin
0aeb4c206c
Import translations. DO NOT MERGE
...
Change-Id: I36bb28cfdf548a38bfdd3127ddafa6c7d938376e
Auto-generated-cl: translation import
2012-08-13 14:05:29 -07:00
Tadashi G. Takaoka
f92f9de7a9
Merge "Eliminate redundant time parameter from gesture detection code" into jb-mr1-dev
2012-08-13 02:25:28 -07:00
Ken Wakasa
40a6d4af2a
Merge "Cleanups in geometry_utils.h" into jb-mr1-dev
2012-08-13 02:11:52 -07:00
Tadashi G. Takaoka
74d0bb09c7
Eliminate redundant time parameter from gesture detection code
...
This change also uses the key width to determine the sampling rate of
the gesture points (instead of the key height).
Change-Id: I987487825693b4883d8359eb5b31f1d668cd5ef4
2012-08-13 18:11:03 +09:00
Ken Wakasa
0fb950858e
Cleanups in geometry_utils.h
...
Change-Id: Ic051703e5b67adfc62753ebd9ab254296719c6e9
2012-08-13 17:47:00 +09:00
Tadashi G. Takaoka
fc5e3f973c
Remove unnecessary drawing point
...
Change-Id: Ib9cba3484a72306320eb9c1744d940da1a0998c7
2012-08-13 14:03:10 +09:00
Tadashi G. Takaoka
708cc94a35
Remove gesture detection hacking code
...
Change-Id: Idaec3753592ca0a5c5545eb5ab65254a3e32e662
2012-08-13 12:19:19 +09:00
Ken Wakasa
bcec82de66
Clean up constructors
...
And, use C++ style casts and use float math functions rather than double ones to save memory space.
Also, stop using FloatMath and NativeUtils as standard Math methods are faster now.
See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700
multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a
Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
2012-08-13 10:48:37 +09:00
satok
814510305c
Merge "Fix JNI" into jb-mr1-dev
2012-08-12 18:29:16 -07:00
satok
847c8dfe17
Fix JNI
...
Change-Id: If134baf52e78fbe18b78611a23870f5d10c80955
2012-08-11 13:54:01 +09:00
alanv
5f312c9c15
Change accessibility event type for app-driven speech.
...
Bug: 6614400
Change-Id: I0ef309b7f3f35bf37b4664ea599c9e6ffb1a4ab8
2012-08-10 13:51:17 -07:00
Baligh Uddin
9b6b279807
Import translations. DO NOT MERGE
...
Change-Id: I22eacc83a5aaa0f4e50e02e84ebf2b176dd08fe6
Auto-generated-cl: translation import
2012-08-10 11:50:11 -07:00
Ken Wakasa
f3850e5543
Use JNI Region calls also in getSuggestions()
...
Change-Id: I9cc0208397c202aeb6f7b5bb5ad59e00c5afbd80
2012-08-10 21:09:23 +09:00
Satoshi Kataoka
f6c2200890
Workaround to stop init dict traverse session
...
Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b
2012-08-10 21:07:53 +09:00
Jean Chalard
7b258e512d
Accept whitelisted entries from any source.
...
...not only the WhitelistDictionary.
Bug: 6906525
Change-Id: I7f181eb6936ec17bbccdc4e736fd09292af24e9c
2012-08-10 19:02:19 +09:00
Jean Chalard
caed149b67
Optimization & Simplification
...
It's useless to do the whitelist lookup twice. Also, putting
this test out of this method will allow whitelist entries to
come from other sources.
Bug: 6906525
Change-Id: I4afe678cae6556d16642d155ce770fbf4e61ad49
2012-08-10 19:02:15 +09:00
Jean Chalard
dc2fb6bc6d
Merge "Pass the type from native code all the way to Java." into jb-mr1-dev
2012-08-10 01:26:59 -07:00
Jean Chalard
926ef06a1e
Pass the type from native code all the way to Java.
...
Bug: 6906525
Change-Id: I057390d47a223450e22d8338509e22c28fc0d5f6
2012-08-10 15:51:55 +09:00
Tadashi G. Takaoka
ce38c62aef
Merge "Remove conservative MainKeyboardView.draw" into jb-mr1-dev
2012-08-09 23:31:53 -07:00
Satoshi Kataoka
e9f3e182e4
Add arguments for dic traverse session
...
Change-Id: I8776ad528eeea9a5fc4dcf394ca13bb80c04fb6d
2012-08-10 12:34:00 +09:00
Tadashi G. Takaoka
1b6829b0e0
Remove conservative MainKeyboardView.draw
...
Change-Id: I52f58d1e013dfe1f1b0f8320cba903d3dbb4eabd
2012-08-10 11:02:41 +09:00
Ken Wakasa
5bb4206275
Use more JNI Region calls
...
Change-Id: I371db517ff4749c0b7e5bdb4362e6310c91a24dc
2012-08-10 00:46:20 +09:00
Satoshi Kataoka
9d29871605
Add reset method for dic travserse session
...
Change-Id: Ia3dd924f92549da2cf8302ef77c629902d4f275b
2012-08-09 17:49:19 +09:00
Tadashi G. Takaoka
877157e1f5
Optimize keyboard drawing code a bit
...
* Remove useless boolean flag.
* Use invalidate(int,int,int,int).
* Don't draw background when hardware acceleration is enabled.
Change-Id: Id560ac84f33b5151437a42a4ff22736284d71e2d
2012-08-09 16:44:11 +09:00
Tadashi G. Takaoka
2be2d77664
Update dictionary availability at onStartInputView
...
This is a follow up of I7901c0f9489b4deb79314c2c903b138611bfd78e
Change-Id: I38c22e886db247c402a964e3ddd10b09a461151c
2012-08-09 16:09:54 +09:00
Tadashi G. Takaoka
9abea49dd4
Merge "Fix NPE and don't call UI API from non-UI thread" into jb-mr1-dev
2012-08-08 20:00:19 -07:00
Tadashi G. Takaoka
8335c59ea7
Fix NPE and don't call UI API from non-UI thread
...
This change also reverts I29ec3e9f10484f30288fac76f0c45b3707bc2259
Bug: 6956969
Bug: 6891020
Bug: 6947253
Change-Id: I7901c0f9489b4deb79314c2c903b138611bfd78e
2012-08-09 11:55:41 +09:00
Satoshi Kataoka
60d4961f34
Merge "Pass traverse session" into jb-mr1-dev
2012-08-08 07:50:44 -07:00
Satoshi Kataoka
9127811493
Pass traverse session
...
Change-Id: I84bfaaa406e3f51421c08a7ee8f9576ebdba54d4
2012-08-08 23:30:31 +09:00
Satoshi Kataoka
181567f9c7
Merge "Add traverse session" into jb-mr1-dev
2012-08-08 04:40:36 -07:00
Satoshi Kataoka
c4e4dfe17d
Add traverse session
...
Bug: 6942265
Change-Id: I384cf701f5ee44c4b1037e5b8ddfa3d570286f55
2012-08-08 20:39:43 +09:00
Tadashi G. Takaoka
732f27984e
Merge "Add toString() method to Keyboard" into jb-mr1-dev
2012-08-08 00:08:13 -07:00
Tadashi G. Takaoka
2bcd913e56
Merge "Add SuggestInitializationListener to BinaryDictionary.resetMainDict()" into jb-mr1-dev
2012-08-08 00:07:57 -07:00
Tadashi G. Takaoka
35336cf83a
Add toString() method to Keyboard
...
Change-Id: I74c8f006323ed78ec67414fd17849ab40966968e
2012-08-08 15:59:56 +09:00
Tadashi G. Takaoka
a890de4215
Merge "Use ArrayList to implement PointerTrackerQueue" into jb-mr1-dev
2012-08-07 23:56:29 -07:00
Tadashi G. Takaoka
79eefda0d3
Add SuggestInitializationListener to BinaryDictionary.resetMainDict()
...
Change-Id: I4c01f172ddb2ca60fa6e604384610c90b76e5457
2012-08-08 15:55:26 +09:00
Tadashi G. Takaoka
7ae1fd02d4
Use ArrayList to implement PointerTrackerQueue
...
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
Baligh Uddin
7bf5415bfe
Import translations. DO NOT MERGE
...
Change-Id: I48e2fcef3c0384fb745f6329b8877a8c1a1cd815
Auto-generated-cl: translation import
2012-08-07 15:05:45 -07:00
Tadashi G. Takaoka
0cc425bd9c
Add PointerTrackerQueue unit tests
...
This is a groundwork to elminate LinkedList from PointerTrackerQueue.
Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
Tadashi G. Takaoka
27e48447a4
Lingering gesture floating preview text a bit
...
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
Baligh Uddin
2a0975be66
Import translations. DO NOT MERGE
...
Change-Id: I8cb76298b75155a9d2d4726127759ad9542a93fc
Auto-generated-cl: translation import
2012-08-06 13:35:01 -07:00
Tadashi G. Takaoka
7a13975700
Cleanup unused import and dead code
...
Change-Id: Ife877620561d29a8f25602916420741186104617
2012-08-06 17:28:33 +09:00
Tadashi G. Takaoka
dba77186f7
Fix duplicate getSuggestions() call for main dictionary
...
Change-Id: I092480063452505cdf03dbd83b9c64e535822931
2012-08-06 17:08:38 +09:00
Tadashi G. Takaoka
b27959741a
Fix Utils.getStackTrace()
...
Change-Id: Iaf160af32bb77b3ad5929cb5ee8eccd01165bdf6
2012-08-06 16:50:43 +09:00
Tadashi G. Takaoka
0a524de3df
Separate updateSuggestionStrip from commitTyped
...
The commitTyped() called updateSuggestionStrip(), and that led to call
Suggest.getSuggestedWordsForTypingInput() even after a batch input was
started because WordComposer.commitWord() reset the batch input state.
Bug: 6932442
Change-Id: If645b1ef0343aa1e21ca71a9275b40c6c3be13df
2012-08-06 14:31:01 +09:00
Tadashi G. Takaoka
4e9e6cd154
Fix IllegalStateException of KeyDetector
...
A KeyDetector without Keyboard may exist in some rare cases. This
change eliminates throwing IllegalStateException and checks explicitly
against null.
Bug: 6891020
Change-Id: I29ec3e9f10484f30288fac76f0c45b3707bc2259
2012-08-06 11:09:50 +09:00
Ying Wang
3d5a0b90f8
Import translations. DO NOT MERGE
...
Change-Id: I9510061c7ae1f4020cd5c5d24ed75348556ee085
Auto-generated-cl: translation import
2012-08-03 14:25:41 -07:00
Jean Chalard
15b28432ba
Merge "Cleanup unused code" into jb-mr1-dev
2012-08-03 09:32:27 -07:00
Jean Chalard
8ee4b35c70
Cleanup unused code
...
The Italian dictionary has been amended to contain words that
include apostrophes, and accordingly the apostrophe is now
excluded from word separators in Italian.
This code was only used for Italian, and in the general case
it does the wrong thing; it was only needed by limitations of
the old dictionary.
Bug: 6929108
Change-Id: I7ff4615e01899a1cebed2c4c51679cd0746740fe
2012-08-04 01:15:04 +09:00
Jean Chalard
54e84a00fc
Make a makedict command for dicttool (A3)
...
This behaves exactly as the old makedict command. Further
changes will redirect the calls to makedict to this, so as
to consolidate similar code.
Groundwork for
Bug: 6429606
Change-Id: Ibeadbf48bec70f988a15ca36ebf5d1ce3b5b54ea
2012-08-04 01:11:46 +09:00
Jean Chalard
1644a3c732
Merge "Update French and Italian separators." into jb-mr1-dev
2012-08-03 08:07:58 -07:00
Jean Chalard
beccb6e573
Update French and Italian separators.
...
French and Italian separators used to be decided this way
because of how the old dictionaries were made.
However, the new dictionaries actually do include the
composite words, and in both French and Italian, apostrophes
and dashes shouldn't be treated as separators any more.
Change-Id: If11c42625c819e223502a76749dbe797163d3c18
2012-08-04 00:04:13 +09:00
Jean Chalard
3f80541844
Merge "Fix an OOB exception" into jb-mr1-dev
2012-08-03 07:17:37 -07:00
Jean Chalard
4c976aceee
Fix an OOB exception
...
Not sure exactly how this can happen, but at least this should
prevent us from crashing.
Bug: 6920884
Change-Id: I451864756b48c5cb5e98b06edee917d88766d77f
2012-08-03 23:10:47 +09:00
Tadashi G. Takaoka
622d6a5b1b
Using hardware accelerated drawing
...
When Canvas has been hardware accelerated, don't use offscreen bitmap.
Bug: 6872994
Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
2012-08-03 20:46:10 +09:00
Tadashi G. Takaoka
ffe36cdc6d
Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev
2012-08-02 01:04:05 -07:00
Tadashi G. Takaoka
8344259fc9
Small cleanup for keyboard drawing code
...
Change-Id: I8b562e03b30f82dddae311b49d316402e867cd31
2012-08-02 16:50:31 +09:00
Tadashi G. Takaoka
76c242a1f6
Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev
2012-08-01 23:45:24 -07:00
Ken Wakasa
fb955693d4
Enable hardware accelerated drawing for SoftInputWindow of LatinIME
...
Taking advantage of Ib6a8bda46223ce1153f32834daf02a820d16136e
bug: 6872994
Change-Id: I799b25b6509980dd9f039bead9bc926b42cbb040
2012-08-02 15:11:31 +09:00
Ying Wang
2ca0f26237
Import translations. DO NOT MERGE
...
Change-Id: Ifdbe0c41f5e01c4afc155ea68c05d50d483e5749
Auto-generated-cl: translation import
2012-08-01 14:58:52 -07:00
Tadashi G. Takaoka
44972bcdb6
Fix multi-touch input in auto-caps field
...
Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
2012-08-01 18:56:11 +09:00
Tadashi G. Takaoka
d2173b5737
Cancel the while-typing timer when user hits the spacebar
...
Bug: 6689079
Change-Id: I6b366acdcefb8b2c0d973a4f2a12329fc12eb5c5
2012-07-31 19:39:52 +09:00
Tadashi G. Takaoka
71c472ed8c
Merge "Add language switch key to 10" tablet" into jb-mr1-dev
2012-07-31 00:43:22 -07:00
Tadashi G. Takaoka
f6235167b7
Add language switch key to 10" tablet
...
Bug: 6637175
Change-Id: Ife9c9a6d35bd3cb4de406b388c504846b35059e7
2012-07-31 16:40:30 +09:00
Ken Wakasa
6492a2f31d
Merge "Add a <uses-sdk> element in the LatinIME's manifest" into jb-mr1-dev
2012-07-31 00:12:37 -07:00
Ken Wakasa
8573223442
Add a <uses-sdk> element in the LatinIME's manifest
...
Change-Id: I8354677e271fc73865aabffe0df489e52c85c1eb
2012-07-31 16:06:18 +09:00
Tadashi G. Takaoka
2b077a6576
Merge "Add android::supportsRtl="true"" into jb-mr1-dev
2012-07-30 23:42:01 -07:00
Tadashi G. Takaoka
b8afd540d9
Add android::supportsRtl="true"
...
Bug: 6904817
Change-Id: I1176e239d001d8eb5ae79ed345660b22be68b137
2012-07-31 15:18:12 +09:00
Tadashi G. Takaoka
b98b957424
Fix east slavic keyboard layouts
...
This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.
[Ukrainian]
* Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
* Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
on 10-inch tablet.
* Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
GHE.
[Belarusian]
* Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
* Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
on 10-inch tablet.
[Kyrgyz]
* Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
* Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
HA because CYRILLIC LETTER SOFT SIGN has it.
[Russian]
* Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
HA because CYRILLIC LETTER SOFT SIGN has it.
This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".
Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
2012-07-31 13:19:11 +09:00
Ying Wang
ff2bec1ce6
Import translations. DO NOT MERGE
...
Change-Id: I4495669f10f41c2c7c3877c65b061df6a2c9f196
Auto-generated-cl: translation import
2012-07-30 14:54:31 -07:00
Jean Chalard
f68fe7a9c9
Don't forward phantom space state on stripper input
...
Bug: 6890540
Change-Id: I923b24e3bc17e7b923be4940ad739b58dca24a1f
2012-07-31 01:48:10 +09:00
Tadashi G. Takaoka
ca57f5ba40
Move gesture preview parameters to KeyboardView attributes
...
Change-Id: Iff9d6b485e202656fc869f3ff4d94575ad2c186f
2012-07-30 20:10:48 +09:00
Tadashi G. Takaoka
6b9677d84b
Merge "Small fix to KeyboardView" into jb-mr1-dev
2012-07-30 01:48:59 -07:00
Tadashi G. Takaoka
b9770cb7f7
Merge "Add device form factor to KeyboardId" into jb-mr1-dev
2012-07-30 00:50:25 -07:00
Tadashi G. Takaoka
edf7990e84
Small fix to KeyboardView
...
Change-Id: Ifb7500ec2e55b50bb7951aa847fd4fbf49e32f4e
2012-07-30 16:50:03 +09:00
Tadashi G. Takaoka
293f062c26
Merge "Add advanced options to turn on/off the gesture trail and text preview" into jb-mr1-dev
2012-07-30 00:22:41 -07:00
Tadashi G. Takaoka
47e2bf3298
Add advanced options to turn on/off the gesture trail and text preview
...
Bug: 6883053
Change-Id: I601718afb37289108b45ef68626c7c315edca35d
2012-07-30 15:54:27 +09:00
Tadashi G. Takaoka
75fb3ce1be
More readable Key.toString() and MoreKeySpec.toString()
...
Change-Id: Iee3c33dedd0c00ba259aa55e8b0c1c57b84eccdd
2012-07-30 15:51:41 +09:00
Tadashi G. Takaoka
4731b67629
Add device form factor to KeyboardId
...
This is a groundword for optimizing keyboard parsing.
Bug: 6860259
Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
2012-07-30 15:33:17 +09:00
Tadashi G. Takaoka
efd8b838ee
Add MoreKeySpec.toString() method for debugging
...
Change-Id: Icf9c6e15521849ffc51911c1e256c9815c1960f4
2012-07-30 15:06:26 +09:00
Ken Wakasa
d157bb0d55
Just a cosmetic cleanup
...
Change-Id: Ie32fb8474b502220bdca9dbce30094bf5fb08e00
2012-07-28 21:24:29 +09:00
Jean Chalard
79d4c70b93
Merge "Don't auto-correct when there are digits." into jb-mr1-dev
2012-07-27 09:12:01 -07:00
Jean Chalard
e7c471a52f
Don't auto-correct when there are digits.
...
Bug: 6667462
Change-Id: I796655f57c71c9f50ae6e38dd08b71df3998dbcf
2012-07-28 00:15:54 +09:00
Jean Chalard
78ee77ad08
Merge "Fix a bug with autocaps" into jb-mr1-dev
2012-07-27 05:19:48 -07:00
Jean Chalard
6fc72cae20
Fix a bug with autocaps
...
Port of Iece016f4
Bug: 6886405
Change-Id: I148c296d8a3841c40b6748e73ed2b0fff473b627
2012-07-27 21:09:25 +09:00
Tadashi G. Takaoka
1057670881
Make PreviewPlacerView final
...
This is a groundwork for the bug.
Bug: 6883053
Change-Id: I51e9235d3bc7021790a88a44596c4314125a1ab3
2012-07-27 19:40:39 +09:00
Tadashi G. Takaoka
99906b3fc2
Move SuddenJumpingTouchEventHandler to internal package
...
Change-Id: Ifc9fb6322a2edbaac0b10e7134ee7e735f14937b
2012-07-27 14:25:53 +09:00
Jean Chalard
7677a0ee7f
Merge "Handle correctly the restarting argument"
2012-07-26 06:47:59 -07:00
Jean Chalard
aa906c36aa
Handle correctly the restarting argument
...
Bug: 6851364
Change-Id: Ie939a43b8527a76aec213b702d3d850717f22a81
2012-07-26 21:57:15 +09:00
Tadashi G. Takaoka
97c8d288a8
Add Zulu keyboard
...
Bug: 6867914
Change-Id: I13316ac2a554a8601f920e875d540e5375e12860
2012-07-26 19:03:35 +09:00
Tadashi G. Takaoka
e863fb712f
Merge "Fix gesture detection when sliding key input is disabled"
2012-07-26 02:13:20 -07:00
Tadashi G. Takaoka
c902dfeb8f
Fix gesture detection when sliding key input is disabled
...
Bug: 6867837
Change-Id: Icbfa69928c436343db545860a7d63171f52266b6
2012-07-26 17:41:54 +09:00
Tadashi G. Takaoka
b90363e40c
Fix Afrikaans more keys layout
...
Bug: 6867914
Change-Id: I43178a729f4770743f9fea87bad539c54da045c5
2012-07-26 16:31:06 +09:00
Tadashi G. Takaoka
55c01170c4
Add Afrikaans keyboard layout
...
Bug: 6867914
Change-Id: Ice35b20a0a51dda21c8271256064523bb5844952
2012-07-26 15:57:35 +09:00
Tadashi G. Takaoka
941f222c21
Merge "Remove unused setProximityCorrectionEnabled() methods"
2012-07-25 19:54:40 -07:00
Ken Wakasa
e55d78ab0c
Stop swallowing an UnsatisfiedLinkError
...
Change-Id: I37d61274e1527229befabae2c392fd78e279b807
2012-07-26 09:15:39 +09:00
Ying Wang
d28858ebde
Merge "Import translations. DO NOT MERGE"
2012-07-25 15:04:41 -07:00
Ying Wang
d95121294a
Import translations. DO NOT MERGE
...
Change-Id: I90620bd20eb0ed8f927709404822d815dc096223
Auto-generated-cl: translation import
2012-07-25 14:58:15 -07:00