Merge branch 'master' of https://github.com/Vavassor/Tusky

app/src/main/res/values-fr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--Generated by crowdin.com-->
 <resources>
     <string name="error_generic">Une erreur s’est produite.</string>
@@ -385,4 +385,9 @@
         %1$s; %2$s; %3$s, %4$s, %5$s; %6$s, %7$s, %8$s, %9$s; %10$s, %11$s, %12$s
     </string>
     <string name="hint_list_name">Nom de la liste</string>
+<string name="edit_hashtag_title">Modifier les hashtags</string>
+    <string name="edit_hashtag_hint">Hastags sans #</string>
+    <string name="hashtag">Hashtag</string>
+
+
 </resources>