Commit 6424fe23 authored by Hussein's avatar Hussein

Merge branch 'P4A-1040' into develop

parents 05daba6d 90d52d70
......@@ -6,66 +6,71 @@
android:background="@color/white"
android:padding="@dimen/intro_fragment_padding">
<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroFirstFragment">
android:layout_centerInParent="true">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/headerText"
style="@style/IntroHeaderText"
android:layout_width="0dp"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
tools:text="@string/intro_frag_first_text_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroFirstFragment">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/secondText"
style="@style/IntroText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:gravity="start"
tools:text="@string/intro_frag_first_text_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/headerText" />
<com.fsck.k9.pEp.ui.PEpContactBadge
android:id="@+id/contactBadge"
android:layout_width="@dimen/intro_contact_badge_width_height"
android:layout_height="@dimen/intro_contact_badge_width_height"
android:layout_marginTop="@dimen/intro_margin_top_standard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/secondText" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/headerText"
style="@style/IntroHeaderText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start"
tools:text="@string/intro_frag_first_text_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/third_text"
style="@style/IntroText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:gravity="start"
android:text="@string/intro_frag_first_text_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contactBadge" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/secondText"
style="@style/IntroText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:gravity="start"
tools:text="@string/intro_frag_first_text_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/headerText" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:adjustViewBounds="true"
android:src="@drawable/intro_actionbar_screenshot"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/third_text" />
<com.fsck.k9.pEp.ui.PEpContactBadge
android:id="@+id/contactBadge"
android:layout_width="@dimen/intro_contact_badge_width_height"
android:layout_height="@dimen/intro_contact_badge_width_height"
android:layout_marginTop="@dimen/intro_margin_top_standard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/secondText" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/third_text"
style="@style/IntroText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:gravity="start"
android:text="@string/intro_frag_first_text_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contactBadge" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:adjustViewBounds="true"
android:src="@drawable/intro_actionbar_screenshot"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/third_text" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</RelativeLayout>
\ No newline at end of file
......@@ -6,97 +6,102 @@
android:background="@color/white"
android:padding="@dimen/intro_fragment_padding">
<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroSecondFragment">
android:layout_centerInParent="true">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_secure"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/pep_status_yellow" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_secure"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_1"
app:layout_constraintStart_toEndOf="@+id/ic_secure"
app:layout_constraintTop_toTopOf="@+id/ic_secure" />
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroSecondFragment">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_secure"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_secure" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_secure"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/pep_status_yellow" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_secure_trusted"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
android:layout_marginTop="@dimen/intro_margin_top_large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_secure"
app:srcCompat="@drawable/pep_status_green" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_secure"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_1"
app:layout_constraintStart_toEndOf="@+id/ic_secure"
app:layout_constraintTop_toTopOf="@+id/ic_secure" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_secure_trusted"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_2"
app:layout_constraintStart_toEndOf="@+id/ic_secure_trusted"
app:layout_constraintTop_toTopOf="@+id/ic_secure_trusted" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_secure"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_secure" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_secure_trusted"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_secure_trusted" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_secure_trusted"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
android:layout_marginTop="@dimen/intro_margin_top_large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_secure"
app:srcCompat="@drawable/pep_status_green" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_mistrusted"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
android:layout_marginTop="@dimen/intro_margin_top_large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_secure_trusted"
app:srcCompat="@drawable/pep_status_red" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_secure_trusted"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_2"
app:layout_constraintStart_toEndOf="@+id/ic_secure_trusted"
app:layout_constraintTop_toTopOf="@+id/ic_secure_trusted" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_mistrusted"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_3"
app:layout_constraintStart_toEndOf="@+id/ic_mistrusted"
app:layout_constraintTop_toTopOf="@+id/ic_mistrusted" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_secure_trusted"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_secure_trusted" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_mistrusted"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_mistrusted" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_mistrusted"
android:layout_width="@dimen/intro_icon_width_height_standard"
android:layout_height="@dimen/intro_icon_width_height_standard"
android:layout_marginTop="@dimen/intro_margin_top_large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_secure_trusted"
app:srcCompat="@drawable/pep_status_red" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_mistrusted"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/intro_margin_start_standard"
android:text="@string/intro_frag_second_header_3"
app:layout_constraintStart_toEndOf="@+id/ic_mistrusted"
app:layout_constraintTop_toTopOf="@+id/ic_mistrusted" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_mistrusted"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:text="@string/intro_frag_second_text_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_mistrusted" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</RelativeLayout>
\ No newline at end of file
......@@ -6,87 +6,92 @@
android:background="@color/white"
android:padding="@dimen/intro_fragment_padding">
<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroThirdFragment">
android:layout_centerInParent="true">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_handshake"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/intro_frag_third_text_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
tools:context="com.fsck.k9.security.pEp.ui.intro.IntroThirdFragment">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/intro_frag_third_text_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/header_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header_handshake"
style="@style/IntroHeaderText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/intro_frag_third_text_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:adjustViewBounds="true"
android:src="@drawable/intro_actionbar_screenshot"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/intro_frag_third_text_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/header_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_2_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_large"
android:text="@string/intro_frag_third_text_3"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_standard"
android:adjustViewBounds="true"
android:src="@drawable/intro_actionbar_screenshot"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_2_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_large"
android:text="@string/intro_frag_third_text_3"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/rejectButton"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/pep_wrong_trustwords"
android:textColor="@color/white"
app:backgroundTint="@color/pep_red"
app:layout_constraintEnd_toStartOf="@+id/accept_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_2_handshake" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/accept_button"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/pep_confirm_trustwords"
android:textColor="@color/white"
app:backgroundTint="@color/pep_green"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/rejectButton"
app:layout_constraintTop_toBottomOf="@+id/text_2_handshake" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/rejectButton"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/pep_wrong_trustwords"
android:textColor="@color/white"
app:backgroundTint="@color/pep_red"
app:layout_constraintEnd_toStartOf="@+id/accept_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_2_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_3_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_large"
android:text="@string/intro_frag_third_text_4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rejectButton" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/accept_button"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="@dimen/intro_margin_top_small"
android:text="@string/pep_confirm_trustwords"
android:textColor="@color/white"
app:backgroundTint="@color/pep_green"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/rejectButton"
app:layout_constraintTop_toBottomOf="@+id/text_2_handshake" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_3_handshake"
style="@style/IntroText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/intro_margin_top_large"
android:text="@string/intro_frag_third_text_4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rejectButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</RelativeLayout>
\ No newline at end of file
......@@ -189,13 +189,13 @@
<string name="pep_key_reset_own_id_warning_title">Restableix el compte% s</string>
<string name="search_empty_error">Escriviu el text per cercar-lo</string>
<string name="intro_frag_first_text_1"><![CDATA[Benvingut al <font color="#4caf50"> p≡p </font> tutorial]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Podeu tancar aquest tutorial en qualsevol moment.\n\n<font color="#4caf50"> p≡p </font> utilitza un estat de privadesa per indicar la seguretat de la vostra comunicació.\n\nAquest estat de privadesa es mostra com a icona a l’avatar de l’usuari]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Podeu tancar aquest tutorial en qualsevol moment.\n\n<font color="#4caf50"> p≡p </font> utilitza un estat de privadesa per indicar la seguretat de la vostra comunicació.\n\nAquest estat de privadesa es mostra com a icona a l’avatar de l’usuari.]]></string>
<string name="intro_frag_first_text_3">I a la barra superior quan obriu o escriviu un correu electrònic:</string>
<string name="intro_frag_second_text_1">Amb aquest estat de privacitat, tota comunicació és segura, però per confirmar que el vostre contacte és realment la persona que coneixeu, haureu de confegir les paraules de confiança amb aquest contacte.</string>
<string name="intro_frag_second_text_2">Quan es confirmi que les paraules de confiança són correctes i es fa el cop de mà, la comunicació serà completament segura i de confiança.</string>
<string name="intro_frag_second_text_3">Si les paraules clau de confiança no són correctes, el seu soci de comunicació no té cap confiança.</string>
<string name="intro_frag_third_text_2">Quan feu clic a la icona de l\'estat de privadesa de la barra superior, arribareu al cop de mà, on podreu verificar el vostre soci de comunicació.</string>
<string name="intro_frag_third_text_3">OUTDISTANCE CORRINA ETHIOPIA EXTERIOR FLEECER ...</string>
<string name="intro_frag_third_text_3">OUTDRAW FLEECER PUPPING COMFORTING TEATIME ...</string>
<string name="intro_frag_third_text_4">Completa un cop de mà amb el teu company de comunicació. Un cop de mà només es necessita una vegada per part i s’assegurarà una comunicació segura i de confiança.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_fourth_text_2">La icona de la barra superior reflecteix l\'estat de privadesa del missatge, que és el denominador comú més baix de tots els socis de comunicació d\'aquest missatge, per exemple:</string>
......
......@@ -185,7 +185,7 @@
<string name="notification_failed_to_encrypt_title">Die Nachricht konnte nicht verschlüsselt werden.</string>
<string name="intro_frag_fourth_text_2">Das Symbol in der oberen Leiste spiegelt den Datenschutzstatus der Nachricht wieder, der für alle Kommunikationspartner dieser Nachricht den kleinsten gemeinsamen Nenner darstellt, z. B.:</string>
<string name="intro_frag_first_text_3">Und in der oberen Leiste, wenn Sie eine E-Mail öffnen oder schreiben:</string>
<string name="intro_frag_first_text_2"><![CDATA[Sie können dieses Tutorial jederzeit schließen.\n\n<font color="#4caf50">p≡p</font> verwendet einen Datenschutzstatus, um die Sicherheit Ihrer Kommunikation anzuzeigen.\n\nDieser Datenschutzstatus wird als Symbol im Avatar des Benutzers angezeigt]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Sie können dieses Tutorial jederzeit schließen.\n\n<font color="#4caf50">p≡p</font> verwendet einen Datenschutzstatus, um die Sicherheit Ihrer Kommunikation anzuzeigen.\n\nDieser Datenschutzstatus wird als Symbol im Avatar des Benutzers angezeigt.]]></string>
<string name="message_failed_to_encrypt">Die Nachricht konnte nicht verschlüsselt werden.</string>
<string name="only_own_identities">Dies ist eine eigene Nachricht, an der kein Kommunikationspartner beteiligt ist.</string>
<string name="action_tutorial">Anleitung</string>
......@@ -196,7 +196,7 @@
<string name="intro_frag_fourth_text_3">In diesem Fall ist der Datenschutzstatus der Nachricht \"Sicher\", da es sich dabei um den kleinsten gemeinsamen Nenner der beiden Kommunikationspartner handelt.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_third_text_4">Führen Sie einen Handshake mit Ihrem Kommunikationspartner durch. Der Handshake ist nur einmal pro Partner nötig und garantiert eine sichere und verifizierte Kommunikation.</string>
<string name="intro_frag_third_text_3">OUTDISTANCE\t\t\tCORRINA\t\t\tETHIOPIA\t\t\tOUTDRAW\t\t\tFLEECER\t\t\t…</string>
<string name="intro_frag_third_text_3">OUTDRAW\t\t\tFLEECER\t\t\tPUPPING\t\t\tCOMFORTING\t\t\tTEATIME\t\t\t…</string>
<string name="intro_frag_third_text_2">Durch Klick auf das Datenschutzstatussymbol öffnen Sie den Handshake-Dialog, in dem Sie Ihren Kommunikationspartner verifizieren können.</string>
<string name="intro_frag_second_text_3">Wenn die Trustwords nicht übereinstimmen, ist Ihr Kommunikationspartner nicht vertrauswürdig.</string>
<string name="intro_frag_third_text_1">Handshake</string>
......
......@@ -145,7 +145,7 @@
<string name="intro_frag_fourth_text_3">En este caso el Estado de Privacidad es \"Seguro\", ya que éste es el mínimo común denominador de los dos interlocutores.</string>
<string name="intro_frag_fourth_text_2">El icono en la barra superior representa el Estado de Privacidad del mensaje, el cual es el denominador común más bajo de todos los interlocutores que participan en el mensaje, por ejemplo:</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_third_text_4">Complete un handshake con su interlocutor. Un handshake se necesita solo una vez por interlocutor y garantiza una comunicación Segura y de Confianza.</string>
<string name="intro_frag_third_text_4">Complete un Handshake con su interlocutor. Un Handshake se necesita solo una vez por interlocutor y garantiza una comunicación Segura y de Confianza.</string>
<string name="intro_frag_third_text_3">"DISYUNTIVO ESTALINIANO POSTOPERATORIO IRRÍTAME CALIMA …"</string>
<string name="intro_frag_third_text_2">Al hacer clic en el ícono Estado de Privacidad en la barra superior, accederá al Handshake, donde podrá verificar a su interlocutor.</string>
<string name="intro_frag_third_text_1">Handshake</string>
......@@ -155,7 +155,7 @@
<string name="intro_frag_second_header_2">Seguro y de confianza</string>
<string name="intro_frag_second_header_1">Seguro</string>
<string name="intro_frag_first_text_3">Y también en la barra superior, cuando abre o redacta un correo electrónico:</string>
<string name="intro_frag_first_text_2"><![CDATA[Puedes cerrar este tutorial en cualquier momento.\n\n<font color="#4caf50">p≡p</font> utiliza un Estado de Privacidad para indicar qué tan segura es su comunicación.\n\nEste Estado de Privacidad se muestra como un icono en el avatar del usuario]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Puedes cerrar este tutorial en cualquier momento.\n\n<font color="#4caf50">p≡p</font> utiliza un Estado de Privacidad para indicar qué tan segura es su comunicación.\n\nEste Estado de Privacidad se muestra como un icono en el avatar del usuario.]]></string>
<string name="intro_frag_first_text_1"><![CDATA[Bienvenidos al tutorial <font color="#4caf50">p≡p</font>]]></string>
<string name="pep_key_reset_own_id_warning_title">Restablecer la cuenta %s</string>
<string name="pep_key_reset_own_id_warning">Esta acción restablecerá su cuenta.
......
......@@ -154,7 +154,7 @@
<string name="intro_frag_third_text_2">Lorsque vous cliquez sur l\'icône État de confidentialité dans la barre supérieure, vous accédez à la poignée de main, où vous pouvez vérifier votre partenaire de communication.</string>
<string name="intro_frag_third_text_1">Handshake</string>
<string name="intro_frag_second_text_3">Si les \"Trustwords\" ne sont pas corrects, votre partenaire de communication n\'est pas digne de confiance.</string>
<string name="intro_frag_first_text_2"><![CDATA[<font color="#4caf50">p≡p</font>Vous pouvez fermer ce didacticiel à tout moment.\n\n<font color="#4caf50">p≡p</font> utilise un statut de confidentialité pour indiquer le degré de sécurité de votre communication.\n\nCe statut de confidentialité est affiché sous forme d\'icône dans l\'avatar de l\'utilisateur]]></string>
<string name="intro_frag_first_text_2"><![CDATA[<font color="#4caf50">p≡p</font>Vous pouvez fermer ce didacticiel à tout moment.\n\n<font color="#4caf50">p≡p</font> utilise un statut de confidentialité pour indiquer le degré de sécurité de votre communication.\n\nCe statut de confidentialité est affiché sous forme d\'icône dans l\'avatar de l\'utilisateur.]]></string>
<string name="intro_frag_first_text_1"><![CDATA[Bienvenue dans le tutoriel <font color="#4caf50">p≡p</font>]]></string>
<string name="ellipsized_text" translatable="false">%s …</string>
<string name="key_reset_all_own_identitities_feedback">Tous les comptes p≡p ont été réinitialisés.</string>
......@@ -196,7 +196,7 @@
<string name="pep_rating_secure">Sécurisé</string>
<string name="intro_frag_fourth_text_3">Dans ce cas-ci, le statut de confidentialité du message est sûr, car c’est le plus petit dénominateur commun des deux partenaires de communication.</string>
<string name="intro_frag_fourth_text_2">L’icône dans la barre supérieure indique le statut de confidentialité du message, qui est le plus petit dénominateur commun entre tous les partenaires de ce message, par exemple :</string>
<string name="intro_frag_third_text_3">OUTDISTANCE\t\t\tCORRINA\t\t\tETHIOPIA\t\t\tOUTDRAW\t\t\tFLEECER\t\t\t…</string>
<string name="intro_frag_third_text_3">OUTDRAW\t\t\tFLEECER\t\t\tPUPPING\t\t\tCOMFORTING\t\t\tTEATIME\t\t\t…</string>
<string name="intro_frag_second_text_2">Lorsque les Trustwords sont confirmés correctement et que la poignée de main a été faite, la communication sera complètement sécurisée et de confiance.</string>
<string name="intro_frag_second_text_1">Avec ce statut de confidentialité, toutes les communications sont sécurisées, mais pour confirmer que votre contact est vraiment la personne que vous connaissez, vous devez Trustwords avec ce contact.</string>
<string name="intro_frag_second_header_3">Méfiant</string>
......
......@@ -218,7 +218,7 @@
<string name="search_empty_error">Schrijf tekst om te zoeken</string>
<!-- Welcome/Tutorial-->
<string name="intro_frag_first_text_1"><![CDATA[<font color="#4caf50">p≡p</font> tutorial]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Je kunt deze tutorial op elk moment sluiten.\n\n<font color="#4caf50"> p≡p </font> gebruikt een privacystatus om aan te geven hoe veilig uw communicatie is.\n\nDeze privacystatus wordt weergegeven als een pictogram in de avatar van de gebruiker]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Je kunt deze tutorial op elk moment sluiten.\n\n<font color="#4caf50"> p≡p </font> gebruikt een privacystatus om aan te geven hoe veilig uw communicatie is.\n\nDeze privacystatus wordt weergegeven als een pictogram in de avatar van de gebruiker.]]></string>
<string name="intro_frag_first_text_3">En in de bovenste balk wanneer u een e-mail opent of schrijft:</string>
<string name="intro_frag_second_header_1">Veilig</string>
<string name="intro_frag_second_header_2">Veilig en vertrouwd</string>
......@@ -228,7 +228,7 @@
<string name="intro_frag_second_text_3">Als de Trustwords niet correct zijn, wordt uw communicatiepartner wantrouwt.</string>
<string name="intro_frag_third_text_1">Handdruk</string>
<string name="intro_frag_third_text_2">Wanneer u op het pictogram Privacystatus in de bovenste balk klikt, komt u bij de Handshake, waar u uw communicatiepartner kunt verifiëren.</string>
<string name="intro_frag_third_text_3">OUTDISTANCE\t\t\tCORRINA\t\t\tETHIOPIA\t\t\tOUTDRAW\t\t\tFLEECER\t\t\t…</string>
<string name="intro_frag_third_text_3">OUTDRAW\t\t\tFLEECER\t\t\tPUPPING\t\t\tCOMFORTING\t\t\tTEATIME\t\t\t…</string>
<string name="intro_frag_third_text_4">Maak een handdruk met je communicatiepartner. Een handdruk is slechts één keer per partner nodig en zorgt voor veilige en vertrouwde communicatie.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_fourth_text_2">Het pictogram in de bovenste balk geeft de privacystatus van het bericht weer, wat de laagste gemene deler is van alle communicatiepartners van dat bericht, bijvoorbeeld:</string>
......
......@@ -218,7 +218,7 @@
<string name="search_empty_error">Ak chcete hľadať, napíšte text</string>
<!-- Welcome/Tutorial-->
<string name="intro_frag_first_text_1"><![CDATA[Vitajte v tutoriále <font color="#4caf50">p≡p</font>]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Túto príručku môžete kedykoľvek zavrieť.\n\n<font color="#4caf50">p≡p</font> používa stav ochrany osobných údajov na označenie bezpečnosti vašej komunikácie.\n\nTento stav ochrany osobných údajov sa zobrazuje ako ikona v avatar používateľa]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Túto príručku môžete kedykoľvek zavrieť.\n\n<font color="#4caf50">p≡p</font> používa stav ochrany osobných údajov na označenie bezpečnosti vašej komunikácie.\n\nTento stav ochrany osobných údajov sa zobrazuje ako ikona v avatar používateľa.]]></string>
<string name="intro_frag_first_text_3">A pri otvorení alebo napísaní e-mailu na hornom paneli:</string>
<string name="intro_frag_second_header_1">Zabezpečiť</string>
<string name="intro_frag_second_header_2">Zabezpečené a dôveryhodné</string>
......@@ -228,7 +228,7 @@
<string name="intro_frag_second_text_3">Ak Trustwords nie sú správne, váš komunikačný partner je nedôveryhodný.</string>
<string name="intro_frag_third_text_1">Handshake</string>
<string name="intro_frag_third_text_2">Po kliknutí na ikonu stavu súkromia na hornom paneli sa dostanete na stránku Handshake, kde môžete overiť svojho komunikačného partnera.</string>
<string name="intro_frag_third_text_3">OUTDISTANCE\t\t\tCORRINA\t\t\tETHIOPIA\t\t\tOUTDRAW\t\t\tFLEECER\t\t\t…</string>
<string name="intro_frag_third_text_3">OUTDRAW\t\t\tFLEECER\t\t\tPUPPING\t\t\tCOMFORTING\t\t\tTEATIME\t\t\t…</string>
<string name="intro_frag_third_text_4">Vyplňte handshake s vašim komunikačným partnerom. Handshake je potrebný iba raz pre partnera a zabezpečí bezpečnú a dôveryhodnú komunikáciu.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_fourth_text_2">Ikona v hornom paneli odráža Stav súkromia správy, ktorá je najnižším spoločným menovateľom všetkých komunikačných partnerov tejto správy, napríklad:</string>
......
......@@ -117,7 +117,7 @@
<string name="pep_key_reset_own_id_warning_title">%s hesabını sıfırla</string>
<string name="search_empty_error">Lütfen aramak için metin yazın</string>
<string name="intro_frag_first_text_1"><![CDATA[<font color="#4caf50">p≡p</font> eğitimine hoş geldiniz<font color="#4caf50">p≡p</font> tutorial</string>
<string name="intro_frag_first_text_2"><![CDATA[Bu öğreticiyi istediğiniz zaman kapatabilirsiniz.\n\n<font color="#4caf50"> p≡p </font> iletişiminizin ne kadar güvenli olduğunu belirtmek için bir Gizlilik Durumu kullanır.\n\nBu Gizlilik Durumu, kullanıcının avatarında bir simge olarak gösterilir]]></string>
<string name="intro_frag_first_text_2"><![CDATA[Bu öğreticiyi istediğiniz zaman kapatabilirsiniz.\n\n<font color="#4caf50"> p≡p </font> iletişiminizin ne kadar güvenli olduğunu belirtmek için bir Gizlilik Durumu kullanır.\n\nBu Gizlilik Durumu, kullanıcının avatarında bir simge olarak gösterilir.]]></string>
<string name="pep_force_protected">Korumayı etkinleştir</string>
<string name="navigation_drawer_close">Gezinme çekmecesini kapat</string>
<string name="message_list_item_removed">Kaldırılan</string>
......@@ -184,7 +184,7 @@
<string name="intro_frag_second_text_3">Trustwords doğru değilse, iletişim ortağınıza güvenilmez.</string>
<string name="intro_frag_third_text_1">Tokalaşma</string>
<string name="intro_frag_third_text_2">Üst çubuktaki Gizlilik Durumu simgesini tıkladığınızda, iletişim ortağınızı doğrulayabileceğiniz El Sıkışma sayfasına gidersiniz.</string>
<string name="intro_frag_third_text_3">Geçmek Corrina ETİYOPYA Hızlı Kovboy FLEECER ...</string>
<string name="intro_frag_third_text_3">Geçmek Rahatlatıcı ETİYOPYA Hızlı Kovboy FLEECER ...</string>
<string name="intro_frag_third_text_4">İletişim ortağınızla bir el sıkışma tamamlayın. Ortak başına bir el sıkışma gereklidir ve Güvenli ve Güvenilir iletişim sağlar.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_fourth_text_2">Üst çubuktaki simge, iletinin tüm iletişim ortaklarının en düşük ortak paydası olan iletinin Gizlilik Durumunu yansıtır, örneğin:</string>
......
......@@ -216,7 +216,7 @@
<string name="search_empty_error">Please write text to search</string>
<!-- Welcome/Tutorial-->
<string name="intro_frag_first_text_1"><![CDATA[Welcome to the <font color="#4caf50">p≡p</font> tutorial]]></string>
<string name="intro_frag_first_text_2"><![CDATA[You can close this tutorial any time.\n\n<font color="#4caf50">p≡p</font> uses a Privacy Status to indicate how secure your communication is.\n\nThis Privacy Status is shown as an icon in the user\'s avatar]]></string>
<string name="intro_frag_first_text_2"><![CDATA[You can close this tutorial any time.\n\n<font color="#4caf50">p≡p</font> uses a Privacy Status to indicate how secure your communication is.\n\nThis Privacy Status is shown as an icon in the user\'s avatar.]]></string>
<string name="intro_frag_first_text_3">And in the top bar when you open or write an e-mail:</string>
<string name="intro_frag_second_header_1">Secure</string>
<string name="intro_frag_second_header_2"><![CDATA[Secure & Trusted]]></string>
......@@ -226,8 +226,8 @@
<string name="intro_frag_second_text_3">If the Trustwords are not correct, your communication partner is Mistrusted.</string>
<string name="intro_frag_third_text_1">Handshake</string>
<string name="intro_frag_third_text_2">When you click on the Privacy Status icon in the top bar, you will get to the Handshake, where you can verify your communication partner.</string>
<string name="intro_frag_third_text_3">OUTDISTANCE\t\t\tCORRINA\t\t\tETHIOPIA\t\t\tOUTDRAW\t\t\tFLEECER\t\t\t…</string>
<string name="intro_frag_third_text_4">Complete a handshake with your communication partner. A handshake is needed only once per partner and will ensure Secure and Trusted communication.</string>
<string name="intro_frag_third_text_3">OUTDRAW\t\t\tFLEECER\t\t\tPUPPING\t\t\tCOMFORTING\t\t\tTEATIME\t\t\t…</string>
<string name="intro_frag_third_text_4">Complete a Handshake with your communication partner. A Handshake is needed only once per partner and will ensure Secure and Trusted communication.</string>
<string name="intro_frag_fourth_text_1">@string/pep_title_activity_privacy_status</string>
<string name="intro_frag_fourth_text_2">The icon in the top bar reflects the Privacy Status of the message, which is the lowest common denominator of all communication partners of that message, for example:</string>
<string name="intro_frag_fourth_text_3">In this case the Privacy Status of the message is Secure, because this is the lowest common denominator of the two communication partners.</string>
......
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