summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1080-927/+96
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/CertInstaller into cm-13.0 Android 6.0.1 release 22
| * Merge "Nemo CTS: Call the right class for SSL" into cw-e-devPaul Soulos2015-10-212-3/+15
| |\ | | | | | | | | | | | | | | | | | | am: b0876d3cb4 * commit 'b0876d3cb4e90c21acc23941a80648d45451e7fd': Nemo CTS: Call the right class for SSL
| | * Merge "Nemo CTS: Call the right class for SSL" into cw-e-devPaul Soulos2015-10-212-3/+15
| | |\
| | | * Nemo CTS: Call the right class for SSLVinod Krishnan2015-10-142-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 24305493 Change-Id: I9486c96aa531f72ae7dee1282903bc96eb7faf1c
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 958f46fd59 -s ours * commit '958f46fd5944f3588ab1b77baae2452270f3a045': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-10-2178-61/+199
| | |/ | | | | | | | | | | | | Change-Id: If200864ac5c6070758dd37bf2cf23e3161930484 Auto-generated-cl: translation import
| * | am 49090f38: (-s ours) am 0a66a571: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\| | | | | | | | | | | | | * commit '49090f38e7103ce0e5e6b63d1251056d4fe73dfb': Import translations. DO NOT MERGE
| | * am 0a66a571: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '0a66a571a80538bc765a7bea799cd16f55c513d5': Import translations. DO NOT MERGE
| * | | am 2813ac1a: (-s ours) am bf0cc6c9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '2813ac1a8b6ab1921cde41eb1e2a0f010dcd98cd': Import translations. DO NOT MERGE
| | * | am bf0cc6c9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'bf0cc6c95788d1bd121a1aeb74bf2534e8f12c49': Import translations. DO NOT MERGE
| * | | | am f3c2168d: (-s ours) am cb405ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f3c2168d102fecec3bcfcca1bd26353190e55dbb': Import translations. DO NOT MERGE
| | * | | am cb405ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-190-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb405ac620f70de541c243bc687bc579ce9d1a19': Import translations. DO NOT MERGE
| * | | | | am 6727a9bc: (-s ours) am 17aa0495: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6727a9bcf2f854e8b76ea231e8d029ac475a179a': Import translations. DO NOT MERGE
| | * | | | am 17aa0495: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17aa049528e4468b6f0b66e9a305beafb5635a79': Import translations. DO NOT MERGE
| * | | | | | am d2dde28a: (-s ours) am 06237447: (-s ours) am 1a472153: (-s ours) Import ↵Geoff Mendal2015-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'd2dde28a94c79553866708dcfbb68aabb7d56e72': Import translations. DO NOT MERGE
| | * | | | | am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '062374474efc97dc45121635767789c8378272b4': Import translations. DO NOT MERGE
| * | | | | | | am b6e3c263: am 78f25fd3: am 909641b2: Offload time consuming task to ↵Sanket Padawe2015-08-062-32/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background while installing HS profile. * commit 'b6e3c263a2b3784b10fd0961c64d27c68230fad6': Offload time consuming task to background while installing HS profile.
| | * | | | | | am 78f25fd3: am 909641b2: Offload time consuming task to background while ↵Sanket Padawe2015-08-062-32/+50
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing HS profile. * commit '78f25fd30ba348daedf520f666d88764bbdf0c91': Offload time consuming task to background while installing HS profile.
| * | | | | | | | am 2da85ade: (-s ours) am 10ae7dbe: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2da85adeb3bfdf0281c015bcd91ee3c490890297': Import translations. DO NOT MERGE
| | * | | | | | | am 10ae7dbe: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10ae7dbe82a193a9ea53e0abdfa0bcf2c9826dca': Import translations. DO NOT MERGE
| * | | | | | | | | am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." ↵Jan Nordqvist2015-08-041-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4': Added "Installing" string.
| | * | | | | | | | am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-devJan Nordqvist2015-08-041-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1be8a62bfe665cdd9f466c3a39d099d7fd3db57c': Added "Installing" string.
| * | | | | | | | | | am d415d944: am 89a882a2: am fb90c6fc: Added logging in a few error paths ↵Jan Nordqvist2015-08-011-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for wifi config installation. * commit 'd415d944f2a65d5e369b00c06bdf07e6abd982d1': Added logging in a few error paths for wifi config installation.
| | * | | | | | | | | am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config ↵Jan Nordqvist2015-08-011-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation. * commit '89a882a2eefc5cd2ff3a293cd4637d119d653e27': Added logging in a few error paths for wifi config installation.
| * | | | | | | | | | | am a7861d47: (-s ours) am 6c53d1e3: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit 'a7861d47e934d847c8d1bf7d8bf3312a7769fcd9': Import translations. DO NOT MERGE
| | * | | | | | | | | | am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c53d1e3fa0b7398075ee25d2ed9438cd61ddd70': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 1e9bb52d: (-s ours) am f36ac064: (-s ours) am a583f03e: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '1e9bb52d682efa84cdbcde173fa936efcef36781': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f36ac0645c333f64d041b221369b7a424d4b5d5d': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | am bd70da0c: am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint ↵Vinit Deshpande2015-07-141-0/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential." into mnc-dev * commit 'bd70da0c584766810470882007ec9b7554dc55bb': Allowing rewrite of Passpoint credential.
| | * | | | | | | | | | | | am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." ↵Vinit Deshpande2015-07-141-0/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '48d644ffb3b8245aeacf596302688b1a1ff94e7a': Allowing rewrite of Passpoint credential.
| * | | | | | | | | | | | | | am 0cb87ab7: (-s ours) am f46f52f1: (-s ours) am c629ad26: (-s ours) Import ↵Geoff Mendal2015-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '0cb87ab7bc36c6eaa770e0ccdbf29f4e28c2b849': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | am f46f52f1: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f46f52f1b2c15fec1bbf79c16638426ac7ba159b': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | am 58ceabbc: (-s ours) am 51e2539a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58ceabbcb862a113d76fe45b5da7c9e3c853c762': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | am 51e2539a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51e2539a2c352a312fcd8fa027f6b668e289fb06': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | am 0b76d2bd: (-s ours) am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import ↵Geoff Mendal2015-07-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '0b76d2bd4565c991417a0fdfba18fc784f09b563': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a6441e3e102f6b24c3442477b1933153905cdc7': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | am 64f505ff: (-s ours) am 549def5e: (-s ours) am dc924634: (-s ours) Import ↵Geoff Mendal2015-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '64f505ff91f77a3775665b41d9cd3a64fbcddaf6': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am 549def5e: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '549def5ec6c95532fe6f381fd78b1c87ba59abf0': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | am 3e729c48: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e729c4854ce80966c8bdad5e2461f5355ffb6d2': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | am e30eb577: Merge "Fixed missing white-space." into mnc-devJan Nordqvist2015-06-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e30eb577fbb64efd7d63f418eb94baf83d49c5ad': Fixed missing white-space.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3c797f7b: Merge "String changes for HS 2.0 dialogs." into mnc-devSanket Padawe2015-06-241-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c797f7b1e32d953336487931e10dd3f87735ab5': String changes for HS 2.0 dialogs.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4359b958: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4359b95876bd4207fce0f2036252f2ccf8189eab': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 477d2ea4: Merge "Add dialog when installing HS 2.0 credentials while wifi ↵Sanket Padawe2015-06-234-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is off." into mnc-dev * commit '477d2ea4810dea406ffb285f778186e40e871018': Add dialog when installing HS 2.0 credentials while wifi is off.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0694d5c4: Catching runtime exception in WifiInstaller.Jan Nordqvist2015-06-231-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0694d5c4498466208bb21df6197787a6c12c7fba': Catching runtime exception in WifiInstaller.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cf819254: Fix RTL layout issueKenny Root2015-06-191-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf81925456d5d6ac5bce8f50fb2294de7a7246ca': Fix RTL layout issue
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e110193e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e110193e399556dd1eb65a7cbca0df5b2346c9cf': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 52eedebd: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52eedebd64090828bcd6427c1a9ece0dbafff446': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 614070af: Merge "am 756c09a..655de81 from ↵Vinit Deshpande2015-06-031-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mirror-m-wireless-internal-release" into mnc-dev * commit '614070af9700216437783534416161717168cf7f': EXTRA_MIME_TYPES is String[], not Object[]. Removed some logging.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4b25db7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4b25db7f5a37685427b4ca7629874e3e08a7ab8': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am db108c09: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db108c099a975a4d17224afe9b0025aaa384ddbb': Import translations. DO NOT MERGE