Commit 8deaba22 authored by Hussein's avatar Hussein

Merge remote-tracking branch 'origin/translate' into translate

# Conflicts:
#	k9mail/src/main/res/values-nl/strings.xml
parents 0d9b2fce 048d9295
......@@ -1046,4 +1046,6 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="status_no_background">Sync désactivée - Aucune activité en arrière-plan</string>
<string name="pep_menu_short_trustwords">Afficher les Trustwords court</string>
<string name="pep_menu_long_trustwords">Afficher les Trustwords long</string>
<string name="status_syncing_blocked">Synchronisation bloquée</string>
<string name="status_poll_and_push_disabled">Interroger et pousser désactivé</string>
</resources>
\ No newline at end of file
......@@ -992,4 +992,5 @@
<string name="error_sign_only_no_encryption">Szyfrowanie nie jest dostępne w trybie sign-only!</string>
<string name="unsigned_text_divider_label">Niepodpisany tekst</string>
<string name="app_name">p≡p</string>
<string name="app_authors">Wyprowadzacze psów K-9, p≡p Security S.A.</string>
</resources>
\ No newline at end of file
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