Merge main into german/i18n-plurals-context

The catalogs conflicted only on neighbouring lines: no key changed on both
sides, so they are merged key by key in main's order. Main removed the rail
timeline, the other user of plain "Latest", so that entry is pruned and the
News test no longer checks the timeline's wording.
This commit is contained in:
German Khokhlov committed 2026-11-16 16:58:37 +04:00
commit 49409ba8f1
1502 files changed
+180715 -47887

No files matched your search

+3 -3
View File
@@ -2,6 +2,6 @@
Data Library list, the News time window, the GhostMaps event age and the
bridge radar range now read "1 Tag" and "7 Tage", «0,75 МОР. МИЛИ» and
«12 МОР. МИЛЬ». Street level words "the view centre" in each language's
grammar, and Latest, FOCUS, CONFIRMED and the course readout each have
their own translation where one word served two places (German, @gekh,
#1700).
grammar, the News heading Latest agrees with the news it heads, and FOCUS,
CONFIRMED and the course readout each have their own translation where one
word served two places (German, @gekh, #1700).