Commit Graph

20 Commits (main)

Author SHA1 Message Date
Adrian Velicu 8dd31a28ae Update dictionaries (possibly_offensive flag)
Correctly encoding possibly offensive words with their correct
frequency and the possibly_offensive flag set.

Continuing to encode with zero frequency only distracters or
words that should never come up.

https://paste.googleplex.com/5167060875214848

Bug: 11031090
Change-Id: Ia394b1827f292ff8d4791cc2f3e6e50b5aff4cbe
2014-10-31 14:49:24 +09:00
Adrian Velicu 487a6a6949 Update dictionaries
>>> dictionaries/de_wordlist.combined.gz
Header :
  date : 1393228134 <=> 1412325412
  version : 44 <=> 52
Body :
Probability changed: kommen 0 -> 149
Added: Käsebrötchen 50
Added: Lädst 50
Added: Müllbeutel 50
Added: Theresienwiese 50
Added: Verdammtes 50
Added: Wurstbrötchen 50
Added: abgebe 50
Added: angucke 50
Added: async 20
Added: backends 20
Added: brate 50
Added: erschreckendes 50
Added: erwische 50
Added: fahrt 80
Added: fragst 100
Added: gepostet 50
Added: gewundert 80
Added: gucke 50
Added: hattet 50
Added: hinkriege 50
Added: hustet 50
Added: hättet 60
Added: irgendwer 60
Added: koche 50
Added: kriege 70
Added: lehrst 50
Added: motivierenden 50
Added: müsstest 50
Added: müsstet 50
Added: organisiere 50
Added: peilen 50
Added: probiere 50
Added: rede 50
Added: reserviere 50
Added: sag 120
Added: schickes 80
Added: schickst 90
Added: sitze 50
Added: standet 50
Added: stolpere 50
Added: stressig 50
Added: telefoniere 80
Added: wolltest 100
Added: wolltet 100
Added: würdet 100
Added: ziele 50
Added: ähnlich 50
Added: älteren 50
Added: übelriechend 80
Added: überholen 50
Added: überlege 50
Added: überlegen 50
Added: überlegt 50
Added: übermorgen 50
Added: übernachte 50
Added: überquert 50
Added: überstanden 50
Added: übrig 50
Added: übrigens 50

>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1402373154 <=> 1412325408
  version : 47 <=> 52
Body :
Deleted: Pinterest  25
Added: Edamame 25
Added: Pinterest 25
Added: amd 0

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1402373154 <=> 1412325184
  version : 47 <=> 52
Body :
Deleted: Pinterest  25
Added: Edamame 25
Added: Pinterest 25
Added: amd 0

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1402373178 <=> 1412325419
  version : 47 <=> 52
Body :
Deleted: Pinterest  25
Added: Edamame 25
Added: Pinterest 25
Added: amd 0

>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1404131686 <=> 1412325412
  version : 49 <=> 52
Body :
Added: cállese 30
Added: mándame 30
Added: recupérate 35

>>> dictionaries/ro_wordlist.combined.gz
Header :
  description : Româna <=> Română
  date : 1408019089 <=> 1412325511
  version : 50 <=> 52
Body :
!!!!!! Truncated. !!!!!!!

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1406597821 <=> 1412325424
  version : 50 <=> 52
Body :
Deleted: Агг 52
Deleted: ЗАГС 77
Deleted: КОНКАКАФ 19
Deleted: Монк 69
Probability changed: НКАО 13 -> 0
Probability changed: НКВД 46 -> 0
Probability changed: НКО 14 -> 0
Probability changed: НКР 22 -> 0
Deleted: НОМОС-БАНК 58
Deleted: ПДД 77
Probability changed: РНК 33 -> 0
Deleted: СМС 78
Probability changed: СНК 35 -> 0
Deleted: ТОО 14
Probability changed: ТЦ 85 -> 5
Probability changed: УНКВД 11 -> 0
Deleted: ФИО 65
Deleted: Эбля 49
Probability changed: асексуальность 59 -> 0
Probability changed: бисексуал 72 -> 0
Probability changed: бисексуалов 85 -> 0
Probability changed: бисексуальной 67 -> 0
Probability changed: бисексуальности 75 -> 0
Deleted: бумажке 94
Deleted: бумажку 104
Deleted: важней 86
Deleted: вероника 58
Deleted: вероники 54
Deleted: вероникой 29
Deleted: веронику 29
Deleted: влезет 94
Deleted: влезть 87
Deleted: врожденная 75
Deleted: врожденного 78
Deleted: врожденное 71
Deleted: врожденной 85
Deleted: врожденную 66
Deleted: врожденные 82
Deleted: врожденный 82
Deleted: врожденным 79
Deleted: врожденными 76
Deleted: врожденных 86
Probability changed: врождённая 68 -> 75
Probability changed: врождённое 69 -> 71
Probability changed: врождённой 80 -> 85
Probability changed: врождённые 78 -> 82
Probability changed: врождённый 77 -> 82
Probability changed: врождённым 74 -> 79
Probability changed: врождённых 80 -> 86
Probability changed: все-таки 113 -> 30
Deleted: вылезли 88
Deleted: г-же 65
Deleted: г-н 88
Deleted: г-на 88
Probability changed: га 135 -> 0
Probability changed: гг 160 -> 0
Probability changed: гетеросексуалов 73 -> 0
Probability changed: гетеросексуального 67 -> 0
Probability changed: гетеросексуальной 71 -> 0
Probability changed: гетеросексуальности 65 -> 0
Probability changed: гетеросексуальность 67 -> 0
Probability changed: гетеросексуальную 65 -> 0
Probability changed: гетеросексуальные 76 -> 0
Probability changed: гетеросексуальных 77 -> 0
Probability changed: гомосексуал 74 -> 0
Probability changed: гомосексуала 67 -> 0
Probability changed: гомосексуалам 75 -> 0
Probability changed: гомосексуалами 70 -> 0
Probability changed: гомосексуализм 91 -> 0
Probability changed: гомосексуализма 91 -> 0
Probability changed: гомосексуализме 74 -> 0
Probability changed: гомосексуализму 68 -> 0
Probability changed: гомосексуалист 80 -> 0
Probability changed: гомосексуалиста 72 -> 0
Probability changed: гомосексуалистам 69 -> 0
Probability changed: гомосексуалистами 69 -> 0
Probability changed: гомосексуалистов 94 -> 0
Probability changed: гомосексуалистом 78 -> 0
Probability changed: гомосексуалисты 77 -> 0
Probability changed: гомосексуалов 93 -> 0
Probability changed: гомосексуалом 65 -> 0
Probability changed: гомосексуалы 82 -> 0
Probability changed: гомосексуальная 70 -> 0
Probability changed: гомосексуального 78 -> 0
Probability changed: гомосексуальное 71 -> 0
Probability changed: гомосексуальной 93 -> 0
Probability changed: гомосексуальности 103 -> 0
Probability changed: гомосексуальность 100 -> 0
Probability changed: гомосексуальностью 73 -> 0
Probability changed: гомосексуальную 75 -> 0
Probability changed: гомосексуальные 92 -> 0
Probability changed: гомосексуальный 75 -> 0
Probability changed: гомосексуальным 74 -> 0
Probability changed: гомосексуальными 70 -> 0
Probability changed: гомосексуальных 91 -> 0
Probability changed: д-р 93 -> 0
Deleted: дада 72
Deleted: даша 55
Deleted: даши 47
Deleted: дашу 29
Probability changed: де 154 -> 30
Probability changed: др 156 -> 0
Deleted: зажги 92
Deleted: зажгу 89
Deleted: зажигай 95
Deleted: зажигаю 88
Probability changed: зоосексуальность 65 -> 0
Probability changed: иРНК 68 -> 0
Probability changed: кДНК 62 -> 0
Probability changed: кв 133 -> 0
Deleted: кио 49
Deleted: лег 91
Deleted: лезу 88
Deleted: лезь 91
Probability changed: ля 103 -> 30
Probability changed: мРНК 102 -> 0
Deleted: машка 29
Probability changed: микроРНК 65 -> 0
Deleted: мону 29
Probability changed: мтДНК 79 -> 0
Probability changed: мяРНК 65 -> 0
Deleted: нажрался 97
Deleted: налил 97
Deleted: налили 86
Probability changed: негетеросексуальной 73 -> 0
Probability changed: негетеросексуальный 73 -> 0
Deleted: орут 98
Deleted: отт 64
Deleted: паша 83
Deleted: паше 66
Deleted: пашей 69
Deleted: пашой 73
Deleted: подоконник 88
Deleted: подскажет 87
Deleted: подскажете 89
Deleted: подскажите 112
Deleted: покажите 95
Deleted: полезли 91
Probability changed: пр 129 -> 0
Probability changed: пре-мРНК 78 -> 0
Deleted: пресекся 73
Probability changed: рРНК 91 -> 0
Deleted: раздражённо 91
Deleted: сажусь 99
Deleted: саше 54
Probability changed: секс 106 -> 0
Probability changed: секс-символ 74 -> 0
Probability changed: секс-символов 65 -> 0
Probability changed: секс-символом 74 -> 0
Probability changed: секс-туризм 62 -> 0
Probability changed: секса 105 -> 0
Probability changed: сексе 93 -> 0
Deleted: секси 88
Probability changed: сексизм 63 -> 0
Probability changed: сексизма 72 -> 0
Probability changed: сексолог 75 -> 0
Probability changed: сексологии 80 -> 0
Probability changed: сексом 102 -> 0
Probability changed: сексу 80 -> 0
Probability changed: сексуальная 95 -> 0
Probability changed: сексуально 88 -> 0
Probability changed: сексуального 107 -> 0
Probability changed: сексуальное 98 -> 0
Probability changed: сексуальной 111 -> 0
Probability changed: сексуальном 84 -> 0
Probability changed: сексуальному 79 -> 0
Probability changed: сексуальности 99 -> 0
Probability changed: сексуальность 90 -> 0
Probability changed: сексуальностью 70 -> 0
Probability changed: сексуальную 95 -> 0
Probability changed: сексуальные 105 -> 0
Probability changed: сексуальный 91 -> 0
Probability changed: сексуальным 95 -> 0
Probability changed: сексуальными 84 -> 0
Probability changed: сексуальных 113 -> 0
Deleted: сете 78
Deleted: слезой 87
Deleted: соображаю 90
Probability changed: тРНК 86 -> 0
Deleted: тав 69
Probability changed: транссексуал 67 -> 0
Probability changed: транссексуалки 64 -> 0
Probability changed: транссексуалов 82 -> 0
Probability changed: транссексуалы 71 -> 0
Probability changed: транссексуальности 77 -> 0
Probability changed: транссексуальность 65 -> 0
Deleted: укажите 83
Probability changed: ул 137 -> 0
Deleted: устар 93
Deleted: эдак 99
Added: Вероника 58
Added: Вероники 54
Added: Вероникой 29
Added: Веронику 29
Added: Даша 55
Added: Даши 47
Added: Дашу 29
Added: Маш 57
Added: Машка 29
Added: Паша 83
Added: Паше 66
Added: Пашей 69
Added: Пашой 73
Added: Саше 54
Added: впросак 0
Added: врождённую 66
Added: втечение 0
Added: втечении 0
Added: лёг 97
Added: машу 80
Added: чтоли 0
Added: чтоль 0
Added: ща 0
Added: щас 0

>>> java/res/raw/main_de.dict
Header :
  date : 1393228134 <=> 1412325412
  version : 44 <=> 52
Body :
Probability changed: kommen 0 -> 149
Added: Käsebrötchen 50
Added: Lädst 50
Added: Müllbeutel 50
Added: Theresienwiese 50
Added: Verdammtes 50
Added: Wurstbrötchen 50
Added: abgebe 50
Added: angucke 50
Added: async 20
Added: backends 20
Added: brate 50
Added: erschreckendes 50
Added: erwische 50
Added: fahrt 80
Added: fragst 100
Added: gepostet 50
Added: gewundert 80
Added: gucke 50
Added: hattet 50
Added: hinkriege 50
Added: hustet 50
Added: hättet 60
Added: irgendwer 60
Added: koche 50
Added: kriege 70
Added: lehrst 50
Added: motivierenden 50
Added: müsstest 50
Added: müsstet 50
Added: organisiere 50
Added: peilen 50
Added: probiere 50
Added: rede 50
Added: reserviere 50
Added: sag 120
Added: schickes 80
Added: schickst 90
Added: sitze 50
Added: standet 50
Added: stolpere 50
Added: stressig 50
Added: telefoniere 80
Added: wolltest 100
Added: wolltet 100
Added: würdet 100
Added: ziele 50
Added: ähnlich 50
Added: älteren 50
Added: übelriechend 80
Added: überholen 50
Added: überlege 50
Added: überlegen 50
Added: überlegt 50
Added: übermorgen 50
Added: übernachte 50
Added: überquert 50
Added: überstanden 50
Added: übrig 50
Added: übrigens 50

>>> java/res/raw/main_en.dict
Header :
  date : 1402373178 <=> 1412325419
  version : 47 <=> 52
Body :
Deleted: Pinterest  25
Added: Edamame 25
Added: Pinterest 25
Added: amd 0

>>> java/res/raw/main_es.dict
Header :
  date : 1404131686 <=> 1412325412
  version : 49 <=> 52
Body :
Added: cállese 30
Added: mándame 30
Added: recupérate 35

>>> java/res/raw/main_ru.dict
Header :
  date : 1406597821 <=> 1412325424
  version : 50 <=> 52
Body :
Deleted: Агг 52
Deleted: ЗАГС 77
Deleted: КОНКАКАФ 19
Deleted: Монк 69
Probability changed: НКАО 13 -> 0
Probability changed: НКВД 46 -> 0
Probability changed: НКО 14 -> 0
Probability changed: НКР 22 -> 0
Deleted: НОМОС-БАНК 58
Deleted: ПДД 77
Probability changed: РНК 33 -> 0
Deleted: СМС 78
Probability changed: СНК 35 -> 0
Deleted: ТОО 14
Probability changed: ТЦ 85 -> 5
Probability changed: УНКВД 11 -> 0
Deleted: ФИО 65
Deleted: Эбля 49
Probability changed: асексуальность 59 -> 0
Probability changed: бисексуал 72 -> 0
Probability changed: бисексуалов 85 -> 0
Probability changed: бисексуальной 67 -> 0
Probability changed: бисексуальности 75 -> 0
Deleted: бумажке 94
Deleted: бумажку 104
Deleted: важней 86
Deleted: вероника 58
Deleted: вероники 54
Deleted: вероникой 29
Deleted: веронику 29
Deleted: влезет 94
Deleted: влезть 87
Deleted: врожденная 75
Deleted: врожденного 78
Deleted: врожденное 71
Deleted: врожденной 85
Deleted: врожденную 66
Deleted: врожденные 82
Deleted: врожденный 82
Deleted: врожденным 79
Deleted: врожденными 76
Deleted: врожденных 86
Probability changed: врождённая 68 -> 75
Probability changed: врождённое 69 -> 71
Probability changed: врождённой 80 -> 85
Probability changed: врождённые 78 -> 82
Probability changed: врождённый 77 -> 82
Probability changed: врождённым 74 -> 79
Probability changed: врождённых 80 -> 86
Probability changed: все-таки 113 -> 30
Deleted: вылезли 88
Deleted: г-же 65
Deleted: г-н 88
Deleted: г-на 88
Probability changed: га 135 -> 0
Probability changed: гг 160 -> 0
Probability changed: гетеросексуалов 73 -> 0
Probability changed: гетеросексуального 67 -> 0
Probability changed: гетеросексуальной 71 -> 0
Probability changed: гетеросексуальности 65 -> 0
Probability changed: гетеросексуальность 67 -> 0
Probability changed: гетеросексуальную 65 -> 0
Probability changed: гетеросексуальные 76 -> 0
Probability changed: гетеросексуальных 77 -> 0
Probability changed: гомосексуал 74 -> 0
Probability changed: гомосексуала 67 -> 0
Probability changed: гомосексуалам 75 -> 0
Probability changed: гомосексуалами 70 -> 0
Probability changed: гомосексуализм 91 -> 0
Probability changed: гомосексуализма 91 -> 0
Probability changed: гомосексуализме 74 -> 0
Probability changed: гомосексуализму 68 -> 0
Probability changed: гомосексуалист 80 -> 0
Probability changed: гомосексуалиста 72 -> 0
Probability changed: гомосексуалистам 69 -> 0
Probability changed: гомосексуалистами 69 -> 0
Probability changed: гомосексуалистов 94 -> 0
Probability changed: гомосексуалистом 78 -> 0
Probability changed: гомосексуалисты 77 -> 0
Probability changed: гомосексуалов 93 -> 0
Probability changed: гомосексуалом 65 -> 0
Probability changed: гомосексуалы 82 -> 0
Probability changed: гомосексуальная 70 -> 0
Probability changed: гомосексуального 78 -> 0
Probability changed: гомосексуальное 71 -> 0
Probability changed: гомосексуальной 93 -> 0
Probability changed: гомосексуальности 103 -> 0
Probability changed: гомосексуальность 100 -> 0
Probability changed: гомосексуальностью 73 -> 0
Probability changed: гомосексуальную 75 -> 0
Probability changed: гомосексуальные 92 -> 0
Probability changed: гомосексуальный 75 -> 0
Probability changed: гомосексуальным 74 -> 0
Probability changed: гомосексуальными 70 -> 0
Probability changed: гомосексуальных 91 -> 0
Probability changed: д-р 93 -> 0
Deleted: дада 72
Deleted: даша 55
Deleted: даши 47
Deleted: дашу 29
Probability changed: де 154 -> 30
Probability changed: др 156 -> 0
Deleted: зажги 92
Deleted: зажгу 89
Deleted: зажигай 95
Deleted: зажигаю 88
Probability changed: зоосексуальность 65 -> 0
Probability changed: иРНК 68 -> 0
Probability changed: кДНК 62 -> 0
Probability changed: кв 133 -> 0
Deleted: кио 49
Deleted: лег 91
Deleted: лезу 88
Deleted: лезь 91
Probability changed: ля 103 -> 30
Probability changed: мРНК 102 -> 0
Deleted: машка 29
Probability changed: микроРНК 65 -> 0
Deleted: мону 29
Probability changed: мтДНК 79 -> 0
Probability changed: мяРНК 65 -> 0
Deleted: нажрался 97
Deleted: налил 97
Deleted: налили 86
Probability changed: негетеросексуальной 73 -> 0
Probability changed: негетеросексуальный 73 -> 0
Deleted: орут 98
Deleted: отт 64
Deleted: паша 83
Deleted: паше 66
Deleted: пашей 69
Deleted: пашой 73
Deleted: подоконник 88
Deleted: подскажет 87
Deleted: подскажете 89
Deleted: подскажите 112
Deleted: покажите 95
Deleted: полезли 91
Probability changed: пр 129 -> 0
Probability changed: пре-мРНК 78 -> 0
Deleted: пресекся 73
Probability changed: рРНК 91 -> 0
Deleted: раздражённо 91
Deleted: сажусь 99
Deleted: саше 54
Probability changed: секс 106 -> 0
Probability changed: секс-символ 74 -> 0
Probability changed: секс-символов 65 -> 0
Probability changed: секс-символом 74 -> 0
Probability changed: секс-туризм 62 -> 0
Probability changed: секса 105 -> 0
Probability changed: сексе 93 -> 0
Deleted: секси 88
Probability changed: сексизм 63 -> 0
Probability changed: сексизма 72 -> 0
Probability changed: сексолог 75 -> 0
Probability changed: сексологии 80 -> 0
Probability changed: сексом 102 -> 0
Probability changed: сексу 80 -> 0
Probability changed: сексуальная 95 -> 0
Probability changed: сексуально 88 -> 0
Probability changed: сексуального 107 -> 0
Probability changed: сексуальное 98 -> 0
Probability changed: сексуальной 111 -> 0
Probability changed: сексуальном 84 -> 0
Probability changed: сексуальному 79 -> 0
Probability changed: сексуальности 99 -> 0
Probability changed: сексуальность 90 -> 0
Probability changed: сексуальностью 70 -> 0
Probability changed: сексуальную 95 -> 0
Probability changed: сексуальные 105 -> 0
Probability changed: сексуальный 91 -> 0
Probability changed: сексуальным 95 -> 0
Probability changed: сексуальными 84 -> 0
Probability changed: сексуальных 113 -> 0
Deleted: сете 78
Deleted: слезой 87
Deleted: соображаю 90
Probability changed: тРНК 86 -> 0
Deleted: тав 69
Probability changed: транссексуал 67 -> 0
Probability changed: транссексуалки 64 -> 0
Probability changed: транссексуалов 82 -> 0
Probability changed: транссексуалы 71 -> 0
Probability changed: транссексуальности 77 -> 0
Probability changed: транссексуальность 65 -> 0
Deleted: укажите 83
Probability changed: ул 137 -> 0
Deleted: устар 93
Deleted: эдак 99
Added: Вероника 58
Added: Вероники 54
Added: Вероникой 29
Added: Веронику 29
Added: Даша 55
Added: Даши 47
Added: Дашу 29
Added: Маш 57
Added: Машка 29
Added: Паша 83
Added: Паше 66
Added: Пашей 69
Added: Пашой 73
Added: Саше 54
Added: впросак 0
Added: врождённую 66
Added: втечение 0
Added: втечении 0
Added: лёг 97
Added: машу 80
Added: чтоли 0
Added: чтоль 0
Added: ща 0
Added: щас 0

Change-Id: I0c6bf1a1ecc9edf03523bfb080774738aa40d163
2014-10-06 10:13:37 +09:00
Jean Chalard 267a8614a0 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1400639634 <=> 1402373154
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1400750526 <=> 1402373154
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1400639659 <=> 1402373178
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

>>> java/res/raw/main_en.dict
Header :
  date : 1400639659 <=> 1402373178
  version : 45 <=> 47
Body :
Shortcut added: lust list 15

Bug: 15347469
Change-Id: I35cb410bdb7b641f2f0d4d9bb19a17e3f4eb9c0b
2014-06-10 14:08:32 +09:00
Jean Chalard 2e795144a6 Update dictionaries
No TRT differences

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1400639634 <=> 1400750526
Body :
Added: google 72

Bug: 11822756
Change-Id: I399fc4e97f4d9e0092ee153f3f6dc5b29ca4d3bd
2014-05-22 20:16:26 +09:00
Jean Chalard 0c80c5e200 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1393228134 <=> 1400639634
  version : 44 <=> 45
Body :
Deleted: SVD 73
Added: google 72

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1393228135 <=> 1400639634
  version : 44 <=> 45
Body :
Deleted: SVD 73

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1393228155 <=> 1400639659
  version : 44 <=> 45
Body :
Deleted: SVD 73
Added: google 72

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1393228135 <=> 1400639634
  version : 44 <=> 45
Body :
Deleted: Déshabillez-moi 27
Deleted: Déshabillons-les 22
Deleted: Laisse-les 14
Deleted: Pendez-les 34
Deleted: Pendez-moi 14
Deleted: Regardez-les 22
Deleted: Saint-Louis-les 38
Deleted: Saint-Vincent-et-les 62
Deleted: Sortez-les 14
Deleted: brula 56
Deleted: brulaient 38
Deleted: brulait 27
Deleted: brulant 68
Deleted: brulante 45
Deleted: brulantes 38
Deleted: brulants 38
Deleted: brule 64
Deleted: brulent 57
Deleted: bruler 67
Deleted: brulera 31
Deleted: bruleur 38
Deleted: bruleurs 38
Deleted: brulez 22
Deleted: brulis 46
Deleted: brulot 36
Deleted: brulots 45
Deleted: brulure 49
Deleted: brulures 56
Deleted: brulèrent 60
Deleted: brulé 82
Deleted: brulée 71
Deleted: brulées 67
Deleted: brulés 74
Deleted: coutaient 43
Deleted: coutait 61
Deleted: coutant 58
Deleted: coutent 60
Deleted: couter 57
Deleted: coutera 60
Deleted: couterait 52
Deleted: couteuse 72
Deleted: couteusement 45
Deleted: couteuses 65
Deleted: couteux 81
Deleted: coutât 31
Deleted: coutèrent 52
Deleted: couté 81
Deleted: rent 51
Deleted: street 96
Added: déshabillez-moi 27
Added: déshabillons-les 22
Added: laisse-les 14
Added: pendez-les 34
Added: pendez-moi 14
Added: regardez-les 22
Added: sortez-les 14

>>> java/res/raw/main_en.dict
Header :
  date : 1393228155 <=> 1400639659
  version : 44 <=> 45
Body :
Deleted: SVD 73
Added: google 72

>>> java/res/raw/main_fr.dict
Header :
  date : 1393228135 <=> 1400639634
  version : 44 <=> 45
Body :
Deleted: Déshabillez-moi 27
Deleted: Déshabillons-les 22
Deleted: Laisse-les 14
Deleted: Pendez-les 34
Deleted: Pendez-moi 14
Deleted: Regardez-les 22
Deleted: Saint-Louis-les 38
Deleted: Saint-Vincent-et-les 62
Deleted: Sortez-les 14
Deleted: brula 56
Deleted: brulaient 38
Deleted: brulait 27
Deleted: brulant 68
Deleted: brulante 45
Deleted: brulantes 38
Deleted: brulants 38
Deleted: brule 64
Deleted: brulent 57
Deleted: bruler 67
Deleted: brulera 31
Deleted: bruleur 38
Deleted: bruleurs 38
Deleted: brulez 22
Deleted: brulis 46
Deleted: brulot 36
Deleted: brulots 45
Deleted: brulure 49
Deleted: brulures 56
Deleted: brulèrent 60
Deleted: brulé 82
Deleted: brulée 71
Deleted: brulées 67
Deleted: brulés 74
Deleted: coutaient 43
Deleted: coutait 61
Deleted: coutant 58
Deleted: coutent 60
Deleted: couter 57
Deleted: coutera 60
Deleted: couterait 52
Deleted: couteuse 72
Deleted: couteusement 45
Deleted: couteuses 65
Deleted: couteux 81
Deleted: coutât 31
Deleted: coutèrent 52
Deleted: couté 81
Deleted: rent 51
Deleted: street 96
Added: déshabillez-moi 27
Added: déshabillons-les 22
Added: laisse-les 14
Added: pendez-les 34
Added: pendez-moi 14
Added: regardez-les 22
Added: sortez-les 14

Bug: 15065819
Bug: 13618068
Change-Id: I3dbe2f1d8868e0880ac76058d99346242bace8cc
2014-05-21 17:33:06 +09:00
Jean Chalard 004cec01a9 Update all dicts to version 44.
Bug: 13164302
Change-Id: I8dc1a839c7dcfaa08a53e26cb6600e9f871447ce
2014-02-24 21:27:25 +09:00
Jean Chalard 66c96e8813 Update dictionaries
en* : add common app and Google product names
en_GB : also add "filters"
ru : add some missing words

Bug: 11043181
Bug: 12276653
Bug: 12953122
Change-Id: I6b62e681a07b7f0149a10ba4e05954e60d6212d4
2014-02-24 15:30:47 +09:00
Jean Chalard 155cb77231 Update dictionaries
This change has no effect on TRT results.

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654051
  version : 42 <=> 43
Body :
Added: dialogue 120
Added: dialogues 94

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> dictionaries/it_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

>>> java/res/raw/main_fr.dict
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> java/res/raw/main_it.dict
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

Bug: 12487270
Bug: 12344108
Change-Id: I94768e223d05ad2551a5508e9e01222a028665c4
2014-01-14 10:37:15 +09:00
Jean Chalard b1eedc6ba0 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1381130519 <=> 1381226409
  version : 41 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1380293342 <=> 1381226409
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

>>> java/res/raw/main_en.dict
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> java/res/raw/main_fr.dict
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

Bug: 11114205
Change-Id: I39d429d24d93ee07a70d8613ce0752432b26acc4
2013-10-08 10:34:56 +00:00
Jean Chalard a267ebed5a Update dictionaries
Add KitKat to all dictionaries.
Version
da, fi, pl : 29 → 40
cs, de, hr, it, lt, lv, nb, nl, sl, sr, sv, tr : 35 → 40
es : 36 → 40
en_gb, en_us, en, fr, pt_br, pt_pt : 39 → 40

Bug: 10958192
Change-Id: I14436616285ced5eb3b70b8c44b9243da94eed4f
2013-09-30 07:12:03 +00:00
Jean Chalard 50b36e2a4b Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1374721653 <=> 1380099152
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10
Added: draft 138

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1374721654 <=> 1380099152
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1374721663 <=> 1380099172
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1376888819 <=> 1380099153
  version : 37 <=> 39
Body :
Added: septembre 150

>>> dictionaries/pt_BR_wordlist.combined.gz
Header :
  date : 1376884524 <=> 1380099168
  version : 37 <=> 39
Body :
Freq changed: atras 87 -> 0
Not a word: atras false -> true
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: cafe café 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15

>>> dictionaries/pt_PT_wordlist.combined.gz
Header :
  date : 1376884536 <=> 1380099168
  version : 37 <=> 39
Body :
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15
Added: cafe 0

>>> java/res/raw/main_en.dict
Header :
  date : 1374721663 <=> 1380099172
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> java/res/raw/main_fr.dict
Header :
  date : 1376888819 <=> 1380099153
  version : 37 <=> 39
Body :
Added: septembre 150

>>> java/res/raw/main_pt_br.dict
Header :
  date : 1376884524 <=> 1380099168
  version : 37 <=> 39
Body :
Freq changed: atras 87 -> 0
Not a word: atras false -> true
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: cafe café 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15

Bug: 10504313
Bug: 10507536
Bug: 10561100
Change-Id: I4267c76cf0de221a703523d5f2dd2befbaf020a0
2013-09-26 08:34:53 +00:00
Jean Chalard 665e4ecc62 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1374634548 <=> 1374721653
Body :
Added: Caltrain 30

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1374634548 <=> 1374721654
Body :
Added: Caltrain 30

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1374634568 <=> 1374721663
Body :
Added: Caltrain 30

>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1372393817 <=> 1374721654
  version : 35 <=> 36
Body :
Added: Caltrain 10

>>> java/res/raw/main_en.dict
Header :
  date : 1374634568 <=> 1374721663
Body :
Added: Caltrain 30

>>> java/res/raw/main_es.dict
Header :
  date : 1372393817 <=> 1374721654
  version : 35 <=> 36
Body :
Added: Caltrain 10

Bug: 9995706
Change-Id: Icf96bf01e45ef94d3ffd6d6a9d6431c52f0f5a86
2013-07-25 12:48:55 +09:00
Jean Chalard f0046aea26 Update dictionaries
en, en_GB, en_US:
Add "id" -> "I'd" whitelist entry
Reinstate "id" and "ID" in the respective dicts

fr:
Remove many words that are not French
Change "google" to "Google"

pt_BR:
Delete "idéia"

Change-Id: I942266ac7995345580926f60de45d202aa257ae7
2013-07-24 12:10:06 +09:00
Jean Chalard ffe7dbbe7a Update dictionaries
>>> dictionaries/cs_wordlist.combined.gz
Header :
  date : 1355802831 <=> 1372393817
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/de_wordlist.combined.gz
Header :
  date : 1355802835 <=> 1372393817
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366272052 <=> 1372393817
  version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366272093 <=> 1372393817
  version : 31 <=> 35
Body :
Added: LTE 25

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366272977 <=> 1372393837
  version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25

>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1355802832 <=> 1372393817
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1366272255 <=> 1372393818
  version : 31 <=> 35
Body :
Deleted: R'n'B 95
Deleted: count 60
Deleted: d'Inti 34
Added: beurk 25

>>> dictionaries/hr_wordlist.combined.gz
Header :
  date : 1355802836 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/it_wordlist.combined.gz
Header :
  date : 1355802836 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/lt_wordlist.combined.gz
Header :
  date : 1355802843 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/lv_wordlist.combined.gz
Header :
  date : 1355802843 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/nb_wordlist.combined.gz
Header :
  date : 1366003450 <=> 1372393818
  version : 31 <=> 35
Body :
Added: LTE 25

>>> dictionaries/nl_wordlist.combined.gz
Header :
  date : 1355802844 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1370244430 <=> 1372393835
  version : 34 <=> 35
Body :
Freq changed: связывание 93 -> 0

>>> dictionaries/sl_wordlist.combined.gz
Header :
  date : 1355802835 <=> 1372393835
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/sr_wordlist.combined.gz
Header :
  date : 1355802853 <=> 1372393835
  version : 29 <=> 35
Body :
Added: LTE 25

>>> dictionaries/sv_wordlist.combined.gz
Header :
  date : 1366003804 <=> 1372393836
  version : 31 <=> 35
Body :
Added: LTE 25

>>> dictionaries/tr_wordlist.combined.gz
Header :
  date : 1355802858 <=> 1372393837
  version : 29 <=> 35
Body :
Added: LTE 25

>>> java/res/raw/main_de.dict
Header :
  date : 1355802835 <=> 1372393817
  version : 29 <=> 35
Body :
Added: LTE 25

>>> java/res/raw/main_en.dict
Header :
  date : 1366272977 <=> 1372393837
  version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25

>>> java/res/raw/main_es.dict
Header :
  date : 1355802832 <=> 1372393817
  version : 29 <=> 35
Body :
Added: LTE 25

>>> java/res/raw/main_fr.dict
Header :
  date : 1366272255 <=> 1372393818
  version : 31 <=> 35
Body :
Deleted: R'n'B 95
Deleted: count 60
Deleted: d'Inti 34
Added: beurk 25

>>> java/res/raw/main_it.dict
Header :
  date : 1355802836 <=> 1372393818
  version : 29 <=> 35
Body :
Added: LTE 25

>>> java/res/raw/main_ru.dict
Header :
  date : 1370244430 <=> 1372393835
  version : 34 <=> 35
Body :
Freq changed: связывание 93 -> 0

Bug: 9301610
Bug: 9607966
Change-Id: I1117ed85d97fbb0ee50f11bc31776f1970b56f12
2013-06-28 14:54:51 +09:00
Jean Chalard 9cf468646f Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366021966 <=> 1366272052
Body :
Added: yt 0

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366021978 <=> 1366272093
Body :
Added: yt 0

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

>>> java/res/raw/main_en.dict
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> java/res/raw/main_fr.dict
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> java/res/raw/main_ru.dict
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

Bug: 8635822
Change-Id: I44dc73bd010b125c994387894847a008276d69f7
2013-04-18 18:41:19 +09:00
Jean Chalard e99daea083 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366003032 <=> 1366021966
Body :
Deleted: FTP 88
Deleted: HTTPS 66
Added: www 72

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366003070 <=> 1366021978
Body :
Deleted: FTP 88
Deleted: HTTPS 66
Added: http 95
Added: www 71

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366003861 <=> 1366021987
Body :
Deleted: FTP 88
Deleted: HTTPS 66
Freq changed: http 120 -> 95
Added: www 71

>>> java/res/raw/main_en.dict
Header :
  date : 1366003861 <=> 1366021987
Body :
Deleted: FTP 88
Deleted: HTTPS 66
Freq changed: http 120 -> 95
Added: www 71

Bug: 8233807
Change-Id: Id55f6e0dcc9ddff26902c0857edcbb9b10d42328
2013-04-15 20:25:48 +09:00
Jean Chalard da175bdcb1 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1355802832 <=> 1366003032
  version : 29 <=> 31
Body :
Deleted: HTTP 95
Deleted: WWW 72
Added: mm 135

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1355112451 <=> 1366003070
  version : 28 <=> 31
Body :
Deleted: HTTP 95
Deleted: WWW 71
Added: mm 135

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1355802851 <=> 1366003861
  version : 29 <=> 31
Body :
Deleted: HTTP 95
Deleted: WWW 71
Added: mm 135

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1357617878 <=> 1366003217
  version : 29 <=> 31
Body :
Not a word: re false -> true
Shortcut added: re le 15

>>> dictionaries/nb_wordlist.combined.gz
Header :
  date : 1355802836 <=> 1366003450
  version : 29 <=> 31
Body :
Freq changed: iPhone 91 -> 30
Added: app 30

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1358763720 <=> 1366003693
  version : 30 <=> 31
Body :
Freq changed: за 140 -> 181
Freq changed: не 140 -> 191
Freq changed: про 131 -> 151
Freq changed: эры 125 -> 140

>>> dictionaries/sv_wordlist.combined.gz
Header :
  date : 1355802856 <=> 1366003804
  version : 29 <=> 31
Body :
Added: vi 180

>>> java/res/raw/main_en.dict
Header :
  date : 1355802851 <=> 1366003861
  version : 29 <=> 31
Body :
Deleted: HTTP 95
Deleted: WWW 71
Added: mm 135

>>> java/res/raw/main_fr.dict
Header :
  date : 1357617878 <=> 1366003217
  version : 29 <=> 31
Body :
Not a word: re false -> true
Shortcut added: re le 15

>>> java/res/raw/main_ru.dict
Header :
  date : 1358763720 <=> 1366003693
  version : 30 <=> 31
Body :
Freq changed: за 140 -> 181
Freq changed: не 140 -> 191
Freq changed: про 131 -> 151
Freq changed: эры 125 -> 140

Bug: 8560415
Bug: 7556679
Change-Id: If1c628edcb1cc5efd67e1715acf94f19c0eb4643
2013-04-15 14:51:02 +09:00
Jean Chalard d080986f93 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1354870724 <=> 1355112440
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1354870736 <=> 1355112451
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1354870744 <=> 1355112460
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1351676002 <=> 1355117676
  version : 26 <=> 28
Body :
Deleted: DoCoMo 40
Added: Docomo 40
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/fi_wordlist.combined.gz
Header :
  date : 1351676054 <=> 1355117691
  version : 26 <=> 28
Body :
Deleted: DoCoMo 28
Added: Docomo 28
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1354872988 <=> 1355117708
  version : 27 <=> 28
Body :
Deleted: DoCoMo 52
Added: Docomo 52
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/pt_PT_wordlist.combined.gz
Header :
  date : 1351676510 <=> 1355117723
  version : 26 <=> 28
Body :
Deleted: DoCoMo 48
Added: Docomo 48
Added: Softbank 25

>>> java/res/raw/main_en.dict
Header :
  date : 1354870744 <=> 1355112460
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> java/res/raw/main_es.dict
Header :
  date : 1353500806 <=> 1355117676
  version : 27 <=> 28
Body :
Deleted: DoCoMo 40
Added: Docomo 40
Added: KDDI 25
Added: Softbank 25

>>> java/res/raw/main_fr.dict
Header :
  date : 1354872988 <=> 1355117708
  version : 27 <=> 28
Body :
Deleted: DoCoMo 52
Added: Docomo 52
Added: KDDI 25
Added: Softbank 25

Change-Id: I3801cbe4535407f55ede8db327674d493a92d1ae
2012-12-10 14:52:43 +09:00
Jean Chalard bd793ed50d Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1353500789 <=> 1354870724
Body :
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1351675958 <=> 1354870736
  version : 26 <=> 27
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1353500998 <=> 1354870744
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1353500832 <=> 1354872988
Body :
Deleted: noël 71
Deleted: po 73
Deleted: ti 73
Added: Noël 71
Added: lose 1
Added: y'a 130

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1353567943 <=> 1354870130
Body :
Demote all CAPS words by 80
Freq changed: модно 51 -> 20

>>> java/res/raw/main_en.dict
Header :
  date : 1353500998 <=> 1354870744
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55

>>> java/res/raw/main_fr.dict
Header :
  date : 1353500832 <=> 1354872988
Body :
Deleted: noël 71
Deleted: po 73
Deleted: ti 73
Added: Noël 71
Added: lose 1
Added: y'a 130

>>> java/res/raw/main_ru.dict
Header :
  date : 1353567943 <=> 1354870130
Body :
Demote all CAPS words by 80
Freq changed: модно 51 -> 20

Change-Id: I6f2d1c359d716535923b22c33d7fa4c3b0a330e4
2012-12-07 18:52:21 +09:00
Jean Chalard a424ff06ec Switch the AOSP word lists to the combined format.
This will help with managing the word lists.

Bug: 7388859
Change-Id: I89f049569b177d3027fe56d6c67eaca27d44dc7d
2012-10-31 18:52:00 +09:00