From a4500d39faafc513277e72b4f6658a2e04cb0408 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 28 Sep 2018 00:34:23 +0900
Subject: [PATCH] merge weblate translations

---
 app/src/main/res/values-fr/strings.xml | 48 --------------------------
 checkMissingTranslation.pl             | 13 ++-----
 2 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b79cc53f..3c18619b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -81,7 +81,6 @@
 	<string name="confirm_boost_from">%1$s voulez-vous partager ce toot ?,\nil sera affiché chez vos abonnés et sur votre profil.</string>
 	<string name="confirm_unboost_from">Unboost this status from %1$s ?</string>
     <string name="confirm_favourite_from">Favourite this status from %1$s ? Notification will be sent to the author.</string>
-	<string name="confirm_unfavourite_from"/>
 
     <string name="confirm_close_column">Fermer cette colonne ?</string>
 	<string name="confirm_delete_attachment">Retirer cette pièce jointe ?</string>
@@ -326,7 +325,6 @@
 	<string name="visibility_private">Abonnés</string>
 	<string name="visibility_public">Public</string>
 	<string name="visibility_unlisted">Non listé</string>
-	<string name="visibility_web_setting"/>
 
 	<string name="wait_previous_operation">Veuillez attendre la fin de la dernière opération.</string>
 	<string name="with_attachment">Avec pièce(s) jointe(s)</string>
@@ -358,7 +356,6 @@
 	<string name="draft_deleted">Brouillon effacé !</string>
 	<string name="draft_picker_desc">Appui long pour effacer.</string>
 	<string name="dont_crop_media_thumbnail">Ne pas recadrer les aperçus de pièces jointes\n(redémarrage nécessaire)</string>
-	<string name="custom_stream_listener"></string>
 	<string name="configuration_url">Configuration URL</string>
 	<string name="secret">Secret</string>
 	<string name="test">Tester</string>
@@ -378,8 +375,6 @@
     <string name="tablet_mode">Mode tablette</string>
 	<string name="post">Post</string>
     <string name="toot_button_default_account">Compte par défaut lorsque le bouton \"Pouet\" est appuyé</string>
-	<string name="account_change_failed_old_draft_has_no_in_reply_to_url"></string>
-	<string name="in_reply_to_id_conversion_failed"></string>
     <string name="prior_chrome_custom_tabs">Onglets personnalisés Chrome (if using Custom Tabs is enabled)</string>
     <string name="enable_speech">Activer la lecture vocale</string>
     <string name="url_omitted">(URL omise)</string>
@@ -429,7 +424,6 @@
 	<string name="access_token_or_api_token">Jeton d\'accès (si vous utilisez Misskey, veuillez entrer le jeton de l\'API)</string>
 	<string name="token_not_specified">Veuillez saisir le jeton d\'accès.</string>
     <string name="quote_name">Citer le nom …</string>
-	<string name="format_of_quote_name"></string>
     <string name="dont_show_favourite">Masquer les favourite</string>
 	<string name="dont_show_follow">Masquer les follow</string>
 	<string name="background_image">Image de fond</string>
@@ -439,7 +433,6 @@
 	<string name="content_sample">(sample)Le cœur déçu mais l’âme plutôt naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälströn où brûlent les novæ.</string>
 	<string name="enable_gif_animation">Activer l\'animation GIF (Cela consomme beaucoup de batterie)</string>
 	<string name="acct_sample">(exemple) utilisateur@instance</string>
-	<string name="mention_full_acct"></string>
 	<string name="remote_profile_warning">Remote user\'s profile may be inadequate information. You can check more accurate information on the web page.</string>
 	<string name="public_profile">Profil public</string>
 	<string name="change_avatar">Changer l\'icône de l\'avatar</string>
@@ -455,8 +448,6 @@
 	<string name="instance_information">Informations sur l\'instance</string>
     <string name="missing_mail_app">App de courriel manquante.</string>
 	<string name="relative_timestamp">Afficher les horodatages relatifs</string>
-	<string name="ago"></string>
-	<string name="later"></string>
 	<string name="time_within_second">à l\'instant</string>
 	<string name="relative_time_second_1">%1$d seconde %2$s</string>
 	<string name="relative_time_second_2">%1$d secondes %2$s</string>
@@ -469,7 +460,6 @@
     <string name="notification_sound_before_oreo">Son de notification (avant Android 8.0)</string>
 	<string name="notification_style_after_oreo">Style de notification (Android 8.0 ou version ultérieure)</string>
     <string name="notification_for">Notification for %1$s</string>
-	<string name="notification_channel_description"></string>
 	<string name="notification_style_before_oreo">Style de notification (avant Android 8. Si votre appareil est sous Android 8.0 ou version ultérieure, veuillez vérifier les Paramètres du compte).</string>
     <string name="enquete_was_end">Sondage terminé.</string>
 	<string name="enquete_voted">a voté !</string>
@@ -479,20 +469,13 @@
 	<string name="choice3">choix 3 (facultatif)</string>
 	<string name="choice4">choix 4 (facultatif)</string>
     <string name="make_enquete">Effectuer un sondage</string>
-	<string name="dont_use_action_button_with_quick_toot_bar"></string>
 
 	<string name="auto_cw">Masquer automatiquement les longs textes (définir un nombre de lignes supérieur à 0 pour activer cette option. Redémarrage de l\'application requis)</string>
     <string name="auto_cw_prefix">(CW automatique)</string>
 
-	<string name="enquete_item_is_empty"></string>
-	<string name="enquete_item_too_long"></string>
-	<string name="enquete_item_duplicate"></string>
     <string name="profile_pin">Épingler sur le profil</string>
 	<string name="profile_unpin">Détacher du profil</string>
-    <string name="profile_pin_progress"></string>
-	<string name="length_warning"/>
 
-	<string name="short_acct_local_user"></string>
     <string name="loading_notification_title">Chargement de la notification…</string>
 	<string name="error_notification_title">Délai d\'attente du serveur</string>
 	<string name="error_notification_summary">Si l\'instance est détruite, veuillez supprimer le compte sur ce serveur.</string>
@@ -511,7 +494,6 @@
     <string name="not_provided_mastodon_under_1_6">Non fourni sous Mastodon 1.6</string>
 
 	<string name="mime_type_missing">Type MIME manquant.</string>
-	<string name="mime_type_not_acceptable"></string>
     <string name="thumbnail_1_6_1_later">Miniature (Mastodon 1.6.1 ou version ultérieure)</string>
     <string name="dont_show_timeout">Ne pas afficher les notifications \"Délai d\'expiration du serveur\"</string>
 	<string name="emoji_category_people">People</string>
@@ -536,7 +518,6 @@
     <string name="card_header_card">Carte</string>
     <string name="card_header_author">Author</string>
     <string name="card_header_provider">Provider</string>
-	<string name="allow_non_space_before_emoji_code"></string>
 	<string name="emoji">Emoji</string>
     <string name="not_blocked">Non bloqué.</string>
     <string name="not_muted">Pas mis en sourdine.</string>
@@ -550,18 +531,13 @@
 	<string name="show_boost_in_home">Afficher les boosts de cet utilisateur sur votre fil principal</string>
 	<string name="operation_succeeded">Opération réussie.</string>
 
-	<string name="list_member_add_remove"></string>
 	<string name="lists">Listes</string>
 	<string name="list_show_member">Afficher les utilisateurs de la liste</string>
-	<string name="list_show_timeline"></string>
-	<string name="list_member_of"></string>
 	<string name="list_tl_of">\"%1$s\" list</string>
 	<string name="list_create_hint">name of new list</string>
 	<string name="list_name_empty">Veuillez entrer le nom de la nouvelle liste.</string>
 	<string name="list_created">La nouvelle liste est créée.</string>
 	<string name="list_delete_confirm">\"%1$s\" sera supprimé. Êtes-vous sûr ?</string>
-	<string name="list_member"></string>
-	<string name="list_timeline"></string>
 	<string name="list_member_delete_confirm">\"%1$s\" sera supprimé de \"%2$s\". Vous êtes sûr ?</string>
 	<string name="target_user">Utilisateur cible</string>
 	<string name="list_owner">Propriétaire de la liste</string>
@@ -570,7 +546,6 @@
 	<string name="list_not_supported">cette instance ne supporte pas les listes.</string>
 	<string name="cant_access_list">Impossible d’accéder aux listes</string>
 	<string name="account_sync_failed">échec de la synchronisation du compte.</string>
-	<string name="list_retry_with_follow"/>
 	<string name="cant_add_list_follow_requesting">Can\'t add user to list:\nif the user is \"locked\", please wait until follow request is approved. else please retry 2…3 times.</string>
 	<string name="cant_add_list_follow_failed">Impossible d\'ajouter l’utilisateur à la liste :
 \nÉchec de l’abonnement.</string>
@@ -581,7 +556,6 @@
 	<string name="ignore_suggestion">ignore suggestion</string>
 	<string name="list_not_created">(list is not created)</string>
 	<string name="your_lists">Your lists</string>
-	<string name="media_attachment_max_byte_size"/>
     <string name="toot_search_msp">Recherche de pouets (MSP)</string>
 	<string name="toot_search_msp_of">Recherche de pouets (MSP) \"%1$s\"</string>
 	<string name="toot_search_ts">Recherche de pouets (ts)</string>
@@ -661,8 +635,6 @@
     <string name="follow_accept_confirm">Approve the follow request from %1$s ?</string>
 	<string name="follow_deny_confirm">Reject the follow request from %1$s ?</string>
 	<string name="direct_messages">Messages privés</string>
-    <string name="unfavourite"></string>
-	<string name="unboost"></string>
     <string name="dont_retrieve_preview_card">Ne pas récupérer les cartes de prévisualisation</string>
 	<string name="field_name1">label1</string>
 	<string name="field_name2">label2</string>
@@ -674,34 +646,15 @@
 	<string name="field_value4">Valeur 4</string>
 	<string name="profile_metadata">Métadonnées de profil</string>
 	<string name="available_mastodon_2_4_later">(disponible dans Mastodon 2.4 ou plus récent)</string>
-	<string name="confirm_boost_private_from"></string>
 	<string name="boost_private_toot_not_allowed">Vous ne pouvez pas booster un toot privé publié par une autre personne.</string>
 
-	<string name="update_push_subscription"></string>
-	<string name="pseudo_account_not_supported"></string>
 	<string name="instance_does_not_support_push_api">La version de l\'Instance %1$s est trop ancienne et ne prend pas en charge l\'abonnement push.</string>
-	<string name="missing_fcm_device_id"></string>
-	<string name="missing_install_id"></string>
-	<string name="token_exported"></string>
-	<string name="missing_push_api"></string>
-	<string name="missing_push_scope"></string>
-	<string name="push_subscription_deleted"></string>
-	<string name="push_subscription_updated"></string>
-	<string name="push_subscription_not_exists"></string>
-	<string name="push_subscription_already_exists"></string>
     <string name="user_agent">En-tête HTTP du User-Agent</string>
-	<string name="user_agent_error"></string>
-	<string name="none_or_hidden_following"></string>
-	<string name="none_or_hidden_followers"></string>
 	<string name="yourself_can_see_your_network">Même si vous choisissez de cacher les graphiques sociaux, vous pouvez les voir.</string>
-	<string name="follow_follower_list_may_restrict"></string>
     <string name="trend_tag">Les tendances des tags</string>
-    <string name="people_talking"></string>
-	<string name="trend_tag_desc"></string>
     <string name="redraft_and_delete">Redraft and delete</string>
     <string name="cant_sync_toot">Can\'t synchronize toot.</string>
     <string name="cant_change_account_when_redraft">Can\'t change account while using redraft.</string>
-	<string name="delete_base_status_before_toot"/>
     <string name="notification_tl_font_size">Notification TL font size (unit:sp. leave empty to default. app restart required)</string>
     <string name="notification_tl_icon_size">Notification TL icon size (unit:dp. default:32. app restart required)</string>
     <string name="post_button_tapped_repeatly">Post button was tapped repeatedly</string>
@@ -789,7 +742,6 @@
 	<string name="endorse_succeeded">Endorsement added.</string>
 	<string name="remove_endorse_succeeded">Endorsement removed.</string>
     <string name="follow_request_cancelled">Follow request was cancelled.</string>
-	<string name="confirm_cancel_follow_request_who_from"/>
     <string name="reaction">Reaction (Misskey)</string>
 	<string name="vote">Vote (Misskey)</string>
     <string name="timeout_for_embed_media_viewer">Timeout for embed media viewer (unit:seconds, app restart(delete from app history) required)</string>
diff --git a/checkMissingTranslation.pl b/checkMissingTranslation.pl
index 9d5029a3..04b6d616 100644
--- a/checkMissingTranslation.pl
+++ b/checkMissingTranslation.pl
@@ -32,17 +32,13 @@ for my $file(@files){
 		die "!! please make at least 2 string entries in $file\n";
 	}
 	
-	if($lang eq 'fr'){
-		print dump($data);
-		exit;
-	}
-
 	my %names;
 	while(my($name,$o)=each %{$data->{string}}){
-		if( not $o->{content} ){
+		if(not $o->{content}){
 			warn "$lang : $name : missing content in ",dump($o),"\n";
+		}else{
+			$names{$name}= $o->{content};
 		}
-		$names{$name}=$o->{content} // "";
 	}
 	$langs{ $lang } = \%names;
 }
@@ -57,15 +53,12 @@ while(my($name,$value)=each %$master){
 	$params{$name} = join ',', sort @params;
 }
 
-
 my %missing;
 my %allNames;
 for my $lang ( sort keys %langs ){
 	my $names = $langs{$lang};
 	while(my($name,$value)=each %$names){
 		
-		$value = $value // "";
-		
 		$allNames{$name}=1;
 		if(not $master->{$name} ){
 			$missing{$name} =1;