Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Фикс неправильно переведённой зоны #1165

Closed
wants to merge 493 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
493 commits
Select commit Hold shift + click to select a range
5931045
Merge branch 'master' into translate
actions-user Dec 8, 2023
a5f9212
Merge branch 'master' into translate
actions-user Dec 8, 2023
8b216fd
Merge branch 'master' into translate
actions-user Dec 9, 2023
fbe7c7a
Merge branch 'master' into translate
actions-user Dec 9, 2023
d971d74
Merge branch 'master' into translate
actions-user Dec 9, 2023
e695c32
Merge branch 'master' into translate
actions-user Dec 10, 2023
388f186
Merge branch 'master' into translate
actions-user Dec 10, 2023
d1b53b5
Merge branch 'master' into translate
actions-user Dec 11, 2023
3464950
Merge branch 'master' into translate
actions-user Dec 11, 2023
32dbf2b
Merge branch 'master' into translate
actions-user Dec 11, 2023
b3f779d
Merge branch 'master' into translate
actions-user Dec 11, 2023
b25c15b
Merge branch 'master' into translate
actions-user Dec 11, 2023
8a1d2b7
Merge branch 'master' into translate
actions-user Dec 13, 2023
38ad97f
Merge branch 'master' into translate
actions-user Dec 14, 2023
25db66d
Merge branch 'master' into translate
actions-user Dec 14, 2023
40dfa51
Merge branch 'master' into translate
actions-user Dec 14, 2023
0d4d01c
Merge branch 'master' into translate
actions-user Dec 14, 2023
0467c95
Merge branch 'master' into translate
actions-user Dec 14, 2023
2e6d5b8
Merge branch 'master' into translate
actions-user Dec 14, 2023
5d56576
Merge branch 'master' into translate
actions-user Dec 14, 2023
916efdc
Merge branch 'master' into translate
actions-user Dec 15, 2023
ed9c1b3
Merge branch 'master' into translate
actions-user Dec 15, 2023
7e25a8f
Merge branch 'master' into translate
actions-user Dec 15, 2023
e301ac1
Merge branch 'master' into translate
actions-user Dec 15, 2023
64f1237
Merge branch 'master' into translate
actions-user Dec 16, 2023
b1b2267
Merge branch 'master' into translate
actions-user Dec 16, 2023
ba898bf
Merge branch 'master' into translate
actions-user Dec 18, 2023
8c43f57
Merge branch 'master' into translate
actions-user Dec 18, 2023
b92b04d
Merge branch 'master' into translate
actions-user Dec 18, 2023
aa793f6
Merge branch 'master' into translate
actions-user Dec 18, 2023
deb5b80
Translate species info in character preferences menu (#852)
dj-34 Dec 18, 2023
db5e46c
Merge branch 'master' into translate
actions-user Dec 18, 2023
a53719b
Merge branch 'master' into translate
actions-user Dec 19, 2023
8b33ded
Merge branch 'master' into translate
actions-user Dec 20, 2023
5c3c578
Merge branch 'master' into translate
actions-user Dec 24, 2023
4f4fa4c
Merge branch 'master' into translate
actions-user Dec 25, 2023
c479768
Merge branch 'master' into translate
actions-user Dec 25, 2023
e7c933c
Merge branch 'master' into translate
actions-user Dec 25, 2023
92936b1
Merge branch 'master' into translate
actions-user Dec 26, 2023
12c42bf
Merge branch 'master' into translate
actions-user Dec 26, 2023
f674f57
Merge branch 'master' into translate
actions-user Dec 26, 2023
c32dabf
Merge branch 'master' into translate
actions-user Dec 29, 2023
62b0f42
Merge branch 'master' into translate
actions-user Dec 29, 2023
f53fd46
Merge branch 'master' into translate
actions-user Dec 30, 2023
dd73357
Merge branch 'master' into translate
actions-user Jan 2, 2024
751c2a4
Merge branch 'master' into translate
actions-user Jan 4, 2024
b3329d8
Merge branch 'master' into translate
actions-user Jan 4, 2024
d0d3b72
Merge branch 'master' into translate
Legendaxe Jan 5, 2024
2259367
Merge branch 'master' into translate
Legendaxe Jan 7, 2024
051752e
Merge branch 'master' into translate
actions-user Jan 8, 2024
17bc71c
Merge branch 'master' into translate
actions-user Jan 9, 2024
fe5bb9c
Merge branch 'master' into translate
actions-user Jan 9, 2024
a0e0f74
Merge branch 'master' into translate
actions-user Jan 10, 2024
d43f126
Merge branch 'master' into translate
actions-user Jan 14, 2024
2c7b9f7
Merge branch 'master' into translate
actions-user Jan 14, 2024
ded187e
Merge branch 'master' into translate
actions-user Jan 14, 2024
93e8847
Merge branch 'master' into translate
Legendaxe Jan 14, 2024
073fd76
Merge branch 'translate' of https://github.com/ss220club/Paradise-SS2…
Legendaxe Jan 14, 2024
96b2c88
Feat: Translate all(?) major and minor annoucement (#903)
dj-34 Jan 15, 2024
b8765c3
Merge branch 'master' into translate
actions-user Jan 15, 2024
2b7fd1f
Merge branch 'master' into translate
actions-user Jan 15, 2024
e9346dc
Merge branch 'master' into translate
actions-user Jan 15, 2024
c4fc243
Merge branch 'master' into translate
actions-user Jan 16, 2024
1d043f0
Translate: Перевод ИИ. (#856)
VERG-SS220 Jan 17, 2024
764bfa4
Merge branch 'master' into translate
actions-user Jan 17, 2024
776cfd5
Merge branch 'master' into translate
actions-user Jan 17, 2024
9bba6a0
Merge branch 'master' into translate
actions-user Jan 18, 2024
3eb4852
Merge branch 'master' into translate
actions-user Jan 18, 2024
195ce0c
Merge branch 'master' into translate
actions-user Jan 19, 2024
7cbef5b
Merge branch 'master' into translate
actions-user Jan 21, 2024
c77d9a9
Merge branch 'master' into translate
Legendaxe Jan 22, 2024
2130d77
Translate: Bots and fixes of my previous translations (#921)
dj-34 Jan 22, 2024
220d0c9
Merge branch 'master' into translate
Legendaxe Jan 22, 2024
2b12a1d
Merge branch 'master' into translate
actions-user Jan 23, 2024
67cddd8
Merge branch 'master' into translate
actions-user Jan 23, 2024
7c41ccf
Merge branch 'master' into translate
actions-user Jan 23, 2024
f5f673f
Merge branch 'master' into translate
actions-user Jan 23, 2024
d7ea447
Merge branch 'master' into translate
actions-user Jan 24, 2024
71d9759
Merge branch 'master' into translate
actions-user Jan 24, 2024
e0a1e79
Merge branch 'master' into translate
actions-user Jan 24, 2024
a0f10f2
Merge branch 'master' into translate
actions-user Jan 25, 2024
ef0b62d
Merge branch 'master' into translate
actions-user Jan 26, 2024
147acdd
Merge branch 'master' into translate
actions-user Jan 27, 2024
de8fb3c
Merge branch 'master' into translate
actions-user Jan 28, 2024
ea87c42
Merge branch 'master' into translate
actions-user Jan 28, 2024
b959afa
Merge branch 'master' into translate
actions-user Jan 28, 2024
9b7340c
Add emote translations to [translate] (#953)
m-dzianishchyts Jan 29, 2024
0cecf93
Merge branch 'master' into translate
actions-user Jan 29, 2024
46269f9
Merge branch 'master' into translate
actions-user Jan 29, 2024
8d14dc6
Merge branch 'master' into translate
actions-user Jan 29, 2024
25a88df
Merge branch 'master' into translate
actions-user Jan 29, 2024
d70dafd
Merge branch 'master' into translate
actions-user Jan 29, 2024
dde4119
Translate: most of atom_say and autosay (#937)
dj-34 Jan 29, 2024
a49eafb
Merge branch 'master' into translate
Legendaxe Jan 29, 2024
f0196ef
Merge branch 'master' into translate
actions-user Jan 29, 2024
4da09c2
Merge branch 'master' into translate
actions-user Jan 29, 2024
2c00636
fix: make choosing voice by borg possible again (#963)
Gaxeer Jan 31, 2024
4f0842e
Revert "fix: make choosing voice by borg possible again" (#975)
Legendaxe Jan 31, 2024
c86cc74
Merge branch 'master' into translate
actions-user Jan 31, 2024
7ed2e48
Merge branch 'master' into translate
actions-user Jan 31, 2024
e568be0
Merge branch 'master' into translate
actions-user Jan 31, 2024
eea3d45
Merge branch 'master' into translate
actions-user Jan 31, 2024
f4069bb
Merge branch 'master' into translate
actions-user Jan 31, 2024
f3161ca
Merge branch 'master' into translate
actions-user Feb 1, 2024
b28afa7
Merge branch 'master' into translate
actions-user Feb 1, 2024
314bfcb
Merge branch 'master' into translate
actions-user Feb 3, 2024
5d5d690
Merge branch 'master' into translate
actions-user Feb 3, 2024
04742cf
Merge branch 'master' into translate
actions-user Feb 3, 2024
52d0122
Merge branch 'master' into translate
actions-user Feb 4, 2024
b3de519
Merge branch 'master' into translate
actions-user Feb 4, 2024
712b20f
kerboros->kerberos typo small fix (#992)
Rerik007 Feb 6, 2024
84d6d16
Merge branch 'master' into translate
Legendaxe Feb 6, 2024
32623f7
Merge branch 'master' into translate
actions-user Feb 7, 2024
8dc39fc
Merge branch 'master' into translate
actions-user Feb 7, 2024
73429e3
Merge branch 'master' into translate
actions-user Feb 7, 2024
9123acc
Translate areas (#913)
Kar4es Feb 7, 2024
d72dae5
Merge branch 'master' into translate
actions-user Feb 7, 2024
c810167
Merge branch 'master' into translate
actions-user Feb 7, 2024
5bfc96a
Merge branch 'master' into translate
actions-user Feb 8, 2024
a4ea269
Merge branch 'master' into translate
actions-user Feb 8, 2024
140b48e
Merge branch 'master' into translate
actions-user Feb 8, 2024
97d7205
Merge branch 'master' into translate
actions-user Feb 8, 2024
8f5fd07
Merge branch 'master' into translate
actions-user Feb 9, 2024
400027a
Merge branch 'master' into translate
actions-user Feb 9, 2024
8ec43d5
Merge branch 'master' into translate
actions-user Feb 9, 2024
69c1107
Merge branch 'master' into translate
actions-user Feb 9, 2024
b0e4e94
Merge branch 'master' into translate
actions-user Feb 9, 2024
9d77b0a
Merge branch 'master' into translate
actions-user Feb 9, 2024
bd32574
Merge branch 'master' into translate
actions-user Feb 10, 2024
29ce40b
Merge branch 'master' into translate
actions-user Feb 10, 2024
57bd191
Merge branch 'master' into translate
actions-user Feb 10, 2024
6815d3b
Merge branch 'master' into translate
actions-user Feb 13, 2024
0310a49
Merge branch 'master' into translate
actions-user Feb 13, 2024
c1e9b09
Merge branch 'master' into translate
actions-user Feb 13, 2024
e34df16
Merge branch 'master' into translate
actions-user Feb 15, 2024
a9f5774
Merge branch 'master' into translate
Legendaxe Feb 15, 2024
b82f1f2
Merge branch 'master' into translate
actions-user Feb 15, 2024
7cf3ba9
Merge branch 'master' into translate
actions-user Feb 15, 2024
c543aac
Merge branch 'master' into translate
actions-user Feb 15, 2024
10b38b8
Merge branch 'master' into translate
actions-user Feb 15, 2024
b0eebe2
Merge branch 'master' into translate
actions-user Feb 15, 2024
c6d6953
Merge branch 'master' into translate
actions-user Feb 16, 2024
3b5111a
Merge branch 'master' into translate
actions-user Feb 16, 2024
9b80e1c
Merge branch 'master' into translate
actions-user Feb 16, 2024
c83b952
Merge branch 'master' into translate
actions-user Feb 17, 2024
5c21648
Merge branch 'master' into translate
actions-user Feb 17, 2024
a8ae819
Merge branch 'master' into translate
actions-user Feb 17, 2024
44fa7d3
Merge branch 'master' into translate
Legendaxe Feb 19, 2024
a17ed67
fix typo
Legendaxe Feb 19, 2024
ecc589b
Merge branch 'master' into translate
actions-user Feb 19, 2024
dc8d686
Merge branch 'master' into translate
Legendaxe Feb 20, 2024
f4a2453
Merge branch 'master' into translate
actions-user Feb 22, 2024
a6f15fe
Merge branch 'master' into translate
actions-user Feb 23, 2024
4cd8c95
Merge branch 'master' into translate
actions-user Feb 23, 2024
4e3d404
Merge branch 'master' into translate
actions-user Feb 23, 2024
97ba2d6
Merge branch 'master' into translate
actions-user Feb 23, 2024
ca373aa
Merge branch 'master' into translate
actions-user Feb 23, 2024
2ff2e76
Merge branch 'master' into translate
Legendaxe Feb 25, 2024
8b11a3d
Merge branch 'master' into translate
actions-user Feb 27, 2024
930775a
Merge branch 'master' into translate
actions-user Feb 27, 2024
8aa0885
Merge branch 'master' into translate
actions-user Feb 27, 2024
7b9704e
Merge branch 'master' into translate
Legendaxe Feb 28, 2024
0b3f393
Merge branch 'master' into translate
actions-user Feb 28, 2024
174f6d8
Merge branch 'master' into translate
actions-user Feb 28, 2024
11e4064
Merge branch 'master' into translate
actions-user Feb 28, 2024
2461b4f
Merge branch 'master' into translate
actions-user Feb 28, 2024
fdda96b
Merge branch 'master' into translate
actions-user Feb 29, 2024
ecd3fee
Merge branch 'master' into translate
actions-user Mar 1, 2024
a7273f1
Merge branch 'master' into translate
actions-user Mar 1, 2024
63f74c5
Merge branch 'master' into translate
Legendaxe Mar 4, 2024
e4cd7e7
Merge branch 'master' into translate
actions-user Mar 5, 2024
568ec5d
Merge branch 'master' into translate
actions-user Mar 6, 2024
37e12bf
Merge branch 'master' into translate
actions-user Mar 6, 2024
8b1b342
Merge branch 'master' into translate
actions-user Mar 6, 2024
85779cd
Merge branch 'master' into translate
actions-user Mar 6, 2024
e36cd1c
Merge branch 'master' into translate
actions-user Mar 7, 2024
467df8d
Merge branch 'master' into translate
actions-user Mar 7, 2024
ba5fb45
Merge branch 'master' into translate
Legendaxe Mar 8, 2024
d93e2d4
Merge branch 'master' into translate
actions-user Mar 8, 2024
71c2487
Merge branch 'master' into translate
actions-user Mar 8, 2024
0e08d56
Merge branch 'master' into translate
actions-user Mar 8, 2024
bb01cbb
Merge branch 'master' into translate
actions-user Mar 10, 2024
da15c4b
Merge branch 'master' into translate
actions-user Mar 10, 2024
5863164
Merge branch 'master' into translate
actions-user Mar 10, 2024
0bf3d3d
Merge branch 'master' into translate
actions-user Mar 10, 2024
ff1f01a
Merge branch 'master' into translate
Legendaxe Mar 10, 2024
e0f64d7
Merge branch 'master' into translate
actions-user Mar 11, 2024
c22063c
Merge branch 'master' into translate
actions-user Mar 11, 2024
1933773
Merge branch 'master' into translate
actions-user Mar 11, 2024
b6dfd40
Merge branch 'master' into translate
actions-user Mar 11, 2024
942e18c
Merge branch 'master' into translate
actions-user Mar 11, 2024
d155ff4
Merge branch 'master' into translate
actions-user Mar 11, 2024
d7f19df
Merge branch 'master' into translate
actions-user Mar 11, 2024
04702ed
Merge branch 'master' into translate
actions-user Mar 11, 2024
0bd4181
Merge branch 'master' into translate
actions-user Mar 11, 2024
3295545
Merge branch 'master' into translate
actions-user Mar 11, 2024
2c02315
Merge branch 'master' into translate
actions-user Mar 11, 2024
4bf8455
Merge branch 'master' into translate
actions-user Mar 12, 2024
261aae6
Merge branch 'master' into translate
Legendaxe Mar 12, 2024
7d4e11a
Merge branch 'master' into translate
actions-user Mar 12, 2024
017bc22
Merge branch 'master' into translate
actions-user Mar 12, 2024
d6cb7bd
Merge branch 'master' into translate
actions-user Mar 12, 2024
fbbf88f
Merge branch 'master' into translate
actions-user Mar 12, 2024
047cc0e
Merge branch 'master' into translate
actions-user Mar 12, 2024
18da2b7
Merge branch 'master' into translate
actions-user Mar 14, 2024
fe017de
Merge branch 'master' into translate
actions-user Mar 14, 2024
15b6c80
Merge branch 'master' into translate
actions-user Mar 14, 2024
b65d340
Перевод консоли запросов (#1096)
VERG-SS220 Mar 15, 2024
efd292e
Merge branch 'master' into translate
actions-user Mar 16, 2024
1108252
Merge branch 'master' into translate
actions-user Mar 16, 2024
c490e3c
Merge branch 'master' into translate
actions-user Mar 17, 2024
ff7c923
Merge branch 'master' into translate
Legendaxe Mar 17, 2024
ca24764
Merge branch 'master' into translate
actions-user Mar 17, 2024
0504563
Merge branch 'master' into translate
Legendaxe Mar 17, 2024
1f4f24c
Merge branch 'master' into translate
actions-user Mar 17, 2024
737ff8d
Merge branch 'master' into translate
actions-user Mar 17, 2024
43037e4
Merge branch 'master' into translate
actions-user Mar 18, 2024
c42a275
Merge branch 'master' into translate
Legendaxe Mar 19, 2024
3fb4c9c
Merge branch 'master' into translate
actions-user Mar 20, 2024
aea8c65
Merge branch 'master' into translate
Legendaxe Mar 21, 2024
a79d396
Merge branch 'master' into translate
actions-user Mar 22, 2024
8e7ca7c
Merge branch 'master' into translate
actions-user Mar 23, 2024
7ad7d40
Merge branch 'master' into translate
actions-user Mar 24, 2024
92bb77a
Merge branch 'master' into translate
actions-user Mar 24, 2024
2b3b6cd
Merge branch 'master' into translate
actions-user Mar 24, 2024
6735dc4
Merge branch 'master' into translate
actions-user Mar 25, 2024
06c1406
Merge branch 'master' into translate
actions-user Mar 25, 2024
a1ab4f1
Merge branch 'master' into translate
Legendaxe Mar 26, 2024
6b4efcb
Merge branch 'master' into translate
actions-user Mar 26, 2024
95825fd
Merge branch 'master' into translate
actions-user Mar 26, 2024
d5245e7
Merge branch 'master' into translate
actions-user Mar 26, 2024
b451959
Merge branch 'master' into translate
actions-user Mar 27, 2024
1ebe1f2
Merge branch 'master' into translate
actions-user Mar 29, 2024
9394c34
Merge branch 'master' into translate
actions-user Mar 29, 2024
9bb5d5b
Merge branch 'master' into translate
actions-user Mar 30, 2024
e3dcf40
Merge branch 'master' into translate
actions-user Apr 2, 2024
06262be
Merge branch 'master' into translate
actions-user Apr 2, 2024
8a950b5
Merge branch 'master' into translate
actions-user Apr 3, 2024
a052b43
Merge branch 'master' into translate
Legendaxe Apr 3, 2024
c31079c
Merge branch 'master' into translate
actions-user Apr 4, 2024
a63f369
Merge branch 'master' into translate
actions-user Apr 4, 2024
4e936b3
Merge branch 'master' into translate
actions-user Apr 4, 2024
d89d378
Перевод ментор и админ тикетов (#1156)
AyIong Apr 6, 2024
33b1212
Merge branch 'master' into translate
actions-user Apr 6, 2024
4238900
Merge branch 'master' into translate
actions-user Apr 6, 2024
f7203b8
Merge branch 'master' into translate
actions-user Apr 6, 2024
440d42e
Merge branch 'master' into translate
Legendaxe Apr 7, 2024
7e020c7
Merge branch 'master' into translate
actions-user Apr 7, 2024
10c780d
Фикс неправильно переведённой зоны
AyIong Apr 8, 2024
81fae06
Merge branch 'uhhhh' of https://github.com/AyIong/Paradise-SS220 into…
AyIong Apr 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into translate
  • Loading branch information
actions-user committed Dec 14, 2023
commit 25db66d8c90d256bbd4a1e889e0c4f7d6d024355

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.