NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 19:31:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
32230 commits 14 branches 0 tags 2.9 GiB
Commit graph

101 commits

Author SHA1 Message Date
lapatison
9137963247
Translate Upstream #2587 (#2588) 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
 2024-09-17 16:49:20 +02:00
Morb0
ca32f59044 Update locale 2024-09-12 11:35:18 +03:00
lzk
ff421c585c
Translate upstream #2504 #2511 (#2512) 
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
 2024-08-27 16:07:39 +02:00
lzk
3bfeec53ae
Translate Upstream #2498 (#2501) 
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
 2024-08-23 10:20:55 +03:00
Morb0
8c43b695cb Update locale 2024-08-19 10:15:41 +03:00
Morb0
5a59ce650b Update locale 2024-08-16 15:32:32 +03:00
lapatison
66591d52e0
Translate Upstream #2466 (#2478) 2024-08-12 18:20:41 +02:00
Morb0
84a13fb57d Update locale 2024-08-12 17:44:55 +03:00
Morb0
a16d31e096 Update locale 2024-08-08 02:20:30 +03:00
Morb0
fc70ff1ade Update locale 2024-06-21 18:56:39 +03:00
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
Morb0
211f301e4d Update locale 2024-06-14 22:54:50 +03:00
lapatison
49670b9041
Translate Upstream #2198 (#2210) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-06-05 20:30:14 +02:00
lapatison
6f142bd6f0
Translate Upstream #2173 (#2176) 2024-05-30 02:03:23 +03:00
lapatison
ffba7dfc04
Translate Upstream #2157 (#2158) 2024-05-24 16:33:52 +03:00
Morb0
eee242cba6 Update locale 2024-05-23 13:17:33 +03:00
lapatison
e90d3810ae
Translate Upstream #2088 (#2097) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-05-04 20:14:14 +03:00
Morb0
a9e6eed04f Merge branch 'master-syndie' into upstream-sync 
# Conflicts:
#	Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
#	Resources/Locale/ru-RU/preferences/loadout-groups.ftl
 2024-05-02 16:51:16 +03:00
lapatison
c551f9d929
Translate Upstream #2047 (#2084) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-05-01 00:45:56 +03:00
Morb0
02698d6e3c Update locale 2024-04-30 23:30:36 +03:00
Morb0
1a417e0b29 Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync 
# Conflicts:
#	Resources/Locale/ru-RU/game-ticking/game-presets/preset-pirates.ftl
#	Resources/Locale/ru-RU/reagents/meta/medicine.ftl
#	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
#	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
#	Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl
 2024-04-26 13:53:16 +03:00
Morb0
0cbc431d2f Update locale 2024-04-26 13:49:13 +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
a1fe34a0a0
Translate Upstream #2008 (#2009) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-04-04 10:19:57 +03:00
Morb0
838ff874f4 Update locale 2024-04-02 12:03:12 +03:00
lapatison
742539231b
Translate Upstream #1949 (#1951) 2024-03-11 12:57:35 +03:00
Morb0
f5e8409c73 Update locale 2024-03-11 08:46:27 +03:00
lapatison
caf8d2978f
Translate Upstream #1885 (#1887) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-02-23 02:39:19 +03:00
Morb0
0f7f420cbe Update locale 2024-02-22 13:37:51 +03:00
lapatison
1458ad8315
Translate Upstream #1869 (part 1) (#1871) 2024-02-15 11:07:31 +03:00
Morb0
a90d1000e5 Update locale 2024-02-12 13:07:26 +03:00
Morb0
a433857857 Update locale 2024-01-18 02:43:05 +03:00
Kot
e8993140c6
Word-wrap a translation line to improve UI (#1753) 2024-01-14 16:50:10 +03:00
lapatison
5e63c0d870
Translation Upstream #1712 (#1723) 2024-01-05 15:57:19 +03:00
Morb0
cafdfcefea Update locale 2024-01-03 01:29:46 +03:00
lzk
277e33fe20
Translate Upstream #1696 (#1701) 
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
 2023-12-30 20:12:41 +03:00
Morb0
8e958c25bb Update locale 2023-12-30 00:20:13 +03:00
lapatison
6cd6c6938a
Translate Upstream #1666 (#1667) 2023-12-23 13:13:03 +03:00
Morb0
203db7d98a Update locale 2023-12-23 03:04:09 +03:00
lapatison
038ddce0c8
Translate Upstream #1653 (#1656) 2023-12-21 01:40:04 +03:00
Morb0
f4fb336663 Update locale 2023-12-18 02:04:20 +03:00
lzk
ba29df26ea
Fix locale stuff (#1651) 2023-12-17 17:58:40 +03:00
lapatison
f854e52771
Translate Upstream #1645 (#1646) 
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
 2023-12-16 22:58:12 +03:00
Morb0
d481826393 Update locale 2023-12-16 16:08:04 +03:00
lapatison
9b294ecef6
Translate Upstream #1616 (#1618) 2023-12-08 17:21:02 +03:00
Morb0
81f07a94d2 Update locale 2023-12-08 16:04:09 +03:00
lapatison
6c17ce1039
Translate Upstream #1596 (#1611) 2023-12-07 13:45:04 +03:00