Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1b2e5f6

Browse files
balshetzerbalshetzer
committedDec 31, 2013
Merge branch 'master' of https://github.com/Zackrobat/plover into Zackrobat-master
Fixed some conflicts and removed a spurious print.
2 parents 34364c2 + 36461cf commit 1b2e5f6

15 files changed

+36664
-36652
lines changed
 

‎plover/assets/dict_number_decimal.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
"5/-P/4": "5.4"}

‎plover/assets/dict_number_fractions.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"HA*F": "1/2",
3+
"TPHA*F": "1/2",
4+
"TH*EURD": "1/3",
5+
"130EU": "1/3",
6+
"KWA*RT": "1/4",
7+
"140EU": "1/4",
8+
"10EU8": "1/8",
9+
"230EU": "2/3",
10+
"340EU": "3/4",
11+
"30EU8": "3/8",
12+
"50EU8": "5/8"}

‎plover/assets/dict_number_integers.json

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"OZ": "00",
3+
"#-Z": "00",
4+
"THUZ": "000",
5+
"10*EU": "01",
6+
"10EU": "01",
7+
"20EU": "02",
8+
"30EU": "03",
9+
"40EU": "04",
10+
"50EU": "05",
11+
"1-D": "11",
12+
"12EU": "21",
13+
"2-D": "22",
14+
"13EU": "31",
15+
"23EU": "32",
16+
"3-D": "33",
17+
"14EU": "41",
18+
"24EU": "42",
19+
"34EU": "43",
20+
"4-D": "44",
21+
"15EU": "51",
22+
"25*EU": "52",
23+
"25EU": "52",
24+
"35EU": "53",
25+
"45EU": "54",
26+
"5D": "55",
27+
"0EU6": "60",
28+
"1EU6": "61",
29+
"2EU6": "62",
30+
"3EU6": "63",
31+
"4EU6": "64",
32+
"5EU6": "65",
33+
"-6D": "66",
34+
"0EU7": "70",
35+
"1EU7": "71",
36+
"2EU7": "72",
37+
"3EU7": "73",
38+
"4EU7": "74",
39+
"5EU7": "75",
40+
"EU67": "76",
41+
"-7D": "77",
42+
"0EU8": "80",
43+
"1EU8": "81",
44+
"2EU8": "82",
45+
"3EU8": "83",
46+
"4EU8": "84",
47+
"5EU8": "85",
48+
"EU68": "86",
49+
"EU78": "87",
50+
"-8D": "88",
51+
"0EU9": "90",
52+
"1EU9": "91",
53+
"2EU9": "92",
54+
"3EU9": "93",
55+
"4EU9": "94",
56+
"5EU9": "95",
57+
"EU69": "96",
58+
"EU79": "97",
59+
"EU89": "98",
60+
"-9D": "99",
61+
"TPHUPBZ": "100",
62+
"1-Z": "100",
63+
"S-Z": "100",
64+
"2-Z": "200",
65+
"3-Z": "300",
66+
"4-Z": "400",
67+
"5Z": "500",
68+
"-6Z": "600",
69+
"-FZ": "600",
70+
"-7Z": "700",
71+
"-8Z": "800",
72+
"-9Z": "900",
73+
"EU9": "900",
74+
"TPHOUZ": "1,000",
75+
"1/THO*EUPB": "1,000",
76+
"1/THOEUB": "1,000",
77+
"1/THOUZ": "1000",
78+
"1-DZ/1": "1001",
79+
"19/OEUP": "1970",
80+
"19/8/6": "1986",
81+
"TWOUZ": "2000",
82+
"TWOUPBD": "2000",
83+
"STWOUPB/1": "2001",
84+
"TWOUPB/7": "2007",
85+
"TWOUPB/10": "2010"}

‎plover/assets/dict_number_money.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"1-9DZ": "$100",
3+
"1-DZ": "$100",
4+
"2-DZ": "$200",
5+
"3-DZ": "$300",
6+
"4-DZ": "$400",
7+
"5DZ": "$500",
8+
"-6DZ": "$600",
9+
"-7DZ": "$700"}

‎plover/assets/dict_number_percent.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
"10/PERS": "10%"}

‎plover/assets/dict_number_s.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"30*S": "30s",
3+
"30/-S": "30s",
4+
"40ES": "40s",
5+
"40S": "40s",
6+
"50S": "50s",
7+
"0EU7S": "70s",
8+
"0EU8S": "80s"}

‎plover/assets/dict_number_th.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"10/*PBT": "10th",
3+
"10/*T": "10th",
4+
"5/*T": "5th"}

‎plover/assets/dict_number_time.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"1-BG": "1:00",
3+
"2-BG": "2:00",
4+
"3-BG": "3:00",
5+
"4-BG": "4:00",
6+
"5BG": "5:00",
7+
"K-6": "6:00",
8+
"K-7": "7:00",
9+
"K-8": "8:00",
10+
"K-9": "9:00",
11+
"10BG": "10:00",
12+
"12-BG": "12:00"}

‎plover/assets/dict_number_x.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
"3/KP*/6": "3 x 6"}

0 commit comments

Comments
 (0)
Please sign in to comment.