diff options
| author | webdesigner97 <Christian_D_97@gmx.de> | 2014-05-31 09:15:00 +0200 |
|---|---|---|
| committer | webdesigner97 <Christian_D_97@gmx.de> | 2014-05-31 09:15:00 +0200 |
| commit | 2f3b60cbfd21d08faeb0f651b2a58cc96e54a945 (patch) | |
| tree | aa93dd46828066614a25e57d77ce8fec65efb43c | |
| parent | 2edbd652e8826b9e45d541d44a4c5b8adc9dc5a2 (diff) | |
| parent | 01d5189998720497578a93c3ca70e97614d210e5 (diff) | |
| download | roads-2f3b60cbfd21d08faeb0f651b2a58cc96e54a945.tar roads-2f3b60cbfd21d08faeb0f651b2a58cc96e54a945.tar.gz roads-2f3b60cbfd21d08faeb0f651b2a58cc96e54a945.tar.bz2 roads-2f3b60cbfd21d08faeb0f651b2a58cc96e54a945.tar.xz roads-2f3b60cbfd21d08faeb0f651b2a58cc96e54a945.zip | |
merge conflicts
| -rw-r--r-- | streetsmod/locale/de.txt | 10 | ||||
| -rw-r--r-- | streetsmod/locale/template.txt.txt | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/streetsmod/locale/de.txt b/streetsmod/locale/de.txt index a0b77d3..57694d3 100644 --- a/streetsmod/locale/de.txt +++ b/streetsmod/locale/de.txt @@ -48,4 +48,12 @@ Concrete wall=Betonwand Concrete=Beton Trafficlight=Ampel Running version=Version -Load time=Ladezeit +Cheater=Schummler +Cheater!=Schummler! +Off=Aus +Channel=Kanal +green=Gruen +red=Rot +warn=Warnung +off=Aus +U cheater U=Du Schummler Du diff --git a/streetsmod/locale/template.txt.txt b/streetsmod/locale/template.txt.txt index 37299a5..179cc7d 100644 --- a/streetsmod/locale/template.txt.txt +++ b/streetsmod/locale/template.txt.txt @@ -48,4 +48,12 @@ Concrete wall= Concrete= Trafficlight= Running version= -Load time=
\ No newline at end of file +Cheater= +Cheater!= +Off= +Channel= +green= +red= +warn= +off= +U cheater U= |