Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
webdesigner97 authored and webdesigner97 committed May 31, 2014
2 parents 2edbd65 + 01d5189 commit 2f3b60c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
10 changes: 9 additions & 1 deletion streetsmod/locale/de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 9 additions & 1 deletion streetsmod/locale/template.txt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,12 @@ Concrete wall=
Concrete=
Trafficlight=
Running version=
Load time=
Cheater=
Cheater!=
Off=
Channel=
green=
red=
warn=
off=
U cheater U=

0 comments on commit 2f3b60c

Please sign in to comment.