summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importcm-13-before-ambientsdkMichael Bestas2016-04-063-2/+330
| | | | Change-Id: I6ea87bb45b3905daf3b52aec89985b1fd09eb35a
* Automatic translation importMichael Bestas2016-03-285-73/+606
| | | | Change-Id: Idb4c0b9db826025854bb88f39d10e344e9da5b6e
* Fix NPE in Contact CardRohit Yengisetty2016-03-211-1/+3
| | | | | | | | | | | Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.contacts.common.util.BlockContactHelper.destroy()' on a null object reference at com.android.contacts.quickcontact.QuickContactActivity.finish(QuickContactActivity.java:2318) at com.android.contacts.quickcontact.QuickContactActivity.processIntent(QuickContactActivity.java:934) at com.android.contacts.quickcontact.QuickContactActivity.onCreate(QuickContactActivity.java:875) Change-Id: I624ca68971079e15b0b9370835533fc4a88e2448 Issue-Id: CYNGNOS-2272
* Automatic translation importMichael Bestas2016-03-1825-7/+711
| | | | Change-Id: Ib999eb0462ca17460cd278d8bca5a085899eb0b6
* QuickContact Expand/Collapse Button removal fixedgkipnis2016-03-171-1/+1
| | | | | | | | | | | When QuckContact is displayed, if there are 4 or more contact fields (email/phone#/etc...), then an Expand/Collapse button is displayed (More/Less). When the contact is edited and only 3 fields remain, this button is supposed to be removed, but was remaining in the view. Change-Id: Ic8b55a4bc551a4b05eda5cead96b4bcf4fa2b624 Ticket-Id: Cyngnos-2225
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1078-1102/+480
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Contacts into cm-13.0 Android 6.0.1 release 22
| * am 63215b6c: (-s ours) am 946371f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\ | | | | | | | | | | | | * commit '63215b6c15b40e4e2bb0aee2b8ecb814f5eedc31': Import translations. DO NOT MERGE
| | * am 946371f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '946371f8314ae0578a3559a956343ea9dbd77bf1': Import translations. DO NOT MERGE
| * | | am 6db1aec7: (-s ours) am 46eb2eb1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '6db1aec72896c6b912e20d32ad55f83420915e00': Import translations. DO NOT MERGE
| | * | am 46eb2eb1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '46eb2eb11e43b24dfa0ca0249da6e7797289fe23': Import translations. DO NOT MERGE
| * | | | am 4887e527: (-s ours) am 0736b4af: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '4887e5270b47088f1786b9978c3b338dae8b1e6a': Import translations. DO NOT MERGE
| | * | | am 0736b4af: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0736b4afed0089d53cdc716b24bbd51277ed1d13': Import translations. DO NOT MERGE
| * | | | | am 213fb2bd: am 3e5c8dda: Remove PinnedHeaderListDemoActivityJay Shrauner2015-08-253-245/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '213fb2bdf1ce10e53555fc0b9b3b938e508f2d00': Remove PinnedHeaderListDemoActivity
| | * | | | am 3e5c8dda: Remove PinnedHeaderListDemoActivityJay Shrauner2015-08-253-245/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e5c8dda05966c6cb93d7137ceb51cd2f0176c66': Remove PinnedHeaderListDemoActivity
| * | | | | | am 0b216b04: am 3faa8082: Merge "Consolidate CallSubject history and ↵Tyler Gunn2015-08-131-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog." into mnc-dr-dev * commit '0b216b048a9b9fef9250aa7a3ec132be54245106': Consolidate CallSubject history and dialog.
| | * | | | | am 3faa8082: Merge "Consolidate CallSubject history and dialog." into mnc-dr-devTyler Gunn2015-08-131-2/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3faa80822a4f0a205568f660bf8de09913b86e01': Consolidate CallSubject history and dialog.
| * | | | | | | am 104bf0ac: am f7483e59: am d37af1cf: Encode read-only lookupKeys twice so ↵Walter Jang2015-08-111-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi vcard URI can split on : * commit '104bf0ac0e6b917f980fb99b249d567a1792ad2b': Encode read-only lookupKeys twice so multi vcard URI can split on :
| | * | | | | | am f7483e59: am d37af1cf: Encode read-only lookupKeys twice so multi vcard ↵Walter Jang2015-08-111-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URI can split on : * commit 'f7483e59b389716a8e34ae419f03c687ca7ac480': Encode read-only lookupKeys twice so multi vcard URI can split on :
| * | | | | | | | am 09f3e02a: (-s ours) am b3ccafd5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09f3e02a26accda11a86d062cfe7258db899f290': Import translations. DO NOT MERGE
| | * | | | | | | am b3ccafd5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ccafd5dd4df7e688cc12ad6ec79d38a5f2893f': Import translations. DO NOT MERGE
| * | | | | | | | | am 91a5575b: am 5f87e923: Add support for "call with note" in quick contacts.Tyler Gunn2015-08-073-10/+96
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91a5575b83403959a0caec42478bc4a033e55ebc': Add support for "call with note" in quick contacts.
| | * | | | | | | | am 5f87e923: Add support for "call with note" in quick contacts.Tyler Gunn2015-08-073-10/+96
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f87e923b0300173ad68f73a47b0dca7348d6a1f': Add support for "call with note" in quick contacts.
| * | | | | | | | | | am 4c487773: (-s ours) am abd8e71a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c487773bcf74913a47fedebb1103a361f56be9e': Import translations. DO NOT MERGE
| | * | | | | | | | | am abd8e71a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abd8e71ad4b5ceec6e317c71ac13ea2c5747c715': Import translations. DO NOT MERGE
| * | | | | | | | | | | am 36906900: am c05c6597: am 615ed9c5: Check for WRITE_CONTACTS permissionJay Shrauner2015-07-291-0/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3690690053db06a531d5f52df13f9b1f1bb02f76': Check for WRITE_CONTACTS permission
| | * | | | | | | | | | am c05c6597: am 615ed9c5: Check for WRITE_CONTACTS permissionJay Shrauner2015-07-291-0/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c05c65971c404bce8d1d8a439da347d309b3c1d1': Check for WRITE_CONTACTS permission
| * | | | | | | | | | | | am 4eeedd93: am b5342537: am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND ↵Yorke Lee2015-07-291-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intent for Vcard" into mnc-dev * commit '4eeedd939779fd1e72c5cb119a15b6e68d122795': Don't set data on ACTION_SEND intent for Vcard
| | * | | | | | | | | | | am b5342537: am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND intent for ↵Yorke Lee2015-07-291-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vcard" into mnc-dev * commit 'b53425375dcb6fda3c6537cc8b690fa278dc16ec': Don't set data on ACTION_SEND intent for Vcard
| * | | | | | | | | | | | | am 857df2e9: am 07d1a77c: am 0653de3d: Apply contact join ops before we ↵Walter Jang2015-07-271-4/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reach the max batch op threshold * commit '857df2e95a30e27642bd31f58e8760f790e699c8': Apply contact join ops before we reach the max batch op threshold
| | * | | | | | | | | | | | am 07d1a77c: am 0653de3d: Apply contact join ops before we reach the max ↵Walter Jang2015-07-271-4/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | batch op threshold * commit '07d1a77c4298558c3c4c4f6672d3c31418bd4deb': Apply contact join ops before we reach the max batch op threshold
| * | | | | | | | | | | | | | am 262b6fd1: am f60da396: am 6a42c290: Merge "Delay AccountTypeManager init ↵Walter Jang2015-07-251-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | until we have the Contacts permission 1/2" into mnc-dev * commit '262b6fd102bb8db60ec0258c3ecc8fad72b3e872': Delay AccountTypeManager init until we have the Contacts permission 1/2
| | * | | | | | | | | | | | | am f60da396: am 6a42c290: Merge "Delay AccountTypeManager init until we have ↵Walter Jang2015-07-251-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Contacts permission 1/2" into mnc-dev * commit 'f60da396778a1b7dbca5424fdee9c179f34cd010': Delay AccountTypeManager init until we have the Contacts permission 1/2
| * | | | | | | | | | | | | | | am d2a0b286: am a6f2048f: am a31f4f86: Merge "Add back READ_EXT_STORAGE so ↵Walter Jang2015-07-251-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we can handle vcard imports again 1/3" into mnc-dev * commit 'd2a0b286b70830a56dc6588bb2fa78f4c9c776e1': Add back READ_EXT_STORAGE so we can handle vcard imports again 1/3
| | * | | | | | | | | | | | | | am a6f2048f: am a31f4f86: Merge "Add back READ_EXT_STORAGE so we can handle ↵Walter Jang2015-07-251-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vcard imports again 1/3" into mnc-dev * commit 'a6f2048f4b5003a1dae63a6b60b26d7b3a9a914c': Add back READ_EXT_STORAGE so we can handle vcard imports again 1/3
| * | | | | | | | | | | | | | | | am 7011e6de: (-s ours) am f221299b: (-s ours) am d6d398e6: (-s ours) Import ↵Geoff Mendal2015-07-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '7011e6de324ae4e14086616d91b1892f77d2c503': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f221299b2253d941ca39f0f4cb3a09b6a5508962': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | am ce17cd28: (-s ours) am 94491f6c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce17cd28caee70b361a1b70c3ae5817714ab47ea': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am 94491f6c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94491f6c44c9110bbf256c36a9dd9b1a4a426525': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | am 5ed4e8b9: am 8b7e2ffa: am 03debc68: Pass MaterialPalete colors to contact ↵Walter Jang2015-07-203-8/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | editor as ints not Parcelable * commit '5ed4e8b97e613ec4ae0dd3bdcff9bb043e5ea006': Pass MaterialPalete colors to contact editor as ints not Parcelable
| | * | | | | | | | | | | | | | | | | am 8b7e2ffa: am 03debc68: Pass MaterialPalete colors to contact editor as ↵Walter Jang2015-07-203-8/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ints not Parcelable * commit '8b7e2ffa7f454643971fca27d08d489867ea8893': Pass MaterialPalete colors to contact editor as ints not Parcelable
| * | | | | | | | | | | | | | | | | | | am 540949be: (-s ours) am 19e5cd85: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '540949bedc17b25cde674761e8cd43114abe9a4c': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | am 19e5cd85: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19e5cd857ee0c3052b5572bced968f211dc7534e': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | am 160bf5ee: am cfe1edfc: am 01b37680: Don\'t display "CUSTOM" when ↵Tingting Wang2015-07-171-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHONE_TYPE == "CUSTOM" and no label set. * commit '160bf5ee1bc67218feafce9868661f580b19bbdc': Don't display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.
| | * | | | | | | | | | | | | | | | | | | am cfe1edfc: am 01b37680: Don\'t display "CUSTOM" when PHONE_TYPE == ↵Tingting Wang2015-07-171-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CUSTOM" and no label set. * commit 'cfe1edfc2e9b115eca9f94a2fec9516f40329eec': Don't display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.
| * | | | | | | | | | | | | | | | | | | | | am 00a1d731: am e58d1f78: am d3cf48da: Merge "Remove READ_EXT_STORAGE perm ↵Walter Jang2015-07-151-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now that user selects vcard import location 2/3" into mnc-dev * commit '00a1d7312487db4788ec00b923e70ef5804f8de7': Remove READ_EXT_STORAGE perm now that user selects vcard import location 2/3
| | * | | | | | | | | | | | | | | | | | | | am e58d1f78: am d3cf48da: Merge "Remove READ_EXT_STORAGE perm now that user ↵Walter Jang2015-07-151-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selects vcard import location 2/3" into mnc-dev * commit 'e58d1f78c1631389372550fc2a23530abf67458e': Remove READ_EXT_STORAGE perm now that user selects vcard import location 2/3
| * | | | | | | | | | | | | | | | | | | | | | am ac499846: (-s ours) am cf3020f9: (-s ours) am 80e8b68e: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ac4998468f4496cdd162e7b66f4c0ca65192e7a0': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | am cf3020f9: (-s ours) am 80e8b68e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf3020f95e85c19bd9e4a584e7dfaf6b1cfff943': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | | | am a467ef27: (-s ours) am 7c3b54a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a467ef272a58e0c4c65c1eac51f6e7f244160fb5': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | | am 7c3b54a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c3b54a5bcebc1d159f7b8868655f62600047d8e': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 20:33:01 +0000