Skip to content

Commit 697201e

Browse files
committed
Merge branch 'master' into 2.4_Lite
# Conflicts: # data/text/po/russian.po
2 parents 82d7102 + 850f047 commit 697201e

File tree

39 files changed

+20654
-25522
lines changed

39 files changed

+20654
-25522
lines changed

data/text/czech/cuts/tanker.sve

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE

data/text/english/cuts/tanker.sve

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE

data/text/french/cuts/tanker.sve

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE

data/text/german/cuts/tanker.sve

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE

data/text/italian/cuts/tanker.sve

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
220:Inscription on the mug: "If it ain't broke, don't fix it."
2+
295:PORT INNER
3+
335:FULL AHEAD
4+
420:
5+
1975:POSEIDON OIL IFF TRANSPONDER RECOGNIZED
6+
2020:DOCKING COMPLETE.
7+
2035:TARGET REACHED.
8+
2055:NAVCOMP DISENGAGED.
9+
2085:WELCOME TO THE ENCLAVE

0 commit comments

Comments
 (0)