Skip to content
Snippets Groups Projects
Commit c0f1555c authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch...

Merge branch '573-maps-fokus-name-enthalt-html-in-englischer-und-franzosischer-version' into 'development'

Resolve "Maps-Fokus-Name enthält html in englischer und französischer Version"

Closes #573

See merge request !1020
parents c828edef 1e122d5e
No related branches found
No related tags found
2 merge requests!1023Development,!1020Resolve "Maps-Fokus-Name enthält html in englischer und französischer Version"
...@@ -7,7 +7,7 @@ return [ ...@@ -7,7 +7,7 @@ return [
"foki.wissenschaft" => "Science", "foki.wissenschaft" => "Science",
"foki.produkte" => "Shopping", "foki.produkte" => "Shopping",
"foki.angepasst" => "Customized", "foki.angepasst" => "Customized",
"foki.maps" => "maps.metager.de <span class=\"badge new-feature\">new</span>", "foki.maps" => "maps.metager.de",
"design" => "select personal theme", "design" => "select personal theme",
"conveyor" => "Purchase at affiliate shops", "conveyor" => "Purchase at affiliate shops",
"partnertitle" => "Support MetaGer without any costs to you", "partnertitle" => "Support MetaGer without any costs to you",
......
...@@ -7,7 +7,7 @@ return [ ...@@ -7,7 +7,7 @@ return [
"foki.wissenschaft" => "Sciènces", "foki.wissenschaft" => "Sciènces",
"foki.produkte" => "Produits", "foki.produkte" => "Produits",
"foki.angepasst" => "ajusté(e)", "foki.angepasst" => "ajusté(e)",
"foki.maps" => "Maps.metager.de <span class=\"badge new-feature\">Nouveau</span>", "foki.maps" => "Maps.metager.de",
"design" => "Choisir un design personnel", "design" => "Choisir un design personnel",
"partnertitle" => "Soutenir MetaGer, sans frais supplémentaires pour vous", "partnertitle" => "Soutenir MetaGer, sans frais supplémentaires pour vous",
"plugin" => "Ajouter un plug-in MetaGer", "plugin" => "Ajouter un plug-in MetaGer",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment