mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-22 11:12:18 +00:00
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:
commit
49409ba8f1
1502 files changed
+180715
-47887
No files matched your search
@@ -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).
|
||||
Reference in new issue
Block a user