Andrew Sapperstein
b8d7d8d31d
Fixed label icons when selected.
...
Fixes b/8599310. Using selector xml drawables
to properly get the right assets for the folder labels.
Also did some renaming/moving cleanup.
Change-Id: I3b5ddc9fb9da239131405880e637fa1df2c99ea6
2013-05-14 14:30:56 -07:00
Baligh Uddin
f9d5bc28ed
Import translations. DO NOT MERGE
...
Change-Id: I7cefdcc3e733f1202182464b86d620b68908b7ce
Auto-generated-cl: translation import
2013-05-13 10:30:22 -07:00
Baligh Uddin
11f64dc521
Import translations. DO NOT MERGE
...
Change-Id: I9874a563b8034f7eef182fa65d1c5084c0dbf9d7
Auto-generated-cl: translation import
2013-05-08 12:01:55 -07:00
Andrew Sapperstein
086936d156
Fix build. Update string.
...
Change-Id: I2baa0790081dda0f6c298ef8f8d0aa4367717d3c
2013-05-06 14:44:51 -07:00
Paul Westbrook
06cbbcb3f6
Merge "Remove unneeded resources" into jb-ub-mail-ur9
2013-05-06 20:01:37 +00:00
Baligh Uddin
06d260573e
Import translations. DO NOT MERGE
...
Change-Id: I1f92fbc61a4a51b3595bf0ece9883e5eafc0cf84
Auto-generated-cl: translation import
2013-05-06 12:46:22 -07:00
Paul Westbrook
7a4ad765c5
Remove unneeded resources
...
Change-Id: I0a5f2d6d91327f14c1dd0d22d3f28a60074353d7
2013-05-06 10:44:59 -07:00
Baligh Uddin
89a78aa99d
Import translations. DO NOT MERGE
...
Change-Id: I62f60bd7b4a520f9e93a22082bae15db824d1722
Auto-generated-cl: translation import
2013-05-03 14:02:21 -07:00
Baligh Uddin
f480039c16
Import translations. DO NOT MERGE
...
Change-Id: Ie8b0a3c1d8f990b83d43294c77b4e800c86fb185
Auto-generated-cl: translation import
2013-05-01 11:40:58 -07:00
Baligh Uddin
53b0388076
Import translations. DO NOT MERGE
...
Change-Id: Idda37765db9dd38be45058b3dbf7cef7636d6da5
Auto-generated-cl: translation import
2013-04-30 01:35:34 -07:00
Alice Yang
6929654a0d
Remove checkboxes from Email
...
Change-Id: Ie2338cddcf15a278622f72e4827e6b160e16912f
2013-04-25 22:13:29 -07:00
Scott Kennedy
c726d4fa6c
Add "Reply all" setting to tablets
...
This controls the notification action on tablets.
Change-Id: I0b8df2ded371820f0dada3f1b11cebad462962ed
2013-04-24 18:15:19 -07:00
Baligh Uddin
33558fc133
Import translations. DO NOT MERGE
...
Change-Id: I06bc1d390dba17ab69bcf287dce947277ad28542
Auto-generated-cl: translation import
2013-04-24 11:18:44 -07:00
Scott Kennedy
643846abbd
Settings changes
...
Bug: 8685202
Change-Id: Ica781557b91e5ed43221f6e28b9d65cbb044ea55
2013-04-23 13:12:31 -07:00
Baligh Uddin
c2dfee3ca8
Import translations. DO NOT MERGE
...
Change-Id: If2f78530cca3ae11bc93975b6504929a6bce9216
Auto-generated-cl: translation import
2013-04-22 12:00:21 -07:00
Baligh Uddin
ac0b2e8571
Import translations. DO NOT MERGE
...
Change-Id: I90409e7de9c729ee77e8e388affb090ecccda8ee
Auto-generated-cl: translation import
2013-04-17 12:07:10 -07:00
Andy Huang
cb6bdff95c
clean up old layouts, pt 3
...
Bug: 8393227
Change-Id: I8fbd3ed96d9f7e10708ff6b064b2fea4865c4f69
2013-04-15 13:55:14 -07:00
Baligh Uddin
e8fd143c81
Import translations. DO NOT MERGE
...
Change-Id: I9ea9f585bf76f378e3de4970c6f0c8d5fdb23e13
Auto-generated-cl: translation import
2013-04-15 12:05:13 -07:00
Baligh Uddin
8b01f18c2d
Import translations. DO NOT MERGE
...
Change-Id: I4604e7a4594d29a100aaeb1f28ede4a57311fe55
Auto-generated-cl: translation import
2013-04-12 11:49:37 -07:00
Alice Yang
9f1cff0659
Checkbox vs. sender image setting
...
Replace the current "Hide checkbox" setting with a tri-state setting with
choice of:
- Show checkboxes
- Show sender image
- Show neither
Bug: 8512959
Change-Id: Ifa233b6d65f8c37388edeed71dbfbfdf1295d6fc
2013-04-11 14:16:01 -07:00
Baligh Uddin
1a217f1643
Import translations. DO NOT MERGE
...
Change-Id: I026066648e2e31a9446019beecdbd7ab79559727
Auto-generated-cl: translation import
2013-04-10 12:21:40 -07:00
Mark Wei
30dec61dbd
Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9
2013-04-04 00:47:57 +00:00
Baligh Uddin
75b933594f
Import translations. DO NOT MERGE
...
Change-Id: I396772ee5921bc2e145b5c247f6935db81c34a08
Auto-generated-cl: translation import
2013-04-03 12:12:48 -07:00
Mark Wei
d7970b3635
Attachments in Conversation List: UI changes to display attachment previews
...
in the conversation list.
Depends on:
PhotoManager: https://googleplex-android-review.googlesource.com/#/c/285814/
Bug: 7481049
Change-Id: Ia9f93c4ce75a4c9be0e9b738d0347292e4b2faca
2013-04-02 19:22:38 -07:00
Baligh Uddin
0c5208e584
Import translations. DO NOT MERGE
...
Change-Id: Ic92709d3de1a3fd8aba1ae704029278aa2684204
Auto-generated-cl: translation import
2013-03-29 20:28:19 -07:00
Yu Ping Hu
c534638b7a
Disable notification prefs until folder prefs are loaded.
...
Bug: 8485354
Change-Id: Id56c2634a16274e9340ad6ecb96661ee8a489d49
2013-03-27 17:40:38 -07:00
Paul Westbrook
7b44f1cd91
Fixed missing resource on phone
...
Bug: 8435176
Change-Id: Idf1df53ba80af13922b984e6a6997c8e576de0ee
2013-03-22 17:43:42 -07:00
Baligh Uddin
0da0c18ede
Import translations. DO NOT MERGE
...
Change-Id: Iab79dd1932eb580a6049c2bb740f462f8b84e562
Auto-generated-cl: translation import
2013-03-20 12:02:46 -07:00
Yu Ping Hu
9ae81e2af0
Move system folder string resources to emailcommon.
...
This permits us to move shared code for looking up system
folder names to emailcommon, which is also in this change.
Also renames emailcommon2 to emailcommon.
This is part of a multi-project submit with
I4a071a07c3e33aaa4ea404eb66a8db1eabc9ef0e and
I5746c0353783f9b29d52d6540472588c6542a6a2.
Bug: 8383232
Change-Id: I6c6eec4f1bcf2abd54c1ed05da1add8d894ee403
2013-03-19 19:45:52 -07:00
Baligh Uddin
ce7773981b
Import translations. DO NOT MERGE
...
Change-Id: Iaa30007bc77bd17d6316c610b9482d229d2b55e0
Auto-generated-cl: translation import
2013-03-18 12:18:00 -07:00
Baligh Uddin
1bba64ca02
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
2013-03-14 04:54:27 +00:00
Alice Yang
700fb3c23d
Merge "Revert "Change "hide checkboxes" to "show checkboxes""" into jb-ub-mail-ur9
2013-03-13 21:31:30 +00:00
Alice Yang
a833b36ec2
Revert "Change "hide checkboxes" to "show checkboxes""
...
This reverts commit 5742d44917
.
Bug 8370186
Change-Id: Ie15b7c30aaba8df8678d15e19dcd38fddea6de13
2013-03-13 14:18:19 -07:00
Baligh Uddin
6be6d42ed3
Import translations. DO NOT MERGE
...
Change-Id: Id7dad5ef31e6571c60da1569f8103d4833fdb3ae
Auto-generated-cl: translation import
2013-03-12 12:15:44 -07:00
Paul Westbrook
06c358dfee
Simplification of app initialization
...
Specify a account query uri in a resource, and remove the old receiver
Change-Id: Ia04dccfc95e0bb1854bba2e6f51e2de1546d72ce
2013-03-11 23:48:44 -07:00
Paul Westbrook
258776d784
Remove unnecessary resource overlay
...
Bug: 8170660
Change-Id: Iba1ed6e6f9e605c66a78d574e6450dcba0b9b195
2013-03-08 18:01:12 -08:00
Paul Westbrook
5a3d863a43
Add support for feedback
...
Change-Id: I6de8c0117f79c0be05d3db2fc108f8bf61415783
2013-03-08 17:15:00 -08:00
Paul Westbrook
3bf7281800
Temporary Work around bug 8170660
...
For some reason, Email crashes when measuring the
RecipientsEditTextView, when replying to a message. Replying to the
same message from Gmail2 doesn't cause this crash
This CL just sets a height on the recipient view
Bug: 8170660
Change-Id: Ib1cd7da3ac423140a0a9d9fb17a3de0c42a20b15
2013-03-01 14:21:14 -08:00
Scott Kennedy
2f9c66d08b
Use swipe preference for archive/delete action
...
Since some people prefer delete over archive, we will use their
conversation list swipe preference to determine whether to show
a "Delete" action or an "Archive"/"Remove label" action. "Delete"
will be shown if they have selected "Always delete"
UR9 version of I4eb0d408474a9f613cc4267c3851cc7277a22ebd
Change-Id: Ia2f1382b88c1ee6f64e864cb8b780d02821b673d
2013-02-14 14:46:02 -08:00
Scott Kennedy
b34608228f
Move notifications to UnifiedEmail
...
This involves redoing the persistence model, to split general,
account, and folder settings into separate SharedPreference stores.
It also requires some preferences to be moved into UnifiedEmail.
Depends on Ibe2e3f93ec164370535ffc5f5b2409544cc8d36d (UnifiedEmail)
Change-Id: Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2
2013-02-08 09:48:22 -08:00
Baligh Uddin
b3cf738aa5
Import translations. DO NOT MERGE
...
Change-Id: I337ed8b8a87953463133f90805202bada4cff5d9
Auto-generated-cl: translation import
2013-01-14 16:03:43 -08:00
Baligh Uddin
ae33ce14f4
Import translations. DO NOT MERGE
...
Change-Id: Ibc5687adea86d2b07df3357b1ce919839a6ce070
Auto-generated-cl: translation import
2013-01-09 12:30:19 -08:00
Scott Kennedy
5742d44917
Change "hide checkboxes" to "show checkboxes"
...
Change-Id: Ie44dc65acab4ed94e8d7b3b26392872c4419a603
2012-12-21 12:24:26 -08:00
Baligh Uddin
017dc48ff6
Import translations. DO NOT MERGE
...
Change-Id: I5a45961dbd1123d45bf102b2ae433065ade7d5ee
Auto-generated-cl: translation import
2012-12-04 08:48:45 -08:00
Scott Kennedy
f9997921cb
Change Email vibrate setting from tri-state to checkbox
...
Migrate the old value as necessary.
Update the unit tests.
Cherry-picked from I1c276ffde3496cbc66846ed4a007088d39f20382 with
minor changes.
Bug: 7624838
Change-Id: I1b3fa331b62f556701bacba5ce9cd64305d9b52a
2012-11-29 12:16:33 -08:00
Baligh Uddin
83f64cfe3b
Import translations. DO NOT MERGE
...
Change-Id: I66d9889e6a21258fe467730bcd66f2c9f270cc1f
Auto-generated-cl: translation import
2012-11-22 21:12:19 -08:00
mindyp
80e231027e
Remove content desc; replace with hint text
...
Fixes b/7592130 email: "Add Exchange Account" , Emailid and pwd fields are not read as "Edit boxes"
Change-Id: I6b69084f6a2a2be9322a2b567099d534412f6905
2012-11-21 11:09:12 -08:00
Scott Kennedy
c629d38ac3
Remove a few unused resources
...
This removes any resources that are also declared in UnifiedGmail and
never referenced anywhere.
Change-Id: Ib918985e0712087dd9cf445af53fb20e8c5cf99e
2012-11-15 13:14:16 -08:00
Baligh Uddin
8288ab73b2
Revert "Import translations. DO NOT MERGE"
...
Broken Build
This reverts commit ba50a0689e
Change-Id: I9ea87dfb18997b0141e1eee70a3f0ca0f17a935a
2012-11-13 09:30:27 -08:00
Baligh Uddin
ba50a0689e
Import translations. DO NOT MERGE
...
Change-Id: I0769f2ef77870f913c52c857cd4a21d7ee183774
Auto-generated-cl: translation import
2012-11-12 06:59:24 -08:00
Vikram Aggarwal
2d081c980a
Change string names to new resources
...
Bug: 7486723 NPE by tapping settings random number in Email2
Change-Id: Ia65fdbab3cf658e9a95dbb67d4ed60e6ea05690c
2012-11-06 15:27:37 -08:00
Scott Kennedy
c6f8c51c67
Prompt for auto-advance option on first action
...
If we're on a tablet, we will pop up a dialog that asks the user what
they want to do. When they select an option, we save it, and take
the original action, and auto-advance to their preference.
Depends on I7b11bd0d17e6cc184b67c8c943531146fc964b49
Bug: 7328118
Change-Id: Ied57eee4d90ad1d61316032d0796f9205fdd1962
2012-11-02 10:20:33 -07:00
Baligh Uddin
51f16b260d
Import translations. DO NOT MERGE
...
Change-Id: I790dbef85d8ed892c36c1da14196e03e5ac4a00f
Auto-generated-cl: translation import
2012-10-16 12:32:17 -07:00
Mark Wei
4e1ed6c75d
Make Email widget available on lock screen
...
Bug: 7295924
Change-Id: I31a07da128ec258c408affa86285195851a29254
2012-10-05 12:42:16 -07:00
Baligh Uddin
950bae8ecd
Import translations. DO NOT MERGE
...
Change-Id: I5717528dd3abecd1949a7f5ce4a2ad1df5421924
Auto-generated-cl: translation import
2012-10-04 12:06:02 -07:00
Baligh Uddin
820c9d898a
Import translations. DO NOT MERGE
...
Change-Id: I18be70578224d7ced0bebfd8edf0ac548bb0417d
Auto-generated-cl: translation import
2012-10-03 17:52:11 -07:00
Baligh Uddin
1df2a83c98
Import translations. DO NOT MERGE
...
Change-Id: I180e7ffa22b74cc2a313918fdb085eab58599009
Auto-generated-cl: translation import
2012-09-28 09:55:08 -07:00
Baligh Uddin
fe390c5875
Import translations. DO NOT MERGE
...
Change-Id: I18b77aeff853601375fcb53e5d435e99ad118d55
Auto-generated-cl: translation import
2012-09-27 21:21:07 -07:00
Baligh Uddin
580c81f396
Import translations. DO NOT MERGE
...
Change-Id: If6568db82a1e4aba8cddefb73b33e4511608049e
Auto-generated-cl: translation import
2012-09-26 15:16:58 -07:00
Baligh Uddin
4931b8beff
Import translations. DO NOT MERGE
...
Change-Id: I760f093c30a8ea25f1d6f8362449c0013198bc27
Auto-generated-cl: translation import
2012-09-25 12:16:44 -07:00
Baligh Uddin
16602f7123
Import translations. DO NOT MERGE
...
Change-Id: I5d7bc8b88fab1c6d156e1f0a2c9cb3da0a8f2ba9
Auto-generated-cl: translation import
2012-09-24 11:24:46 -07:00
Baligh Uddin
3073a047c8
Import translations. DO NOT MERGE
...
Change-Id: I83c5638bf4175e6e8ff00794578e26506f3db92c
Auto-generated-cl: translation import
2012-09-21 12:58:35 -07:00
Marc Blank
b6992942aa
Merge "Restore Imap1" into jb-ub-mail
2012-09-21 09:04:44 -07:00
Marc Blank
5c52385838
Restore Imap1
...
* Restore Imap1 code
* Legacy users will use Imap1
* Existing Imap2 users will continue to use Imap2
* New accounts will be created in Imap1
* More to follow
Bug: 7203993
Change-Id: I8b86fcada59a854fd464d5269c94d00ebae85459
2012-09-21 08:29:09 -07:00
Baligh Uddin
37d6afb98a
Import translations. DO NOT MERGE
...
Change-Id: I5444c1bba3f50f8689cd4f00044257c54d163f44
Auto-generated-cl: translation import
2012-09-20 14:50:59 -07:00
Yorke Lee
4b4d984dd1
Merge "Correct icon for folder/account selection" into jb-ub-mail
2012-09-19 19:11:09 -07:00
Yorke Lee
d33c8de4f0
Correct icon for folder/account selection
...
Bug: 7180129
Change-Id: I58fab9016e6e1f8be1ce5ac14d9d2e64f8fda051
2012-09-19 18:52:45 -07:00
Baligh Uddin
f432549144
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-09-19 14:01:47 -07:00
Baligh Uddin
ce5901fcf2
Import translations. DO NOT MERGE
...
Change-Id: I6440dd7def16da46c5c84a695cd13940c46cd0b1
Auto-generated-cl: translation import
2012-09-19 14:01:01 -07:00
Mark Wei
533c4ff919
Merge "Fix Email widget preview using wrong resource." into jb-ub-mail
2012-09-19 13:46:34 -07:00
Marc Blank
67439a3e33
Add translatable=false as required
...
Bug: 7144392
Change-Id: Ibbe21ea46b443f18795d6266341b9fa995de521e
2012-09-19 13:34:02 -07:00
Mark Wei
b2d4258646
Fix Email widget preview using wrong resource.
...
Bug: 7180129
Change-Id: Iffa4e5d4bd23a3311cec6f567a5b12467e13cde2
2012-09-19 12:06:27 -07:00
Baligh Uddin
82ab334f7f
Import translations. DO NOT MERGE
...
Change-Id: I9010c2a7bda6d87f915b7184649873641e4f54c2
Auto-generated-cl: translation import
2012-09-17 11:58:16 -07:00
Baligh Uddin
9db1132ac7
Import translations. DO NOT MERGE
...
Change-Id: I8f574861539ec2436d87970808b795a33a16e668
Auto-generated-cl: translation import
2012-09-14 11:48:16 -07:00
Baligh Uddin
78d8312ad8
Import translations. DO NOT MERGE
...
Change-Id: I1f4bc4f0463e83604acdc70252e3b09a429fcc2b
Auto-generated-cl: translation import
2012-09-13 10:51:34 -07:00
mindyp
885a86c4bf
Fix swipe settings text
...
Fixes b/6991536 Swipe conversation strings in settings
Change-Id: I9f4d954665982d1e24e8c7bd4b26ee7da3c9378e
2012-09-11 16:43:12 -07:00
Marc Blank
74c79a5043
Modify intent names
...
Change-Id: Iad8b4842056a7f553363f9af47e65665c2b26a5d
2012-09-10 17:18:32 -07:00
Marc Blank
d8b2b8aebd
Merge "Add "System Folders" settings" into jb-ub-mail
2012-09-10 11:52:11 -07:00
Marc Blank
266064bcc7
Add "System Folders" settings
...
* Add this category and preferences for setting the trash
and sent items folders
Bug: 7100092
Change-Id: I964e02e5e319b3f04b030d36ed7dca30ed046362
2012-09-10 11:07:18 -07:00
Baligh Uddin
b41c9be836
Import translations. DO NOT MERGE
...
Change-Id: I6083a21b80a8edebdcd0c4505d981c6214d9933e
Auto-generated-cl: translation import
2012-09-10 08:53:08 -07:00
Marc Blank
81b0f74efa
Create requireSetup attribute; use it for gImap
...
Change-Id: Id5f37861e4d6f2c2ed0fe98bd8b4d7eb73868c09
2012-09-08 13:08:50 -07:00
Marc Blank
9a341d85f0
Merge "Improve trash folder picker upon account creation" into jb-ub-mail
2012-09-06 17:49:34 -07:00
Marc Blank
2616405471
Improve trash folder picker upon account creation
...
* Use setup intent uri
* TODO: More cleanup
Bug: 7077441
Change-Id: Ieab5b0ed33b73b7a0e9012aedd6becf867db1566
2012-09-06 16:01:45 -07:00
Baligh Uddin
c713035238
Import translations. DO NOT MERGE
...
Change-Id: I8c7968c624f3d7bc2dd31a1504fc48bd62bd41c8
Auto-generated-cl: translation import
2012-09-05 10:32:27 -07:00
Baligh Uddin
2c2508607c
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-09-04 11:57:16 -07:00
Marc Blank
6eac1c9f1c
Show "Creating account..." dialog during account creation
...
Bug: 7100373
Change-Id: Ic86d8b8c8fafe628a69e867d93719bb986c7c583
2012-09-03 16:44:33 -07:00
Marc Blank
b82ae909d7
Add support for "load more" for Imap2
...
* Use new attribute in services.xml to indicate support
* Initial implementation
Change-Id: Ia8709d606d521c6d495c343a47ee074b5024d340
2012-09-01 15:58:46 -07:00
Marc Blank
e714bb9d15
Convert authorities, intents, and account manager types
...
* Tested ok on wiped Nexus
* Tested ok on S3
* Upgrade verified on Nexus
Change-Id: If5d4ce594f8a309cdb59589d10b1d33f3b79326c
2012-08-31 23:26:36 -07:00
Baligh Uddin
a0a713505b
Import translations. DO NOT MERGE
...
Change-Id: I5c4d713426d4f5f9bd0c6e19d6b57379dea4b4cc
Auto-generated-cl: translation import
2012-08-31 07:51:16 -07:00
Baligh Uddin
6e22a960dc
Import translations. DO NOT MERGE
...
Change-Id: Id2452d3d26174d4538245c350a8b80ca8b5826bd
Auto-generated-cl: translation import
2012-08-23 16:28:07 -07:00
Baligh Uddin
6767a03ee2
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-08-22 20:45:07 -07:00
Marc Blank
70edcf0538
Integrate Imap2 into Email
...
* Also, convert imap accounts to imap2
* The original imap service remains, but is no used
* There remain some questions about how the upgrade
should work in terms of settings
Change-Id: I0e05edad6a1553f428a2c2fa3daf1df878d4b5f7
2012-08-22 14:17:57 -07:00
Baligh Uddin
f1c9939ec0
Import translations. DO NOT MERGE
...
Change-Id: If8e556953d64e5f6cd567ead729088864f087537
Auto-generated-cl: translation import
2012-08-22 09:39:53 -07:00
Baligh Uddin
0c66dd6520
Import translations. DO NOT MERGE
...
Change-Id: I28ed9c36ec419f002aa147b31f5c2865c4eb5d88
Auto-generated-cl: translation import
2012-08-21 09:19:36 -07:00
Baligh Uddin
d23d514bd1
Import translations. DO NOT MERGE
...
Change-Id: I853db6ca13e7e3efd21159d881d87e6627771489
Auto-generated-cl: translation import
2012-08-20 08:07:15 -07:00
Marc Blank
277dd4a9ba
Show alert message (if any) after Imap2 validation failure
...
Change-Id: Ibfee4526330184dd9780f56dd52292a10d7b6f41
2012-08-17 15:14:04 -07:00
Marc Blank
20dfb4107e
Improve progress strings
...
Bug: 7009089
Change-Id: Icdfb133f7ac7d62006adf82c31014d64295b8411
2012-08-17 14:11:17 -07:00
Marc Blank
b89744ecfb
Use appropriate prefix to infer server address
...
Bug: 6999072
Change-Id: I71aa184b1cfa0b6926f4dae8861f071f27d3acb2
2012-08-16 14:11:11 -07:00
Baligh Uddin
bb7363cecd
Import translations. DO NOT MERGE
...
Change-Id: Iac0e63ae002877e7a2d5d08c3ee2fb273f4a6652
Auto-generated-cl: translation import
2012-08-14 09:58:56 -07:00
Baligh Uddin
7d015353a9
Import translations. DO NOT MERGE
...
Change-Id: I259940cf92b6fdb08412a5e97eca5e954eb6107a
Auto-generated-cl: translation import
2012-08-10 09:07:13 -07:00