Revert "Fix conflicts"

This reverts commit f3451745d3, reversing
changes made to c5d4d5533d.
This commit is contained in:
neslihanturan 2019-09-17 17:36:53 +03:00
parent f3451745d3
commit 148c891580
44 changed files with 166 additions and 1397 deletions

View file

@ -564,10 +564,4 @@
<string name="delete_helper_ask_reason_copyright_logo">Logo</string>
<string name="delete_helper_ask_reason_copyright_other">Autre</string>
<string name="delete_helper_ask_alert_set_positive_button_reason">Parce quelle est</string>
<string name="share_image_via">Partager limage via</string>
<string name="no_achievements_yet">Vous navez encore fait aucune contribution</string>
<string name="account_created">Compte créé!</string>
<string name="text_copy">Texte copié dans le presse-papier</string>
<string name="notification_mark_read">Notification marquée comme lue</string>
<string name="some_error">Il y a eu une erreur!</string>
</resources>