summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id967dca7145ac067115d6d4acebf7cda8aaf3df2
| * | | | | | | | | am ee4f8772: (-s ours) am b725b483: Import translations. DO NOT MERGEEric Fischer2012-06-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | | | | | | | | | * commit 'ee4f8772c1fbe6c8383f5d55a75a15f489f4373b': Import translations. DO NOT MERGE
| | * | | | | | | am b725b483: Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b725b483bf3e7b52abbd95e3f34c3c5c6013ef08': Import translations. DO NOT MERGE
| * | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-112-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d9b6ca3da84f177a91f50881267e577f276fc51
| * | | | | | | | | am eaf1b227: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | * commit 'eaf1b2279ad634054673047cf5d04de211b1a011':
| | * | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e12054121ede80c673a8fb14e3d3a87d96b42c3
| * | \ \ \ \ \ \ \ \ am 7fe56c46: (-s ours) am bce32b5e: Import translations. DO NOT MERGEEric Fischer2012-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7fe56c4696cfc62655c991b7fafaded102792954': Import translations. DO NOT MERGE
| | * | | | | | | | | am bce32b5e: Import translations. DO NOT MERGEEric Fischer2012-06-082-9/+8
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bce32b5e66caf46cf14cd57a726ab5830109b88f': Import translations. DO NOT MERGE
| * | \ \ \ \ \ \ \ \ \ am d694d07b: (-s ours) am c1b34cec: Import translations. DO NOT MERGEEric Fischer2012-06-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd694d07bf67eaa328e02b386e4ae5ee1a6a6b944': Import translations. DO NOT MERGE
| | * | | | | | | | | | am c1b34cec: Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1b34cec7bd0016ca433bf6087991bca18c3e500': Import translations. DO NOT MERGE
| * | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If983e489c3d470cb44662dd1d0ed8f2662becaee
| * | | | | | | | | | | | am 65cf68da: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65cf68daed8ea6ee1c6d7b11e508847a69b15f6b':
| | * | | | | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4478b3e8cce8c0d56d3123215d40f22b5cc2345d
| * | \ \ \ \ \ \ \ \ \ \ \ am fef4b82c: am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into ↵Martijn Coenen2012-06-062-6/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'fef4b82cb6f95a9a7dbb510e31d6316883857c26': Don't assume Bluetooth is present.
| | * | | | | | | | | | | | am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into jb-devMartijn Coenen2012-06-062-6/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59b6bb0b0f64dbe400fa919d4ad4fcd01a88c672': Don't assume Bluetooth is present.
| * | \ \ \ \ \ \ \ \ \ \ \ \ am c55ca83f: (-s ours) am 7a0c3948: Import translations. DO NOT MERGEEric Fischer2012-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c55ca83f84c16601e00ec5a12473b890efcb9d2f': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | am 7a0c3948: Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a0c39486bbc51b7d377fa902f399a5279839c55': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6414a27f17b7d16666f870779b7eab7577043a55
| * | | | | | | | | | | | | | | am 847cec06: (-s ours) am 450be298: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '847cec06a95eb5f5d6a1e1d440de8bebcfa11e6d': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | am 450be298: Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '450be298a7d03e2cbe3ad5a800213a8657264a16': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7045888f5b91b62f0bac53e917ce4d6df982bfc7
| * | | | | | | | | | | | | | | | am 066cd6df: (-s ours) am f6686c27: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '066cd6dfca8f759182631279e7b701613155d741': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | am f6686c27: Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6686c270cc4678c92b8f72773881f0a97aa67da': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia30d6af598d859cd1533e8942681a4e664217177
| * | | | | | | | | | | | | | | | | am 180562b0: (-s ours) am 24bd050e: Import translations. DO NOT MERGEEric Fischer2012-06-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '180562b071c619af686beb76a40fb258e084a9fd': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am 24bd050e: Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24bd050ecbf61f7b0806801ed70d6a972f0f2a7f': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bab021567a2f4a20b0a29b178c4b815ea75913b
| * | | | | | | | | | | | | | | | | | am d560e24e: am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd560e24e8edf8251a3756400ce5f75bcfdd51b9a': Add watchdog to applyRouting().
| | * | | | | | | | | | | | | | | | | am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f439271150e4548f116919e0254d57655421581c': Add watchdog to applyRouting().
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 72b19e1f: (-s ours) am 5c1c4487: Import translations. DO NOT MERGEEric Fischer2012-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72b19e1fce104dc282b4befeb26b86c7d08622e1': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | am 5c1c4487: Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c1c4487e6b1d67995507d882e10f92871158904': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib98177897b66315752a65ac7b228978a69437cb0
| * | | | | | | | | | | | | | | | | | | | am f7f7996c: (-s ours) am 932c012a: Import translations. DO NOT MERGEEric Fischer2012-05-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7f7996ccce657bd005495f2029e5c825b631962': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | am 932c012a: Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '932c012adba93f19b19f7ad964bbe3cacf6a1b89': Import translations. DO NOT MERGE
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-3017-184/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17048d6769349b28c3ca1f9e7bf3314a81027eb7
| * | | | | | | | | | | | | | | | | | | | | | am 1738f4ae: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / * commit '1738f4ae9bb28740f8bcb49915601d0429f5d0b6':
| | * | | | | | | | | | | | | | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82c3797a2b47e23b7593ef0f72b399f6e638e9b5
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-2948-97/+145
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45b218ab020a6452a2954db326d014a303beb704
| * | | | | | | | | | | | | | | | | | | | | | | am 78620a76: (-s ours) am 2b08c897: Import translations. DO NOT MERGEEric Fischer2012-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | * commit '78620a76995de7070c4ac4cc2132b043727c38cb': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | am 2b08c897: Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b08c89735ae57d070d798ac333ef47d265c900d': Import translations. DO NOT MERGE
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ff4263e1: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff4263e19522bc8db124405541da59434b652054':
| | | | | | | | | | | | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcd615270e5572f17209cc2f91396c38144a0915
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62a8997361a059183f2547365a6055db3d45e9c9': Use new handover intent actions.
| | * | | | | | | | | | | | | | | | | | | | | | | | | am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd03870614245ed7807afe449fd20f5e9b2f36609': Use new handover intent actions.
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ↵Martijn Coenen2012-05-254-5/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails." into jb-dev * commit 'abf67e1baa0a4b313d9338e69261db47c33725be': Fall back to NDEF push if handover SNEP get fails.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get fails." into ↵Martijn Coenen2012-05-254-5/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '423cc45adf0a67c321eb03bb2e3a0b5f9b324e54': Fall back to NDEF push if handover SNEP get fails.
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f1566deb: (-s ours) am b2753981: Import translations. DO NOT MERGEEric Fischer2012-05-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1566deb91461f68f98ebd8dd3c13c44c202904a': Import translations. DO NOT MERGE