Commit Graph

25580 Commits (86f829fc202b45d91e05899e5227b9f03af0ea1a)

Author SHA1 Message Date
Satoshi Kataoka e4287a99c0 am 424aea8b: am 71c4b7cf: am 0a230b91: am 179108b1: am 03bf6a49: am ae478dc0: am b8dc0e0d: am 5f0d026b: am d7260980: am 6e77dadf: am 501a4755: am 685b6558: am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"
* commit '424aea8be8b9ee8924cbcbc43cf4c8ef262b11d5':
2013-10-10 00:26:45 -07:00
Tadashi G. Takaoka 4733ed4382 am 7a8d1e15: am 7250ada8: am 9d75fa96: am f17593b6: am 6a6a0331: am 7803072f: am ca385e30: am eb6be873: am 6b21eca0: am a7458183: am 4036c18a: am e681b528: am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project"
* commit '7a8d1e15addb0c29951eabe9c283bd7191e395f0':
2013-10-10 00:26:41 -07:00
Tadashi G. Takaoka 5b95a46b49 am f9f72000: am 09b792ad: am 736bb668: am f5060284: am d93482a9: am 219eef3f: am b09e9222: am 913ce054: am b7407520: am 4ac9456c: am 41d46c84: am 33eaf073: am 01f044b0: am dca46b50: Merge "Keep task stack when invoking settings from setup wizard"
* commit 'f9f7200046f15622e54aa8e7fb984ec83bfffa79':
2013-10-10 00:26:37 -07:00
Tadashi G. Takaoka 36e68034ed am 61873f24: am c2881bc1: am 9b7f0650: am 51b70e0c: am f7fd2259: am 375024af: am 82a0080a: am a29d3b63: am 1ac906a7: am 30ef393d: am 09b8783d: am 037be7fa: am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
* commit '61873f2403ace288c6776755054fcd299c14a507':
2013-10-10 00:26:32 -07:00
Tom Ouyang b14b2ec54b am f9ceabda: am 021c6fbc: am 4c5b824b: am 4a0a1ef5: am 589ea327: am 274a9c6d: am d40e77d8: am 49992dac: am d248d49c: am 77b4c24a: am d0e57396: am b55f0be8: am 17fce9e3: am fd02ec10: Always consider corrections of intentional omissions (e.g., apostrophe)
* commit 'f9ceabdae0716f427acbe82a15800db287da37bf':
2013-10-10 00:26:28 -07:00
Jean Chalard f86fc7ba58 am 133b3df4: am 154e428c: am 98ba25ab: am 84ce99ca: am 7d6b55a0: am 4318a311: am 99915d92: am 87de110c: am 0185bdf8: am 97fe53b9: am c471c0e5: am 511432b2: am ba4677fe: am df3ca042: Fix deleting a dictionary
* commit '133b3df4d9185c47d58341e273e4706509543853':
2013-10-10 00:26:24 -07:00
Jean Chalard 75075311fd am 5731db37: am 5928f50d: am b2e96dd3: am 30317458: am cd620000: am b135da78: am 0f978c4d: am a024aba2: am 334f5e8e: am b5ba5f4b: am f089e298: am 5ca33bdc: am 12b35158: am 1919072c: Merge "[ZF1] Check profanity in Java rather than in native"
* commit '5731db37070b793787a1a1b1c7b96e93a709992c':
2013-10-10 00:26:19 -07:00
Jean Chalard 168ed73435 am 0e1da67f: am b60949d0: am 90988945: am d5b4a9ea: am 58d65aff: am fb7f14ad: am 7a3a4d08: am 6bdb9aa0: am 0067c22b: am 2bc90074: am d0bad5ab: am fa51a86b: am 9799b7dc: am fb34869f: Merge "[PB8] Add an animation upon status change."
* commit '0e1da67f949b5edf010921c9c1da6939548d8fde':
2013-10-10 00:26:14 -07:00
Tadashi G. Takaoka abc07bc863 am 1dae4618: am 27e5bc6f: am cd922f1e: am e26dfbba: am 69c74b2a: am ee9b897b: am 6ac87aec: am be7dcffa: am 05b7a08d: am 2aa4c5fb: am a6e0f544: am 03b6259b: am 4ecc0a29: am b1b03cfc: Merge "Fix missing initialization of PreviewPlacerView"
* commit '1dae4618734d9fcb80a308e3159705483a81eed9':
2013-10-10 00:26:10 -07:00
Keisuke Kuroynagi 3ba56e08d0 am 9b50c905: am 0c24d1e8: am 86f28ceb: am 8cee7784: am 480835d6: am 9bfaf3af: am 4c1f7fed: am 2a05faeb: am 5821093e: am 599c4e24: am 3f6ccd13: am e591c0bf: am f2edc2a8: am 3261746f: Merge "Fix exact match checking for words with digraph."
* commit '9b50c905b90fcd2135be6c55232de91cd4621daf':
2013-10-10 00:26:05 -07:00
Jean Chalard e0b08e5ea9 am 61787a80: am 8c98428a: am 7fca5039: am 53e32503: am 17c26355: am 938fc034: am a1750eb5: am 0f992dff: am fde870b6: am 2a7b624c: am b4bc130e: am e6b7fa93: am 47c5846d: am 43590149: Work around a bug in older DownloadManager versions.
* commit '61787a807b22211f5a10f32e2868367b74cba515':
2013-10-10 00:26:01 -07:00
Jean Chalard 1f1fad91af am dc732bd3: am 38771b10: am 7facebea: am 38f223f5: am 2ac6f855: am 719fe111: am eebaf132: am 19d47087: am 4473367c: am a2c73cbd: am 2b25c68e: am b7853ede: am 13a2e1b2: am 4dc77dcf: Merge "[PB7] Export animation code out of the preference"
* commit 'dc732bd34924f825589862cecb4f8c4a2d2facc8':
2013-10-10 00:25:57 -07:00
Jean Chalard f7d68d213d am 2eda9a84: am 2e46dea7: am bacfa166: am 04a04617: am e3e69c7f: am 07708ba1: am 02f31e7d: am ea189991: am e9a1e249: am 8e3ec23a: am 6f3c5af3: am 8810ac41: am c090b38c: am a995bf40: Put temp files within app files
* commit '2eda9a8448ee7bb33bece6431057c7be5c0b4ff0':
2013-10-10 00:25:53 -07:00
Satoshi Kataoka 9390517963 am c548fbea: am 2bd211a2: am 70d1abd4: am 09f6f70d: am 0404de69: am f79dc17d: am 21df6c41: am 11f67124: am 4180df05: am 83bd9f3a: am a8e0946a: am 56ec8d6a: am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry to the user dictionary"
* commit 'c548fbeafdc6db3b47da034dc27dbf3d14762bed':
2013-10-10 00:25:48 -07:00
Jean Chalard c2c476bbed am ae38aeb0: am 4b6d4f02: am 954aaef4: am 9004a298: am 25d5be41: am 030abe19: am 7508080b: am 8cf4c163: am 2dfd3f15: am fd144a90: am ca940c2f: am 2037d6e4: am 7e22f2e3: am 2cf450f4: [PB6] Encapsulate the buttons into a view
* commit 'ae38aeb00fc4e087ce1ecd98075db1e4f5f74df8':
2013-10-10 00:25:44 -07:00
Jean Chalard a7c7255463 am 8ec3d221: am cd7765e6: am b1103523: am 8c815f8a: am be127723: am 472b98f8: am 4cc76912: am e9a0703b: am 14458503: am 6c87b6e2: am 9eae1f97: am 6ace5215: am 7a9ec9dd: am e91387e2: Merge "[PB5] Store state in a more convenient manner"
* commit '8ec3d2217365b62d605e4762f74fe719a5bdd3c1':
2013-10-10 00:25:39 -07:00
Baligh Uddin 2911b832b8 am 8f7b7454: am 3a1edc60: am 6a61345e: am 70f0e192: (-s ours) am 109c8f7b: (-s ours) am 8a37e64e: (-s ours) am f2868b03: (-s ours) am 02ebe9da: (-s ours) am 332a6266: (-s ours) am 0d8ef210: (-s ours) am 56283324: (-s ours) am 6116b9f7: (-s ours) am 8b2dcbcb: am 348e06
* commit '8f7b74541faa18093c2e01b541be1c21a99d9e37':
2013-10-10 00:25:34 -07:00
Baligh Uddin 7e496ec360 am 75e86b90: am 4102dfbc: am 3e0a6032: am c9c34554: (-s ours) am 63c5564c: (-s ours) am 6606664f: (-s ours) am 910b71a0: (-s ours) am f8be73d6: (-s ours) am ec311ab5: (-s ours) am eed5db73: (-s ours) am 661593de: (-s ours) am 357460ae: (-s ours) am 44ba9cc2: (-s ours)
* commit '75e86b90085da31956eb50911b9f74f83c927201':
2013-10-10 00:25:30 -07:00
Jean Chalard 5b6212e5ca am 32522fda: am d017a70b: am d42ed87c: am 43981666: am fba7286a: am ea6ff093: am 9e7bd2eb: am 59f3395c: am d961ebf6: am ce8ce90f: am 55e6d8d0: am a4d5187a: am 6157a049: am e91c001d: Merge "[PB4] Make a memory non-static"
* commit '32522fda00617d34b6651b26a60e628ac4a2474e':
2013-10-10 00:25:25 -07:00
Jean Chalard 8a4011b86f am 6e9a17a7: am 0eeb7730: am 37327796: am 0be1dc42: am eb0fc6f7: am 56f6e75b: am a00ddec9: am 87639513: am 51c2c551: am 035c1b60: am d82c7c3f: am 45496215: am 77bcc98a: am 80790d78: Merge "[PB3] Simplify storage"
* commit '6e9a17a79aca9204d7d6a70477212cdba5b6ca53':
2013-10-10 00:25:21 -07:00
Jean Chalard 1c6c9cb7b3 am 56104e4d: am 3981b5af: am efeef28d: am 260e2989: am c2a765fb: am 277c0d3f: am 27c4209e: am 33a212e6: am 1dc8e5eb: am 16753f2d: am 03e73b64: am 49ab021b: am e52eb1f7: am 776edcfe: Merge "[PB2] Small bugfix"
* commit '56104e4dec02c530dadf55dd5ee5727d9b683124':
2013-10-10 00:25:17 -07:00
Keisuke Kuroynagi 30d304b6ed am 3387afdd: am e7f20f17: am 1a259a7f: am 9c923f70: am 685e6812: am 66fdfa6f: am 07eab88f: am 80c0b1ea: am 1c55e66e: am 24c5e1b8: am 1acbcf99: am 2f503e74: am 617f99b2: am 911f3268: Fix proximity/edit correction detection that affects the terminal cost.
* commit '3387afddaafbd2ac423449e9954b7ba933ec6a0a':
2013-10-10 00:25:12 -07:00
Tadashi G. Takaoka 0839d8a189 am a9b18e84: am 5959603b: am 16f4fdf5: am c0070c3b: am 90cf6d45: am 15267783: am 0da1e6be: am e20e2c74: am 26b5c276: am 51ad2175: am 04744d17: am b713600a: am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard"
* commit 'a9b18e84dbe5e8a1798e4f8eb33410f800d2a6b4':
2013-10-10 00:25:08 -07:00
Tadashi G. Takaoka 7af3ca3454 am 2f2eef17: am c7ee37f8: am 82a55823: am bbe0d166: am 560cd077: am e3d0980e: am aef17277: am 57e09d39: am e1857789: am 5bb4689e: am 1e6a232c: am dfa5d2d7: am 38df0ed2: am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet"
* commit '2f2eef17848277a40928013e908fd5915ee32794':
2013-10-10 00:24:55 -07:00
Satoshi Kataoka 6e572dda10 am d2689b6e: am 643e1668: am c3aef57b: am 1bbca316: am 0e908897: am 9ecbc351: am 8336184b: am 20b262ff: am 32938d39: am 4df74596: am ff20f57a: am 96d5e291: am 6448f749: am b35aa487: Merge "Make aggressive threshold really aggressive"
* commit 'd2689b6e0808cbf3cf2f76c0b31ad4f5c58dbb73':
2013-10-10 00:24:51 -07:00
Tadashi G. Takaoka fa48daba8d am e51839a0: am e7ca19fa: am 215cf2b6: am 429278f1: am 48b96df7: am da70997d: am 19ee5d53: am 45a7b54c: am 4ece54a8: am 48e894e9: am 89b5283a: am 7710c9d5: am ceb3f293: am 0e96003e: Merge "Refactor SetupStepGroup"
* commit 'e51839a02890a2f2d427f824261a63022851b0ad':
2013-10-10 00:24:45 -07:00
Tom Ouyang ac0c460e9f am 019bd617: am 7123fa78: am 9b3b0642: am a814320c: am 7241b1ea: am abe5b141: am 50322caa: am 4c3c3f26: am 57dffbc9: am d7666ad5: am 568058ed: am 98db1665: am 4b4e5f6c: am f99f1a75: Merge "Check bigrams for lowercased previous word if original is not found"
* commit '019bd617dd44380c34f3a5746d86af0b98811ddf':
2013-10-10 00:24:41 -07:00
Tadashi G. Takaoka 04bca20204 am 9dbb9f3a: am 69b0f312: am bd33ec49: am 93f25c7a: am e4db34b5: am 765213ad: am 391b7e62: am 95772c9c: am 07ac4a8e: am 262da0fc: am e0316d8e: am b689e661: am 9ff6a6bf: am 3ee39be1: Merge "Add setup wizard indicator size resource"
* commit '9dbb9f3a96e2115748794235e825bdfaaa0dfa2b':
2013-10-10 00:24:36 -07:00
Jean Chalard 9403200749 am 015b997e: am 951117d3: am b2cd3022: am c02103f9: am a5a8da96: am 20f8fffa: am 867d200f: am 05fcbf5e: am 8b1d9c49: am 650c5548: am e3c47da6: am 1f4b7481: am 6a355d2d: am 197a2d32: Merge "[PB1] Cleanup"
* commit '015b997eba1df018d9e054449f00009d62632046':
2013-10-10 00:24:31 -07:00
Tadashi G. Takaoka 7cf0965260 am da3f44e0: am 6170b3ee: am c79a084c: am 81cea044: am c8ee289f: am 301875f6: (-s ours) am f052472e: am a1152760: (-s ours) am 9ba8dda1: (-s ours) am 96401b43: (-s ours) am 59d90f89: (-s ours) am 459c83a2: (-s ours) am bf53cade: am b71e435e: (-s ours) am e55ae342: am
* commit 'da3f44e05751589362c9dae3f71920d9d08b1a69':
2013-10-10 00:24:26 -07:00
Baligh Uddin e95c4ce704 am b5b7d291: am 2aa92e36: am ec9b119a: am 3bc91637: am 5b908d58: am a2be12a2: (-s ours) am 4776a462: (-s ours) am ba2b24e7: (-s ours) am 8804f2a6: (-s ours) am 5893220a: (-s ours) am 8df657d3: (-s ours) am 778b8c3d: (-s ours) am 23c1fd83: am ea51fc9c: (-s ours) am 6b8
* commit 'b5b7d291310fc630afa48f4895c7cd342a5563e5':
2013-10-10 00:24:18 -07:00
Tadashi G. Takaoka be3b9ed41c am ab37d574: am 4dbda263: am 2044cdd4: am c1fa5b3c: am 85ed37f6: am db3f1345: am e36773e0: am 3d51dbb3: am 75c7cd2e: am de8fad93: am 9b59e68e: am 230068e2: am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard"
* commit 'ab37d57425deac63f1785b0213c3875adfdaa248':
2013-10-10 00:24:13 -07:00
Tadashi G. Takaoka b41e07ec41 am 473bb913: am 1650ffb3: am 68f985a7: am bb9761d1: am 77270ad9: am db3926d3: am 8ba86dea: am e425c04e: am 55839083: am c924801a: am d5a1e30e: am b00dc36b: am 5dac40f2: am 586578b7: Merge "Disable shadow of gesture trail"
* commit '473bb9133de50c6ad08c30a4e00fa05f10884d84':
2013-10-10 00:24:08 -07:00
Tadashi G. Takaoka 03425e1362 am 6d2ddd72: am 4963dbe1: am 62ff3951: am 4f8592a9: am 3c64fa49: am 0453130f: am 902daa63: am 87b41356: am e46e4b23: am 834ac8d4: am 9f85d497: am d66e4c45: am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application"
* commit '6d2ddd72c83c29675cca81b5ef76f3e6548d9a21':
2013-10-10 00:24:04 -07:00
Tadashi G. Takaoka 10d93f3a18 am 7136fc57: am bd8e4705: am 3df59adc: am 2a86865a: am 63992be5: am 037f61bc: am 415d0903: am acc1d931: am f672fc91: am eb888a01: am ecc459af: am 85e8dca4: am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"
* commit '7136fc57b098b1abfe687da4687e465c42ad5e9a':
2013-10-10 00:23:59 -07:00
Jean Chalard 5626a39211 am 20d49ce7: am e8ede3d6: am ca8ed426: am 6a959b19: am a9ab6da2: am 1c3815b2: am 8c930641: am 151c806e: am a3cbfe0d: am d2dc2d39: am 12ac4d55: am 5fe03e93: am 1aab945b: am c3f47836: Add an additional ID to the client info.
* commit '20d49ce78aca3a914dee52292b9845d778abc9cc':
2013-10-10 00:23:47 -07:00
Tom Ouyang 5713a5b343 am e910248c: am 510d7c57: am 9501578b: am f3aa1d8c: am bdb3a393: am af3679f1: am 7422c43a: am e0b57919: am 18dfb405: am 7abde243: am 21e6e12b: am 5d8638e4: am 56fab87b: am 14aa8f1d: Fix autocompletion lookahead handling
* commit 'e910248cd0af1194de3b65df465ee8bb700f7393':
2013-10-10 00:23:43 -07:00
Baligh Uddin b7cbf231c3 am 83160e88: am ee734fd5: am cfdfe697: am 724c7795: (-s ours) am 221e6372: (-s ours) am 0b837599: (-s ours) am fdcbbf40: (-s ours) am 730ce6a2: (-s ours) am 9370457e: (-s ours) am 337e45a5: (-s ours) am 90ff1c45: (-s ours) am 7e383483: (-s ours) am 6ef7a95c: am f595a0
* commit '83160e8888dbb1f49d924f27139fb0478a3d6145':
2013-10-10 00:23:38 -07:00
Baligh Uddin 38eef10e5d am f36904d8: am 98ec7c65: am 9eeab0d1: am eed3ca99: (-s ours) am b0351093: (-s ours) am a4ddff8d: (-s ours) am 0bd5082a: (-s ours) am 072f1fd7: (-s ours) am a73bf9ab: (-s ours) am 23470172: (-s ours) am 4674c44f: (-s ours) am a25cab6f: (-s ours) am 3b4a2b31: (-s ours)
* commit 'f36904d8ae21a534c23b582db3a0de60b05e3cd9':
2013-10-10 00:23:33 -07:00
Satoshi Kataoka b35dc194f2 am 217b417d: am 9fe75404: am e0ecfc72: am 5e48601d: am 3e8a7cc4: am 1230c824: am 79642e0e: am d6be3fd4: am 10f50009: am bffa1894: am 4937d4c6: am 874c4fda: am 434abe45: am 9b4e3db1: Legal notice
* commit '217b417d0cdc546deec9873e9afd5f42c4ac8d41':
2013-10-10 00:23:28 -07:00
Tadashi G. Takaoka 77785f8f0b am 4ac635ba: am 8fe077a4: am 8d1fb069: am ec088491: am 60ed054a: am 31df9aa7: am 8c0dbd04: am f8202b3a: am ed686652: am 4722a400: am 9b27761c: am 16bacd59: am 34b00870: am 1a9bf159: Merge "Don\'t triger onPress and startLongPressTimer when gesture is canceled"
* commit '4ac635bafeca61fe7d5b155799a4ad7e585e638d':
2013-10-10 00:23:23 -07:00
Tadashi G. Takaoka c4c5d78357 am 7462b061: am 3db656f1: am 2c9d13dd: am c0a388d3: am 05de05e8: am de566bed: am a5d7235f: am e8743aeb: am 04d573ee: am ea0a2d3d: am fec589f4: am 7a584880: am 80a98ee5: am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ICS"
* commit '7462b0617d01fc42504b5d54f537de979a505993':
2013-10-10 00:23:19 -07:00
Jean Chalard 9663ad8c84 am 695f073b: am 88136e29: am ee58871a: am 9c0f481c: am 41f023d3: am 92e13e5b: am b634b92c: am cf34ec74: am 0b0ed3c9: am 94ca19ee: am 9a6050df: am d8217ff0: am 19c46d32: am c9688ef2: Fix a small bug
* commit '695f073bc725ce763f542143b45c4681e82ce7bf':
2013-10-10 00:23:09 -07:00
Jean Chalard 3e22134d21 am f9f033f4: am 782067fa: am 340b1bed: am a7cdcdfe: am 08c97a98: am ce47c639: am 0813b1d3: am b0278f3f: am 5c9fbe19: am 4685e53f: am 06c75423: am cd7f6963: am 72e8d942: am 6d25be9a: Merge "Don\'t kill suggestions with native score < 1"
* commit 'f9f033f4113a51974734b980394323e5621fd0d3':
2013-10-10 00:23:05 -07:00
Tadashi G. Takaoka 785b58fa19 am b768cd1e: am 65a4b31a: am e46eea2a: am 03fc4c69: am 85d065f0: am 192e4f44: am 4f98bffb: am b0b15736: am a90ae9bc: am 2d3d4250: am b5bb317d: am 962c245c: am 6bbe6858: am 0f07935e: Centering setup wizard welcome video
* commit 'b768cd1ea5d3303fd1052c3fb409045ea95d76b4':
2013-10-10 00:23:01 -07:00
Ken Wakasa 2e0cce6252 am 63c65d58: am e7993608: am 2964538d: am 69478b05: am 7de58797: am cdbfd0d4: am 5ab0d2f7: am 43b65cd1: am 29a53c5f: am b022f3c9: am adccd218: am 77d7f8a0: am 72797500: am 2a9b5447: am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries
* commit '63c65d5882804f04f12ce56406d63c8c72b42e87':
2013-10-10 00:22:55 -07:00
Kurt Partridge 84373011be am 20c379e2: am d5cc6dbc: am 902b8466: am e2f90feb: am a708f060: am 53560879: am 55d86194: am 47415587: am 28f1b992: am 3b0a6bf3: am 1a017fc7: am 6f3b9ddd: am bd99e8dc: am 41b34cf2: Merge "Allow LogUnits to hold >1 word"
* commit '20c379e2bd7beed2d0f3e2d3b9c8eb2d54590675':
2013-10-10 00:22:51 -07:00
Jean Chalard 86ae6a7dfd am 8a0eeb70: am eeaa37ac: am fe6b380f: am fe5880b6: am c5db596a: am 331dcd09: am 340b0b4c: am 789bf1eb: am 2f26a0d8: am 1a56ff13: am a3116056: am 643bdb0f: am 6f6974e6: am 825da76c: Redisplay a hidden button after it entered the screen again.
* commit '8a0eeb70b94f4b44afe51f6e1a519479603620bc':
2013-10-10 00:22:46 -07:00
Jean Chalard bed7cce157 am b3fcd256: am 59eca1dc: am 86e0f1ba: am 8cb65844: am c46d0e3b: am 6d937632: am bb09e98e: am 71c4a980: am a0735e5a: am f24739a1: am b54d1bad: am 12e180a6: am 6dc9933d: am f8014eea: Hide the correct button when pressing a new button.
* commit 'b3fcd256dae256a89ba5f0f68e796761d339b44d':
2013-10-10 00:22:40 -07:00
Tadashi G. Takaoka 3323c8ab0b am 34a96a1b: am 6dda579f: am ea791bc9: am 5f0858ef: am 28306ce8: am e90368cd: am f01f5112: am 6e3ce30f: am 27e6a433: am d7316d30: am 2d9847ac: am 56c6c336: am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings
* commit '34a96a1b174e728fb3939332d2b7c1d415fbad41':
2013-10-10 00:22:35 -07:00