Commit graph

12 commits

Author SHA1 Message Date
lapatison
1854db61fc
Translate Upstream #2280 (#2281) 2024-06-18 01:28:18 +02:00
Morb0
b7a17507bb Merge branch 'refs/heads/master-syndie' into upstream-sync
# Conflicts:
#	Resources/Locale/ru-RU/borg/borg.ftl
#	Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
#	Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl
#	Resources/Locale/ru-RU/preferences/loadout-groups.ftl
#	Resources/Locale/ru-RU/station-events/events/meteor-swarm.ftl
2024-06-18 01:13:20 +03:00
lapatison
6a08a3e6b0
Translate Upstream #2256 (#2267)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-06-18 00:01:36 +02:00
Morb0
733180931e Update locale 2024-06-18 00:23:14 +03:00
lapatison
dc6f667e18
Translate Upstream #2114 (#2116) 2024-05-12 00:53:50 +03:00
Morb0
a6110dcea6 Update locale 2024-05-09 14:01:06 +03:00
mhamster
9ffc1eb2ea
[Locale] Ё (#2051)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-04-23 06:56:23 +03:00
lapatison
90f3195678
Translate Upstream #1328 (#1335) 2023-08-14 23:29:21 +03:00
Morb0
74d25ef671 Update locale 2023-08-14 03:29:32 +03:00
lzk
64979ee1e0
Translation fixes (#1325) 2023-08-14 01:09:00 +03:00
lapatison
0fc439d88e
Translate Upstream #1322 (#1324) 2023-08-14 00:03:19 +03:00
Morb0
4aa0869911 Update locale 2023-08-13 05:47:46 +03:00