From 3aee3e1e8db215bef2bed2ef5249f8a66fa819e0 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 7 Dec 2020 22:37:22 +0900
Subject: [PATCH] fix string resource bugs

---
 app/src/main/res/layout/act_post.xml       | 4 ++--
 app/src/main/res/values-ca/strings.xml     | 5 ++---
 app/src/main/res/values-de/strings.xml     | 5 ++---
 app/src/main/res/values-fr/strings.xml     | 5 ++---
 app/src/main/res/values-ja/strings.xml     | 4 ++--
 app/src/main/res/values-ko/strings.xml     | 5 ++---
 app/src/main/res/values-nb-rNO/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 6 +++---
 checkMissingTranslation.pl                 | 6 +++++-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/act_post.xml b/app/src/main/res/layout/act_post.xml
index 3651a219..7e1cf9e0 100644
--- a/app/src/main/res/layout/act_post.xml
+++ b/app/src/main/res/layout/act_post.xml
@@ -426,7 +426,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="4dp"
-                        android:text="@string/" />
+                        android:text="@string/plus" />
 
                     <EditText
                         android:id="@+id/etExpireHours"
@@ -447,7 +447,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="4dp"
-                        android:text="@string/" />
+                        android:text="@string/plus" />
 
                     <EditText
                         android:id="@+id/etExpireMinutes"
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e95be25b..fb467b72 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -634,7 +634,7 @@
     <string name="always_show_application">Mostra (mitjançant) el nom de l\'aplicació, si és possible</string>
     <string name="force_gap_when_refresh">Forçar que s\'afegeixi una separació en refrescar la part superior</string>
     <string name="avatar_icon_size">Mida d\'icona d\'avatar (Unitat:dp. per defecte:48. cal reiniciar aplicació)</string>
-    <string name="avatar_icon_round_ratio">Quocient d\'arrodoniment de la icona d\'avatar (Unitat:%%. per defrecte:33. cal reiniciar aplicació)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">Quocient d\'arrodoniment de la icona d\'avatar (Unitat:%. per defrecte:33. cal reiniciar aplicació)</string>
     <string name="avatar_icon_dont_round">No arrodonir els angles de la icona d\'avatar (cal reiniciar l\'aplicació)</string>
     <string name="share_view_pool">Comparteix la visualització entre pissarres</string>
     <string name="rename">Rebateja…</string>
@@ -821,7 +821,7 @@
     <string name="conversation_to">A:</string>
     <string name="use_quote_toot">Fer ús de \"Nota citada\"</string>
     <string name="mute_application_confirm">Vols silenciar l\'aplicació \"%1$s\"\?</string>
-    <string name="boost_button_alpha">Augmenta l\'opacitat del botó de difusió (Unitat:%%. cal reiniciar aplicació. també afecta al text de contingut alfa.)</string>
+    <string name="boost_button_alpha" formatted="false">Augmenta l\'opacitat del botó de difusió (Unitat:%. cal reiniciar aplicació. també afecta al text de contingut alfa.)</string>
     <string name="toot_background_color">Color de fons dels brams</string>
     <string name="column_color_default">Color per defecte de les pissarres</string>
     <string name="header_background_color">Color de fons de la capçalera</string>
@@ -906,7 +906,6 @@
     <string name="poll_dont_make">No fer enquesta</string>
     <string name="poll_make">Crear enquesta</string>
     <string name="poll_make_friends_nico">Crear enquesta (friends.nico API)</string>
-    <string name="plus">+</string>
     <string name="poll_expire_days">dies</string>
     <string name="poll_expire_hours">hores</string>
     <string name="poll_expire_minutes">minuts</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 86a7c4d6..70475a94 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -424,7 +424,7 @@
     <string name="notification_type_mention">Nennung</string>
     <string name="share_view_pool">Teile Anzeigenpool zwischen den Spalten</string>
     <string name="allow_column_duplication">Erlaube Verdoppelung von Spalten</string>
-    <string name="avatar_icon_round_ratio">Abrundungsfaktor des Avatarbildes (Einheit: %%. Standard: 33. App-Neustart erforderlich)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">Abrundungsfaktor des Avatarbildes (Einheit: %. Standard: 33. App-Neustart erforderlich)</string>
     <string name="always_show_application">Zeige per App-Name, falls möglich</string>
     <string name="domain_block_from_local">Kann Domänen auf deinem Server nicht blockieren.</string>
     <string name="domain_block_from_pseudo">Kann Domäne nicht vom Pseudokonto aus blockieren.</string>
@@ -569,7 +569,7 @@
     <string name="endorse_set">In deinem Profil promoten</string>
     <string name="already_voted">Bereits abgestimmt.</string>
     <string name="toot_background_color">Hintergrundfarbe des Toots</string>
-    <string name="boost_button_alpha">Deckkraft des Boost-Buttons (Einheit: %%. App-Neustart erforderlich; wird auch von der Transparenz des Inhaltstextes beeinflusst)</string>
+    <string name="boost_button_alpha" formatted="false">Deckkraft des Boost-Buttons (Einheit: %. App-Neustart erforderlich; wird auch von der Transparenz des Inhaltstextes beeinflusst)</string>
     <string name="mute_application_confirm">App \"%1$s\" stummschalten\?</string>
     <string name="use_quote_toot">Benutze “Toot zitieren”. (Misskey oder individiualisierter Mastodonserver)</string>
     <string name="conversation_to">An:</string>
@@ -662,7 +662,6 @@
     <string name="poll_expire_minutes">Minuten</string>
     <string name="poll_expire_hours">Stunden</string>
     <string name="poll_expire_days">Tage</string>
-    <string name="plus">+</string>
     <string name="poll_make_friends_nico">Umfrage erstellen (friends.nico-API)</string>
     <string name="poll_make">Umfrage erstellen</string>
     <string name="poll_dont_make">Umfrage nicht erstellen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2daa422e..b94188de 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -602,7 +602,7 @@
     <string name="always_show_application">Afficher (via) le nom de l\'application si possible</string>
     <string name="force_gap_when_refresh">Forcer l’ajout d\'un espace lors du rafraîchissement du dessus</string>
     <string name="avatar_icon_size">Taille de l’icône de l’avatar (Unité:dp. par défaut:48. Redémarrage de l’app requis)</string>
-    <string name="avatar_icon_round_ratio">Ratio de l’arrondi de l’icône de l’avatar (Unité:%%. défaut:33. redémarrage de l\'application requis)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">Ratio de l’arrondi de l’icône de l’avatar (Unité:%. défaut:33. redémarrage de l\'application requis)</string>
     <string name="avatar_icon_dont_round">Ne pas arrondir les coins de l’avatar (redémarrage requis)</string>
     <string name="share_view_pool">Partager le pool de vues entre les colonnes</string>
     <string name="rename">Renommer …</string>
@@ -849,7 +849,7 @@
     <string name="strip_icon_size">Taille de l’icône de la barre de colonne (Unité : dp. Défaut : 30. Redémarrage de l’application requis)</string>
     <string name="show_acct_in_system_notification">Afficher le compte (au lieu du nom d’utilisateur) dans les notifications système</string>
     <string name="account_tl_around">Fil public autour …</string>
-    <string name="boost_button_alpha">Transparence du bouton Boost (Unité:%%. redémarrage de l’app nécessaire. Affecte également la transparence du contenu texte.)</string>
+    <string name="boost_button_alpha" formatted="false">Transparence du bouton Boost (Unité:%. redémarrage de l’app nécessaire. Affecte également la transparence du contenu texte.)</string>
     <string name="move_notifications_quick_filter_to_column_setting">Afficher le filtre rapide des notifications dans la configuration de la colonne (redémarrage de l’app requis)</string>
     <string name="official_account">Compte officiel</string>
     <string name="releases">Sorties</string>
@@ -873,7 +873,6 @@
     <string name="poll_dont_make">Sans sondage</string>
     <string name="poll_make">Effectuer un sondage</string>
     <string name="poll_make_friends_nico">Effectuer un sondage (friends.nico API)</string>
-    <string name="plus">+</string>
     <string name="poll_expire_days">jours</string>
     <string name="poll_expire_hours">heures</string>
     <string name="poll_expire_minutes">minutes</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ec08a5df..f1867fd8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -71,7 +71,7 @@
     <string name="auto_cw_prefix">(自動CW)</string>
     <string name="available_mastodon_2_4_later">(マストドン2.4以降で利用可能)</string>
     <string name="avatar_icon_dont_round">ユーザ画像を角丸にしない(アプリ再起動が必要)</string>
-    <string name="avatar_icon_round_ratio">ユーザ画像の角丸率(単位:%%。デフォルト:33。アプリ再起動が必要)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">ユーザ画像の角丸率(単位:%。デフォルト:33。アプリ再起動が必要)</string>
     <string name="avatar_icon_size">ユーザ画像の大きさ(単位:dp。デフォルト:48。アプリ再起動が必要)</string>
     <string name="back_button_action">戻るボタンの動作</string>
     <string name="back_to_column_list">戻るボタンでカラム一覧を開く</string>
@@ -808,7 +808,7 @@
     <string name="conversation_to">送り先:</string>
     <string name="use_quote_toot">引用トゥートにする(MisskeyまたはカスタマイズされたMastodonサーバ)</string>
     <string name="mute_application_confirm">アプリ \"%1$s\" はミュートされます。よろしいですか?</string>
-    <string name="boost_button_alpha">ブーストボタンのアルファ不透明度(単位:%%。アプリの再起動が必要。本文テキスト色のアルファ値の影響も受けます)</string>
+    <string name="boost_button_alpha" formatted="false">ブーストボタンのアルファ不透明度(単位:%。アプリの再起動が必要。本文テキスト色のアルファ値の影響も受けます)</string>
     <string name="toot_background_color">トゥート背景色</string>
     <string name="unlisted_visibility">\'未収載\' 公開範囲</string>
     <string name="followers_visibility">\'フォロワーのみ\' 公開範囲</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index be27db05..5971c1da 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -611,7 +611,7 @@
     <string name="always_show_application">가능하면 (경유) 앱 이름 보이기</string>
     <string name="force_gap_when_refresh">위로 새로고침할 때 강제로 띄움 넣기</string>
     <string name="avatar_icon_size">아바타 아이콘 크기 (단위:dp. 기본값:48. 앱 재시작 필요)</string>
-    <string name="avatar_icon_round_ratio">아바타 아이콘 곡률 (Unit:%%. 기본값:33. 앱 재시작 필요)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">아바타 아이콘 곡률 (Unit:%. 기본값:33. 앱 재시작 필요)</string>
     <string name="avatar_icon_dont_round">아바타 아이콘의 모서리를 둥글게 하지 않기 (앱 재시작 필요)</string>
     <string name="share_view_pool">칼럼 사이에 뷰 풀을 공유</string>
     <string name="rename">이름 변경…</string>
@@ -796,7 +796,7 @@
     <string name="conversation_to">받을 이:</string>
     <string name="use_quote_toot">\"인용 리노트\" 사용</string>
     <string name="mute_application_confirm">앱 \"%1$s\"를 음소거할까요\?</string>
-    <string name="boost_button_alpha">부스트 버튼 알파 불투명도 (단위:%%. 앱 재시작 필요. 본문의 알파에 영향을 미침.)</string>
+    <string name="boost_button_alpha" formatted="false">부스트 버튼 알파 불투명도 (단위:%. 앱 재시작 필요. 본문의 알파에 영향을 미침.)</string>
     <string name="toot_background_color">툿 배경색</string>
     <string name="column_color_default">칼럼 색 기본값</string>
     <string name="header_background_color">헤더 배경색</string>
@@ -881,7 +881,6 @@
     <string name="poll_dont_make">투표 만들지 않기</string>
     <string name="poll_make">투표 만들기</string>
     <string name="poll_make_friends_nico">투표 만들기 (friends.nico API)</string>
-    <string name="plus">+</string>
     <string name="poll_expire_days">일</string>
     <string name="poll_expire_hours">시간</string>
     <string name="poll_expire_minutes">분</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 8e5cc462..6257b28c 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -678,7 +678,7 @@
     <string name="media_attachment_still_uploading">Media har ikke blitt lastet opp enda.</string>
     <string name="highlight_word">Framhev nøkkelord</string>
     <string name="avatar_icon_size">Avatarikonstørrelse (enhet:dp. Forvalg:48. Programomstart kreves)</string>
-    <string name="avatar_icon_round_ratio">Avatarikonstørrelseforhold (enhet:%%. Forvalg:33. Programomstart kreves)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">Avatarikonstørrelseforhold (enhet:%. Forvalg:33. Programomstart kreves)</string>
     <string name="avatar_icon_dont_round">Ikke avrund avatarikonets hjørner (programomstart kreves)</string>
     <string name="allow_column_duplication">Tillat duplisering av kolonner</string>
     <string name="system_notification_not_related">Ikke valgt når systemmerknad trykkes</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9131866..35380c16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -622,7 +622,7 @@
     <string name="always_show_application">Show (via) application name if possible</string>
     <string name="force_gap_when_refresh">Force adding gap when refreshing top</string>
     <string name="avatar_icon_size">Avatar icon size (Unit:dp. default:48. app restart required)</string>
-    <string name="avatar_icon_round_ratio">Avatar icon round ratio (Unit:%%. default:33. app restart required)</string>
+    <string name="avatar_icon_round_ratio" formatted="false">Avatar icon round ratio (Unit:%. default:33. app restart required)</string>
     <string name="avatar_icon_dont_round">Don\'t round corner of avatar icon (app restart required)</string>
     <string name="share_view_pool">Share view pool between columns</string>
     <string name="rename">Rename…</string>
@@ -816,7 +816,7 @@
     <string name="conversation_to">To:</string>
     <string name="use_quote_toot">Use \"Quote Toot\". (Misskey or some customized Mastodon server)</string>
     <string name="mute_application_confirm">Mute the app \"%1$s\"?</string>
-    <string name="boost_button_alpha">Boost button alpha opacity (Unit:%%. app restart required. also affected of content text alpha.)</string>
+    <string name="boost_button_alpha" formatted="false">Boost button alpha opacity (Unit:%. app restart required. also affected of content text alpha.)</string>
     <string name="toot_background_color">Toot background color</string>
     <string name="column_color_default">Column color default</string>
     <string name="header_background_color">Header background color</string>
@@ -901,7 +901,7 @@
     <string name="poll_dont_make">Don\'t make poll</string>
     <string name="poll_make">Make poll</string>
     <string name="poll_make_friends_nico">Make poll (friends.nico API)</string>
-    <string name="plus">+</string>
+    <string name="plus" translatable="false">+</string>
     <string name="poll_expire_days">days</string>
     <string name="poll_expire_hours">hours</string>
     <string name="poll_expire_minutes">minutes</string>
diff --git a/checkMissingTranslation.pl b/checkMissingTranslation.pl
index 39403854..addbac6c 100644
--- a/checkMissingTranslation.pl
+++ b/checkMissingTranslation.pl
@@ -5,7 +5,9 @@ use warnings;
 use File::Find;
 use XML::Simple;
 use Data::Dump qw(dump);
+use utf8;
 
+binmode $_ for \*STDOUT,\*STDERR;
 
 
 sub cmd($){
@@ -122,7 +124,9 @@ for my $lang ( sort keys %langs ){
 
 		# 残りの部分に%が登場したらエラー
 		my $sv = $value;
-		$sv =~ s/(%\d+\$[\d\.]*[sdxf])|%%//g;
+		$sv =~ s/(%\d+\$[\d\.]*[sdxf])//g;
+		# Unit:%. を除外したい
+		$sv =~ s/%[\s.。]//g;
 		if( $sv =~ /%/  ){
 			$hasError =1;
 			print "!! ($lang)$name : broken param: $sv // $value\n";