Commit graph

1409 commits

Author SHA1 Message Date
flower_elf
34e230ff25 Update zh-cn.json for setting pages.Also fix wrong translation 2024-05-04 21:20:16 +08:00
Frooxius
3202696dc1 Update stats 2024-05-04 13:22:31 +02:00
Tomas Mariancik
d3140eb8fd
Merge pull request #314 from shadowpanther/main
RU: Earmuffs, VSync, Texture quality
2024-05-04 13:05:45 +02:00
Tomas Mariancik
69778e071d
Merge pull request #315 from Muppeq/main
de: translated new settings, fixed earmuff ConeDistance key;  en: fixed typo
2024-05-04 13:05:18 +02:00
Tomas Mariancik
757f03e43f
Merge pull request #316 from jae1911/jae-settings-strings
FR: more strings
2024-05-04 13:04:51 +02:00
Muppeq
ed944a2a3d Merge branch 'main' of https://github.com/Yellow-Dog-Man/Locale into main
# Conflicts:
#	de.json

Fixed merge conflict.
2024-05-04 10:14:32 +02:00
flower_elf
6e379ac043 fix something 2024-05-04 14:29:36 +08:00
Jae Lo Presti
60cda9c5d1
Merge branch 'Yellow-Dog-Man:main' into jae-settings-strings 2024-05-04 03:57:10 +03:00
Shadow Panther
f31ef59a91 Merge commit '4cc50f41427f003f9ce437515c63797b09f0618a'
# Conflicts:
#	ru.json
2024-05-04 00:43:44 +02:00
flower_elf
779a83dbba Update zh-cn.json 2024-05-04 06:12:35 +08:00
flower_elf
f2a1a6bf83 Update cloud server status key 2024-05-04 06:09:00 +08:00
flower_elf
6e6380369b Update zh-cn.json 2024-05-04 06:07:52 +08:00
Tomas Mariancik
4cc50f4142
Merge pull request #313 from modimobeikete/main
zh-cn:Add more keys.
2024-05-03 22:27:38 +02:00
Tomas Mariancik
5a1aafa048
Merge branch 'main' into main 2024-05-03 22:27:11 +02:00
Tomas Mariancik
a9cda67dc2
Merge pull request #312 from Aesc3625/patch-4
Update ja.json
2024-05-03 22:26:27 +02:00
Tomas Mariancik
1b8da11021
Merge branch 'main' into patch-4 2024-05-03 22:26:07 +02:00
Tomas Mariancik
4a59a45284
Merge pull request #309 from mirpasec/main
KR:Notify, Earmuff, GamePad, Tracker
2024-05-03 22:25:01 +02:00
Tomas Mariancik
c698ca6dde
Merge pull request #305 from art0007i/main
use cleanJSON.py and add some strings to polish locale
2024-05-03 22:24:10 +02:00
Jae Lo Presti [j4]
aa7c2a6245
chore: add more translated strings 2024-05-03 18:52:30 +03:00
Muppeq
75dec40181
en: fixed typo 2024-05-03 17:44:15 +02:00
Muppeq
faca76d691
de: translated new settings, fixed earmuff key 2024-05-03 17:42:29 +02:00
Shadow Panther
56cf695f63 RU: Earmuffs, VSync, Texture quality 2024-05-03 15:58:34 +02:00
Aesc
158af7360d
Update ja.json 2024-05-03 19:46:53 +09:00
Aesc
5f05b466df
シンク -> 同期 2024-05-03 19:24:13 +09:00
modimobeikete
4825993a7c
Update zh-cn.json 2024-05-03 17:42:33 +08:00
modimobeikete
0c5558b4fd
Update zh-cn.json 2024-05-03 17:34:37 +08:00
modimobeikete
b0fde85a0f
Update zh-cn.json 2024-05-03 16:35:09 +08:00
modimobeikete
38f907f706
Update de.json 2024-05-03 16:33:34 +08:00
modimobeikete
c23e2c81b0
Update ru.json 2024-05-03 16:33:02 +08:00
modimobeikete
4f428043c9
Update zh-cn.json 2024-05-03 16:31:31 +08:00
modimobeikete
914f50a783
Update zh-cn.json 2024-05-03 16:30:29 +08:00
Gwang Sun Yun
b967742d1d
Change "EarmuffSettings.ConeDistance*" to "EarmuffSettings.Distance*" 2024-05-03 17:17:49 +09:00
Gwang Sun Yun
4a4a1040f2
Change "EarmuffSettings.ConeDistance*" to "EarmuffSettings.Distance*" 2024-05-03 17:17:18 +09:00
Aesc
1e1c389527
Update ja.json 2024-05-03 17:14:52 +09:00
Aesc
cb9dc8a117
Update ja.json 2024-05-03 17:12:55 +09:00
Gwang Sun Yun
04067691ce
Merge branch 'Yellow-Dog-Man:main' into main 2024-05-03 17:08:39 +09:00
Gwang Sun Yun
a13ea66804
KR:TextureQuality 2024-05-03 17:06:31 +09:00
Aesc
b6ba6604a7
fix invalid keys in de.json 2024-05-03 17:04:00 +09:00
Aesc
cc25bb9144
fix invalid keys in ru.json 2024-05-03 17:03:14 +09:00
Aesc
07a6042955
Update ja.json
More desktop settings
2024-05-03 17:00:25 +09:00
Frooxius
57c69d7827 Update stats 2024-05-03 09:49:16 +02:00
Tomas Mariancik
1f434dc2c6
Merge pull request #295 from shadowpanther/main
RU: Earmuffs, Steam rich presence, Steam Store texts, New settings and notifications
2024-05-03 09:46:21 +02:00
Tomas Mariancik
918d39e06f
Merge pull request #311 from Aesc3625/main
Update ja.json
2024-05-03 09:45:54 +02:00
Tomas Mariancik
cff3879483
Merge pull request #307 from modimobeikete/main
zh-cn:Add missing keys
2024-05-03 09:44:56 +02:00
Tomas Mariancik
9eb1e84e8a
Merge pull request #302 from Muppeq/main
de: translated earmuff strings
2024-05-03 09:44:10 +02:00
Frooxius
9a1d2f4829 More desktop settings 2024-05-03 09:42:30 +02:00
modimobeikete
1e61f1d7fe
Update fr.json 2024-05-03 15:42:06 +08:00
modimobeikete
5641eca51e
Update zh-cn.json 2024-05-03 15:39:54 +08:00
modimobeikete
2f6e8d407c
Update zh-cn.json 2024-05-03 15:38:34 +08:00
Gwang Sun Yun
cc716c1b54
Merge branch 'Yellow-Dog-Man:main' into main 2024-05-03 16:38:27 +09:00