Merge pull request #436 from mastodon/feature-hashtag-refresh

Add hashtag refresh feature

.gitignore

@@ -120,6 +120,6 @@ xcuserdata
 
 # End of https://www.toptal.com/developers/gitignore/api/swift,swiftpm,xcode,cocoapods
 
-Localization/StringsConvertor/input
+# Localization/StringsConvertor/input
 Localization/StringsConvertor/output
 .DS_Store

Localization/StringsConvertor/Intents/input/pt.lproj/Intents.stringsdict

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>There are ${count} options matching ‘${content}’. - 2</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>There are %#@count_option@ matching ‘${content}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 option</string>
+        <key>other</key>
+        <string>%ld options</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>There are %#@count_option@ matching ‘${visibility}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 option</string>
+        <key>other</key>
+        <string>%ld options</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

Localization/StringsConvertor/Intents/input/ru.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "Post on Mastodon";
+
+"751xkl" = "Text Content";
+
+"CsR7G2" = "Post on Mastodon";
+
+"HZSGTr" = "What content to post?";
+
+"HdGikU" = "Posting failed";
+
+"KDNTJ4" = "Failure Reason";
+
+"RHxKOw" = "Send Post with text content";
+
+"RxSqsb" = "Post";
+
+"WCIR3D" = "Post ${content} on Mastodon";
+
+"ZKJSNu" = "Post";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Visibility";
+
+"Zo4jgJ" = "Post Visibility";
+
+"apSxMG-dYQ5NN" = "There are ${count} options matching ‘Public’.";
+
+"apSxMG-ehFLjY" = "There are ${count} options matching ‘Followers Only’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Public";
+
+"ayoYEb-ehFLjY" = "${content}, Followers Only";
+
+"dUyuGg" = "Post on Mastodon";
+
+"dYQ5NN" = "Public";
+
+"ehFLjY" = "Followers Only";
+
+"gfePDu" = "Posting failed. ${failureReason}";
+
+"k7dbKQ" = "Post was sent successfully.";
+
+"oGiqmY-dYQ5NN" = "Just to confirm, you wanted ‘Public’?";
+
+"oGiqmY-ehFLjY" = "Just to confirm, you wanted ‘Followers Only’?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Post was sent successfully. ";

Localization/StringsConvertor/Intents/input/sv_FI/Intents.strings

@@ -1,51 +0,0 @@
-"16wxgf" = "Julkaise Mastodonissa";
-
-"751xkl" = "Tekstisisältö";
-
-"CsR7G2" = "Julkaise Mastodonissa";
-
-"HZSGTr" = "Mitä sisältöä julkaista?";
-
-"HdGikU" = "Julkaiseminen epäonnistui";
-
-"KDNTJ4" = "Epäonnistumisen syy";
-
-"RHxKOw" = "Lähetä julkaisu teksisisällöllä";
-
-"RxSqsb" = "Julkaisu";
-
-"WCIR3D" = "Julkaise ${content} Mastodonissa";
-
-"ZKJSNu" = "Julkaisu";
-
-"ZS1XaK" = "${content}";
-
-"ZbSjzC" = "Näkyvyys";
-
-"Zo4jgJ" = "Julkaisun näkyvyys";
-
-"apSxMG-dYQ5NN" = "On ${count} vaihtoehtoa, jotka vastaavat ‘Julkinen’.";
-
-"apSxMG-ehFLjY" = "On ${count} vaihtoehtoa, jotka vastaavat ‘Vain seuraajat’.";
-
-"ayoYEb-dYQ5NN" = "${content}, julkinen";
-
-"ayoYEb-ehFLjY" = "${content}, vain seuraajat";
-
-"dUyuGg" = "Julkaise Mastodonissa";
-
-"dYQ5NN" = "Julkinen";
-
-"ehFLjY" = "Vain seuraajat";
-
-"gfePDu" = "Julkaiseminen epäonnistui. ${failureReason}";
-
-"k7dbKQ" = "Julkaisu lähetettiin onnistuneesti.";
-
-"oGiqmY-dYQ5NN" = "Vahvitukseksi, halusit ‘Julkinen’?";
-
-"oGiqmY-ehFLjY" = "Vahvitstukseksi, halusit ‘Vain seuraajat’?";
-
-"rM6dvp" = "URL";
-
-"ryJLwG" = "Julkaisu lähetettiin onnistuneesti. ";

Localization/StringsConvertor/Intents/input/sv_FI/Intents.stringsdict

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>There are ${count} options matching ‘${content}’. - 2</key>
-    <dict>
-      <key>NSStringLocalizedFormatKey</key>
-      <string>On %#@count_option@, joka/jotka vastaavat sisältöön ‘${content}’.</string>
-      <key>count_option</key>
-      <dict>
-        <key>NSStringFormatSpecTypeKey</key>
-        <string>NSStringPluralRuleType</string>
-        <key>NSStringFormatValueTypeKey</key>
-        <string>%ld</string>
-        <key>one</key>
-        <string>1 vaihtoehto</string>
-        <key>other</key>
-        <string>%ld vaihtoehtoa</string>
-      </dict>
-    </dict>
-    <key>There are ${count} options matching ‘${visibility}’.</key>
-    <dict>
-      <key>NSStringLocalizedFormatKey</key>
-      <string>On vaihtoehtoa %#@count_option@, joka/jotka vastaavat näkyvyyteen ‘${visibility}’.</string>
-      <key>count_option</key>
-      <dict>
-        <key>NSStringFormatSpecTypeKey</key>
-        <string>NSStringPluralRuleType</string>
-        <key>NSStringFormatValueTypeKey</key>
-        <string>%ld</string>
-        <key>one</key>
-        <string>1 vaihtoehto</string>
-        <key>other</key>
-        <string>%ld vaihtoehtoa</string>
-      </dict>
-    </dict>
-  </dict>
-</plist>

Localization/StringsConvertor/Sources/StringsConvertor/main.swift

@@ -47,31 +47,30 @@ private func convert(from inputDirectoryURL: URL, to outputDirectory: URL) {
 
 private func map(language: String) -> String? {
     switch language {
-    case "ar_SA":   return "ar"         // Arabic (Saudi Arabia)
+    case "ar.lproj":        return "ar"         // Arabic
-    case "eu_ES":   return "eu-ES"      // Basque
+    case "eu.lproj":        return "eu"         // Basque
-    case "ca_ES":   return "ca"         // Catalan
+    case "ca.lproj":        return "ca"         // Catalan
-    case "zh_CN":   return "zh-Hans"    // Chinese Simplified
+    case "zh-Hans.lproj":   return "zh-Hans"    // Chinese Simplified
-    case "zh_TW":   return "zh-Hant"    // Chinese Traditional
+    case "zh-Hant.lproj":   return "zh-Hant"    // Chinese Traditional
-    case "nl_NL":   return "nl"         // Dutch
+    case "nl.lproj":        return "nl"         // Dutch
-    case "en_US":   return "en"
+    case "en.lproj":        return "en"
-    case "fr_FR":   return "fr"         // French
+    case "fr.lproj":        return "fr"         // French
-    case "gl_ES":   return "gl"         // Galician
+    case "gl.lproj":        return "gl"         // Galician
-    case "de_DE":   return "de"         // German
+    case "de.lproj":        return "de"         // German
-    case "it_IT":   return "it"         // Italian
+    case "it.lproj":        return "it"         // Italian
-    case "ja_JP":   return "ja"         // Japanese
+    case "ja.lproj":        return "ja"         // Japanese
-    case "kab_KAB": return "kab"        // Kabyle
+    case "kab.lproj":       return "kab"        // Kabyle
-    case "kmr_TR":  return "ku"         // Kurmanji (Kurdish)
+    case "kmr.lproj":       return "ku"         // Kurmanji (Kurdish) [intent mapping]
-    case "ru_RU":   return "ru"         // Russian
+    case "ru.lproj":        return "ru"         // Russian
-    case "gd_GB":   return "gd-GB"      // Scottish Gaelic
+    case "gd.lproj":        return "gd"         // Scottish Gaelic
-    case "ckb_IR":  return "ckb"        // Sorani (Kurdish)
+    case "ckb.lproj":       return "ckb"        // Sorani (Kurdish)
-    case "es_ES":   return "es"         // Spanish
+    case "es.lproj":        return "es"         // Spanish
-    case "es_AR":   return "es-419"     // Spanish, Argentina
+    case "es_AR.lproj":     return "es-AR"      // Spanish, Argentina
-    case "sv-SE":   return "sv"         // Swedish
+    case "sv.lproj":        return "sv"         // Swedish
-    case "sv_FI":   return "sv_FI"      // Swedish, Finland
+    case "th.lproj":        return "th"         // Thai
-    case "th_TH":   return "th"         // Thai
+    case "tr.lproj":        return "tr"         // Turkish
-    case "tr_TR":   return "tr"         // Turkish
+    case "vi.lproj":        return "vi"         // Vietnamese
-    case "vi_VN":   return "vi"         // Vietnamese
+    default:                return nil
-    default:        return nil
     }
 }
 

Localization/StringsConvertor/input/ar.lproj/Localizable.stringsdict

@@ -98,6 +98,30 @@
         <string>منشور</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>zero</key>
+        <string>%ld media</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>two</key>
+        <string>%ld media</string>
+        <key>few</key>
+        <string>%ld media</string>
+        <key>many</key>
+        <string>%ld media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/ar.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "أخبرنا عن نفسك.",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "حذف"
@@ -320,7 +321,8 @@
         },
         "confirm_email": {
             "title": "شيءٌ أخير.",
-            "subtitle": "لقد أرسلنا للتو بريد إلكتروني إلى %s،\nانقر على الرابط لتأكيد حسابك.",
+            "subtitle": "أنقر على الرابط المرسل إليك لاستيثاق حسابك.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "فتح تطبيق البريد الإلكتروني",
                 "resend": "إعادَةُ الإرسال"
@@ -641,7 +643,8 @@
                 "mute_user": "كَتمُ %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "لَن تَرى مُشارَكاتِهِ أو إعادَاتِ تَدوينَهِ فِي تغذيَتِكَ الرَّئيسَة. لَن يَعرِفَ أنَّهُ قَد كُتِمَ أيضًا.",
                 "block_user": "حَظرُ %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "لَن يَتمكَّنَ بَعدَ الآنِ مِن مُتابَعَةِ مَنشوراتِكَ أو رُؤيَتِها، وَلكِن يُمكِنَهُ مَعرِفَةُ مَا إذا حُظَرِت عَنه."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "لَن يَتمكَّنَ بَعدَ الآنِ مِن مُتابَعَةِ مَنشوراتِكَ أو رُؤيَتِها، وَلكِن يُمكِنَهُ مَعرِفَةُ مَا إذا حُظَرِت عَنه.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/ca.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>publicacions</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 mèdia</string>
+        <key>other</key>
+        <string>%ld mèdia</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/ca.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Anem a configurar-te a %s",
+            "lets_get_you_set_up_on_domain": "Anem a configurar-te a %s",
             "input": {
                 "avatar": {
                     "delete": "Suprimeix"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "Una última cosa.",
             "subtitle": "Toca l'enllaç del correu electrònic que t'hem enviat per a confirmar el teu compte.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Toca l'enllaç del correu electrònic que t'hem enviat per a confirmar el teu compte",
             "button": {
                 "open_email_app": "Obre l'aplicació de correu",
                 "resend": "Reenvia"
@@ -641,7 +643,8 @@
                 "mute_user": "Silencia %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "No veuràs les seves publicacions o impulsos a la teva línia de temps personal. No sabran que han estat silenciats.",
                 "block_user": "Bloca %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "Ja no podran seguir ni veure les teves publicacions, però poden veure si han estat bloquejats."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "Ja no podran seguir ni veure les teves publicacions, però poden veure si han estat bloquejats.",
+                "while_we_review_this_you_can_take_action_against_user": "Mentre ho revisem, pots prendre mesures contra %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/ckb.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>پۆست</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/ckb.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "خۆت تۆمار بکە لە %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "بیسڕەوە"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "کۆتا شت.",
             "subtitle": "بۆ پشتڕاستکردنەوەی هەژمارەکەت ئەو بەستەرە بکەوە کە بە ئیمێڵ بۆمان ناردوویت.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "بەرنامەی ئیمێڵەکەت بکەوە",
                 "resend": "بینێرەوە"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/cy.lproj/Localizable.stringsdict

@@ -98,6 +98,30 @@
         <string>postiau</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>zero</key>
+        <string>%ld media</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>two</key>
+        <string>%ld media</string>
+        <key>few</key>
+        <string>%ld media</string>
+        <key>many</key>
+        <string>%ld media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/cy.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Let’s get you set up on %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Delete"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "One last thing.",
             "subtitle": "Tap the link we emailed to you to verify your account.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Open Email App",
                 "resend": "Resend"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/da.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>posts</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/da.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Let’s get you set up on %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Delete"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "One last thing.",
             "subtitle": "Tap the link we emailed to you to verify your account.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Open Email App",
                 "resend": "Resend"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/de.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>Beiträge</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/de.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Erzähle uns von dir.",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Löschen"
@@ -320,7 +321,8 @@
         },
         "confirm_email": {
             "title": "Noch eine letzte Sache.",
-            "subtitle": "Wir haben gerade eine E-Mail an %s gesendet,\ntippe darin auf den Link, um Dein Konto zu bestätigen.",
+            "subtitle": "Schaue kurz in dein E-Mail-Postfach und tippe den Link an, den wir dir gesendet haben.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "E-Mail-App öffnen",
                 "resend": "Erneut senden"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/en-US.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>posts</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/en-US.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Let’s get you set up on %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Delete"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "One last thing.",
             "subtitle": "Tap the link we emailed to you to verify your account.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Open Email App",
                 "resend": "Resend"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/en.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>posts</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/en.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Let’s get you set up on %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Delete"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "One last thing.",
             "subtitle": "Tap the link we emailed to you to verify your account.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Open Email App",
                 "resend": "Resend"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/es-AR.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>mensajes</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/es-AR.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Contanos sobre vos.",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Eliminar"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "Una última cosa.",
             "subtitle": "Acabamos de enviar un correo electrónico a %s,\npulsá en el enlace para confirmar tu cuenta.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Abrir aplicación de correo electrónico",
                 "resend": "Reenviar"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {

Localization/StringsConvertor/input/es.lproj/Localizable.stringsdict

@@ -66,6 +66,22 @@
         <string>publicaciones</string>
       </dict>
     </dict>
+    <key>plural.count.media</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@media_count@</string>
+      <key>media_count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>1 media</string>
+        <key>other</key>
+        <string>%ld media</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

Localization/StringsConvertor/input/es.lproj/app.json

@@ -251,6 +251,7 @@
         },
         "register": {
             "title": "Háblanos de ti.",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "Borrar"
@@ -321,6 +322,7 @@
         "confirm_email": {
             "title": "Una última cosa.",
             "subtitle": "Te acabamos de enviar un correo a %s,\npulsa en el enlace para confirmar tu cuenta.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account",
             "button": {
                 "open_email_app": "Abrir Aplicación de Correo Electrónico",
                 "resend": "Reenviar"
@@ -641,7 +643,8 @@
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",
                 "block_user": "Block %s",
-                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
             }
         },
         "preview": {