Commit graph

135 commits

Author SHA1 Message Date
lapatison
ac59a66e15
Translate Upstream #2640 (#2641)
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
2024-10-05 12:00:52 +02:00
Morb0
46dfad9b4a Update locale 2024-10-04 20:28:43 +03:00
lzk
20f3ceb46b
Additional Translate #2580 (#2611)
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-09-24 16:26:34 +02:00
lapatison
df9d6553b9
Partially Translate Upstream #2580 (#2586)
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-09-17 17:09:35 +02:00
Morb0
c188a25662 Update locale 2024-09-11 11:28:16 +03:00
lapatison
749b7d7a4a
Translate Upstream #2556 (#2557)
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
2024-09-04 01:10:07 +02: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
Morb0
53a5f91801 Update locale 2024-08-23 10:14:14 +03:00
lapatison
f894d4dd6d
Translate Upstream #2446 (#2451)
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-08-04 00:55:50 +02:00
Morb0
c2b5a1315c Update locale 2024-08-02 12:32:07 +03:00
lapatison
2f507f27cc
Translate Upstream #2426 (#2430)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-22 07:19:41 +02:00
Morb0
ad11a22766 Update locale 2024-07-21 07:47:45 +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
8fb1b54c44
Locale tweaks (#2217) 2024-06-06 21:38:00 +02: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
3762b3cdad
Translate Upstream #2133 (#2138) 2024-05-18 02:56:09 +03:00
Morb0
96440f88c1 Update locale 2024-05-15 20:07:30 +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
496db0a687 Update locale 2024-04-27 15:27:55 +03:00
Morb0
f145f3d26f Update locale 2024-04-27 13:46:05 +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
7c189fe116
Translate Upstream #1993 (#1994) 2024-03-28 02:04:33 +03:00
Morb0
a45c5db60a Update locale 2024-03-27 01:32:00 +03:00
Ed
cec88aef03
IC contraband and staff knowledge of the items (#1767)
Co-authored-by: Kit0vras <123590995+Kit0vras@users.noreply.github.com>
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2024-03-21 00:57:25 +03:00
lapatison
bb3b33118d
Translate Upstream #1969 (#1971) 2024-03-19 22:07:30 +03:00
Morb0
b12b5af0c7 Update locale 2024-03-17 14:58:13 +03:00
lapatison
f873c7732d
Translate Upstream #1957 (#1959) 2024-03-14 12:55:50 +03:00
Morb0
d0528cbb42 Update locale 2024-03-13 17:18:30 +03:00
lapatison
394fda3eec
Translate Upstream #1924 (#1936)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-03-09 23:04:47 +03:00
Morb0
7a8e3e1e24 Update locale 2024-03-09 01:49:45 +03:00
lapatison
507a5b9ee0
Translate Upstream #1907 (#1908) 2024-03-01 19:38:49 +03:00
Morb0
2f1f6f41e7 Generate locale 2024-02-29 12:51:46 +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
lapatison
b11fb1deb6
Translate Upstream #1787 (#1790) 2024-01-21 15:17:52 +03:00
lapatison
2337dac5cd
Translate Upstream #1764 (#1765) 2024-01-16 00:25:45 +03:00
Morb0
d89306bc6c Update locale 2024-01-15 02:57:26 +03:00
lapatison
ad3ad3f3ae
Translate Upstream #1743 (#1745)
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-14 16:51:34 +03:00