From 42db819a355d3dec3d42fd144ba1ba984579a949 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <k.pozniak@gmx.at>
Date: Mon, 22 Jul 2019 17:20:58 +0200
Subject: [PATCH] fix string problems

---
 app/src/main/res/values-en-rGB/strings.xml |  4 ++--
 app/src/main/res/values-en-rUS/strings.xml | 12 +-----------
 app/src/main/res/values-eo/strings.xml     |  2 +-
 app/src/main/res/values-ko/strings.xml     |  5 ++---
 app/src/main/res/values-tr/strings.xml     |  5 +----
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 71cc57a1..3ea002a9 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -12,8 +12,8 @@
     <string name="notification_favourite_name">Favourites</string>
     <string name="notification_favourite_description">Notifications when your toots get marked as favourite</string>
     <plurals name="favs">
-	<item quantity="one"><b>%1$s</b> Favourite</item>
-	<item quantity="other"><b>%1$s</b> Favourites</item>
+	<item quantity="one">&lt;b>%1$s&lt;/b> Favourite</item>
+	<item quantity="other">&lt;b>%1$s&lt;/b> Favourites</item>
 </plurals>
 
     <string name="title_favourited_by">Favourited by</string>
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index d9b340cf..2392d59a 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -1,12 +1,2 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="dialog_whats_an_instance"><a href="https://instances.social">more!</a> 
-\n
-\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to join and create an account there.
-\n
-\nAn instance is a single place where your account is hosted, but you can easily communicate with and follow folks on other instances as though you were on the same site. 
-\n
-\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
-    <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
-    <string name="poll_option_format"> <!-- 15% vote for this! --> &lt;b&gt;%1$d%%&lt;/b&gt; %2$s</string>
-
-    </resources>
+<resources></resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 8888d08f..0f6eda73 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -421,7 +421,7 @@
     <string name="action_mute_domain">Silentigi %s</string>
     <string name="confirmation_domain_unmuted">%s malsilentigita</string>
 
-    <string name="mute_domain_warning">Ĉu vi certas ke vi volas tute bloki {domain}\? Vi ne vidos enhavon de tiu domajno en publika tempolinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.</string>
+    <string name="mute_domain_warning">Ĉu vi certas ke vi volas tute bloki %s\? Vi ne vidos enhavon de tiu domajno en publika tempolinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.</string>
     <string name="mute_domain_warning_dialog_ok">Kaŝi la tutan domajnon</string>
 
     <string name="caption_notoemoji">La aktuala emoĝiaro de Google</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 34ae8cef..c4c1592e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -58,7 +58,7 @@
     <string name="footer_empty">게시물이 없습니다. 아래로 당겨서 새로고침하세요!</string>
 
     <string name="notification_reblog_format">%s님이 부스트 했습니다</string>
-    <string name="notification_favourite_format">%님이 즐겨찾기 했습니다</string>
+    <string name="notification_favourite_format">%s님이 즐겨찾기 했습니다</string>
     <string name="notification_follow_format">%s님이 나를 팔로우 했습니다.</string>
 
     <string name="report_username_format">\@%s 신고</string>
@@ -134,7 +134,6 @@
     <string name="download_image">%1$s 다운로드 중</string>
 
     <string name="action_copy_link">링크 복사</string>
-    <string name="action_open_as">사사사</string>
     <string name="action_share_as">공유</string>
     <string name="download_media">다운로드</string>
     <string name="downloading_media">미디어 다운로드 중</string>
@@ -313,7 +312,7 @@
     <string name="follows_you">당신을 팔로우합니다</string>
     <string name="pref_title_alway_show_sensitive_media">민감한 컨텐츠 항상 보이기</string>
     <string name="title_media">미디어</string>
-    <string name="replying_to">\@s에게 답장</string>
+    <string name="replying_to">\@%s에게 답장</string>
     <string name="load_more_placeholder_text">더 불러오기</string>
 
     <string name="pref_title_public_filter_keywords">공개 타임라인</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9580b5b1..8f7644e3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -240,7 +240,7 @@
     <string name="follows_you">Sizi takip ediyor</string>
     <string name="pref_title_alway_show_sensitive_media">Her zaman hassas içerikleri göster</string>
     <string name="title_media">Medya</string>
-    <string name="replying_to"/>
+
     <string name="load_more_placeholder_text">daha fazla yükle</string>
     <string name="add_account_name">Hesap Ekle</string>
     <string name="add_account_description">Yeni Mastodon hesabı ekle</string>
@@ -248,7 +248,6 @@
     <string name="title_lists">Listeler</string>
     <string name="title_list_timeline">Zaman çizelgesini listele</string>
     <string name="compose_active_account_description">%1$s hesabıyla gönderiliyor</string>
-    <string name="error_failed_set_caption"/>
     <string name="hint_describe_for_visually_impaired">Görme engelliler için açıklama
 \n(%d karakter limiti)</string>
     <string name="action_set_caption">Başlık belirle</string>
@@ -278,9 +277,7 @@
     <string name="caption_blobmoji">Android 4.4 — 7.1\'den bilinen baloncuk emojisi</string>
     <string name="caption_twemoji">Mastodon\'un standart emoji seti</string>
     <string name="download_failed">İndirme başarısız</string>
-    <string name="profile_badge_bot_text"/>
     <string name="account_moved_description">%1$s buraya taşındı:</string>
-    <string name="reblog_private"/>
     <string name="unreblog_private">Yinelemeyi geri al</string>
     <string name="license_description">Tusky aşağıdakı açık kaynaklı projelerden kod ve materyal içeriyor:</string>
     <string name="license_apache_2">Apache Lisansı altında lisanslanmıştır (kopya aşağıda)</string>