n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,987 Commits 6 Branches 15 Tags 681 MiB
70a662716d
Commit Graph

6625 Commits

Author SHA1 Message Date
Jean Chalard
ddafcf82dc Merge "Fix bugs and add tests" 2013-04-09 08:35:28 +00:00
Jean Chalard
9310f42a36 Offer to add any OOV typed word to the dictionary. 
That includes gestures, which used not to work.

Bug: 8532637
Change-Id: I04606565d7000faadf954c4a806c39d4d162a2c1
 2013-04-09 12:05:54 +09:00
Kurt Partridge
1f70a4d681 Merge "Allow logging while replaying" 2013-04-09 02:33:09 +00:00
Kurt Partridge
d117c1a116 Merge "Do not record log split time when handling separator" 2013-04-09 02:31:48 +00:00
Baligh Uddin
e4760624ce Import translations. DO NOT MERGE 
Change-Id: I3605a7fd941d9ebe76460d114f384b1e233b3440
Auto-generated-cl: translation import
 2013-04-08 14:47:06 -07:00
Ken Wakasa
d17c8bd929 Update comments 
Change-Id: I6aef328ec9041666cc168c8323bed04d39591b71
 2013-04-08 23:05:45 +09:00
Ken Wakasa
370461ef9f Clean up a few option strings under the Advanced settings 
Change-Id: If41ac016128fce401dedcab0fa7d6c23edaca158
 2013-04-08 01:16:32 +09:00
Jean Chalard
c87449497c Fix bugs and add tests 
Change-Id: I6b56b91ace57f4a49584b5dceb71b145859f839e
 2013-04-05 12:11:19 +09:00
Jean Chalard
7d3836d63a Move a generic string utility to StringUtils 
Change-Id: I9cc2e9a7ac0b3346af40bcb083f939333336cf09
 2013-04-05 12:09:14 +09:00
Kurt Partridge
3547bd2932 am 228d4533: am 5779bc91: Merge "Split LogUnits differently." 
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
  Split LogUnits differently.
 2013-04-03 19:33:00 -07:00
Kurt Partridge
3ec6a8bdf9 am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" 
* commit '6c522b53f0950fa511bf93e1e506434e7cdef6ad':
  Reorder ResearchLogger call
 2013-04-03 19:27:26 -07:00
Tadashi G. Takaoka
b1533116f5 am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" 
* commit 'b08506c2211490fb42617f30dbd8901bf5651b47':
  Interpolate gesture preview trails
 2013-04-03 19:27:22 -07:00
Jean Chalard
873c20ba06 am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" 
* commit 'e40d5633659a401e1357e1c530238ed74cc158f6':
  Ask the client to make itself known when it's not
 2013-04-03 19:27:20 -07:00
Jean Chalard
3b9d7fd179 am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." 
* commit '151e4e182c86a2b7aea534bda777e9e9aafa549b':
  Fix two nasty bugs with surrogate pairs.
 2013-04-03 19:27:19 -07:00
Jean Chalard
4c535232bc am a38d907b: am 740da0d8: Fix an NPE 
* commit 'a38d907b96882f41174d6cf7d0da6faefcc97228':
  Fix an NPE
 2013-04-03 19:27:15 -07:00
Tadashi G. Takaoka
76c00decc9 am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler 
* commit '7580e9945ba096a2a084a6f571c2bd1a945dec8c':
  Fix potential NPE in MainKeyboardView.KeyTimerHandler
 2013-04-03 19:27:13 -07:00
Jean Chalard
86b8b7b407 am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" 
* commit '9bf1dfebd8e51fb16ac26c59de9aa646b4499765':
  Fix an NPE
 2013-04-03 19:27:12 -07:00
Jean Chalard
1c63efc975 am a657afc3: am d555a0d7: Merge "Cleanup" 
* commit 'a657afc32e099d1b12516788e1a32d1303ced295':
  Cleanup
 2013-04-03 19:27:11 -07:00
Jean Chalard
a747d76285 am 6e78878f: am 844e5014: Merge "Increase string limits" 
* commit '6e78878f7b038afa46afc75117cd773e2d181a5c':
  Increase string limits
 2013-04-03 19:21:06 -07:00
Satoshi Kataoka
395e500b09 am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" 
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
  Fix Possible NPE
 2013-04-03 19:21:01 -07:00
Satoshi Kataoka
0c99a379bd am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" 
* commit 'e42522f33566857402a8db645f58de2818456dc7':
  Fix possible SIOOBE
 2013-04-03 19:21:00 -07:00
Kurt Partridge
35e02ccdda am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView" 
* commit 'bf62dc036f1e71751c8713ff13e686bbf635d6c3':
  Close ResearchLogger upon onFinishInputView
 2013-04-03 19:20:59 -07:00
Baligh Uddin
4b8494c4fc Import translations. DO NOT MERGE 
Change-Id: I66b30c5f9673fc4ed3b96753cfec023e7d498dec
Auto-generated-cl: translation import
 2013-04-03 13:13:26 -07:00
Baligh Uddin
4cdb7ccb32 Import translations. DO NOT MERGE 
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
 2013-04-03 13:06:22 -07:00
Tadashi G. Takaoka
6e3f307266 Refactor SpellCheckerProximityInfo as extending ProximityInfo 
Change-Id: I544eec9d661796d57749dbaa2163bc1e2a891353
 2013-04-02 19:06:32 +09:00
Jean Chalard
ecb59eff90 Revert "[DO NOT MERGE] Activate hardware keyboard handling" 
This reverts commit c741f1f83b
DO NOT MERGE is ignored and this is merged anyway :(

Change-Id: Ie044cdfc6021933379ec97ad7346c5c8591f70bf
 2013-04-02 16:08:48 +09:00
Jean Chalard
c741f1f83b [DO NOT MERGE] Activate hardware keyboard handling 
Change-Id: Ifdec9338a454291621b2b87c899f5d4301480b27
 2013-04-02 15:38:13 +09:00
Kurt Partridge
30772c3758 Allow logging while replaying 
Previously logging was disabled during replay.  This makes it impossible to use logged data as a
regression test, since the new log was unavailable.  This change corrects this problem.

Change-Id: I19dc31def2f2f87fd219dc561c739d18e4ab9c9c
 2013-04-01 16:49:39 -07:00
Kurt Partridge
636b8c4231 Do not record log split time when handling separator 
Previously handleSeparator() caused the ResearchLogger to mark the time at which a LogUnit should be
broken.  However, this causes the motion data associated with a separator to be associated with the
LogUnit of the previous word.  This change corrects this bug.

Change-Id: I8b4d4fa6de2a013de9e2a28bb668c446a07f1957
 2013-04-01 16:48:15 -07:00
Kurt Partridge
5779bc91e6 Merge "Split LogUnits differently." 2013-04-01 23:08:21 +00:00
Baligh Uddin
02fc1ed512 Merge "Import translations. DO NOT MERGE" 2013-04-01 20:54:38 +00:00
Baligh Uddin
2caa1d81ce Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-01 20:53:56 +00:00
Kurt Partridge
0c0ab2b4d9 Merge "Reorder ResearchLogger call" 2013-04-01 15:19:45 +00:00
Jean Chalard
0745fe83d4 am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. 
* commit 'b8869ec1e39c1751825841e790d21fc854dca9ce':
  Deactivate hardware keyboard handling.
 2013-04-01 05:42:42 -07:00
Jean Chalard
b8869ec1e3 am 0fcc4960: Deactivate hardware keyboard handling. 
* commit '0fcc4960bcd037b7e1482098f85342743eb2ddee':
  Deactivate hardware keyboard handling.
 2013-04-01 05:40:07 -07:00
Jean Chalard
0fcc4960bc Deactivate hardware keyboard handling. 
Bug: 8000119

Change-Id: I021481343d6d87efd8ff6110e9aa0906a1a3d11d
 2013-04-01 21:35:45 +09:00
Tadashi G. Takaoka
75028af28c Interpolate gesture preview trails 
There is the boolean flag to kill interpolation.

Bug: 7167303
Change-Id: Iac7e4cb88cf437c2ee77c003c9cddb92416025c7
 2013-04-01 19:15:36 +09:00
Jean Chalard
43341ba042 Merge "Ask the client to make itself known when it's not" 2013-04-01 09:00:25 +00:00
Jean Chalard
76d5f512f9 Ask the client to make itself known when it's not 
Upon invoking the settings of the dictionary pack with an unknown
client, we now launch an intent to ask the client to make itself known.
This change also includes the code that receives this intent and
acts upon it.

Bug: 8492879
Change-Id: I2c6496dea845646961ecafcf64e282cb93ee91dc
 2013-04-01 17:37:22 +09:00
Jean Chalard
065f126f1d Merge "Fix two nasty bugs with surrogate pairs." 2013-04-01 08:28:08 +00:00
Jean Chalard
a411595b16 Fix two nasty bugs with surrogate pairs. 
The important bug is in findWordInTree. The problem, which is
not obvious, is that we were calling codePointAt() with the
code point index in the string, instead of the char index.
The other bug this change fixes was harmless in the practice,
because it's in the iteration which is only used for debug and
pretty printing purposes. It's very similar in that it would
substract a length in code point to a length in chars and
truncate a StringBuilder at that length, so it would fail in a
quite similar manner. This changes the meaning of the "length"
attribute in Position, but it's clearer this way anyway.

Bug: 8450145
Change-Id: If396f883a9e6449de39351553ba83f5be5bd30f0
 2013-04-01 17:06:19 +09:00
Baligh Uddin
bd4fdf8e4e Import translations. DO NOT MERGE 
Change-Id: I8752437b40f9f8bcb7b8920bc1dc4342e51b3621
Auto-generated-cl: translation import
 2013-03-29 21:27:10 -07:00
Baligh Uddin
cea6a7a2a3 Import translations. DO NOT MERGE 
Change-Id: I19c04b125fc3d2a6dd7b0a32ee90f098d931f83b
Auto-generated-cl: translation import
 2013-03-29 21:21:20 -07:00
Jean Chalard
740da0d8d0 Fix an NPE 
Also remove an unused method and make 2 private variables
final.

Bug: 8461093
Change-Id: I676d93fda28e82eb5a6978f2e7ad5a0add2cbecf
 2013-03-29 18:41:29 +09:00
Tadashi G. Takaoka
48d8d8d0ae Fix potential NPE in MainKeyboardView.KeyTimerHandler 
Bug: 8469652
Change-Id: Ib7a548e6a24d2e02de85ab444c0ec99d8f6b82c3
 2013-03-28 17:54:36 +09:00
Jean Chalard
2188cbae63 Merge "Fix an NPE" 2013-03-28 06:56:49 +00:00
Jean Chalard
d555a0d77a Merge "Cleanup" 2013-03-28 06:16:40 +00:00
Jean Chalard
28d5f4577f Fix an NPE 
The code was passing the wrong parameter.

Bug: 8492879
Change-Id: I091d62ca29601e3807eed287c7bdad38bf43a502
 2013-03-28 15:08:05 +09:00
Jean Chalard
dae90cfb01 Cleanup 
Seems there was an unclosed cursor :o

Change-Id: I7616849ace5217d8c6f54465f7b3a634e3c14116
 2013-03-28 14:43:32 +09:00
Baligh Uddin
fd0e40ef91 am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki 
* commit '78b07d8b574fe2d1a43e796775b89b116f8f411f':
 2013-03-27 22:09:51 -07:00
Baligh Uddin
78b07d8b57 am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki 
* commit '0cd02c2bd732383766099aa2ec94abc8a8ac174a':
 2013-03-27 22:05:16 -07:00
Tadashi G. Takaoka
33fa6a0b3b am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()" 
* commit 'cc75c950410f206c5bc6406071d256071aeabca9':
  Use XmlPullParser.getEventType()
 2013-03-27 21:59:46 -07:00
Satoshi Kataoka
dd8ca1f821 am bc586fb1: am 0b327101: Merge "Fix possible NPE" 
* commit 'bc586fb1ff553bc640676b348b3b24ee2626bf42':
  Fix possible NPE
 2013-03-27 21:59:44 -07:00
Tadashi G. Takaoka
56b1bd866a am f892f775: am d17b69ec: Clean up XmlParserUtils 
* commit 'f892f7751e1263b71dd1b0a49618f922a16df1ae':
  Clean up XmlParserUtils
 2013-03-27 21:59:43 -07:00
Tadashi G. Takaoka
71fb8af7c5 am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException 
* commit 'ec183b50ff1b44390a44ec94f8910373f7dbf985':
  Fix possible ArrayIndexOutOfBoundsException
 2013-03-27 21:59:39 -07:00
Alan Viverette
8f80758226 am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. 
* commit 'e47ee18192554877cd202455cbc3c9e932b86728':
  Don't announce changes for A11y within the same keyboard mode.
 2013-03-27 21:45:08 -07:00
Satoshi Kataoka
189c1b0ee8 am 97ddbf22: am 19a70087: Merge "Fix appname" 
* commit '97ddbf22d5c6d4791b3115526fdc885a40009695':
  Fix appname
 2013-03-27 21:45:07 -07:00
Tadashi G. Takaoka
0992fd245b am 1e3c73de: am 3a8a63c3: Remove unused import 
* commit '1e3c73de06caeeba31cb43099f4555e1ed17dba4':
  Remove unused import
 2013-03-27 21:45:06 -07:00
Tadashi G. Takaoka
bb679a224f am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" 
* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
  Remove reference to string.english_ime_name
 2013-03-27 21:45:05 -07:00
Satoshi Kataoka
4bb504cedb am 45728330: am f4352c2c: Merge "Use correct appname resource" 
* commit '457283308a2bb929a473086040b402c673aca390':
  Use correct appname resource
 2013-03-27 21:45:03 -07:00
Satoshi Kataoka
0cc6314958 am c1c3e03c: am 140b6705: Merge "Fix appname" 
* commit 'c1c3e03c12891dfd8a87f1254c8bc9d9ccc9333a':
  Fix appname
 2013-03-27 21:45:00 -07:00
Tadashi G. Takaoka
dbb90d08b5 am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder 
* commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205':
  Clean up InflateException reference from KeyboardBuilder
 2013-03-27 21:44:59 -07:00
Jean Chalard
844e5014fa Merge "Increase string limits" 2013-03-28 04:07:24 +00:00
Jean Chalard
db5e07f756 Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 2013-03-28 04:04:28 +00:00
Jean Chalard
eda69e5272 Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144

Change-Id: I7062e533e5d4521d2866a6c5f947c8f25b790675
 2013-03-28 13:03:49 +09:00
Jean Chalard
830cd7b915 [DO NOT MERGE] Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144
Change-Id: I7845f85ddee992313f658e0268d090eae73778b3
 2013-03-28 13:01:41 +09:00
Baligh Uddin
8ca085db42 Import translations. DO NOT MERGE 
Change-Id: Ic1a341b949098fc55c0e5f46c976547ba02f8eca
Auto-generated-cl: translation import
 2013-03-27 12:39:26 -07:00
Baligh Uddin
c08b8245d9 Import translations. DO NOT MERGE 
Change-Id: If21c77c39e8945f39c3ecb5186b80fd8229a7659
Auto-generated-cl: translation import
 2013-03-27 12:34:24 -07:00
Baligh Uddin
841e60163b Import translations. DO NOT MERGE 
Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec
Auto-generated-cl: translation import
 2013-03-27 12:32:41 -07:00
Satoshi Kataoka
f463b45d8e Merge "Fix Possible NPE" 2013-03-27 04:51:48 +00:00
Satoshi Kataoka
2cdf5351aa Merge "Fix possible SIOOBE" 2013-03-27 03:28:49 +00:00
Satoshi Kataoka
33306acfa4 Fix possible SIOOBE 
Bug: 8461021

Change-Id: I8b0385610b80b5a672ec380935c485a0e01ae984
 2013-03-27 12:25:02 +09:00
Kurt Partridge
189be5196a Split LogUnits differently. 
Previously an autocorrection caused a new LogUnit to be started,
splitting off the previous LogUnit right at the autocorrection method
time.  This change causes the split to happen before the MotionEvents
that led to the autocorrection being called.

Change-Id: I2504df8eb47ee77e5f46bac34a8450636c03fd9f
 2013-03-26 16:46:43 -07:00
Kurt Partridge
cb25e1fe37 Reorder ResearchLogger call 
Previously, ResearchLogger#onWordFinished() was called with an outdated parameter value for
isBatchMode, causing it to report false even for gestures.  This changes fixes this problem.

Change-Id: Ifcabee236ba5fe20376ad882155d3f3142cd7613
 2013-03-26 14:37:57 -07:00
Kurt Partridge
ef103e1f2e Merge "Close ResearchLogger upon onFinishInputView" 2013-03-26 19:23:00 +00:00
Tadashi G. Takaoka
73d00e68d8 Merge "Use XmlPullParser.getEventType()" 2013-03-26 05:38:18 +00:00
Satoshi Kataoka
435cccb2c5 Fix Possible NPE 
Bug: 8448448
Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c
 2013-03-26 13:02:23 +09:00
Satoshi Kataoka
0b3271010f Merge "Fix possible NPE" 2013-03-26 03:49:06 +00:00
Tadashi G. Takaoka
52f4b04768 Use XmlPullParser.getEventType() 
Change-Id: Ie423d3416639f81409cc920658c8088b7519b045
 2013-03-26 12:13:56 +09:00
Tadashi G. Takaoka
d17b69ec00 Clean up XmlParserUtils 
Change-Id: I636e8f359d47f39e61a7f77e3e686f2721779b6f
 2013-03-26 12:03:07 +09:00
Kurt Partridge
6d71d238e2 [FileEncap18] Clean up uploading scheduling 
- Move scheduling logic from ResearchLogger.java to
  UploaderService.java
- Switch to a one-shot timer.  Previously the uploader was scheduled
  on an inexact repeating schedule.  It's better to reschedule the
  next upload after the current one is finished to reduce the chances
  of multiple uploads happening at the same time.
- Avoid double-execution
    - Previously a scheduled upload might run right after an explicit
      one if they occured at the same time.  This change reduces the
      chances of this.
- Some method extraction and naming

Change-Id: I9efda11be77d334c7f61bd40a36d65f0421ebde4
 2013-03-25 17:50:26 -07:00
Kurt Partridge
87bc3a4a62 Close ResearchLogger upon onFinishInputView 
Previously, ResearchLogger#stop() was called both in
LatinIME#onFinishInputView() and in LatinIME#onWindowHidden().  This
resulted in multiple logs being written.

Since onFinishInputView is the more reliable of the two (it is called
in InputMethodService#onDestroy; onWindowHidden is not), the code now
uses onFinishInputView as a stopping signal.

Change-Id: Iae4b8c3bdab226027624eeab19b3737367e4a108
 2013-03-25 17:31:25 -07:00
Baligh Uddin
6616188ea6 Import translations. DO NOT MERGE 
Change-Id: I8468f1e69374a5ada2ea03e427895b771b8dc048
Auto-generated-cl: translation import
 2013-03-25 15:45:33 -07:00
Baligh Uddin
fba5459750 Import translations. DO NOT MERGE 
Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9
Auto-generated-cl: translation import
 2013-03-25 15:38:08 -07:00
Satoshi Kataoka
a17dccbfc6 Fix possible NPE 
Bug: 8457109
Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
 2013-03-25 19:00:38 +09:00
Tadashi G. Takaoka
fb658d6c53 Fix possible ArrayIndexOutOfBoundsException 
Bug: 8461864
Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
 2013-03-25 12:37:04 +09:00
Baligh Uddin
afe343c16f Merge "Import translations. DO NOT MERGE" 2013-03-23 01:48:28 +00:00
Baligh Uddin
56a2088e7d Import translations. DO NOT MERGE 
Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1
Auto-generated-cl: translation import
 2013-03-22 13:39:40 -07:00
Baligh Uddin
21160c4eba Import translations. DO NOT MERGE 
Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c
Auto-generated-cl: translation import
 2013-03-22 13:31:54 -07:00
Alan Viverette
a7b4398c35 Don't announce changes for A11y within the same keyboard mode. 
Bug: 8439108
Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
 2013-03-22 11:53:12 -07:00
Satoshi Kataoka
19a7008728 Merge "Fix appname" 2013-03-22 07:23:08 +00:00
Satoshi Kataoka
3c8117c88f Fix appname 
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
 2013-03-22 16:19:44 +09:00
Tadashi G. Takaoka
3a8a63c399 Remove unused import 
This is a follow up of I062c076f.

Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
 2013-03-22 15:23:06 +09:00
Tadashi G. Takaoka
c6452f2569 Merge "Remove reference to string.english_ime_name" 2013-03-22 05:11:50 +00:00
Satoshi Kataoka
f4352c2ce3 Merge "Use correct appname resource" 2013-03-22 05:11:26 +00:00
Satoshi Kataoka
242c066dde Use correct appname resource 
Bug: 6789579
Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8
 2013-03-22 14:08:38 +09:00
Tadashi G. Takaoka
9f3774c194 Remove reference to string.english_ime_name 
Bug: 6789579
Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d
 2013-03-22 14:08:23 +09:00
Baligh Uddin
a3e47f8780 am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev 
* commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...
 2013-03-22 05:01:10 +00:00
Satoshi Kataoka
c1c3e03c12 am 140b6705: Merge "Fix appname" 
* commit '140b6705ece0559f2ea9647044b3baf6a314f3d3':
  Fix appname
 2013-03-21 20:45:30 -07:00
Satoshi Kataoka
140b6705ec Merge "Fix appname" 2013-03-22 03:42:54 +00:00