aboutsummaryrefslogtreecommitdiff
path: root/connector/src/main/resources/properties/messages_de.properties
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2022-05-12 14:33:30 +0000
committerThomas Lenz <thomas.lenz@egiz.gv.at>2022-05-12 14:33:30 +0000
commite412bda31b304821c08d8f8c7b2473d67246dba0 (patch)
tree34b34b7cd306ba2e822b9635645cba8c0d4fcc41 /connector/src/main/resources/properties/messages_de.properties
parentb3f78f57ff8da8a82af57377eaabea22031582e9 (diff)
parentc54b0a87fe2794ce9926e750e7b52f50685ae894 (diff)
downloadNational_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.tar.gz
National_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.tar.bz2
National_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.zip
Merge branch 'nightlybuild_matching' into 'nightlybuild'
eIDAS matching functionality See merge request egiz/eidas_at_proxy!18
Diffstat (limited to 'connector/src/main/resources/properties/messages_de.properties')
-rw-r--r--connector/src/main/resources/properties/messages_de.properties3
1 files changed, 3 insertions, 0 deletions
diff --git a/connector/src/main/resources/properties/messages_de.properties b/connector/src/main/resources/properties/messages_de.properties
index 6f470ea0..187b7b37 100644
--- a/connector/src/main/resources/properties/messages_de.properties
+++ b/connector/src/main/resources/properties/messages_de.properties
@@ -48,8 +48,11 @@ gui.countryselection.country.is=Island
gui.countryselection.country.is.logo.alt=Isländische-eID
gui.countryselection.country.it=Italien
gui.countryselection.country.it.logo.alt=Italienische-eID
+<<<<<<< HEAD
gui.countryselection.country.li=Lichtenstein
gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
+=======
+>>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
gui.countryselection.country.lt=Litauen
gui.countryselection.country.lt.logo.alt=Litauische-eID
gui.countryselection.country.lv=Lettland