German translations

Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
This commit is contained in:
simon84 2015-04-16 22:52:49 +02:00
parent cc75928cc0
commit e7f9bc09df
2 changed files with 0 additions and 6 deletions

View File

@ -1353,7 +1353,6 @@
<Spanish>Suturando</Spanish>
<German>Nähen</German>
<French>Sutures</French>
<Spanish>Suturando</Spanish>
<Polish>Szycie</Polish>
<Hungarian>Összevarrás</Hungarian>
<Italian>Suturando</Italian>
@ -1364,7 +1363,6 @@
<Spanish>Estás intubando a %1</Spanish>
<German>Du behandelst den Atemweg von %1</German>
<French>Vous traitez les voies respiratoires de %1</French>
<Spanish>Estás intubando a %1</Spanish>
<Polish>Udrażniasz drogi oddechowe %1</Polish>
<Hungarian>Kezeled %1 légútját</Hungarian>
<Italian>Controlli le vie respiratorie di %1</Italian>

View File

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<!-- Edited with tabler. -->
=======
>>>>>>> acemod/master
<Project name="ACE">
<Package name="WindDeflection">
<Container ID="Weather_Meter">