nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,298 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

38298 Commits (cf4b2bf7097ac506e031add76891bab8ec0f9342)

Author SHA1 Message Date
Geoff Mendal cf4b2bf709 Import translations. DO NOT MERGE 
Change-Id: I49316abaf3db35799511fb25edbde618bb839ab3
Auto-generated-cl: translation import
 2016-02-02 07:33:28 -08:00
Geoff Mendal f6d1c5f323 Import translations. DO NOT MERGE 
Change-Id: Iad1409117bddf84a193f3999bbc502ad36c2ad84
Auto-generated-cl: translation import
 2015-12-07 05:15:13 -08:00
Geoff Mendal b8442588a3 Import translations. DO NOT MERGE am: fdbd6fe212 -s ours 
am: c2483d98b5  -s ours

* commit 'c2483d98b58977b80bb3645bfdee516eedab2141':
  Import translations. DO NOT MERGE
 2015-11-25 16:22:36 +00:00
Geoff Mendal c2483d98b5 Import translations. DO NOT MERGE 
am: fdbd6fe212  -s ours

* commit 'fdbd6fe212eafe89c889a900fe235dfd5141b10b':
  Import translations. DO NOT MERGE
 2015-11-25 16:17:45 +00:00
Geoff Mendal fdbd6fe212 Import translations. DO NOT MERGE 
Change-Id: I3b0659978c7d5b8d37020621ce41a56366cf0b27
Auto-generated-cl: translation import
 2015-11-25 05:42:06 -08:00
Geoff Mendal 888712e489 Import translations. DO NOT MERGE 
Change-Id: If7cc2bd21fbc9f806909e544495cce1acf951b29
Auto-generated-cl: translation import
 2015-11-25 05:35:56 -08:00
Geoff Mendal b8643b22c6 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2015-11-16 15:50:23 +00:00
Geoff Mendal 6cca573fbe Import translations. DO NOT MERGE 
Change-Id: Id9670893071d981904e3a9eca8ebef55ac1cc265
Auto-generated-cl: translation import
 2015-11-16 06:37:44 -08:00
Geoff Mendal 006c30a36e Import translations. DO NOT MERGE 
Change-Id: Iab1557d1610a2b3a68f9a29b1bff565a83fe3ff0
Auto-generated-cl: translation import
 2015-11-16 06:36:54 -08:00
Geoff Mendal 23d90ed34d Import translations. DO NOT MERGE am: 76218d9045 -s ours 
am: b6e8df2cf1  -s ours

* commit 'b6e8df2cf10acff16a0267483ec3764b8f78a617':
  Import translations. DO NOT MERGE
 2015-11-14 15:08:29 +00:00
Geoff Mendal b6e8df2cf1 Import translations. DO NOT MERGE 
am: 76218d9045  -s ours

* commit '76218d9045409d1881a72a20ece23dc6371070e7':
  Import translations. DO NOT MERGE
 2015-11-14 15:05:33 +00:00
Geoff Mendal 76218d9045 Import translations. DO NOT MERGE 
Change-Id: I2f10dd89298df82a8cf092a0de3d4a635ab7e696
Auto-generated-cl: translation import
 2015-11-14 06:57:59 -08:00
Chieu Nguyen 305aef9c87 Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 
am: fab2818b96

* commit 'fab2818b96c7b85f4c415576dd8c03fa6e067c7e':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 21:58:59 +00:00
Chieu Nguyen fab2818b96 Unicode 8.0 emoji additions to Google Keyboard. 
am: 7674a65367

* commit '7674a653678b542d795b0bd05c241654ffe1015a':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 21:54:20 +00:00
Chieu Nguyen 7674a65367 Unicode 8.0 emoji additions to Google Keyboard. 
Squashed commit of the following:

    commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Tue Nov 10 11:29:44 2015 -0800

        Remove check for version code.
        This was unnecessary and caused multi-codepoint
        emoji to not show up on any device.

        Bug: 25369504
        Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

    commit 4a4a042072790b19048a14d2ddab655b1be31a6e
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Sun Nov 1 18:38:20 2015 -0800

        Add description strings for Unicode 8.0 new emoji.

        Bug: 16185905
        Bug: 25369504

        Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17

Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
 2015-11-11 11:04:45 -08:00
Geoff Mendal 076414fde9 Import translations. DO NOT MERGE am: 4de1e2262e -s ours 
am: 826c31f06d  -s ours

* commit '826c31f06dc2c6abd466195a3e1f2c5f511c18b1':
  Import translations. DO NOT MERGE
 2015-11-11 13:39:46 +00:00
Geoff Mendal 826c31f06d Import translations. DO NOT MERGE 
am: 4de1e2262e  -s ours

* commit '4de1e2262e1d81f8d015a2ea3ccace35316308d0':
  Import translations. DO NOT MERGE
 2015-11-11 13:35:31 +00:00
Geoff Mendal 4de1e2262e Import translations. DO NOT MERGE 
Change-Id: Ib2017e067aadd10ca7d2ea82c3a54c2b04fc2cf3
Auto-generated-cl: translation import
 2015-11-11 05:29:20 -08:00
Ian Pedowitz 25dcdc2b15 Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 
am: 1ce99504c5

* commit '1ce99504c5295eb4aef5df87db8d2bfc42001302':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:33:01 +00:00
Ian Pedowitz 3544e4c5ca Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev am: 9dfac101f2 
am: 89efd96db6

* commit '89efd96db6b8d76c256e65968cb166af1f0df698':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:32:45 +00:00
Ian Pedowitz 1ce99504c5 Revert "Unicode 8.0 emoji changes to Google Keyboard." 
am: e1d5012683

* commit 'e1d501268396e58bfdd37a0a50dfeb2ac48139a8':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:30:57 +00:00
Ian Pedowitz 89efd96db6 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev 
am: 9dfac101f2

* commit '9dfac101f2c7c34992e0214c09ee34f20b396bb1':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:30:33 +00:00
Ian Pedowitz e1d5012683 Revert "Unicode 8.0 emoji changes to Google Keyboard." 
This reverts commit 9cc42549d1.

Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
 2015-11-10 03:29:41 +00:00
Ian Pedowitz 9dfac101f2 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev 2015-11-10 03:29:13 +00:00
Ian Pedowitz 354d0092ac Revert "Add description strings for Unicode 8.0 new emoji." 
This reverts commit 332181b834.

Change-Id: Ic7c494292249f86159ec6f4bc1f7a72859b10282
 2015-11-10 03:05:40 +00:00
Reena Lee f25c8c6c6f Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev am: 9749f1f1c3 
am: 2c56e60003

* commit '2c56e600037bf48e64474d06cf491ca0347ff5fc':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:45:21 +00:00
Reena Lee 2c56e60003 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev 
am: 9749f1f1c3

* commit '9749f1f1c3755ece6ddfc822d642ac0e8218d138':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:42:26 +00:00
Reena Lee 9749f1f1c3 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev 2015-11-09 21:36:55 +00:00
Chieu Nguyen 3ca694e58f Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1 
am: 72d0a185d9

* commit '72d0a185d9227e8ec43ceb2bd0d3f9d7cc0f5c97':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:35:10 +00:00
Chieu Nguyen 72d0a185d9 Unicode 8.0 emoji changes to Google Keyboard. 
am: 9cc42549d1

* commit '9cc42549d18f1e28ffc8dae94ff36728933f53f1':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:30:07 +00:00
Chieu Nguyen 9cc42549d1 Unicode 8.0 emoji changes to Google Keyboard. 
Squashed commit of the following:

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
 2015-11-06 18:22:05 -08:00
Chieu Nguyen 332181b834 Add description strings for Unicode 8.0 new emoji. 
Bug: 16185905
Bug: 25369504

Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17
(cherry picked from commit 4a4a042072790b19048a14d2ddab655b1be31a6e)
 2015-11-06 01:08:50 +00:00
Dmitry Torokhov 0b20a8d2bb am b1cd4006: am 28e65858: Do not start in recents tab if we do not have recent emojis 
* commit 'b1cd4006027af90db427839b3c477930ab6aee31':
  Do not start in recents tab if we do not have recent emojis
 2015-10-16 22:02:22 +00:00
Dan Zivkovic 51fc864e69 am 1194ad63: am 1fdb8f31: Define shortcuts for toggling IME layouts. 
* commit '1194ad63ee11ccccab4cd6bdeaa0dc85852008a9':
  Define shortcuts for toggling IME layouts.
 2015-10-16 22:02:20 +00:00
Dan Zivkovic 8aed171ccb am 33bbbb0d: am de674ac0: Re-activate emoji keyboard shortcut. 
* commit '33bbbb0d333223451eb24d6b462840755fb51152':
  Re-activate emoji keyboard shortcut.
 2015-10-16 22:02:19 +00:00
Dmitry Torokhov b1cd400602 am 28e65858: Do not start in recents tab if we do not have recent emojis 
* commit '28e65858d9f7e8f94e0b298275624703fd74af05':
  Do not start in recents tab if we do not have recent emojis
 2015-10-16 21:56:09 +00:00
Dan Zivkovic 1194ad63ee am 1fdb8f31: Define shortcuts for toggling IME layouts. 
* commit '1fdb8f31562eeef78167585a878eb0450310036b':
  Define shortcuts for toggling IME layouts.
 2015-10-16 21:56:08 +00:00
Dan Zivkovic 33bbbb0d33 am de674ac0: Re-activate emoji keyboard shortcut. 
* commit 'de674ac02ee0090078f1ec0d286f26ef19cdeebb':
  Re-activate emoji keyboard shortcut.
 2015-10-16 21:56:07 +00:00
Dmitry Torokhov 28e65858d9 Do not start in recents tab if we do not have recent emojis 
If user has not used emojis we should not bring recents emoji tab on the
first invocation of the on-screen keyboard as it is confusing to see an
empty tab.

We will still be showing recents tab even if it is empty if user
actively switched to it when using on-screen keyboard.

Bug: 24497650

Change-Id: I68b4bf64441590858d246168cc4733a2875a1357
(cherry picked from commit 24d67eba27cb23c0d3aca44236247ec12380daa5)
 2015-10-15 12:47:32 -07:00
Dan Zivkovic 1fdb8f3156 Define shortcuts for toggling IME layouts. 
Out of the box, we want Alt-Left to toggle Emojis, while Alt-Right
toggles the shifted symbols layout.

Bug: 23954008
Bug: 24369173

Change-Id: I93dd66fb469e5d0a831359ff3a786fe68e1d73ea
(cherry picked from commit 411841b374aa04e333ea5a438dfd539f49ec589a)
 2015-10-15 12:47:32 -07:00
Dan Zivkovic de674ac02e Re-activate emoji keyboard shortcut. 
Bug 23900149.

Change-Id: Iff8a3892bb88f82736e5fa680c38d98cda4d2777
(cherry picked from commit e1641395e30de7b53b06fc5c820ea83bf04b3aad)
 2015-10-15 17:14:04 +00:00
Baligh Uddin c028104898 am e8e27b0b: (-s ours) am cada0b33: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e8e27b0bd73d7b7bdfc52daecbf359ab8e951c3f':
  Import translations. DO NOT MERGE
 2015-09-25 03:16:22 +00:00
Baligh Uddin ca5e7521ca am 13cf3027: (-s ours) am d993ade7: (-s ours) Import translations. DO NOT MERGE 
* commit '13cf3027963ff8c31332a964a97d72c8dd2c5510':
  Import translations. DO NOT MERGE
 2015-09-25 03:16:20 +00:00
Baligh Uddin e8e27b0bd7 am cada0b33: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cada0b3374f3bb16887219f615671500f73db0ff':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:18 +00:00
Baligh Uddin 13cf302796 am d993ade7: (-s ours) Import translations. DO NOT MERGE 
* commit 'd993ade72b5ef87f48e923d055b1d12d731c1784':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:17 +00:00
Baligh Uddin cada0b3374 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:56:49 +00:00
Baligh Uddin d993ade72b Import translations. DO NOT MERGE 
Change-Id: I3b2bbe3c7c543e8e0182e7879beedfac207f14a4
Auto-generated-cl: translation import
 2015-09-24 15:22:10 -07:00
Baligh Uddin ff853888c0 Import translations. DO NOT MERGE 
Change-Id: Id3a49d7cac8bb9ae65e2b11f80971e0e5f7c71dd
Auto-generated-cl: translation import
 2015-09-24 15:16:29 -07:00
Baligh Uddin fccf17c2e8 am ab1919eb: (-s ours) am 76fb6294: (-s ours) Import translations. DO NOT MERGE 
* commit 'ab1919eb23e49b626e5778bc926c41f8d4036e4d':
  Import translations. DO NOT MERGE
 2015-09-23 17:43:03 +00:00
Baligh Uddin ab1919eb23 am 76fb6294: (-s ours) Import translations. DO NOT MERGE 
* commit '76fb62948b7d98e4f19ad5b9362e171cc96140cc':
  Import translations. DO NOT MERGE
 2015-09-23 17:25:11 +00:00