Commit 231ca606 authored by Marc Vial's avatar Marc Vial
Browse files

Merge branch 'master' of C:\Users\marcv\StudioProjects\divoc with conflicts.

parent 5134276e
......@@ -9,8 +9,7 @@
android:id="@+id/textView"
android:layout_width="185dp"
android:layout_height="40dp"
android:text="@string/bouton_legal_mentions"
android:textAlignment="center"
android:text="@string/legal_mentions"
android:textSize="24sp"
tools:layout_editor_absoluteX="113dp"
tools:layout_editor_absoluteY="66dp" />
......
......@@ -16,11 +16,10 @@
<string name="bouton_tips_links">Tips/Links</string>
<string name="bouton_languages">Languages</string>
<string name="bouton_legal_mentions">Legal mentions</string>
<!-- Text tips and links -->
<string name="tips_title">Tips</string>
<string name="tips_content">Wash your hands frequently\nMaintain social distancin\nAvoid touching eyes, nose and mouth.\nIf you have fever, cough and difficulty breathing, seek medical care early\nStay informed and follow advice\nClean and disinfect household surfaces</string>
<string name="links_title">Links</string>
<string name="links_content" translatable="false">https://coronavirus.unisante.ch\nhttps://www.corona-data.ch\nhttps://www.bag.admin.ch/bag/fr/home.html</string>
<!-- Settings language page -->
......@@ -28,7 +27,5 @@
<string name="sumarry_language">You need to restart to make the changes</string>
<string name="about" translatable="false"></string>
<!-- Text manage trusted devices -->
<string name="title_manage_trust">Manage trusted devices</string>
</resources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment