Merge pull request #439 from mastodon/release-1.4.2

Release v1.4.2

.github/scripts/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# workaround https://github.com/CocoaPods/CocoaPods/issues/11355
+sed -i '' $'1s/^/source "https:\\/\\/github.com\\/CocoaPods\\/Specs.git"\\\n\\\n/' Podfile
+
 # Install Ruby Bundler
 gem install bundler:2.3.11
 

.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

AppShared/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.1</string>
+	<string>1.4.2</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>133</string>
 </dict>
 </plist>

Localization/Localizable.stringsdict

@@ -68,6 +68,37 @@
             <string>%ld characters</string>
         </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@names@%#@count_mutual@</string>
+        <key>names</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>other</key>
+            <string></string>
+        </dict>
+        <key>count_mutual</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>Followed by %1$@</string>
+            <key>one</key>
+            <string>Followed by %1$@, and another mutual</string>
+            <key>few</key>
+            <string>Followed by %1$@, and %ld mutuals</string>
+            <key>many</key>
+            <string>Followed by %1$@, and %ld mutuals</string>
+            <key>other</key>
+            <string>Followed by %1$@, and %ld mutuals</string>
+        </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
         <key>NSStringLocalizedFormatKey</key>
@@ -90,6 +121,28 @@
             <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>zero</key>
+            <string>0 media</string>
+            <key>one</key>
+            <string>1 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/Intents/input/gl.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "Publicar en Mastodon";
+
+"751xkl" = "Texto a incluír";
+
+"CsR7G2" = "Publicar en Mastodon";
+
+"HZSGTr" = "Cal é o contido a publicar?";
+
+"HdGikU" = "Fallou a publicación";
+
+"KDNTJ4" = "Razón do fallo";
+
+"RHxKOw" = "Enviar Publicación con texto";
+
+"RxSqsb" = "Publicación";
+
+"WCIR3D" = "Publicar ${content} en Mastodon";
+
+"ZKJSNu" = "Publicación";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Visibilidade";
+
+"Zo4jgJ" = "Visibilidade da publicación";
+
+"apSxMG-dYQ5NN" = "Hai ${count} opcións que coinciden con ‘Público’.";
+
+"apSxMG-ehFLjY" = "Hai ${count} opcións que coinciden con 'Só seguidoras’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Público";
+
+"ayoYEb-ehFLjY" = "${content}, Só seguidoras";
+
+"dUyuGg" = "Publicar en Mastodon";
+
+"dYQ5NN" = "Público";
+
+"ehFLjY" = "Só seguidoras";
+
+"gfePDu" = "Fallou a publicación. ${failureReason}";
+
+"k7dbKQ" = "Publicación correcta.";
+
+"oGiqmY-dYQ5NN" = "Só para confirmar, querías ’Público'?";
+
+"oGiqmY-ehFLjY" = "Só para confirmar, querías ’Só para seguidoras'?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Publicación correcta. ";

Localization/StringsConvertor/Intents/input/gl.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>Hai %#@count_option@ coincidencias con '${content}'.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opción</string>
+        <key>other</key>
+        <string>%ld opcións</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Hai %#@count_option@ coincidentes con '${visibility}'.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opción</string>
+        <key>other</key>
+        <string>%ld opcións</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

Localization/StringsConvertor/Intents/input/pt_PT/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>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_RU/Intents.strings

@@ -1,51 +0,0 @@
-"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.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "Publicera på Mastodon";
+
+"751xkl" = "Textinnehåll";
+
+"CsR7G2" = "Publicera på Mastodon";
+
+"HZSGTr" = "Vilket innehåll ska publiceras?";
+
+"HdGikU" = "Publiceringen misslyckades";
+
+"KDNTJ4" = "Felorsak";
+
+"RHxKOw" = "Skicka inlägg med textinnehåll";
+
+"RxSqsb" = "Inlägg";
+
+"WCIR3D" = "Publicera ${content} på Mastodon";
+
+"ZKJSNu" = "Inlägg";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Synlighet";
+
+"Zo4jgJ" = "Inläggssynlighet";
+
+"apSxMG-dYQ5NN" = "Det finns ${count} alternativ som matchar ‘Offentligt’.";
+
+"apSxMG-ehFLjY" = "Det finns ${count} alternativ som matchar ‘Endast följare’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Offentligt";
+
+"ayoYEb-ehFLjY" = "${content}, Endast följare";
+
+"dUyuGg" = "Publicera på Mastodon";
+
+"dYQ5NN" = "Offentligt";
+
+"ehFLjY" = "Endast följare";
+
+"gfePDu" = "Publicering misslyckades. ${failureReason}";
+
+"k7dbKQ" = "Inlägget har publicerats.";
+
+"oGiqmY-dYQ5NN" = "Bara för att bekräfta, ville du ha 'Offentligt'?";
+
+"oGiqmY-ehFLjY" = "Bara för att bekräfta, ville du ha 'Endast följare'?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Inlägget har publicerats. ";

Localization/StringsConvertor/Intents/input/sv_SE/Intents.strings

@@ -1,51 +0,0 @@
-"16wxgf" = "Posta på Mastodon";
-
-"751xkl" = "Textinnehåll";
-
-"CsR7G2" = "Posta på Mastodon";
-
-"HZSGTr" = "Vilket innehåll ska jag posta?";
-
-"HdGikU" = "Inlägget misslyckades";
-
-"KDNTJ4" = "Felorsak";
-
-"RHxKOw" = "Skicka inlägg med textinnehåll";
-
-"RxSqsb" = "Posta";
-
-"WCIR3D" = "Posta ${content} på Mastodon";
-
-"ZKJSNu" = "Posta";
-
-"ZS1XaK" = "${content}";
-
-"ZbSjzC" = "Synlighet";
-
-"Zo4jgJ" = "Inläggssynlighet";
-
-"apSxMG-dYQ5NN" = "Det finns ${count} alternativ som matchar ‘Publikt’.";
-
-"apSxMG-ehFLjY" = "Det finns ${count} alternativ som matchar ‘Endast följare’.";
-
-"ayoYEb-dYQ5NN" = "${content}, Publikt";
-
-"ayoYEb-ehFLjY" = "${content}, Endast följare";
-
-"dUyuGg" = "Posta på Mastodon";
-
-"dYQ5NN" = "Publikt";
-
-"ehFLjY" = "Endast följare";
-
-"gfePDu" = "Inlägget misslyckades. ${failureReason}";
-
-"k7dbKQ" = "Inlägget har postats.";
-
-"oGiqmY-dYQ5NN" = "Bara för att bekräfta, ville du ha 'Publikt'?";
-
-"oGiqmY-ehFLjY" = "Bara för att bekräfta, ville du ha 'Endast följare'?";
-
-"rM6dvp" = "URL";
-
-"ryJLwG" = "Inlägget har postats. ";

Localization/StringsConvertor/Sources/StringsConvertor/main.swift

@@ -47,31 +47,31 @@ 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 "eu_ES":   return "eu-ES"      // Basque
-    case "ca_ES":   return "ca"         // Catalan
-    case "zh_CN":   return "zh-Hans"    // Chinese Simplified
-    case "zh_TW":   return "zh-Hant"    // Chinese Traditional
-    case "nl_NL":   return "nl"         // Dutch
-    case "en_US":   return "en"
-    case "fr_FR":   return "fr"         // French
-    case "gl_ES":   return "gl"         // Galician
-    case "de_DE":   return "de"         // German
-    case "it_IT":   return "it"         // Italian
-    case "ja_JP":   return "ja"         // Japanese
-    case "kab_KAB": return "kab"        // Kabyle
-    case "kmr_TR":  return "ku"         // Kurmanji (Kurdish)
-    case "ru_RU":   return "ru"         // Russian
-    case "gd_GB":   return "gd-GB"      // Scottish Gaelic
-    case "ckb_IR":  return "ckb"        // Sorani (Kurdish)
-    case "es_ES":   return "es"         // Spanish
-    case "es_AR":   return "es-419"     // Spanish, Argentina
-    case "sv-SE":   return "sv"         // Swedish
-    case "sv_FI":   return "sv_FI"      // Swedish, Finland
-    case "th_TH":   return "th"         // Thai
-    case "tr_TR":   return "tr"         // Turkish
-    case "vi_VN":   return "vi"         // Vietnamese
-    default:        return nil
+    case "ar.lproj":        return "ar"         // Arabic
+    case "eu.lproj":        return "eu"         // Basque
+    case "ca.lproj":        return "ca"         // Catalan
+    case "zh-Hans.lproj":   return "zh-Hans"    // Chinese Simplified
+    case "zh-Hant.lproj":   return "zh-Hant"    // Chinese Traditional
+    case "nl.lproj":        return "nl"         // Dutch
+    case "en.lproj":        return "en"
+    case "fi.lproj":        return "fi"         // Finnish
+    case "fr.lproj":        return "fr"         // French
+    case "gl.lproj":        return "gl"         // Galician
+    case "de.lproj":        return "de"         // German
+    case "it.lproj":        return "it"         // Italian
+    case "ja.lproj":        return "ja"         // Japanese
+    case "kab.lproj":       return "kab"        // Kabyle
+    case "kmr.lproj":       return "ku"         // Kurmanji (Kurdish) [intent mapping]
+    case "ru.lproj":        return "ru"         // Russian
+    case "gd.lproj":        return "gd"         // Scottish Gaelic
+    case "ckb.lproj":       return "ckb"        // Sorani (Kurdish)
+    case "es.lproj":        return "es"         // Spanish
+    case "es_AR.lproj":     return "es-AR"      // Spanish, Argentina
+    case "sv.lproj":        return "sv"         // Swedish
+    case "th.lproj":        return "th"         // Thai
+    case "tr.lproj":        return "tr"         // Turkish
+    case "vi.lproj":        return "vi"         // Vietnamese
+    default:                return nil
     }
 }
 

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

@@ -74,6 +74,49 @@
         <string>%ld حَرف</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>zero</key>
+        <string></string>
+        <key>one</key>
+        <string></string>
+        <key>two</key>
+        <string></string>
+        <key>few</key>
+        <string></string>
+        <key>many</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>zero</key>
+        <string>مُتابَعٌ مِن قِبَلِ لَا أحَد</string>
+        <key>one</key>
+        <string>مُتابَعٌ مِن قِبَلِ %1$@، وشَخصٌ آخَرُ مُتبادَل</string>
+        <key>two</key>
+        <string>مُتابَعٌ مِن قِبَلِ %1$@، وشَخصانِ آخَرَانِ مُتبادَلَان</string>
+        <key>few</key>
+        <string>مُتابَعٌ مِن قِبَلِ %1$@، و%ld آخَرينَ مُتبادَلين</string>
+        <key>many</key>
+        <string>مُتابَعٌ مِن قِبَلِ %1$@، و%ld آخَرينَ مُتبادَلين</string>
+        <key>other</key>
+        <string>مُتابَعٌ مِن قِبَلِ %1$@، و%ld آخَرَ مُتبادَل</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -98,6 +141,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>لا وسيطة</string>
+        <key>one</key>
+        <string>وسيطةٌ واحِدَة</string>
+        <key>two</key>
+        <string>وسيطتانِ اِثنتان</string>
+        <key>few</key>
+        <string>%ld أوساط</string>
+        <key>many</key>
+        <string>%ld وَسَطًا</string>
+        <key>other</key>
+        <string>%ld وَسَط</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -109,7 +176,7 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>ld</string>
         <key>zero</key>
-        <string>لا منشور</string>
+        <string>لا مَنشورات</string>
         <key>one</key>
         <string>منشورٌ واحِد</string>
         <key>two</key>
@@ -447,13 +514,13 @@
         <key>zero</key>
         <string>تتبقى لَحظة</string>
         <key>one</key>
-        <string>تتبقى ثانية</string>
+        <string>تتبقى ثانية واحِدة</string>
         <key>two</key>
-        <string>تتبقى ثانيتين</string>
+        <string>تتبقى ثانيتان</string>
         <key>few</key>
         <string>تتبقى %ld ثوان</string>
         <key>many</key>
-        <string>تتبقى %ld ثانيةً</string>
+        <string>تتبقى %ld ثانية</string>
         <key>other</key>
         <string>تتبقى %ld ثانية</string>
       </dict>

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

@@ -71,7 +71,7 @@
                 "cancel": "إلغاء",
                 "discard": "تجاهُل",
                 "try_again": "المُحاولة مرة أُخرى",
-                "take_photo": "التقاط صورة",
+                "take_photo": "اِلتِقاطُ صُورَة",
                 "save_photo": "حفظ الصورة",
                 "copy_photo": "نسخ الصورة",
                 "sign_in": "تسجيل الدخول",
@@ -240,7 +240,8 @@
                 "category": "الفئة"
             },
             "input": {
-                "placeholder": "اِبحَث عن خادِم أو انضم إلى آخر خاص بك..."
+                "placeholder": "اِبحَث عن خادِم أو انضم إلى آخر خاص بك...",
+                "search_servers_or_enter_url": "اِبحَث فِي الخَوادِم أو أدخِل رابِط"
             },
             "empty_state": {
                 "finding_servers": "يجري إيجاد خوادم متوفِّرَة...",
@@ -250,6 +251,7 @@
         },
         "register": {
             "title": "أخبرنا عن نفسك.",
+            "lets_get_you_set_up_on_domain": "دَعنا نَبدَأُ بِإعدادِكَ عَلَى %s",
             "input": {
                 "avatar": {
                     "delete": "حذف"
@@ -319,7 +321,8 @@
         },
         "confirm_email": {
             "title": "شيءٌ أخير.",
-            "subtitle": "لقد أرسلنا للتو بريد إلكتروني إلى %s،\nانقر على الرابط لتأكيد حسابك.",
+            "subtitle": "أنقر على الرابط المرسل إليك لاستيثاق حسابك.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "اُنقُر عَلَى الرَّابِطِ الَّذي أرسَلناهُ إليكَ عَبرَ البَريدِ الإلِكتُرُونيّ لِلتَّحَقُقِ مِن حِسابِك",
             "button": {
                 "open_email_app": "فتح تطبيق البريد الإلكتروني",
                 "resend": "إعادَةُ الإرسال"
@@ -342,7 +345,11 @@
                 "offline": "غَير مُتَّصِل",
                 "new_posts": "إظهار منشورات جديدة",
                 "published": "تمَّ النَّشر!",
-                "Publishing": "يَجري نَشر المُشارَكَة..."
+                "Publishing": "يَجري نَشر المُشارَكَة...",
+                "accessibility": {
+                    "logo_label": "ُّزِرُّ الشِّعار",
+                    "logo_hint": "اُنقُر لِلتمريرِ لأعلى واُنقُر مَرّةً أُخرَى لِلذَّهابِ إلَى المَوقِعِ السَّابِق"
+                }
             }
         },
         "suggestion_account": {
@@ -355,11 +362,11 @@
                 "new_reply": "رَدٌّ جديد"
             },
             "media_selection": {
-                "camera": "إلتقاط صورة",
-                "photo_library": "مكتبة الصور",
-                "browse": "تصفح"
+                "camera": "اِلتِقاطُ صُورَة",
+                "photo_library": "مَكتَبَةُ الصُّوَر",
+                "browse": "تَصَفَّح"
             },
-            "content_input_placeholder": "أخبِرنا بِما يَجُولُ فِي ذِهنَك",
+            "content_input_placeholder": "عَبِّر عَمَّ يَجُولُ فِي ذِهنِك",
             "compose_action": "نَشر",
             "replying_to_user": "رَدًا على %s",
             "attachment": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "مُتابِعِين",
             "footer": "لا يُمكِن عَرض المُتابِعين مِنَ الخوادم الأُخرى."
         },
         "following": {
+            "title": "مُتابَعُون",
             "footer": "لا يُمكِن عَرض المُتابَعات مِنَ الخوادم الأُخرى."
         },
+        "familiarFollowers": {
+            "title": "مُتابِعُونَ مَألُوفُونَ بِالنِّسبَةِ لَك",
+            "followed_by_names": "مُتابَعٌ مِن قِبَلِ %s"
+        },
+        "favorited_by": {
+            "title": "مُفَضَّلٌ مِن قِبَلِ"
+        },
+        "reblogged_by": {
+            "title": "اُعيدَ تَدوينَهُ بِواسِطَةِ"
+        },
         "search": {
             "title": "البَحث",
             "search_bar": {
@@ -588,15 +607,57 @@
         "report": {
             "title_report": "إبلاغ",
             "title": "الإبلاغ عن %s",
-            "step1": "الخطوة الأولى مِن أصل اثنتين",
-            "step2": "الخطوة الثانية والأخيرة",
+            "step1": "الخطوة 1 مِن أصل 2",
+            "step2": "الخطوة 2 مِن أصل 2",
             "content1": "هل ترغب في إضافة أي منشورات أُخرى إلى البلاغ؟",
             "content2": "هل هناك أي شيء يجب أن يعرفه المُراقبين حول هذا البلاغ؟",
             "report_sent_title": "شُكرًا لَكَ على الإبلاغ، سَوفَ نَنظُرُ فِي هَذَا الأمر.",
             "send": "إرسال البلاغ",
             "skip_to_send": "إرسال بدون تعليق",
             "text_placeholder": "اكتب أو الصق تعليقات إضافيَّة",
-            "reported": "مُبْلَغٌ عَنه"
+            "reported": "مُبْلَغٌ عَنه",
+            "step_one": {
+                "step_1_of_4": "الخطوة 1 مِن أصل 4",
+                "whats_wrong_with_this_post": "ما المُشكِلَةُ فِي هَذَا المَنشُور؟",
+                "whats_wrong_with_this_account": "ما المُشكِلَةُ فِي هَذَا الحِساب؟",
+                "whats_wrong_with_this_username": "ما المُشكِلَة مَعَ %s؟",
+                "select_the_best_match": "اِختَر أفضلَ تَطابُق",
+                "i_dont_like_it": "لا يُعجِبُني",
+                "it_is_not_something_you_want_to_see": "إنَّهُ ليسَ شيئًا تُريدُ رُؤيَتَه",
+                "its_spam": "إنَّهُ غَيرٌ مَرغوبٍ فيه",
+                "malicious_links_fake_engagement_or_repetetive_replies": "رَوابِطٌ ضَارَّة، اِرتِباطاتٌ مُزيَّفَة أو رُدودٌ مُتَكَرِّرَة",
+                "it_violates_server_rules": "يَنتَهِكُ قَواعِدَ الخادِم",
+                "you_are_aware_that_it_breaks_specific_rules": "أنتَ مُدِركٌ لِانتِهاكِهِ قَواعِدًا مُحَدَّدَة",
+                "its_something_else": "إنَّهُ شَيءٌ آخَر",
+                "the_issue_does_not_fit_into_other_categories": "المُشكِلَةُ لَا تَتَناسَبُ مَعَ الفِئاتِ الأُخرَى"
+            },
+            "step_two": {
+                "step_2_of_4": "الخطوة 2 مِن أصل 4",
+                "which_rules_are_being_violated": "مَا هِيَ القَواعِدُ الَّتي تُنتَهَك؟",
+                "select_all_that_apply": "اِختَر كُلَّ ما يَنطَبِق",
+                "i_just_don’t_like_it": "أنا فَقَط لا يُعجِبُني"
+            },
+            "step_three": {
+                "step_3_of_4": "الخطوة 3 مِن أصل 4",
+                "are_there_any_posts_that_back_up_this_report": "هَل هُناكَ أيُّ مَنشُوراتٍ أُخرَى تَتَوافَقُ مَعَ هَذَا التَّقرير؟",
+                "select_all_that_apply": "اِختَر كُلَّ ما يَنطَبِق"
+            },
+            "step_four": {
+                "step_4_of_4": "الخطوة 4 مِن أصل 4",
+                "is_there_anything_else_we_should_know": "هَل هُناكَ شَيءٌ آخَرَ يَجِبُ أن نَعلَمَ بِه؟"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "ألَا تُريدُ رُؤيَةَ هَذَا؟",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "عِندما تَرى شيئًا لَا يُعجِبُكَ عَلَى مَاستودُون، يُمكِنُكَ إزالَةُ الشَّخصِ مِن تَجرِبَتِك.",
+                "unfollow": "إلغاءُ المُتابَعَة",
+                "unfollowed": "أُلغِيَت المُتابَعَة",
+                "unfollow_user": "إلغاءُ مُتابَعَةِ %s",
+                "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": "لَن يَتمكَّنَ بَعدَ الآنِ مِن مُتابَعَةِ مَنشوراتِكَ أو رُؤيَتِها، وَلكِن يُمكِنَهُ مَعرِفَةُ مَا إذا حُظَرِت عَنه.",
+                "while_we_review_this_you_can_take_action_against_user": "أثناءُ مُراجَعَتِنا لِذلِك، يُمكِنُكَ اِتِّخاذُ إجراءٍ ضِدَّ %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -50,6 +50,33 @@
         <string>%ld caràcters</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Seguit per %1$@, i un altre mutu</string>
+        <key>other</key>
+        <string>Seguit per %1$@, i %ld mutus</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -240,16 +240,18 @@
                 "category": "CATEGORIA"
             },
             "input": {
-                "placeholder": "Troba un servidor o uneix-te al teu..."
+                "placeholder": "Cerca servidors",
+                "search_servers_or_enter_url": "Cerca servidors o introdueix l'enllaç"
             },
             "empty_state": {
                 "finding_servers": "Cercant els servidors disponibles...",
-                "bad_network": "S'ha produït un error en carregar les dades. Comprova la teva connexió a Internet.",
+                "bad_network": "Alguna cosa no ha anat bé en carregar les dades. Comprova la teva connexió a Internet.",
                 "no_results": "No hi ha resultats"
             }
         },
         "register": {
-            "title": "Parla'ns de tu.",
+            "title": "Anem a configurar-te a %s",
+            "lets_get_you_set_up_on_domain": "Anem a configurar-te a %s",
             "input": {
                 "avatar": {
                     "delete": "Suprimeix"
@@ -309,7 +311,7 @@
         },
         "server_rules": {
             "title": "Algunes regles bàsiques.",
-            "subtitle": "Aquestes regles estan establertes per els administradors de %s.",
+            "subtitle": "Aquestes regles estan establertes i aplicades per els moderadors de %s.",
             "prompt": "Al continuar, estàs subjecte als termes de servei i a la política de privacitat de %s.",
             "terms_of_service": "termes del servei",
             "privacy_policy": "política de privadesa",
@@ -320,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"
@@ -342,11 +345,15 @@
                 "offline": "Fora de línia",
                 "new_posts": "Veure noves publicacions",
                 "published": "Publicat!",
-                "Publishing": "S'està publicant..."
+                "Publishing": "S'està publicant...",
+                "accessibility": {
+                    "logo_label": "Botó de logotip",
+                    "logo_hint": "Toca per desplaçar-te cap a dalt i torna a toca de nou per tornar a la ubicació anterior"
+                }
             }
         },
         "suggestion_account": {
-            "title": "Cerca Persones per Seguir",
+            "title": "Cerca Persones a Seguir",
             "follow_explain": "Quan segueixes algú, veuràs les seves publicacions a Inici."
         },
         "compose": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "seguidor",
             "footer": "Els seguidors d'altres servidors no son mostrats."
         },
         "following": {
+            "title": "seguint",
             "footer": "Els seguits d'altres servidors no son mostrats."
         },
+        "familiarFollowers": {
+            "title": "Seguidors coneguts",
+            "followed_by_names": "Seguit per %s"
+        },
+        "favorited_by": {
+            "title": "Preferit per"
+        },
+        "reblogged_by": {
+            "title": "Impulsat per"
+        },
         "search": {
             "title": "Cerca",
             "search_bar": {
@@ -596,7 +615,49 @@
             "send": "Envia Informe",
             "skip_to_send": "Envia sense comentaris",
             "text_placeholder": "Escriu o enganxa comentaris addicionals",
-            "reported": "REPORTAT"
+            "reported": "REPORTAT",
+            "step_one": {
+                "step_1_of_4": "Pas 1 de 4",
+                "whats_wrong_with_this_post": "Quin és el problema amb aquesta publicació?",
+                "whats_wrong_with_this_account": "Quin és el problema amb aquest compte?",
+                "whats_wrong_with_this_username": "Quin és el problema amb %s?",
+                "select_the_best_match": "Selecciona la millor coincidència",
+                "i_dont_like_it": "No m'agrada",
+                "it_is_not_something_you_want_to_see": "No és una cosa que vulguis veure",
+                "its_spam": "És contingut brossa",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Enllaços maliciosos, compromís falç o respostes repetitives",
+                "it_violates_server_rules": "Infringeix les normes del servidor",
+                "you_are_aware_that_it_breaks_specific_rules": "Ets conscient que incompleix normes específiques",
+                "its_something_else": "És una altra cosa",
+                "the_issue_does_not_fit_into_other_categories": "El problema no encaixa en altres categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Pas 2 de 4",
+                "which_rules_are_being_violated": "Quines normes s'estan infringint?",
+                "select_all_that_apply": "Selecciona tot el que correspongui",
+                "i_just_don’t_like_it": "Simplement no m'agrada"
+            },
+            "step_three": {
+                "step_3_of_4": "Pas 3 de 4",
+                "are_there_any_posts_that_back_up_this_report": "Hi ha alguna publicació que recolzi aquest informe?",
+                "select_all_that_apply": "Selecciona tot el que correspongui"
+            },
+            "step_four": {
+                "step_4_of_4": "Pas 4 de 4",
+                "is_there_anything_else_we_should_know": "Hi ha res més que hauríem de saber?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "No vols veure això?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "Quan veus alguna cosa que no t'agrada a Mastodon, pots eliminar la persona de la vostra experiència.",
+                "unfollow": "Deixa de seguir",
+                "unfollowed": "S'ha deixat de seguir",
+                "unfollow_user": "Deixa de seguir %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "Mentre ho revisem, pots prendre mesures contra %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -50,6 +50,33 @@
         <string>%ld نووسە</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -240,7 +240,8 @@
                 "category": "بەش"
             },
             "input": {
-                "placeholder": "بگەڕێ"
+                "placeholder": "بگەڕێ",
+                "search_servers_or_enter_url": "Search servers or enter URL"
             },
             "empty_state": {
                 "finding_servers": "ڕاژەکار دەدۆزرێتەوە...",
@@ -250,6 +251,7 @@
         },
         "register": {
             "title": "خۆت تۆمار بکە لە %s",
+            "lets_get_you_set_up_on_domain": "Let’s get you set up on %s",
             "input": {
                 "avatar": {
                     "delete": "بیسڕەوە"
@@ -320,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": "بینێرەوە"
@@ -342,7 +345,11 @@
                 "offline": "دەرهێڵ",
                 "new_posts": "پۆستە نوێکان ببینە",
                 "published": "بڵاوکرایەوە!",
-                "Publishing": "پۆستەکە بڵاو دەکرێتەوە..."
+                "Publishing": "پۆستەکە بڵاو دەکرێتەوە...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
             }
         },
         "suggestion_account": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "follower",
             "footer": "شوێنکەوتووەکانی لە ڕاژەکارەکانی ترەوە نیشان نادرێت."
         },
         "following": {
+            "title": "following",
             "footer": "شوێنکەوتنەکانی بۆ هەژماری ڕاژەکارەکانی تر نیشان نادرێت."
         },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
         "search": {
             "title": "بگەڕێ",
             "search_bar": {
@@ -596,7 +615,49 @@
             "send": "سکاڵاکە بنێرە",
             "skip_to_send": "بەبێ لێدوان بینێرە",
             "text_placeholder": "ڕوونکردنەوەی زۆرتر بدە",
-            "reported": "سکاڵای لێ کرا"
+            "reported": "سکاڵای لێ کرا",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -47,7 +47,7 @@
         <key>many</key>
         <string>%ld characters</string>
         <key>other</key>
-        <string>%ld characters</string>
+        <string>%ld nodau</string>
       </dict>
     </dict>
     <key>a11y.plural.count.input_limit_remains</key>
@@ -74,6 +74,49 @@
         <string>%ld characters</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>zero</key>
+        <string></string>
+        <key>one</key>
+        <string></string>
+        <key>two</key>
+        <string></string>
+        <key>few</key>
+        <string></string>
+        <key>many</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>zero</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>two</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+        <key>few</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+        <key>many</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -85,17 +128,41 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>ld</string>
         <key>zero</key>
-        <string>posts</string>
+        <string>post</string>
         <key>one</key>
         <string>post</string>
         <key>two</key>
-        <string>posts</string>
+        <string>postiau</string>
         <key>few</key>
         <string>posts</string>
         <key>many</key>
         <string>posts</string>
         <key>other</key>
-        <string>posts</string>
+        <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>

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

@@ -0,0 +1,680 @@
+{
+    "common": {
+        "alerts": {
+            "common": {
+                "please_try_again": "Please try again.",
+                "please_try_again_later": "Please try again later."
+            },
+            "sign_up_failure": {
+                "title": "Sign Up Failure"
+            },
+            "server_error": {
+                "title": "Server Error"
+            },
+            "vote_failure": {
+                "title": "Vote Failure",
+                "poll_ended": "The poll has ended"
+            },
+            "discard_post_content": {
+                "title": "Discard Draft",
+                "message": "Confirm to discard composed post content."
+            },
+            "publish_post_failure": {
+                "title": "Publish Failure",
+                "message": "Failed to publish the post.\nPlease check your internet connection.",
+                "attachments_message": {
+                    "video_attach_with_photo": "Cannot attach a video to a post that already contains images.",
+                    "more_than_one_video": "Cannot attach more than one video."
+                }
+            },
+            "edit_profile_failure": {
+                "title": "Edit Profile Error",
+                "message": "Cannot edit profile. Please try again."
+            },
+            "sign_out": {
+                "title": "Sign Out",
+                "message": "Are you sure you want to sign out?",
+                "confirm": "Sign Out"
+            },
+            "block_domain": {
+                "title": "Are you really, really sure you want to block the entire %s? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.",
+                "block_entire_domain": "Block Domain"
+            },
+            "save_photo_failure": {
+                "title": "Save Photo Failure",
+                "message": "Please enable the photo library access permission to save the photo."
+            },
+            "delete_post": {
+                "title": "Delete Post",
+                "message": "Are you sure you want to delete this post?"
+            },
+            "clean_cache": {
+                "title": "Clean Cache",
+                "message": "Successfully cleaned %s cache."
+            }
+        },
+        "controls": {
+            "actions": {
+                "back": "Back",
+                "next": "Next",
+                "previous": "Previous",
+                "open": "Open",
+                "add": "Add",
+                "remove": "Remove",
+                "edit": "Edit",
+                "save": "Save",
+                "ok": "OK",
+                "done": "Done",
+                "confirm": "Confirm",
+                "continue": "Continue",
+                "compose": "Compose",
+                "cancel": "Cancel",
+                "discard": "Discard",
+                "try_again": "Try Again",
+                "take_photo": "Take Photo",
+                "save_photo": "Save Photo",
+                "copy_photo": "Copy Photo",
+                "sign_in": "Sign In",
+                "sign_up": "Sign Up",
+                "see_more": "See More",
+                "preview": "Preview",
+                "share": "Share",
+                "share_user": "Share %s",
+                "share_post": "Share Post",
+                "open_in_safari": "Open in Safari",
+                "open_in_browser": "Open in Browser",
+                "find_people": "Find people to follow",
+                "manually_search": "Manually search instead",
+                "skip": "Skip",
+                "reply": "Reply",
+                "report_user": "Report %s",
+                "block_domain": "Block %s",
+                "unblock_domain": "Unblock %s",
+                "settings": "Settings",
+                "delete": "Delete"
+            },
+            "tabs": {
+                "home": "Home",
+                "search": "Search",
+                "notification": "Notification",
+                "profile": "Profile"
+            },
+            "keyboard": {
+                "common": {
+                    "switch_to_tab": "Switch to %s",
+                    "compose_new_post": "Compose New Post",
+                    "show_favorites": "Show Favorites",
+                    "open_settings": "Open Settings"
+                },
+                "timeline": {
+                    "previous_status": "Previous Post",
+                    "next_status": "Next Post",
+                    "open_status": "Open Post",
+                    "open_author_profile": "Open Author's Profile",
+                    "open_reblogger_profile": "Open Reblogger's Profile",
+                    "reply_status": "Reply to Post",
+                    "toggle_reblog": "Toggle Reblog on Post",
+                    "toggle_favorite": "Toggle Favorite on Post",
+                    "toggle_content_warning": "Toggle Content Warning",
+                    "preview_image": "Preview Image"
+                },
+                "segmented_control": {
+                    "previous_section": "Previous Section",
+                    "next_section": "Next Section"
+                }
+            },
+            "status": {
+                "user_reblogged": "%s reblogged",
+                "user_replied_to": "Replied to %s",
+                "show_post": "Show Post",
+                "show_user_profile": "Show user profile",
+                "content_warning": "Content Warning",
+                "sensitive_content": "Sensitive Content",
+                "media_content_warning": "Tap anywhere to reveal",
+                "tap_to_reveal": "Tap to reveal",
+                "poll": {
+                    "vote": "Vote",
+                    "closed": "Closed"
+                },
+                "actions": {
+                    "reply": "Reply",
+                    "reblog": "Hybwch",
+                    "unreblog": "Undo reblog",
+                    "favorite": "Favorite",
+                    "unfavorite": "Unfavorite",
+                    "menu": "Menu",
+                    "hide": "Hide",
+                    "show_image": "Show image",
+                    "show_gif": "Show GIF",
+                    "show_video_player": "Show video player",
+                    "tap_then_hold_to_show_menu": "Tap then hold to show menu"
+                },
+                "tag": {
+                    "url": "URL",
+                    "mention": "Mention",
+                    "link": "Link",
+                    "hashtag": "Hashtag",
+                    "email": "Email",
+                    "emoji": "Emoji"
+                },
+                "visibility": {
+                    "unlisted": "Everyone can see this post but not display in the public timeline.",
+                    "private": "Only their followers can see this post.",
+                    "private_from_me": "Only my followers can see this post.",
+                    "direct": "Only mentioned user can see this post."
+                }
+            },
+            "friendship": {
+                "follow": "Follow",
+                "following": "Following",
+                "request": "Request",
+                "pending": "Pending",
+                "block": "Block",
+                "block_user": "Block %s",
+                "block_domain": "Block %s",
+                "unblock": "Unblock",
+                "unblock_user": "Unblock %s",
+                "blocked": "Blocked",
+                "mute": "Mute",
+                "mute_user": "Mute %s",
+                "unmute": "Unmute",
+                "unmute_user": "Unmute %s",
+                "muted": "Muted",
+                "edit_info": "Edit Info"
+            },
+            "timeline": {
+                "filtered": "Filtered",
+                "timestamp": {
+                    "now": "Now"
+                },
+                "loader": {
+                    "load_missing_posts": "Load missing posts",
+                    "loading_missing_posts": "Loading missing posts...",
+                    "show_more_replies": "Show more replies"
+                },
+                "header": {
+                    "no_status_found": "No Post Found",
+                    "blocking_warning": "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.",
+                    "user_blocking_warning": "You can’t view %s’s profile\nuntil you unblock them.\nYour profile looks like this to them.",
+                    "blocked_warning": "You can’t view this user’s profile\nuntil they unblock you.",
+                    "user_blocked_warning": "You can’t view %s’s profile\nuntil they unblock you.",
+                    "suspended_warning": "This user has been suspended.",
+                    "user_suspended_warning": "%s’s account has been suspended."
+                }
+            }
+        }
+    },
+    "scene": {
+        "welcome": {
+            "slogan": "Social networking\nback in your hands.",
+            "get_started": "Get Started",
+            "log_in": "Log In"
+        },
+        "server_picker": {
+            "title": "Mastodon is made of users in different servers.",
+            "subtitle": "Pick a server based on your interests, region, or a general purpose one.",
+            "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.",
+            "button": {
+                "category": {
+                    "all": "All",
+                    "all_accessiblity_description": "Category: All",
+                    "academia": "academia",
+                    "activism": "activism",
+                    "food": "food",
+                    "furry": "furry",
+                    "games": "games",
+                    "general": "general",
+                    "journalism": "journalism",
+                    "lgbt": "lgbt",
+                    "regional": "regional",
+                    "art": "art",
+                    "music": "music",
+                    "tech": "tech"
+                },
+                "see_less": "See Less",
+                "see_more": "See More"
+            },
+            "label": {
+                "language": "LANGUAGE",
+                "users": "USERS",
+                "category": "CATEGORY"
+            },
+            "input": {
+                "placeholder": "Search servers",
+                "search_servers_or_enter_url": "Search servers or enter URL"
+            },
+            "empty_state": {
+                "finding_servers": "Finding available servers...",
+                "bad_network": "Something went wrong while loading the data. Check your internet connection.",
+                "no_results": "No results"
+            }
+        },
+        "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"
+                },
+                "username": {
+                    "placeholder": "username",
+                    "duplicate_prompt": "This username is taken."
+                },
+                "display_name": {
+                    "placeholder": "display name"
+                },
+                "email": {
+                    "placeholder": "email"
+                },
+                "password": {
+                    "placeholder": "password",
+                    "require": "Your password needs at least:",
+                    "character_limit": "8 characters",
+                    "accessibility": {
+                        "checked": "checked",
+                        "unchecked": "unchecked"
+                    },
+                    "hint": "Your password needs at least eight characters"
+                },
+                "invite": {
+                    "registration_user_invite_request": "Why do you want to join?"
+                }
+            },
+            "error": {
+                "item": {
+                    "username": "Username",
+                    "email": "Email",
+                    "password": "Password",
+                    "agreement": "Agreement",
+                    "locale": "Locale",
+                    "reason": "Reason"
+                },
+                "reason": {
+                    "blocked": "%s contains a disallowed email provider",
+                    "unreachable": "%s does not seem to exist",
+                    "taken": "%s is already in use",
+                    "reserved": "%s is a reserved keyword",
+                    "accepted": "%s must be accepted",
+                    "blank": "%s is required",
+                    "invalid": "%s is invalid",
+                    "too_long": "%s is too long",
+                    "too_short": "%s is too short",
+                    "inclusion": "%s is not a supported value"
+                },
+                "special": {
+                    "username_invalid": "Username must only contain alphanumeric characters and underscores",
+                    "username_too_long": "Username is too long (can’t be longer than 30 characters)",
+                    "email_invalid": "This is not a valid email address",
+                    "password_too_short": "Password is too short (must be at least 8 characters)"
+                }
+            }
+        },
+        "server_rules": {
+            "title": "Some ground rules.",
+            "subtitle": "These are set and enforced by the %s moderators.",
+            "prompt": "By continuing, you’re subject to the terms of service and privacy policy for %s.",
+            "terms_of_service": "terms of service",
+            "privacy_policy": "privacy policy",
+            "button": {
+                "confirm": "I Agree"
+            }
+        },
+        "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"
+            },
+            "dont_receive_email": {
+                "title": "Check your email",
+                "description": "Check if your email address is correct as well as your junk folder if you haven’t.",
+                "resend_email": "Resend Email"
+            },
+            "open_email_app": {
+                "title": "Check your inbox.",
+                "description": "We just sent you an email. Check your junk folder if you haven’t.",
+                "mail": "Mail",
+                "open_email_client": "Open Email Client"
+            }
+        },
+        "home_timeline": {
+            "title": "Home",
+            "navigation_bar_state": {
+                "offline": "Offline",
+                "new_posts": "See new posts",
+                "published": "Published!",
+                "Publishing": "Publishing post...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
+            }
+        },
+        "suggestion_account": {
+            "title": "Find People to Follow",
+            "follow_explain": "When you follow someone, you’ll see their posts in your home feed."
+        },
+        "compose": {
+            "title": {
+                "new_post": "New Post",
+                "new_reply": "New Reply"
+            },
+            "media_selection": {
+                "camera": "Take Photo",
+                "photo_library": "Photo Library",
+                "browse": "Browse"
+            },
+            "content_input_placeholder": "Type or paste what’s on your mind",
+            "compose_action": "Publish",
+            "replying_to_user": "replying to %s",
+            "attachment": {
+                "photo": "photo",
+                "video": "video",
+                "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.",
+                "description_photo": "Describe the photo for the visually-impaired...",
+                "description_video": "Describe the video for the visually-impaired..."
+            },
+            "poll": {
+                "duration_time": "Duration: %s",
+                "thirty_minutes": "30 minutes",
+                "one_hour": "1 Hour",
+                "six_hours": "6 Hours",
+                "one_day": "1 Day",
+                "three_days": "3 Days",
+                "seven_days": "7 Days",
+                "option_number": "Option %ld"
+            },
+            "content_warning": {
+                "placeholder": "Write an accurate warning here..."
+            },
+            "visibility": {
+                "public": "Public",
+                "unlisted": "Unlisted",
+                "private": "Followers only",
+                "direct": "Only people I mention"
+            },
+            "auto_complete": {
+                "space_to_add": "Space to add"
+            },
+            "accessibility": {
+                "append_attachment": "Add Attachment",
+                "append_poll": "Add Poll",
+                "remove_poll": "Remove Poll",
+                "custom_emoji_picker": "Custom Emoji Picker",
+                "enable_content_warning": "Enable Content Warning",
+                "disable_content_warning": "Disable Content Warning",
+                "post_visibility_menu": "Post Visibility Menu"
+            },
+            "keyboard": {
+                "discard_post": "Discard Post",
+                "publish_post": "Publish Post",
+                "toggle_poll": "Toggle Poll",
+                "toggle_content_warning": "Toggle Content Warning",
+                "append_attachment_entry": "Add Attachment - %s",
+                "select_visibility_entry": "Select Visibility - %s"
+            }
+        },
+        "profile": {
+            "dashboard": {
+                "posts": "postiadau",
+                "following": "following",
+                "followers": "followers"
+            },
+            "fields": {
+                "add_row": "Add Row",
+                "placeholder": {
+                    "label": "Label",
+                    "content": "Content"
+                }
+            },
+            "segmented_control": {
+                "posts": "Postiadau",
+                "replies": "Replies",
+                "posts_and_replies": "Postiadau ac Atebion",
+                "media": "Media",
+                "about": "About"
+            },
+            "relationship_action_alert": {
+                "confirm_mute_user": {
+                    "title": "Mute Account",
+                    "message": "Confirm to mute %s"
+                },
+                "confirm_unmute_user": {
+                    "title": "Unmute Account",
+                    "message": "Confirm to unmute %s"
+                },
+                "confirm_block_user": {
+                    "title": "Block Account",
+                    "message": "Confirm to block %s"
+                },
+                "confirm_unblock_user": {
+                    "title": "Unblock Account",
+                    "message": "Confirm to unblock %s"
+                }
+            },
+            "accessibility": {
+                "show_avatar_image": "Show avatar image",
+                "edit_avatar_image": "Edit avatar image",
+                "show_banner_image": "Show banner image",
+                "double_tap_to_open_the_list": "Double tap to open the list"
+            }
+        },
+        "follower": {
+            "title": "follower",
+            "footer": "Followers from other servers are not displayed."
+        },
+        "following": {
+            "title": "following",
+            "footer": "Follows from other servers are not displayed."
+        },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
+        "search": {
+            "title": "Search",
+            "search_bar": {
+                "placeholder": "Search hashtags and users",
+                "cancel": "Cancel"
+            },
+            "recommend": {
+                "button_text": "See All",
+                "hash_tag": {
+                    "title": "Trending on Mastodon",
+                    "description": "Hashtags that are getting quite a bit of attention",
+                    "people_talking": "%s people are talking"
+                },
+                "accounts": {
+                    "title": "Accounts you might like",
+                    "description": "You may like to follow these accounts",
+                    "follow": "Follow"
+                }
+            },
+            "searching": {
+                "segment": {
+                    "all": "All",
+                    "people": "People",
+                    "hashtags": "Hashtags",
+                    "posts": "Postiadau"
+                },
+                "empty_state": {
+                    "no_results": "No results"
+                },
+                "recent_search": "Recent searches",
+                "clear": "Clear"
+            }
+        },
+        "discovery": {
+            "tabs": {
+                "posts": "Postiadau",
+                "hashtags": "Hashtags",
+                "news": "News",
+                "community": "Community",
+                "for_you": "For You"
+            },
+            "intro": "These are the posts gaining traction in your corner of Mastodon."
+        },
+        "favorite": {
+            "title": "Your Favorites"
+        },
+        "notification": {
+            "title": {
+                "Everything": "Everything",
+                "Mentions": "Mentions"
+            },
+            "notification_description": {
+                "followed_you": "followed you",
+                "favorited_your_post": "favorited your post",
+                "reblogged_your_post": "reblogged your post",
+                "mentioned_you": "mentioned you",
+                "request_to_follow_you": "request to follow you",
+                "poll_has_ended": "poll has ended"
+            },
+            "keyobard": {
+                "show_everything": "Show Everything",
+                "show_mentions": "Show Mentions"
+            }
+        },
+        "thread": {
+            "back_title": "Post",
+            "title": "Post from %s"
+        },
+        "settings": {
+            "title": "Settings",
+            "section": {
+                "appearance": {
+                    "title": "Appearance",
+                    "automatic": "Automatic",
+                    "light": "Always Light",
+                    "dark": "Always Dark"
+                },
+                "look_and_feel": {
+                    "title": "Look and Feel",
+                    "use_system": "Use System",
+                    "really_dark": "Really Dark",
+                    "sorta_dark": "Sorta Dark",
+                    "light": "Light"
+                },
+                "notifications": {
+                    "title": "Notifications",
+                    "favorites": "Favorites my post",
+                    "follows": "Follows me",
+                    "boosts": "Reblogs my post",
+                    "mentions": "Mentions me",
+                    "trigger": {
+                        "anyone": "anyone",
+                        "follower": "a follower",
+                        "follow": "anyone I follow",
+                        "noone": "no one",
+                        "title": "Notify me when"
+                    }
+                },
+                "preference": {
+                    "title": "Preferences",
+                    "true_black_dark_mode": "True black dark mode",
+                    "disable_avatar_animation": "Disable animated avatars",
+                    "disable_emoji_animation": "Disable animated emojis",
+                    "using_default_browser": "Use default browser to open links",
+                    "open_links_in_mastodon": "Open links in Mastodon"
+                },
+                "boring_zone": {
+                    "title": "The Boring Zone",
+                    "account_settings": "Account Settings",
+                    "terms": "Terms of Service",
+                    "privacy": "Privacy Policy"
+                },
+                "spicy_zone": {
+                    "title": "The Spicy Zone",
+                    "clear": "Clear Media Cache",
+                    "signout": "Sign Out"
+                }
+            },
+            "footer": {
+                "mastodon_description": "Mastodon is open source software. You can report issues on GitHub at %s (%s)"
+            },
+            "keyboard": {
+                "close_settings_window": "Close Settings Window"
+            }
+        },
+        "report": {
+            "title_report": "Report",
+            "title": "Report %s",
+            "step1": "Step 1 of 2",
+            "step2": "Step 2 of 2",
+            "content1": "Are there any other posts you’d like to add to the report?",
+            "content2": "Is there anything the moderators should know about this report?",
+            "report_sent_title": "Thanks for reporting, we’ll look into this.",
+            "send": "Send Report",
+            "skip_to_send": "Send without comment",
+            "text_placeholder": "Type or paste additional comments",
+            "reported": "REPORTED",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
+        },
+        "preview": {
+            "keyboard": {
+                "close_preview": "Close Preview",
+                "show_next": "Show Next",
+                "show_previous": "Show Previous"
+            }
+        },
+        "account_list": {
+            "tab_bar_hint": "Current selected profile: %s. Double tap then hold to show account switcher",
+            "dismiss_account_switcher": "Dismiss Account Switcher",
+            "add_account": "Add Account"
+        },
+        "wizard": {
+            "new_in_mastodon": "New in Mastodon",
+            "multiple_account_switch_intro_description": "Switch between multiple accounts by holding the profile button.",
+            "accessibility_hint": "Double tap to dismiss this wizard"
+        }
+    }
+}

Localization/StringsConvertor/input/cy.lproj/ios-infoPlist.json

@@ -0,0 +1,6 @@
+{
+    "NSCameraUsageDescription": "Used to take photo for post status",
+    "NSPhotoLibraryAddUsageDescription": "Used to save photo into the Photo Library",
+    "NewPostShortcutItemTitle": "Post Newydd",
+    "SearchShortcutItemTitle": "Chwilio"
+}

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

@@ -50,6 +50,33 @@
         <string>%ld characters</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -240,7 +240,8 @@
                 "category": "CATEGORY"
             },
             "input": {
-                "placeholder": "Search servers"
+                "placeholder": "Search servers",
+                "search_servers_or_enter_url": "Search servers or enter URL"
             },
             "empty_state": {
                 "finding_servers": "Finding available servers...",
@@ -250,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"
@@ -320,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"
@@ -342,7 +345,11 @@
                 "offline": "Offline",
                 "new_posts": "See new posts",
                 "published": "Published!",
-                "Publishing": "Publishing post..."
+                "Publishing": "Publishing post...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
             }
         },
         "suggestion_account": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "follower",
             "footer": "Followers from other servers are not displayed."
         },
         "following": {
+            "title": "following",
             "footer": "Follows from other servers are not displayed."
         },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
         "search": {
             "title": "Search",
             "search_bar": {
@@ -596,7 +615,49 @@
             "send": "Send Report",
             "skip_to_send": "Send without comment",
             "text_placeholder": "Type or paste additional comments",
-            "reported": "REPORTED"
+            "reported": "REPORTED",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -50,6 +50,33 @@
         <string>%ld Zeichen</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -129,7 +129,7 @@
                 "show_post": "Beitrag anzeigen",
                 "show_user_profile": "Benutzerprofil anzeigen",
                 "content_warning": "Inhaltswarnung",
-                "sensitive_content": "Sensitive Content",
+                "sensitive_content": "NSFW-Inhalt",
                 "media_content_warning": "Tippe irgendwo zum Anzeigen",
                 "tap_to_reveal": "Zum Anzeigen tippen",
                 "poll": {
@@ -207,7 +207,7 @@
     "scene": {
         "welcome": {
             "slogan": "Soziale Netzwerke wieder in deinen Händen.",
-            "get_started": "Erste Schritte",
+            "get_started": "Registrieren",
             "log_in": "Anmelden"
         },
         "server_picker": {
@@ -240,7 +240,8 @@
                 "category": "KATEGORIE"
             },
             "input": {
-                "placeholder": "Finde einen Server oder trete deinem eigenen bei..."
+                "placeholder": "Nach Server suchen oder URL eingeben",
+                "search_servers_or_enter_url": "Search servers or enter URL"
             },
             "empty_state": {
                 "finding_servers": "Verfügbare Server werden gesucht...",
@@ -250,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"
@@ -319,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"
@@ -342,7 +345,11 @@
                 "offline": "Offline",
                 "new_posts": "Neue Beiträge anzeigen",
                 "published": "Veröffentlicht!",
-                "Publishing": "Beitrag wird veröffentlicht..."
+                "Publishing": "Beitrag wird veröffentlicht...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
             }
         },
         "suggestion_account": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "follower",
             "footer": "Follower von anderen Servern werden nicht angezeigt."
         },
         "following": {
+            "title": "following",
             "footer": "Wem das Konto folgt wird von anderen Servern werden nicht angezeigt."
         },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
         "search": {
             "title": "Suche",
             "search_bar": {
@@ -501,7 +520,7 @@
                 "community": "Community",
                 "for_you": "Für dich"
             },
-            "intro": "These are the posts gaining traction in your corner of Mastodon."
+            "intro": "Dies sind die Beiträge, die in deiner Umgebung auf Mastodon beliebter werden."
         },
         "favorite": {
             "title": "Deine Favoriten"
@@ -596,7 +615,49 @@
             "send": "Meldung abschicken",
             "skip_to_send": "Ohne Kommentar abschicken",
             "text_placeholder": "Zusätzliche Kommentare eingeben oder einfügen",
-            "reported": "GEMELDET"
+            "reported": "GEMELDET",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
         },
         "preview": {
             "keyboard": {
@@ -612,7 +673,7 @@
         },
         "wizard": {
             "new_in_mastodon": "Neu in Mastodon",
-            "multiple_account_switch_intro_description": "Wechsel zwischen mehreren Konten durch drücken der Profil-Schaltfläche.",
+            "multiple_account_switch_intro_description": "Wechsel zwischen mehreren Konten durch Drücken der Profil-Schaltfläche.",
             "accessibility_hint": "Doppeltippen, um diesen Assistenten zu schließen"
         }
     }

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

@@ -50,6 +50,33 @@
         <string>%ld characters</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -240,7 +240,8 @@
                 "category": "CATEGORY"
             },
             "input": {
-                "placeholder": "Search servers"
+                "placeholder": "Search servers",
+                "search_servers_or_enter_url": "Search servers or enter URL"
             },
             "empty_state": {
                 "finding_servers": "Finding available servers...",
@@ -250,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"
@@ -320,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"
@@ -342,7 +345,11 @@
                 "offline": "Offline",
                 "new_posts": "See new posts",
                 "published": "Published!",
-                "Publishing": "Publishing post..."
+                "Publishing": "Publishing post...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
             }
         },
         "suggestion_account": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "follower",
             "footer": "Followers from other servers are not displayed."
         },
         "following": {
+            "title": "following",
             "footer": "Follows from other servers are not displayed."
         },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
         "search": {
             "title": "Search",
             "search_bar": {
@@ -596,7 +615,49 @@
             "send": "Send Report",
             "skip_to_send": "Send without comment",
             "text_placeholder": "Type or paste additional comments",
-            "reported": "REPORTED"
+            "reported": "REPORTED",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -50,6 +50,33 @@
         <string>%ld characters</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Followed by %1$@, and another mutual</string>
+        <key>other</key>
+        <string>Followed by %1$@, and %ld mutuals</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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

@@ -240,7 +240,8 @@
                 "category": "CATEGORY"
             },
             "input": {
-                "placeholder": "Search servers"
+                "placeholder": "Search servers",
+                "search_servers_or_enter_url": "Search servers or enter URL"
             },
             "empty_state": {
                 "finding_servers": "Finding available servers...",
@@ -250,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"
@@ -320,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"
@@ -342,7 +345,11 @@
                 "offline": "Offline",
                 "new_posts": "See new posts",
                 "published": "Published!",
-                "Publishing": "Publishing post..."
+                "Publishing": "Publishing post...",
+                "accessibility": {
+                    "logo_label": "Logo Button",
+                    "logo_hint": "Tap to scroll to top and tap again to previous location"
+                }
             }
         },
         "suggestion_account": {
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "follower",
             "footer": "Followers from other servers are not displayed."
         },
         "following": {
+            "title": "following",
             "footer": "Follows from other servers are not displayed."
         },
+        "familiarFollowers": {
+            "title": "Followers you familiar",
+            "followed_by_names": "Followed by %s"
+        },
+        "favorited_by": {
+            "title": "Favorited By"
+        },
+        "reblogged_by": {
+            "title": "Reblogged By"
+        },
         "search": {
             "title": "Search",
             "search_bar": {
@@ -596,7 +615,49 @@
             "send": "Send Report",
             "skip_to_send": "Send without comment",
             "text_placeholder": "Type or paste additional comments",
-            "reported": "REPORTED"
+            "reported": "REPORTED",
+            "step_one": {
+                "step_1_of_4": "Step 1 of 4",
+                "whats_wrong_with_this_post": "What's wrong with this post?",
+                "whats_wrong_with_this_account": "What's wrong with this account?",
+                "whats_wrong_with_this_username": "What's wrong with %s?",
+                "select_the_best_match": "Select the best match",
+                "i_dont_like_it": "I don’t like it",
+                "it_is_not_something_you_want_to_see": "It is not something you want to see",
+                "its_spam": "It’s spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies",
+                "it_violates_server_rules": "It violates server rules",
+                "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules",
+                "its_something_else": "It’s something else",
+                "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories"
+            },
+            "step_two": {
+                "step_2_of_4": "Step 2 of 4",
+                "which_rules_are_being_violated": "Which rules are being violated?",
+                "select_all_that_apply": "Select all that apply",
+                "i_just_don’t_like_it": "I just don’t like it"
+            },
+            "step_three": {
+                "step_3_of_4": "Step 3 of 4",
+                "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?",
+                "select_all_that_apply": "Select all that apply"
+            },
+            "step_four": {
+                "step_4_of_4": "Step 4 of 4",
+                "is_there_anything_else_we_should_know": "Is there anything else we should know?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "Don’t want to see this?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
+                "unfollow": "Unfollow",
+                "unfollowed": "Unfollowed",
+                "unfollow_user": "Unfollow %s",
+                "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.",
+                "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s"
+            }
         },
         "preview": {
             "keyboard": {

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

@@ -50,6 +50,33 @@
         <string>%ld caracteres</string>
       </dict>
     </dict>
+    <key>plural.count.followed_by_and_mutual</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@names@: "%#@count_mutual@</string>
+      <key>names</key>
+      <dict>
+        <key>one</key>
+        <string></string>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>other</key>
+        <string></string>
+      </dict>
+      <key>count_mutual</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>ld</string>
+        <key>one</key>
+        <string>Seguido por %1$@ y otra cuenta mutua</string>
+        <key>other</key>
+        <string>Seguido por %1$@ y otras %ld cuentas mutuas</string>
+      </dict>
+    </dict>
     <key>plural.count.metric_formatted.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
@@ -66,6 +93,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 medio</string>
+        <key>other</key>
+        <string>%ld medios</string>
+      </dict>
+    </dict>
     <key>plural.count.post</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>

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

@@ -180,7 +180,7 @@
                 "unmute": "Dejar de silenciar",
                 "unmute_user": "Dejar de silenciar a %s",
                 "muted": "Silenciado",
-                "edit_info": "Editar información"
+                "edit_info": "Editar"
             },
             "timeline": {
                 "filtered": "Filtrado",
@@ -194,11 +194,11 @@
                 },
                 "header": {
                     "no_status_found": "Mensaje no encontrado",
-                    "blocking_warning": "No podés ver el perfil de este usuario\n hasta que lo desbloquees.\nTu perfil le aparece así a este usuario.",
-                    "user_blocking_warning": "No podés ver el perfil de %s\n hasta que lo desbloquees.\nTu perfil le aparece así a este usuario.",
-                    "blocked_warning": "No podés ver el perfil de este usuario\n hasta que dicho usuario te desbloquee.",
-                    "user_blocked_warning": "No podés ver el perfil de %s\n hasta que dicho usuario te desbloquee.",
-                    "suspended_warning": "Este usuario está suspendido.",
+                    "blocking_warning": "No podés ver el perfil de este usuario\nhasta que lo desbloquees.\nTu perfil le aparece así a este usuario.",
+                    "user_blocking_warning": "No podés ver el perfil de %s\nhasta que lo desbloquees.\nTu perfil le aparece así a este usuario.",
+                    "blocked_warning": "No podés ver el perfil de este usuario\nhasta que dicho usuario te desbloquee.",
+                    "user_blocked_warning": "No podés ver el perfil de %s\nhasta que dicho usuario te desbloquee.",
+                    "suspended_warning": "Esta cuenta está suspendida.",
                     "user_suspended_warning": "La cuenta de %s está suspendida."
                 }
             }
@@ -211,16 +211,16 @@
             "log_in": "Iniciar sesión"
         },
         "server_picker": {
-            "title": "Elegí un servidor,\nel que quieras.",
-            "subtitle": "Elegí una comunidad basada en tus intereses, región o una de propósitos generales.",
-            "subtitle_extend": "Elegí una comunidad basada en tus intereses, región o una de propósitos generales. Cada comunidad es operada por una organización o individuo totalmente independiente.",
+            "title": "Mastodon está compuesto de cuentas en diferentes servidores.",
+            "subtitle": "Elegí un servidor basado en tus intereses, región, o de propósitos generales.",
+            "subtitle_extend": "Elegí un servidor basado en tus intereses, región, o de propósitos generales. Cada servidor es operado por una organización o individuo totalmente independientes.",
             "button": {
                 "category": {
                     "all": "Todas",
                     "all_accessiblity_description": "Categoría: Todas",
                     "academia": "académico",
                     "activism": "activismo",
-                    "food": "comida",
+                    "food": "alimentación",
                     "furry": "furry",
                     "games": "juegos",
                     "general": "general",
@@ -240,7 +240,8 @@
                 "category": "CATEGORÍA"
             },
             "input": {
-                "placeholder": "Encontrá un servidor o unite al tuyo…"
+                "placeholder": "Buscar servidores",
+                "search_servers_or_enter_url": "Buscar servidores o introducir dirección web"
             },
             "empty_state": {
                 "finding_servers": "Buscando servidores disponibles…",
@@ -249,7 +250,8 @@
             }
         },
         "register": {
-            "title": "Contanos sobre vos.",
+            "title": "Vamos a prepararte en %s",
+            "lets_get_you_set_up_on_domain": "Vamos a prepararte en %s",
             "input": {
                 "avatar": {
                     "delete": "Eliminar"
@@ -284,7 +286,7 @@
                     "email": "Correo electrónico",
                     "password": "Contraseña",
                     "agreement": "Acuerdo",
-                    "locale": "Idioma de la interface",
+                    "locale": "Interno",
                     "reason": "Motivo"
                 },
                 "reason": {
@@ -319,7 +321,8 @@
         },
         "confirm_email": {
             "title": "Una última cosa.",
-            "subtitle": "Acabamos de enviar un correo electrónico a %s,\npulsá en el enlace para confirmar tu cuenta.",
+            "subtitle": "Tocá el enlace que te enviamos por correo electrónico para verificar tu cuenta.",
+            "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tocá el enlace que te enviamos por correo electrónico para verificar tu cuenta",
             "button": {
                 "open_email_app": "Abrir aplicación de correo electrónico",
                 "resend": "Reenviar"
@@ -340,14 +343,18 @@
             "title": "Principal",
             "navigation_bar_state": {
                 "offline": "Desconectado",
-                "new_posts": "Ver nuevos mensajes",
+                "new_posts": "Ver nuevos msjs",
                 "published": "¡Enviado!",
-                "Publishing": "Enviando mensaje…"
+                "Publishing": "Enviando mensaje…",
+                "accessibility": {
+                    "logo_label": "Botón de logo",
+                    "logo_hint": "Tocá para desplazarte hacia arriba y tocá de nuevo para ir a la ubicación anterior"
+                }
             }
         },
         "suggestion_account": {
             "title": "Encontrá cuentas para seguir",
-            "follow_explain": "Cuando sigás a alguien, verás sus mensajes en tu línea temporal principal."
+            "follow_explain": "Cuando sigás una cuenta, verás sus mensajes en tu línea temporal principal."
         },
         "compose": {
             "title": {
@@ -363,10 +370,10 @@
             "compose_action": "Enviar",
             "replying_to_user": "respondiendo a %s",
             "attachment": {
-                "photo": "foto",
+                "photo": "imagen",
                 "video": "video",
                 "attachment_broken": "Este archivo de %s está roto\ny no se puede subir a Mastodon.",
-                "description_photo": "Describí la foto para personas con dificultades visuales…",
+                "description_photo": "Describí la imagen para personas con dificultades visuales…",
                 "description_video": "Describí el video para personas con dificultades visuales…"
             },
             "poll": {
@@ -389,7 +396,7 @@
                 "direct": "Sólo a las cuentas que menciono"
             },
             "auto_complete": {
-                "space_to_add": "Espacio para agregar"
+                "space_to_add": "Tocá la tecla «Espacio» para agregar"
             },
             "accessibility": {
                 "append_attachment": "Agregar archivo adjunto",
@@ -455,11 +462,23 @@
             }
         },
         "follower": {
+            "title": "seguidor",
             "footer": "No se muestran los seguidores de otros servidores."
         },
         "following": {
+            "title": "siguiendo",
             "footer": "No se muestran las cuentas de otros servidores que seguís."
         },
+        "familiarFollowers": {
+            "title": "Seguidores conocidos",
+            "followed_by_names": "Seguido por %s"
+        },
+        "favorited_by": {
+            "title": "Marcado como favorito por"
+        },
+        "reblogged_by": {
+            "title": "Adherido por"
+        },
         "search": {
             "title": "Buscar",
             "search_bar": {
@@ -498,7 +517,7 @@
                 "posts": "Mensajes",
                 "hashtags": "Etiquetas",
                 "news": "Novedades",
-                "community": "Community",
+                "community": "Comunidad",
                 "for_you": "Para vos"
             },
             "intro": "Estos son los mensajes que están ganando tracción en tu rincón de Mastodon."
@@ -596,7 +615,49 @@
             "send": "Enviar denuncia",
             "skip_to_send": "Enviar sin comentarios",
             "text_placeholder": "Escribí o pegá comentarios adicionales",
-            "reported": "DENUNCIADA"
+            "reported": "DENUNCIADA",
+            "step_one": {
+                "step_1_of_4": "Paso 1 de 4",
+                "whats_wrong_with_this_post": "¿Cuál es el problema con este mensaje?",
+                "whats_wrong_with_this_account": "¿Cuál es el problema con esta cuenta?",
+                "whats_wrong_with_this_username": "¿Cuál es el problema con %s?",
+                "select_the_best_match": "Seleccioná la mejor coincidencia",
+                "i_dont_like_it": "No te gusta",
+                "it_is_not_something_you_want_to_see": "Es algo que no querés ver",
+                "its_spam": "Es spam",
+                "malicious_links_fake_engagement_or_repetetive_replies": "Enlaces maliciosos, interacciones falsas o respuestas repetitivas",
+                "it_violates_server_rules": "Viola las reglas del servidor",
+                "you_are_aware_that_it_breaks_specific_rules": "Sos consciente de que infringe normas específicas",
+                "its_something_else": "Es otra cosa",
+                "the_issue_does_not_fit_into_other_categories": "El problema no aplica en otras categorías"
+            },
+            "step_two": {
+                "step_2_of_4": "Paso 2 de 4",
+                "which_rules_are_being_violated": "¿Qué reglas se están violando?",
+                "select_all_that_apply": "Seleccioná todo lo que corresponda",
+                "i_just_don’t_like_it": "Simplemente no te gusta"
+            },
+            "step_three": {
+                "step_3_of_4": "Paso 3 de 4",
+                "are_there_any_posts_that_back_up_this_report": "¿Hay algún mensaje que respalde esta denuncia?",
+                "select_all_that_apply": "Seleccioná todo lo que corresponda"
+            },
+            "step_four": {
+                "step_4_of_4": "Paso 4 de 4",
+                "is_there_anything_else_we_should_know": "¿Hay algo más que deberíamos saber?"
+            },
+            "step_final": {
+                "dont_want_to_see_this": "¿No querés ver esto?",
+                "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "Cuando veas algo que no te gusta en Mastodon, podés quitar a esa cuenta de tu experiencia.",
+                "unfollow": "Dejar de seguir",
+                "unfollowed": "Dejaste de seguir a esta cuenta",
+                "unfollow_user": "Dejar de seguir a %s",
+                "mute_user": "Silenciar a %s",
+                "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "No verás sus publicaciones ni sus adhesiones en tu línea temporal. El usuario de esta cuenta no sabrá que fue silenciado.",
+                "block_user": "Bloquear a %s",
+                "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "El usuario de esta cuenta ya no podrá seguirte o leer tus mensajes, pero podrá fijarse si fue bloqueado.",
+                "while_we_review_this_you_can_take_action_against_user": "Mientras revisamos esto, podés tomar medidas contra %s"
+            }
         },
         "preview": {
             "keyboard": {