Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pfau/update_german_translation' into 'master'

Browse Source 
update german translation

See merge request veloren/veloren!1038
This commit is contained in:
Monty Marz 2020-06-03 19:32:55 +00:00
commit 3cffdac6fd
18 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/items/apple.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 20,
cause: Item,
)),
amount: 20,
)),
),
)

1
assets/common/items/boss_drops/potions.ron
View File

@ -7,6 +7,5 @@ Item(
amount: 100,
cause: Item,
)),
amount: 10,
),
)

3
assets/common/items/cheese.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 15,
cause: Item,
)),
amount: 20,
)),
),
)

3
assets/common/items/coconut.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 30,
cause: Item,
)),
amount: 20,
)),
),
)

3
assets/common/items/mushroom.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 10,
cause: Item,
)),
amount: 40,
)),
),
)

2
assets/common/items/potion_big.ron
View File

@ -7,6 +7,6 @@ Item(
amount: 100,
cause: Item,
)),
amount: 10,
,
),
)

3
assets/common/items/potion_med.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 70,
cause: Item,
)),
amount: 10,
)),
),
)

3
assets/common/items/potion_minor.ron
View File

@ -6,7 +6,6 @@ Item(
effect: Health((
amount: 50,
cause: Item,
)),
amount: 10,
)),
),
)

3
assets/common/items/velorite.ron
View File

@ -4,6 +4,5 @@ Item(
kind: Consumable(
kind: Velorite,
effect: Xp(20),
),
amount: 10,
),
)

3
assets/common/items/veloritefrag.ron
View File

@ -4,6 +4,5 @@ Item(
kind: Consumable(
kind: VeloriteFrag,
effect: Xp(10),
),
amount: 20,
),
)

16
assets/voxygen/i18n/de_DE.ron
View File

@ -194,17 +194,17 @@ um dieses Fenster zu schließen? Drückt 'TAB'!
Viel Spaß in der Welt von Veloren, Abenteurer!"#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!
"hud.temp_quest_headline": r#"Bitte helft uns, Reisender!"#,
"hud.temp_quest_text": r#"Höhlen voller böser Kultisten sind überall
um unsere Dörfer herum aufgetaucht!
Gather some company, stack up on food
and defeat their vile leaders and acolytes.
Versammelt einige Kämpfer, sucht etwas
Nahrung und besiegt ihre abscheulichen
Anführer und Akolyten.
Maybe you can even obtain one of their
magically infused items?"#,
Vielleicht könnt ihr sogar einen ihrer
magischen Gegenstände ergattern?"#,
// Inventory
"hud.bag.inventory": "{playername}s Inventar",

2
assets/voxygen/i18n/en.ron
View File

@ -190,7 +190,7 @@ Want to free your cursor to close this window? Press TAB!
Enjoy your stay in the World of Veloren."#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

2
assets/voxygen/i18n/fr_FR.ron
View File

@ -153,7 +153,7 @@ Vous souhaitez libérer votre souris pour fermer cette fenêtre? Tapez sur TAB!
Profitez de votre séjour dans le monde de Veloren."#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

2
assets/voxygen/i18n/it_IT.ron
View File

@ -280,7 +280,7 @@ Vuoi sbloccare il cursore per chiudere questa finestra? Premi TAB!
Goditi il tuo soggiorno nel Mondo di Veloren."#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

2
assets/voxygen/i18n/pt_PT.ron
View File

@ -182,7 +182,7 @@ Quer libertar o mouse para fechar esta janela? Clique em TAB!
Aprecie a sua estadia no mundo de Veloren."#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

2
assets/voxygen/i18n/ru_RU.ron
View File

@ -179,7 +179,7 @@ https://account.veloren.net."#,
Наслаждайтесь миром Veloren."#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

2
assets/voxygen/i18n/tr_TR.ron
View File

@ -191,7 +191,7 @@ Bu pencereyi kapatmak için imlecini serbest bırakmak mı istiyorsun? TAB'a bas
Veloren'in Dünyasında sana iyi eğlenceler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveler!"#,
"hud.temp_quest_headline": r#"Please, help us Traveller!"#,
"hud.temp_quest_text": r#"Dungeons filled with evil cultists
have emerged all around our peaceful towns!

6
voxygen/src/hud/mod.rs
View File

@ -1155,7 +1155,7 @@ impl Hud {
.label_font_id(self.fonts.cyri.conrod_id)
.label_font_size(self.fonts.cyri.scale(22))
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(1.0))
.label_y(conrod_core::position::Relative::Scalar(2.0))
.set(self.ids.accept_button, ui_widgets)
.was_clicked()
{
@ -1165,7 +1165,9 @@ impl Hud {
}
}
},
Intro::Never => {},
Intro::Never => {
self.show.intro = false;
},
}
}