Merge pull request #603 from mastodon/release-1.4.7

Release v1.4.7

.arkana.yml

@@ -0,0 +1,17 @@
+import_name: 'ArkanaKeys'
+namespace: 'Keys'
+result_path: 'Dependencies'
+flavors:
+  - AppStore
+swift_declaration_strategy: let
+should_generate_unit_tests: true
+package_manager: spm
+environments:
+  - Debug
+  - Release
+global_secrets:
+  # nothing
+environment_secrets:
+  # Will lookup for <Key>Debug and <Key>Release env vars (assuming no flavor was declared)
+  # Mastodon Push Notification Endpoint
+  - NotificationEndpoint

.env.example

@@ -0,0 +1,7 @@
+# Required
+
+# https://<your-domain>/relay-to/development
+NotificationEndpointDebug=""
+
+# https://<your-domain>/relay-to/production
+NotificationEndpointRelease=""

.github/scripts/build-release.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+set -xeu
+set -o pipefail
+
+function finish() {
+  ditto -c -k --sequesterRsrc --keepParent "${RESULT_BUNDLE_PATH}" "${RESULT_BUNDLE_PATH}.zip"
+  rm -rf "${RESULT_BUNDLE_PATH}"
+}
+
+trap finish EXIT
+
+SDK="${SDK:-iphoneos}"
+WORKSPACE="${WORKSPACE:-Mastodon.xcworkspace}"
+SCHEME="${SCHEME:-Mastodon}"
+CONFIGURATION=${CONFIGURATION:-Release}
+
+BUILD_DIR=${BUILD_DIR:-.build}
+ARTIFACT_PATH=${RESULT_PATH:-${BUILD_DIR}/Artifacts}
+RESULT_BUNDLE_PATH="${ARTIFACT_PATH}/${SCHEME}.xcresult"
+ARCHIVE_PATH=${ARCHIVE_PATH:-${BUILD_DIR}/Archives/${SCHEME}.xcarchive}
+DERIVED_DATA_PATH=${DERIVED_DATA_PATH:-${BUILD_DIR}/DerivedData}
+EXPORT_OPTIONS_FILE=".github/support/ExportOptions.plist"
+
+WORK_DIR=$(pwd)
+API_PRIVATE_KEYS_PATH="${WORK_DIR}/${BUILD_DIR}/private_keys"
+API_KEY_FILE="${API_PRIVATE_KEYS_PATH}/api_key.p8"
+
+rm -rf "${RESULT_BUNDLE_PATH}"
+
+rm -rf "${API_PRIVATE_KEYS_PATH}"
+mkdir -p "${API_PRIVATE_KEYS_PATH}"
+echo -n "${ENV_API_PRIVATE_KEY_BASE64}" | base64 --decode > "${API_KEY_FILE}"
+
+BUILD_NUMBER=$(app-store-connect get-latest-testflight-build-number $ENV_APP_ID --issuer-id $ENV_ISSUER_ID --key-id $ENV_API_KEY_ID --private-key @file:$API_KEY_FILE)
+BUILD_NUMBER=$((BUILD_NUMBER+1))
+CURRENT_PROJECT_VERSION=${BUILD_NUMBER:-0}
+
+echo "GITHUB_TAG_NAME=build-$CURRENT_PROJECT_VERSION" >> $GITHUB_ENV
+
+agvtool new-version -all $CURRENT_PROJECT_VERSION
+
+xcrun xcodebuild clean \
+    -workspace "${WORKSPACE}" \
+    -scheme "${SCHEME}" \
+    -configuration "${CONFIGURATION}"
+
+xcrun xcodebuild archive \
+    -workspace "${WORKSPACE}" \
+    -scheme "${SCHEME}" \
+    -configuration "${CONFIGURATION}" \
+    -destination generic/platform=iOS \
+    -sdk "${SDK}" \
+    -parallelizeTargets \
+    -showBuildTimingSummary \
+    -derivedDataPath "${DERIVED_DATA_PATH}" \
+    -archivePath "${ARCHIVE_PATH}" \
+    -resultBundlePath "${RESULT_BUNDLE_PATH}" \
+    -allowProvisioningUpdates \
+    -authenticationKeyPath "${API_KEY_FILE}" \
+    -authenticationKeyID "${ENV_API_KEY_ID}" \
+    -authenticationKeyIssuerID "${ENV_ISSUER_ID}"
+
+xcrun xcodebuild \
+    -exportArchive \
+    -archivePath "${ARCHIVE_PATH}" \
+    -exportOptionsPlist "${EXPORT_OPTIONS_FILE}" \
+    -exportPath "${ARTIFACT_PATH}/${SCHEME}.ipa" \
+    -allowProvisioningUpdates \
+    -authenticationKeyPath "${API_KEY_FILE}" \
+    -authenticationKeyID "${ENV_API_KEY_ID}" \
+    -authenticationKeyIssuerID "${ENV_ISSUER_ID}"
+
+# Zip up the Xcode Archive into Artifacts folder.
+ditto -c -k --sequesterRsrc --keepParent "${ARCHIVE_PATH}" "${ARTIFACT_PATH}/${SCHEME}.xcarchive.zip"

.github/scripts/build.sh

@@ -7,6 +7,6 @@ set -eo pipefail
 
 xcodebuild -workspace Mastodon.xcworkspace \
 	-scheme Mastodon \
-	-destination "platform=iOS Simulator,name=iPhone SE (2nd generation)" \
+ 	-destination "platform=iOS Simulator,name=iPhone SE (2nd generation)" \
 	clean \
 	build | xcpretty

.github/scripts/setup.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
 
-sudo gem install cocoapods-keys
+# workaround https://github.com/CocoaPods/CocoaPods/issues/11355
+# sed -i '' $'1s/^/source "https:\\/\\/github.com\\/CocoaPods\\/Specs.git"\\\n\\\n/' Podfile
 
-# stub keys. DO NOT use in production
-pod keys set notification_endpoint "<endpoint>"
-pod keys set notification_endpoint_debug "<endpoint>"
+# Install Ruby Bundler
+gem install bundler:2.3.11
 
-pod install
+# Install Ruby Gems
+bundle install
+
+# Setup notification endpoint
+bundle exec arkana
+
+bundle exec pod install

.github/support/ExportOptions.plist

@@ -0,0 +1,10 @@
+<?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>method</key>
+  <string>app-store</string>
+  <key>manageAppVersionAndBuildNumber</key>
+  <true/>
+</dict>
+</plist>

.github/workflows/develop-build.yml

@@ -0,0 +1,74 @@
+name: Build for Develop TestFlight
+
+on: 
+  push:
+    branches:
+    - develop
+    - release*
+    - ci-test
+
+jobs:
+  build:
+    name: Build
+    runs-on: macOS-12
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      
+      - name: Setup
+        env: 
+          NotificationEndpointDebug: ${{ secrets.NotificationEndpointDebug }}
+          NotificationEndpointRelease: ${{ secrets.NotificationEndpointRelease }}
+        run: exec ./.github/scripts/setup.sh
+
+      - name: Install codemagic-cli-tools
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11' 
+      - run: |
+          pip3 install codemagic-cli-tools
+      - run: |
+          codemagic-cli-tools --version || true
+
+      - name: Import Code-Signing Certificates            
+        uses: Apple-Actions/import-codesign-certs@v1            # https://github.com/Apple-Actions/import-codesign-certs
+        with:
+          keychain: build-p12
+          p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          p12-password: ${{ secrets.P12_PASSWORD }}
+
+      - name: Download Provisioning Profiles
+        uses: Apple-Actions/download-provisioning-profiles@v1   # https://github.com/Apple-Actions/download-provisioning-profiles
+        with:
+          bundle-id: org.joinmastodon.app
+          issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
+          api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+          api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
+
+      - name: Build
+        env: 
+          ENV_APP_ID: ${{ secrets.APP_ID }}
+          ENV_ISSUER_ID: ${{ secrets.APPSTORE_ISSUER_ID }}
+          ENV_API_KEY_ID: ${{ secrets.APPSTORE_KEY_ID }}
+          ENV_API_PRIVATE_KEY: ${{ secrets.APPSTORE_PRIVATE_KEY }}
+          ENV_API_PRIVATE_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_KEY_BASE64 }}
+        run: exec ./.github/scripts/build-release.sh
+
+      - name: Upload TestFlight Build
+        uses: Apple-Actions/upload-testflight-build@master
+        with:
+          app-path: .build/Artifacts/Mastodon.ipa/Mastodon.ipa
+          issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
+          api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+          api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
+
+      - name: Tag commit
+        uses: tvdias/github-tagger@v0.0.1
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          tag: "${{ env.GITHUB_TAG_NAME }}"
+
+      - name: Clean up keychain and provisioning profile
+        if: ${{ always() }}
+        run: |
+          security delete-keychain build-p12.keychain-db 

.github/workflows/main.yml

@@ -6,6 +6,9 @@ on:
     - master
     - develop
     - feature/*
+    - feature-*
+    - issue/*
+    - issue-*
   pull_request:
     branches:
     - develop
@@ -15,13 +18,14 @@ on:
 jobs:
   build:
     name: CI build
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: force Xcode 13.2.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.2.1.app
       - name: setup
+        env: 
+          NotificationEndpointDebug: ${{ secrets.NotificationEndpointDebug }}
+          NotificationEndpointRelease: ${{ secrets.NotificationEndpointRelease }}
         run: exec ./.github/scripts/setup.sh
       - name: build
         run: exec ./.github/scripts/build.sh

.gitignore

@@ -120,6 +120,9 @@ 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
+.DS_Store
+
+env/**/**
+!env/.env

AppShared/AppShared.h

@@ -1,18 +0,0 @@
-//
-//  AppShared.h
-//  AppShared
-//
-//  Created by MainasuK Cirno on 2021-4-27.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for AppShared.
-FOUNDATION_EXPORT double AppSharedVersionNumber;
-
-//! Project version string for AppShared.
-FOUNDATION_EXPORT const unsigned char AppSharedVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <AppShared/PublicHeader.h>
-
-

AppShared/Info.plist

@@ -1,22 +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>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
-	<key>CFBundleVersion</key>
-	<string>109</string>
-</dict>
-</plist>

Documentation/Acknowledgments.md

@@ -0,0 +1,34 @@
+# Acknowledgments
+
+- [Alamofire](https://github.com/Alamofire/Alamofire)
+- [AlamofireImage](https://github.com/Alamofire/AlamofireImage)
+- [AlamofireNetworkActivityIndicator](https://github.com/Alamofire/AlamofireNetworkActivityIndicator)
+- [Arkana](https://github.com/rogerluan/arkana)
+- [CommonOSLog](https://github.com/mainasuk/CommonOSLog)
+- [CryptoSwift](https://github.com/krzyzanowskim/CryptoSwift)
+- [DateToolSwift](https://github.com/MatthewYork/DateTools)
+- [FLAnimatedImage](https://github.com/Flipboard/FLAnimatedImage)
+- [FLEX](https://github.com/FLEXTool/FLEX)
+- [FPSIndicator](https://github.com/MainasuK/FPSIndicator)
+- [Fuzi](https://github.com/cezheng/Fuzi)
+- [Kanna](https://github.com/tid-kijyun/Kanna)
+- [KeychainAccess](https://github.com/kishikawakatsumi/KeychainAccess.git)
+- [Kingfisher](https://github.com/onevcat/Kingfisher)
+- [MetaTextKit](https://github.com/TwidereProject/MetaTextKit)
+- [Nuke-FLAnimatedImage-Plugin](https://github.com/kean/Nuke-FLAnimatedImage-Plugin)
+- [Nuke](https://github.com/kean/Nuke)
+- [Pageboy](https://github.com/uias/Pageboy#the-basics)
+- [PanModal](https://github.com/slackhq/PanModal.git)
+- [SDWebImage](https://github.com/SDWebImage/SDWebImage)
+- [swift-collections](https://github.com/apple/swift-collections)
+- [swift-nio](https://github.com/apple/swift-nio)
+- [SwiftGen](https://github.com/SwiftGen/SwiftGen)
+- [SwiftUI-Introspect](https://github.com/siteline/SwiftUI-Introspect)
+- [SwiftyJSON](https://github.com/SwiftyJSON/SwiftyJSON)
+- [TabBarPager](https://github.com/TwidereProject/TabBarPager)
+- [Tabman](https://github.com/uias/Tabman)
+- [ThirdPartyMailer](https://github.com/vtourraine/ThirdPartyMailer)
+- [TOCropViewController](https://github.com/TimOliver/TOCropViewController)
+- [TwidereX-iOS](https://github.com/TwidereProject/TwidereX-iOS)
+- [TwitterProfile](https://github.com/OfTheWolf/TwitterProfile)
+- [UITextView-Placeholder](https://github.com/devxoul/UITextView-Placeholder)

Documentation/CONTRIBUTING.md

@@ -1,30 +1,30 @@
 # Contributing
 
-- File the issue for bug report and feature request
+- File an issue to report a bug or feature request
 - Translate the project in our [Crowdin](https://crowdin.com/project/mastodon-for-ios) project
 - Make the Pull Request to contribute
 
 ## Bug Report
-File the issue about the bug. Make sure you are installing the latest version app from TestFlight or App Store.
+File an issue about the bug or feature request. Make sure you are installing the latest version of the app from TestFlight or App Store.
 
 ## Translation
 [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)
 
-The translation will update regularly. Please request language if not listed via issue.
+The translation will update regularly. Please request the language if it is not listed via an issue.
 
 ## Pull Request
 
-You can make a pull request directly with small block code changes for bugfix or feature implementations. Before making a pull request with hundred lines of changes to this repository, please first discuss the change you wish to make via issue. 
+You can create a pull request directly with small block code changes for bugfix or feature implementations. Before making a pull request with hundred lines of changes to this repository, please first discuss the change you wish to make via an issue. 
 
 Also, there are lots of existing feature request issues that could be a good-first-issue discussing place.
 
 Follow the git-flow pattern to make your pull request.
 
-1. Ensure you are checkout on the `develop` branch.
-2. Write your codes and test them on **iPad and iPhone**.
-3. Merge the `develop` into your branch then make a Pull Request. Please merge the branch and resolve any conflicts when the `develop` updates. **Do not force push your codes.**
-4. Make sure the permission for your folk is open to the reviewer. Code style fix, conflict resolution, and other changes may be committed by the reviewer directly.
+1. Ensure you have started a new branch based on the `develop` branch.
+2. Write your changes and test them on **iPad and iPhone**.
+3. Merge the `develop` branch into your branch then make a Pull Request. Please merge the branch and resolve any conflicts if `develop` updates. **Do not force push your commits.**
+4. Make sure the permission for your fork is open to the reviewer. Code style fix, conflict resolution, and other changes may be committed by the reviewer directly.
 5. Request a code review and wait for approval. The PR will be merged when it is approved.
 
 ## Documentation
-The documents for this app is list under the [Documentation](../Documentation/) folder. We are also welcome contributions for documentation.
+The documentation for this app is listed under the [Documentation](../Documentation/) folder. We are also welcoming contributions for documentation.

Documentation/Setup.md

@@ -7,17 +7,18 @@
 - iOS 14.0+
 
 
-Intell the latest version of Xcode from the App Store or Apple Developer Download website. Also, we assert you have the [Homebrew](https://brew.sh) package manager.  
+Install the latest version of Xcode from the App Store or Apple Developer Download website. Also, we assert you have the [Homebrew](https://brew.sh) package manager.  
 
 This guide may not suit your machine and actually setup procedure may change in the future. Please file the issue or Pull Request if there are any problems.
 
 ## CocoaPods
-The app use [CocoaPods]() and [CocoaPods-Keys](https://github.com/orta/cocoapods-keys). The M1 Mac needs virtual ruby env to workaround compatibility issues.
+The app use [CocoaPods]() and [Arkana](https://github.com/rogerluan/arkana). Ruby Gems are managed through Bundler. The M1 Mac needs virtual ruby env to workaround compatibility issues. Make sure you have [Rosetta](https://support.apple.com/en-us/HT211861) installed if you are using the M1 Mac.
 
 #### Intel Mac
 
 ```zsh
-sudo gem install cocoapods cocoapods-keys
+gem install bundler
+bundle install
 ```
 
 #### M1 Mac
@@ -40,31 +41,39 @@ rbenv global 3.0.3
 ruby --version
 # > ruby 3.0.3p157 (2021-11-24 revision 3fb7d2cadc) [arm64-darwin21]
 
-sudo gem install cocoapods cocoapods-keys
+gem install bundler
+bundle install
 ```
 
 ## Bootstrap
 
 ```zsh
 # make a clean build
-sudo gem install cocoapods-clean
-pod clean
+bundle install
+bundle exec pod clean
+
+# setup arkana
+# please check the `.env.example` to create your's or use the empty example directly
+bundle exec arkana -e ./env/.env
+
+# clean pods
+bundle exec pod clean
 
 # make install
-pod install --repo-update
+bundle exec pod install --repo-update
 
 # open workspace
 open Mastodon.xcworkspace
 ```
 
-The CocoaPods-Key plugin will request the push notification endpoint. You can fufill the empty string and set it later. To setup the push notification. Please check section `Push Notification` below.
+The Arkana plugin will setup the push notification endpoint. You can use the empty template from `./env/.env` or use your own `.env` file. To setup the push notification. Please check section `Push Notification` below.
 
-The app requires the `App Group` capability. To make sure it works for your developer membership. Please check [AppSecret.swift](../AppShared/AppSecret.swift) file and set another unique `groupID` and update `App Group` settings.
+The app requires the `App Group` capability. To make sure it works for your developer membership. Please check [AppSecret.swift](../MastodonSDK/Sources/MastodonCore/AppSecret.swift) file and set another unique `groupID` and update `App Group` settings.
 
 #### Push Notification (Optional)
-The app is compatible with [toot-relay](https://github.com/DagAgren/toot-relay) APNs. You can set your push notification endpoint via Cocoapod-Keys. There are two endpoints:
-- notification_endpoint: for `RELEASE` usage
-- notification_endpoint_debug: for `DEBUG` usage
+The app is compatible with [toot-relay](https://github.com/DagAgren/toot-relay) APNs. You can set your push notification endpoint via Arkana. There are two endpoints:
+- NotificationEndpointDebug: for `DEBUG` usage. e.g. `https://<your.domin>/relay-to/development`
+- NotificationEndpointRelease: for `RELEASE` usage. e.g. `https://<your.domin>/relay-to/production`
 
 Please check the [Establishing a Certificate-Based Connection to APNs
 ](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_certificate-based_connection_to_apns) document to generate the certificate and exports the p12 file.
@@ -80,4 +89,4 @@ Please check and set the `notification.Topic` to the app BundleID in [toot-relay
 
 ## What's next
 
-We welcome contributions! And if you have an interest to contribute codes. Here is a document that describes the app architecture and what's tech stack it uses.
+We welcome contributions! And if you have an interest to contribute codes. Here is a document that describes the app architecture and what's tech stack it uses.

Documentation/Snapshot.md

@@ -14,7 +14,7 @@ We use `xcodebuild` CLI tool to trigger UITest.
 Set the `name` in `-destination` option to add device for snapshot. For example:
 `-destination 'platform=iOS Simulator,name=iPad Pro (12.9-inch) (5th generation)' \`
 
-You can list the avaiable simulator:
+You can list the available simulators:
 ```zsh
 # list the destinations
 xcodebuild \

Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'arkana'
+gem "cocoapods"
+gem "cocoapods-clean"
+gem "xcpretty"
+

Gemfile.lock

@@ -0,0 +1,114 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    arkana (1.2.0)
+      colorize (~> 0.8)
+      dotenv (~> 2.7)
+      yaml (~> 0.2)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-clean (0.0.1)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.3)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.10)
+    dotenv (2.8.1)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    minitest (5.16.3)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.7)
+    rexml (3.2.5)
+    rouge (2.0.7)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.22.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    yaml (0.2.0)
+    zeitwerk (2.6.3)
+
+PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-22
+  x86_64-darwin-21
+  x86_64-darwin-22
+
+DEPENDENCIES
+  arkana
+  cocoapods
+  cocoapods-clean
+  xcpretty
+
+BUNDLED WITH
+   2.3.17

Localization/Localizable.stringsdict

@@ -13,15 +13,15 @@
             <key>NSStringFormatValueTypeKey</key>
             <string>ld</string>
             <key>zero</key>
-            <string>no unread notification</string>
+            <string>no unread notifications</string>
             <key>one</key>
             <string>1 unread notification</string>
             <key>few</key>
             <string>%ld unread notifications</string>
             <key>many</key>
-            <string>%ld unread notification</string>
+            <string>%ld unread notifications</string>
             <key>other</key>
-            <string>%ld unread notification</string>
+            <string>%ld unread notifications</string>
         </dict>
     </dict>
     <key>a11y.plural.count.input_limit_exceeds</key>
@@ -67,6 +67,59 @@
             <key>other</key>
             <string>%ld characters</string>
         </dict>
+    </dict>
+	<key>a11y.plural.count.characters_left</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@character_count@ left</string>
+		<key>character_count</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>zero</key>
+			<string>no characters</string>
+			<key>one</key>
+			<string>1 character</string>
+			<key>few</key>
+			<string>%ld characters</string>
+			<key>many</key>
+			<string>%ld characters</string>
+			<key>other</key>
+			<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>
@@ -90,6 +143,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/README.md

@@ -1,23 +1,34 @@
 # Localization
 [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)
 
-Mastodon localization template file
+We use Crowdin for translations and some automation.
 
+## How to contribute
 
-## How to contribute?
+### Help with translations
 
-Please use the [Crodwin](https://crowdin.com/project/mastodon-for-ios) to contribute. If your language is not in the list. Please feel free to open the issue.
+Head over [Crowdin][crowdin-mastodon-ios] for that. To help with translations, select your language and translate :-) If your language is not in the list, please feel free to [open a topic on Crowdin](crowdin-mastodon-ios-discussions).
 
-## How to maintains
+Please note: You need to have an account on Crowdin to help with translations.
 
-The project use a script to generate Xcode localized strings files.
+### Add new strings
 
-```zsh
-// enter workdir
-cd Mastodon
+This is mainly for developers.
 
-// merge PR from Crowdin bot
+1. Add new strings in `Localization/app.json` **and** the `Localizable.strings` for English.
+2. Run `swiftgen` to generate the `Strings.swift`-file **or** have Xcode build the app (`swiftgen` is a Build phase, too).
+3. Use `import MastodonLocalization` and its (new) `L10n`-enum and its properties where ever you need them in the app.
+4. Once the updated `Localization/app.json` hits `develop`, it gets synced to Crowdin, where people can help with translations. `Localization/app.json` must be a valid json.
 
-// update resource
-./update_localization.sh
-```
+## How to update translations
+
+If there are new translations, Crowdin pushes new commits to a branch called `l10n_develop` and creates a new Pull Request. Both, the branch and the PR might be updated once an hour. The project itself uses a script to generate the various `Localizable.strings`-files etc. for Xcode.
+
+To update or add new translations, the workflow is as follows:
+
+1. Merge the PR with `l10n_develop` into `develop`. It's usually called `New Crowdin Updates`
+2. Run `update.localization.sh` on your computer.
+3. Commit the changes and push `develop`.
+
+[crowdin-mastodon-ios]: https://crowdin.com/project/mastodon-for-ios
+[crowdin-mastodon-ios-discussions]: https://crowdin.com/project/mastodon-for-ios/discussions

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

@@ -1,4 +1,4 @@
-"16wxgf" = "النَشر على ماستودون";
+"16wxgf" = "النَّشرُ عَلَى مَاستودُون";
 
 "751xkl" = "محتوى نصي";
 
@@ -14,7 +14,7 @@
 
 "RxSqsb" = "مَنشور";
 
-"WCIR3D" = "نَشر ${content} على ماستودون";
+"WCIR3D" = "نَشرُ ${content} عَلَى مَاستودُون";
 
 "ZKJSNu" = "مَنشور";
 
@@ -32,9 +32,9 @@
 
 "ayoYEb-ehFLjY" = "${content}، المُتابِعُون فقط";
 
-"dUyuGg" = "النشر على ماستدون";
+"dUyuGg" = "النَّشرُ عَلَى مَاستودُون";
 
-"dYQ5NN" = "للعامة";
+"dYQ5NN" = "لِلعَامَّة";
 
 "ehFLjY" = "لمتابعيك فقط";
 

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

@@ -0,0 +1,51 @@
+"16wxgf" = "پۆستێک بکە";
+
+"751xkl" = "نووسین";
+
+"CsR7G2" = "پۆستێک بکە";
+
+"HZSGTr" = "چی پۆست بکرێت؟";
+
+"HdGikU" = "پۆستکردنەکە سەرکەوتوو نەبوو";
+
+"KDNTJ4" = "هۆکاری سەرنەکەوتن";
+
+"RHxKOw" = "پۆست بە نووسینەوە بکە";
+
+"RxSqsb" = "پۆست";
+
+"WCIR3D" = "${content} لە ماستۆدۆن پۆست بکە";
+
+"ZKJSNu" = "پۆست";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "دەرکەوتن";
+
+"Zo4jgJ" = "دەرکەوتنی پۆست";
+
+"apSxMG-dYQ5NN" = "${count} بژاردە بۆ 'گشتی' هەن.";
+
+"apSxMG-ehFLjY" = "${count} بژاردە بۆ 'تەنیا شوێنکەوتووەکان' هەن.";
+
+"ayoYEb-dYQ5NN" = "${content}، گشتی";
+
+"ayoYEb-ehFLjY" = "${content}، تەنیا شوێنکەوتووەکان";
+
+"dUyuGg" = "پۆستێک بکە";
+
+"dYQ5NN" = "گشتی";
+
+"ehFLjY" = "تەنیا شوێنکەوتووەکان";
+
+"gfePDu" = "پۆستکردنەکە سەرکەوتوو نەبوو. ${failureReason}";
+
+"k7dbKQ" = "پۆستەکە کرا.";
+
+"oGiqmY-dYQ5NN" = "دڵنیایت لە هەڵبژاردنی 'گشتی'؟";
+
+"oGiqmY-ehFLjY" = "دڵنیایت لە هەڵبژاردنی 'تەنیا شوێنکەوتووەکان'؟";
+
+"rM6dvp" = "بەستەر";
+
+"ryJLwG" = "پۆستەکە کرا. ";

Localization/StringsConvertor/Intents/input/ckb.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>%#@count_option@ بژاردە بۆ '${content}' هەن.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld بژاردە</string>
+        <key>other</key>
+        <string>%ld بژاردە</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count_option@ بژاردە بۆ '${visibility}' هەن.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld بژاردە</string>
+        <key>other</key>
+        <string>%ld بژاردە</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,51 @@
+"16wxgf" = "Příspěvek na Mastodon";
+
+"751xkl" = "Textový obsah";
+
+"CsR7G2" = "Příspěvek na Mastodon";
+
+"HZSGTr" = "Jaký obsah se má přidat?";
+
+"HdGikU" = "Odeslání se nezdařilo";
+
+"KDNTJ4" = "Důvod selhání";
+
+"RHxKOw" = "Odeslat příspěvek s textovým obsahem";
+
+"RxSqsb" = "Příspěvek";
+
+"WCIR3D" = "Zveřejnit ${content} na Mastodon";
+
+"ZKJSNu" = "Příspěvek";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Viditelnost";
+
+"Zo4jgJ" = "Viditelnost příspěvku";
+
+"apSxMG-dYQ5NN" = "Existuje ${count} možností odpovídajících 'Veřejný'.";
+
+"apSxMG-ehFLjY" = "Existuje ${count} možností, které odpovídají „jen sledujícím“.";
+
+"ayoYEb-dYQ5NN" = "${content}, veřejné";
+
+"ayoYEb-ehFLjY" = "${content}, pouze sledující";
+
+"dUyuGg" = "Příspěvek na Mastodon";
+
+"dYQ5NN" = "Veřejný";
+
+"ehFLjY" = "Pouze sledující";
+
+"gfePDu" = "Odeslání se nezdařilo. ${failureReason}";
+
+"k7dbKQ" = "Příspěvek byl úspěšně odeslán.";
+
+"oGiqmY-dYQ5NN" = "Jen pro kontrolu, chtěli jste „Veřejný“?";
+
+"oGiqmY-ehFLjY" = "Jen pro kontrolu, chtěli jste „Pouze sledující“?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Příspěvek byl úspěšně odeslán. ";

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

@@ -0,0 +1,46 @@
+<?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>Existuje %#@count_option@ odpovídající „${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>few</key>
+        <string>%ld options</string>
+        <key>many</key>
+        <string>%ld options</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>few</key>
+        <string>%ld options</string>
+        <key>many</key>
+        <string>%ld options</string>
+        <key>other</key>
+        <string>%ld options</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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/is.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "Birta á Mastodon";
+
+"751xkl" = "Efni texta";
+
+"CsR7G2" = "Birta á Mastodon";
+
+"HZSGTr" = "Hvaða efni á að birta?";
+
+"HdGikU" = "Birting færslu mistókst";
+
+"KDNTJ4" = "Ástæða bilunar";
+
+"RHxKOw" = "Senda færslu með textaefni";
+
+"RxSqsb" = "Færsla";
+
+"WCIR3D" = "Birta ${content} á Mastodon";
+
+"ZKJSNu" = "Færsla";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Sýnileiki";
+
+"Zo4jgJ" = "Sýnileiki færslu";
+
+"apSxMG-dYQ5NN" = "Það eru ${count} valkostir sem samsvara ‘Opinbert’.";
+
+"apSxMG-ehFLjY" = "Það eru ${count} valkostir sem samsvara ‘Einungis fylgjendur’.";
+
+"ayoYEb-dYQ5NN" = "${content}, opinbert";
+
+"ayoYEb-ehFLjY" = "${content}, einungis fylgjendur";
+
+"dUyuGg" = "Birta á Mastodon";
+
+"dYQ5NN" = "Opinbert";
+
+"ehFLjY" = "Einungis fylgjendur";
+
+"gfePDu" = "Birting færslu mistókst. ${failureReason}";
+
+"k7dbKQ" = "Það tókst að senda færsluna.";
+
+"oGiqmY-dYQ5NN" = "Bara til að staðfesta, þú vildir 'Opinbert'?";
+
+"oGiqmY-ehFLjY" = "Bara til að staðfesta, þú vildir ''Einungis fylgjendur'?";
+
+"rM6dvp" = "URL-slóð";
+
+"ryJLwG" = "Það tókst að senda færsluna. ";

Localization/StringsConvertor/Intents/input/is.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>Það eru %#@count_option@ sem samsvara ‘${content}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 valkostur</string>
+        <key>other</key>
+        <string>%ld valkostir</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Það eru %#@count_option@ sem samsvara ‘${visibility}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 valkostur</string>
+        <key>other</key>
+        <string>%ld valkostir</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,51 @@
+"16wxgf" = "Pubblica su Mastodon";
+
+"751xkl" = "Contenuto testuale";
+
+"CsR7G2" = "Pubblica su Mastodon";
+
+"HZSGTr" = "Quale contenuto postare?";
+
+"HdGikU" = "Pubblicazione non riuscita";
+
+"KDNTJ4" = "Motivo del fallimento";
+
+"RHxKOw" = "Invia post con contenuto testuale";
+
+"RxSqsb" = "Pubblica";
+
+"WCIR3D" = "Pubblica ${content} su Mastodon";
+
+"ZKJSNu" = "Pubblica";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Visibilità";
+
+"Zo4jgJ" = "Visibilità del post";
+
+"apSxMG-dYQ5NN" = "Ci sono ${count} opzioni corrispondenti a 'Pubblico'.";
+
+"apSxMG-ehFLjY" = "Ci sono ${count} opzioni corrispondenti a ‘Solo Seguaci’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Pubblico";
+
+"ayoYEb-ehFLjY" = "${content}, Solo seguaci";
+
+"dUyuGg" = "Pubblica su Mastodon";
+
+"dYQ5NN" = "Pubblico";
+
+"ehFLjY" = "Solo i seguaci";
+
+"gfePDu" = "Pubblicazione fallita. ${failureReason}";
+
+"k7dbKQ" = "Post inviato con successo.";
+
+"oGiqmY-dYQ5NN" = "Solo per confermare, volevi ‘Pubblico’?";
+
+"oGiqmY-ehFLjY" = "Solo per confermare, volevi 'Solo seguaci'?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Post inviato con successo. ";

Localization/StringsConvertor/Intents/input/it.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>Ci sono %#@count_option@ corrispondenti a «${content}».</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opzione</string>
+        <key>other</key>
+        <string>%ld opzioni</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Ci sono %#@count_option@ corrispondenti a «${visibility}».</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opzione</string>
+        <key>other</key>
+        <string>%ld opzioni</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -29,9 +29,9 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
         <key>one</key>
-        <string>1 uɣewwaṛ</string>
+        <string>%ld n uɣewwaṛ</string>
         <key>other</key>
-        <string>%ld iɣewwaṛen</string>
+        <string>%ld n iɣewwaṛen</string>
       </dict>
     </dict>
   </dict>

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

@@ -14,7 +14,7 @@
 
 "RxSqsb" = "Post";
 
-"WCIR3D" = "Posta ${content} på Mastodon";
+"WCIR3D" = "Post ${content} on Mastodon";
 
 "ZKJSNu" = "Post";
 
@@ -34,18 +34,18 @@
 
 "dUyuGg" = "Post on Mastodon";
 
-"dYQ5NN" = "Publikt";
+"dYQ5NN" = "공개";
 
-"ehFLjY" = "Endast följare";
+"ehFLjY" = "팔로워 전용";
 
-"gfePDu" = "Posting failed. ${failureReason}";
+"gfePDu" = "게시를 실패했습니다. ${failureReason}";
 
-"k7dbKQ" = "Post was sent successfully.";
+"k7dbKQ" = "성공적으로 게시물을 전송했습니다.";
 
-"oGiqmY-dYQ5NN" = "Just to confirm, you wanted ‘Public’?";
+"oGiqmY-dYQ5NN" = "확인차 물어보건데, '공개'로 게시하시길 원합니까?";
 
-"oGiqmY-ehFLjY" = "Just to confirm, you wanted ‘Followers Only’?";
+"oGiqmY-ehFLjY" = "확인차 물어보건데, '팔로워 전용'으로 게시하시길 원합니까?";
 
 "rM6dvp" = "URL";
 
-"ryJLwG" = "Post was sent successfully. ";
+"ryJLwG" = "성공적으로 게시물을 전송했습니다. ";

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

@@ -13,7 +13,7 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
         <key>other</key>
-        <string>%ld options</string>
+        <string>%ld 개의 옵션</string>
       </dict>
     </dict>
     <key>There are ${count} options matching ‘${visibility}’.</key>
@@ -27,7 +27,7 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
         <key>other</key>
-        <string>%ld options</string>
+        <string>%ld 개의 옵션</string>
       </dict>
     </dict>
   </dict>

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

@@ -12,7 +12,7 @@
 
 "RHxKOw" = "Send Post with text content";
 
-"RxSqsb" = "Post";
+"RxSqsb" = "Ziņa";
 
 "WCIR3D" = "Post ${content} on Mastodon";
 
@@ -34,9 +34,9 @@
 
 "dUyuGg" = "Post on Mastodon";
 
-"dYQ5NN" = "Public";
+"dYQ5NN" = "Publisks";
 
-"ehFLjY" = "Followers Only";
+"ehFLjY" = "Tikai sekotājiem";
 
 "gfePDu" = "Posting failed. ${failureReason}";
 

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

@@ -12,6 +12,8 @@
         <string>NSStringPluralRuleType</string>
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
+        <key>zero</key>
+        <string>%ld options</string>
         <key>one</key>
         <string>1 option</string>
         <key>other</key>
@@ -28,6 +30,8 @@
         <string>NSStringPluralRuleType</string>
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
+        <key>zero</key>
+        <string>%ld options</string>
         <key>one</key>
         <string>1 option</string>
         <key>other</key>

Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "Postar no Mastodon";
+
+"751xkl" = "Conteúdo do texto";
+
+"CsR7G2" = "Postar no Mastodon";
+
+"HZSGTr" = "Qual conteúdo a publicar?";
+
+"HdGikU" = "Falha na publicação";
+
+"KDNTJ4" = "Motivo da falha";
+
+"RHxKOw" = "Enviar postagem com conteúdo de texto";
+
+"RxSqsb" = "Postagem";
+
+"WCIR3D" = "Postar ${content} no Mastodon";
+
+"ZKJSNu" = "Postar";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Visibilidade";
+
+"Zo4jgJ" = "Visibilidade da publicação";
+
+"apSxMG-dYQ5NN" = "Existem ${count} opções correspondentes a ‘Público’.";
+
+"apSxMG-ehFLjY" = "Existem ${count} opções correspondentes a ‘Apenas para seguidores’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Público";
+
+"ayoYEb-ehFLjY" = "${content}, Apenas para seguidores";
+
+"dUyuGg" = "Postar no Mastodon";
+
+"dYQ5NN" = "Público";
+
+"ehFLjY" = "Apenas para seguidores";
+
+"gfePDu" = "Falha na publicação. ${failureReason}";
+
+"k7dbKQ" = "Publicação enviada com sucesso.";
+
+"oGiqmY-dYQ5NN" = "Só para confirmar, você queria ‘Público’?";
+
+"oGiqmY-ehFLjY" = "Só para confirmar, você queria ‘Apenas para seguidores’?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Publicação enviada com sucesso. ";

Localization/StringsConvertor/Intents/input/pt-BR.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>Existem %#@count_option@ opções correspondentes a ‘${content}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opção</string>
+        <key>other</key>
+        <string>%ld opções</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Existem %#@count_option@ opções correspondentes a ‘${visibility}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 opção</string>
+        <key>other</key>
+        <string>%ld opções</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,51 @@
+"16wxgf" = "Objavi na Mastodonu";
+
+"751xkl" = "besedilo";
+
+"CsR7G2" = "Objavi na Mastodonu";
+
+"HZSGTr" = "Kakšno vsebino želite objaviti?";
+
+"HdGikU" = "Objava ni uspela";
+
+"KDNTJ4" = "Vzrok za neuspeh";
+
+"RHxKOw" = "Pošlji objavo z besedilom";
+
+"RxSqsb" = "Objavi";
+
+"WCIR3D" = "Objavite ${content} na Mastodonu";
+
+"ZKJSNu" = "Objavi";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Vidnost";
+
+"Zo4jgJ" = "Vidnost objave";
+
+"apSxMG-dYQ5NN" = "Z \"Javno\" se ujema ${count} možnosti.";
+
+"apSxMG-ehFLjY" = "S \"Samo sledilci\" se ujema ${count} možnosti.";
+
+"ayoYEb-dYQ5NN" = "${content}, javno";
+
+"ayoYEb-ehFLjY" = "${content}, samo sledilci";
+
+"dUyuGg" = "Objavi na Mastodonu";
+
+"dYQ5NN" = "Javno";
+
+"ehFLjY" = "Samo sledilci";
+
+"gfePDu" = "Objava je spodletela. ${failureReason}";
+
+"k7dbKQ" = "Uspešno poslana objava.";
+
+"oGiqmY-dYQ5NN" = "Da ne bo nesporazuma - želeli ste \"Javno\"?";
+
+"oGiqmY-ehFLjY" = "Da ne bo nesporazuma - želeli ste \"Samo sledilci\"?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Uspešno poslana objava. ";

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

@@ -0,0 +1,46 @@
+<?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>Na voljo: %#@count_option@, ki se ujema z "${content}".</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld možnost</string>
+        <key>two</key>
+        <string>%ld možnosti</string>
+        <key>few</key>
+        <string>%ld možnosti</string>
+        <key>other</key>
+        <string>%ld možnosti</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Na voljo: %#@count_option@, ki se ujema z "${visibility}".</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld možnost</string>
+        <key>two</key>
+        <string>%ld možnosti</string>
+        <key>few</key>
+        <string>%ld možnosti</string>
+        <key>other</key>
+        <string>%ld možnosti</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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" = "Kunde inte publicera. ${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.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>Det finns %#@count_option@ alternativ som matchar ‘${content}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld alternativ</string>
+        <key>other</key>
+        <string>%ld alternativ</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Det finns %#@count_option@ alternativ som matchar ‘${visibility}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>%ld alternativ</string>
+        <key>other</key>
+        <string>%ld alternativ</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,51 @@
+"16wxgf" = "Mastodon'da paylaş";
+
+"751xkl" = "Metin içeriği";
+
+"CsR7G2" = "Mastodon'da paylaş";
+
+"HZSGTr" = "Ne içeriği paylaşılacak?";
+
+"HdGikU" = "Gönderi paylaşılamadı";
+
+"KDNTJ4" = "Hata Sebebi";
+
+"RHxKOw" = "Metin içeriği ile gönderiyi paylaş";
+
+"RxSqsb" = "Gönderi";
+
+"WCIR3D" = "${content} içeriğini Mastodon'da paylaş";
+
+"ZKJSNu" = "Gönderi";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Gizlilik";
+
+"Zo4jgJ" = "Gönderi Gizliliği";
+
+"apSxMG-dYQ5NN" = "\"Herkese açık\" ile eşleşen ${count} seçenek var.";
+
+"apSxMG-ehFLjY" = "\"Sadece takipçiler\" ile eşleşen ${count} seçenek var.";
+
+"ayoYEb-dYQ5NN" = "${content}, Herkese açık";
+
+"ayoYEb-ehFLjY" = "${content}, Sadece takipçiler";
+
+"dUyuGg" = "Mastodon'da paylaş";
+
+"dYQ5NN" = "Herkese açık";
+
+"ehFLjY" = "Sadece takipçiler";
+
+"gfePDu" = "Gönderi paylaşılamadı. ${failureReason}";
+
+"k7dbKQ" = "Gönderi başarıyla paylaşıldı.";
+
+"oGiqmY-dYQ5NN" = "\"Herkese açık\" paylaşmak istediğinize emin misiniz?";
+
+"oGiqmY-ehFLjY" = "\"Sadece takipçiler\" için paylaşmak istediğinize emin misiniz?";
+
+"rM6dvp" = "Bağlantı";
+
+"ryJLwG" = "Gönderi başarıyla paylaşıldı. ";

Localization/StringsConvertor/Intents/input/tr.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>‘${content}’ ile eşleşen %#@count_option@ var.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 seçenek</string>
+        <key>other</key>
+        <string>%ld seçenek</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>‘${visibility}’ ile eşleşen %#@count_option@ var.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>one</key>
+        <string>1 seçenek</string>
+        <key>other</key>
+        <string>%ld seçenek</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,46 @@
+<?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>few</key>
+        <string>%ld options</string>
+        <key>many</key>
+        <string>%ld options</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>few</key>
+        <string>%ld options</string>
+        <key>many</key>
+        <string>%ld options</string>
+        <key>other</key>
+        <string>%ld options</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

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

@@ -0,0 +1,51 @@
+"16wxgf" = "Đăng lên Mastodon";
+
+"751xkl" = "Nội dung văn bản";
+
+"CsR7G2" = "Đăng lên Mastodon";
+
+"HZSGTr" = "Đăng loại nội dung nào?";
+
+"HdGikU" = "Không thể đăng";
+
+"KDNTJ4" = "Lý do không thể đăng";
+
+"RHxKOw" = "Gửi tút với nội dung là chữ";
+
+"RxSqsb" = "Tút";
+
+"WCIR3D" = "Đăng ${content} lên Mastodon";
+
+"ZKJSNu" = "Tút";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "Hiển thị";
+
+"Zo4jgJ" = "Thay đổi quyền riêng tư";
+
+"apSxMG-dYQ5NN" = "Có ${count} lựa chọn khớp với ‘Công khai’.";
+
+"apSxMG-ehFLjY" = "Có ${count} lựa chọn khớp với ‘Riêng tư’.";
+
+"ayoYEb-dYQ5NN" = "${content}, Công khai";
+
+"ayoYEb-ehFLjY" = "${content}, Chỉ người theo dõi";
+
+"dUyuGg" = "Đăng lên Mastodon";
+
+"dYQ5NN" = "Công khai";
+
+"ehFLjY" = "Riêng tư";
+
+"gfePDu" = "Không thể đăng. ${failureReason}";
+
+"k7dbKQ" = "Đã đăng tút thành công.";
+
+"oGiqmY-dYQ5NN" = "Xin xác nhận, bạn muốn ‘Công khai’?";
+
+"oGiqmY-ehFLjY" = "Xin xác nhận, bạn muốn ‘Riêng tư’?";
+
+"rM6dvp" = "URL";
+
+"ryJLwG" = "Đã đăng tút thành công. ";

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

@@ -0,0 +1,34 @@
+<?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>Có %#@count_option@ khớp với ‘${content}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>other</key>
+        <string>%ld lựa chọn</string>
+      </dict>
+    </dict>
+    <key>There are ${count} options matching ‘${visibility}’.</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>Có %#@count_option@ khớp với ‘${visibility}’.</string>
+      <key>count_option</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>%ld</string>
+        <key>other</key>
+        <string>%ld lựa chọn</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>

Localization/StringsConvertor/Intents/input/zh-Hant.lproj/Intents.strings

@@ -0,0 +1,51 @@
+"16wxgf" = "於 Mastodon 上發嘟文";
+
+"751xkl" = "文字內容";
+
+"CsR7G2" = "於 Mastodon 上發嘟文";
+
+"HZSGTr" = "要發什麼嘟呢？";
+
+"HdGikU" = "嘟文失敗";
+
+"KDNTJ4" = "失敗原因";
+
+"RHxKOw" = "發送文字內容嘟文";
+
+"RxSqsb" = "嘟文";
+
+"WCIR3D" = "將 ${content} 於 Mastodon 上發嘟";
+
+"ZKJSNu" = "嘟文";
+
+"ZS1XaK" = "${content}";
+
+"ZbSjzC" = "可見性";
+
+"Zo4jgJ" = "嘟文可見性";
+
+"apSxMG-dYQ5NN" = "有 ${count} 個選項符合「公開」。";
+
+"apSxMG-ehFLjY" = "有 ${count} 個選項符合「僅限跟隨者」。";
+
+"ayoYEb-dYQ5NN" = "${content}，公開";
+
+"ayoYEb-ehFLjY" = "${content}，僅限跟隨者";
+
+"dUyuGg" = "於 Mastodon 上發嘟文";
+
+"dYQ5NN" = "公開";
+
+"ehFLjY" = "僅限跟隨者";
+
+"gfePDu" = "發嘟失敗。${failureReason}";
+
+"k7dbKQ" = "成功發出嘟文。";
+
+"oGiqmY-dYQ5NN" = "再確認一次，您想要「公開」？";
+
+"oGiqmY-ehFLjY" = "再確認一次，您想要「僅限跟隨者」？";
+
+"rM6dvp" = "網址";
+
+"ryJLwG" = "成功發出嘟文。 ";

Localization/StringsConvertor/Intents/input/zh-Hant.lproj/Intents.stringsdict

@@ -5,7 +5,7 @@
     <key>There are ${count} options matching ‘${content}’. - 2</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
-      <string>There are %#@count_option@ matching ‘${content}’.</string>
+      <string>有 %#@count_option@ 符合「 ${content} 」。</string>
       <key>count_option</key>
       <dict>
         <key>NSStringFormatSpecTypeKey</key>
@@ -13,13 +13,13 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
         <key>other</key>
-        <string>%ld options</string>
+        <string>%ld 個選項</string>
       </dict>
     </dict>
     <key>There are ${count} options matching ‘${visibility}’.</key>
     <dict>
       <key>NSStringLocalizedFormatKey</key>
-      <string>There are %#@count_option@ matching ‘${visibility}’.</string>
+      <string>有 %#@count_option@ 符合「 ${visibility} 」。</string>
       <key>count_option</key>
       <dict>
         <key>NSStringFormatSpecTypeKey</key>
@@ -27,7 +27,7 @@
         <key>NSStringFormatValueTypeKey</key>
         <string>%ld</string>
         <key>other</key>
-        <string>%ld options</string>
+        <string>%ld 個選項</string>
       </dict>
     </dict>
   </dict>

Localization/StringsConvertor/Sources/StringsConvertor/main.swift

@@ -47,23 +47,34 @@ 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 "nl_NL":   return "nl"         // Dutch
-    case "en_US":   return "en"
-    case "fr_FR":   return "fr"         // French
-    case "de_DE":   return "de"         // German
-    case "ja_JP":   return "ja"         // Japanese
-    case "kmr_TR":  return "ku"         // Kurmanji (Kurdish)
-    case "ru_RU":   return "ru"         // Russian
-    case "gd_GB":   return "gd-GB"      // Scottish Gaelic
-    case "es_ES":   return "es"         // Spanish
-    case "es_AR":   return "es-419"     // Spanish, Argentina
-    case "sv_FI":   return "sv_FI"      // Swedish, Finland
-    case "th_TH":   return "th"         // Thai
-    default:        return nil
+    case "Base.lproj":      return "Base"
+    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 "cs.lproj":        return "cs"         // Czech
+    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 "sl.lproj":        return "sl"         // Slovenian
+    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/Base.lproj/Localizable.stringsdict

@@ -0,0 +1,631 @@
+<?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>a11y.plural.count.unread.notification</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@notification_count_unread_notification@</string>
+        <key>notification_count_unread_notification</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>no unread notifications</string>
+            <key>one</key>
+            <string>1 unread notification</string>
+            <key>few</key>
+            <string>%ld unread notifications</string>
+            <key>many</key>
+            <string>%ld unread notifications</string>
+            <key>other</key>
+            <string>%ld unread notifications</string>
+        </dict>
+    </dict>
+    <key>a11y.plural.count.input_limit_exceeds</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>Input limit exceeds %#@character_count@</string>
+        <key>character_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 characters</string>
+            <key>one</key>
+            <string>1 character</string>
+            <key>few</key>
+            <string>%ld characters</string>
+            <key>many</key>
+            <string>%ld characters</string>
+            <key>other</key>
+            <string>%ld characters</string>
+        </dict>
+    </dict>
+    <key>a11y.plural.count.input_limit_remains</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>Input limit remains %#@character_count@</string>
+        <key>character_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 characters</string>
+            <key>one</key>
+            <string>1 character</string>
+            <key>few</key>
+            <string>%ld characters</string>
+            <key>many</key>
+            <string>%ld characters</string>
+            <key>other</key>
+            <string>%ld characters</string>
+        </dict>
+    </dict>
+	<key>a11y.plural.count.characters_left</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@character_count@ left</string>
+		<key>character_count</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>zero</key>
+			<string>no characters</string>
+			<key>one</key>
+			<string>1 character</string>
+			<key>few</key>
+			<string>%ld characters</string>
+			<key>many</key>
+			<string>%ld characters</string>
+			<key>other</key>
+			<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>
+        <string>%@ %#@post_count@</string>
+        <key>post_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>posts</string>
+            <key>one</key>
+            <string>post</string>
+            <key>few</key>
+            <string>posts</string>
+            <key>many</key>
+            <string>posts</string>
+            <key>other</key>
+            <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>
+        <string>%#@post_count@</string>
+        <key>post_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 posts</string>
+            <key>one</key>
+            <string>1 post</string>
+            <key>few</key>
+            <string>%ld posts</string>
+            <key>many</key>
+            <string>%ld posts</string>
+            <key>other</key>
+            <string>%ld posts</string>
+        </dict>
+    </dict>
+	<key>plural.count.favorite</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@favorite_count@</string>
+        <key>favorite_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 favorites</string>
+            <key>one</key>
+            <string>1 favorite</string>
+            <key>few</key>
+            <string>%ld favorites</string>
+            <key>many</key>
+            <string>%ld favorites</string>
+            <key>other</key>
+            <string>%ld favorites</string>
+        </dict>
+    </dict>
+	<key>plural.count.reblog</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@reblog_count@</string>
+		<key>reblog_count</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>zero</key>
+			<string>0 reblogs</string>
+			<key>one</key>
+			<string>1 reblog</string>
+			<key>few</key>
+			<string>%ld reblogs</string>
+			<key>many</key>
+			<string>%ld reblogs</string>
+			<key>other</key>
+			<string>%ld reblogs</string>
+		</dict>
+	</dict>
+    <key>plural.count.reply</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@reply_count@</string>
+		<key>reply_count</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>zero</key>
+			<string>0 replies</string>
+			<key>one</key>
+			<string>1 reply</string>
+			<key>few</key>
+			<string>%ld replies</string>
+			<key>many</key>
+			<string>%ld replies</string>
+			<key>other</key>
+			<string>%ld replies</string>
+		</dict>
+	</dict>
+    <key>plural.count.vote</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@vote_count@</string>
+        <key>vote_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 votes</string>
+            <key>one</key>
+            <string>1 vote</string>
+            <key>few</key>
+            <string>%ld votes</string>
+            <key>many</key>
+            <string>%ld votes</string>
+            <key>other</key>
+            <string>%ld votes</string>
+        </dict>
+    </dict>
+    <key>plural.count.voter</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@voter_count@</string>
+        <key>voter_count</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 voters</string>
+            <key>one</key>
+            <string>1 voter</string>
+            <key>few</key>
+            <string>%ld voters</string>
+            <key>many</key>
+            <string>%ld voters</string>
+            <key>other</key>
+            <string>%ld voters</string>
+        </dict>
+    </dict>
+    <key>plural.people_talking</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_people_talking@</string>
+        <key>count_people_talking</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 people talking</string>
+            <key>one</key>
+            <string>1 people talking</string>
+            <key>few</key>
+            <string>%ld people talking</string>
+            <key>many</key>
+            <string>%ld people talking</string>
+            <key>other</key>
+            <string>%ld people talking</string>
+        </dict>
+    </dict>
+    <key>plural.count.following</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_following@</string>
+        <key>count_following</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 following</string>
+            <key>one</key>
+            <string>1 following</string>
+            <key>few</key>
+            <string>%ld following</string>
+            <key>many</key>
+            <string>%ld following</string>
+            <key>other</key>
+            <string>%ld following</string>
+        </dict>
+    </dict>
+    <key>plural.count.follower</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_follower@</string>
+        <key>count_follower</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 followers</string>
+            <key>one</key>
+            <string>1 follower</string>
+            <key>few</key>
+            <string>%ld followers</string>
+            <key>many</key>
+            <string>%ld followers</string>
+            <key>other</key>
+            <string>%ld followers</string>
+        </dict>
+    </dict>
+    <key>date.year.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_year_left@</string>
+        <key>count_year_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 years left</string>
+            <key>one</key>
+            <string>1 year left</string>
+            <key>few</key>
+            <string>%ld years left</string>
+            <key>many</key>
+            <string>%ld years left</string>
+            <key>other</key>
+            <string>%ld years left</string>
+        </dict>
+    </dict>
+    <key>date.month.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_month_left@</string>
+        <key>count_month_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 months left</string>
+            <key>one</key>
+            <string>1 months left</string>
+            <key>few</key>
+            <string>%ld months left</string>
+            <key>many</key>
+            <string>%ld months left</string>
+            <key>other</key>
+            <string>%ld months left</string>
+        </dict>
+    </dict>
+    <key>date.day.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_day_left@</string>
+        <key>count_day_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 days left</string>
+            <key>one</key>
+            <string>1 day left</string>
+            <key>few</key>
+            <string>%ld days left</string>
+            <key>many</key>
+            <string>%ld days left</string>
+            <key>other</key>
+            <string>%ld days left</string>
+        </dict>
+    </dict>
+    <key>date.hour.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_hour_left@</string>
+        <key>count_hour_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 hours left</string>
+            <key>one</key>
+            <string>1 hour left</string>
+            <key>few</key>
+            <string>%ld hours left</string>
+            <key>many</key>
+            <string>%ld hours left</string>
+            <key>other</key>
+            <string>%ld hours left</string>
+        </dict>
+    </dict>
+    <key>date.minute.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_minute_left@</string>
+        <key>count_minute_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 minutes left</string>
+            <key>one</key>
+            <string>1 minute left</string>
+            <key>few</key>
+            <string>%ld minutes left</string>
+            <key>many</key>
+            <string>%ld minutes left</string>
+            <key>other</key>
+            <string>%ld minutes left</string>
+        </dict>
+    </dict>
+    <key>date.second.left</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_second_left@</string>
+        <key>count_second_left</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0 seconds left</string>
+            <key>one</key>
+            <string>1 second left</string>
+            <key>few</key>
+            <string>%ld seconds left</string>
+            <key>many</key>
+            <string>%ld seconds left</string>
+            <key>other</key>
+            <string>%ld seconds left</string>
+        </dict>
+    </dict>
+        <key>date.year.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_year_ago_abbr@</string>
+        <key>count_year_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0y ago</string>
+            <key>one</key>
+            <string>1y ago</string>
+            <key>few</key>
+            <string>%ldy ago</string>
+            <key>many</key>
+            <string>%ldy ago</string>
+            <key>other</key>
+            <string>%ldy ago</string>
+        </dict>
+    </dict>
+    <key>date.month.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_month_ago_abbr@</string>
+        <key>count_month_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0M ago</string>
+            <key>one</key>
+            <string>1M ago</string>
+            <key>few</key>
+            <string>%ldM ago</string>
+            <key>many</key>
+            <string>%ldM ago</string>
+            <key>other</key>
+            <string>%ldM ago</string>
+        </dict>
+    </dict>
+    <key>date.day.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_day_ago_abbr@</string>
+        <key>count_day_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0d ago</string>
+            <key>one</key>
+            <string>1d ago</string>
+            <key>few</key>
+            <string>%ldd ago</string>
+            <key>many</key>
+            <string>%ldd ago</string>
+            <key>other</key>
+            <string>%ldd ago</string>
+        </dict>
+    </dict>
+    <key>date.hour.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_hour_ago_abbr@</string>
+        <key>count_hour_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0h ago</string>
+            <key>one</key>
+            <string>1h ago</string>
+            <key>few</key>
+            <string>%ldh ago</string>
+            <key>many</key>
+            <string>%ldh ago</string>
+            <key>other</key>
+            <string>%ldh ago</string>
+        </dict>
+    </dict>
+    <key>date.minute.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_minute_ago_abbr@</string>
+        <key>count_minute_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0m ago</string>
+            <key>one</key>
+            <string>1m ago</string>
+            <key>few</key>
+            <string>%ldm ago</string>
+            <key>many</key>
+            <string>%ldm ago</string>
+            <key>other</key>
+            <string>%ldm ago</string>
+        </dict>
+    </dict>
+    <key>date.second.ago.abbr</key>
+    <dict>
+        <key>NSStringLocalizedFormatKey</key>
+        <string>%#@count_second_ago_abbr@</string>
+        <key>count_second_ago_abbr</key>
+        <dict>
+            <key>NSStringFormatSpecTypeKey</key>
+            <string>NSStringPluralRuleType</string>
+            <key>NSStringFormatValueTypeKey</key>
+            <string>ld</string>
+            <key>zero</key>
+            <string>0s ago</string>
+            <key>one</key>
+            <string>1s ago</string>
+            <key>few</key>
+            <string>%lds ago</string>
+            <key>many</key>
+            <string>%lds ago</string>
+            <key>other</key>
+            <string>%lds ago</string>
+        </dict>
+    </dict>
+</dict>
+</plist>

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

@@ -74,8 +74,8 @@
                 "take_photo": "Take Photo",
                 "save_photo": "Save Photo",
                 "copy_photo": "Copy Photo",
-                "sign_in": "Sign In",
-                "sign_up": "Sign Up",
+                "sign_in": "Log in",
+                "sign_up": "Create account",
                 "see_more": "See More",
                 "preview": "Preview",
                 "share": "Share",
@@ -129,11 +129,19 @@
                 "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"
                 },
+                "meta_entity": {
+                    "url": "Link: %s",
+                    "hashtag": "Hashtag: %s",
+                    "mention": "Show Profile: %s",
+                    "email": "Email address: %s"
+                },
                 "actions": {
                     "reply": "Reply",
                     "reblog": "Reblog",
@@ -141,7 +149,11 @@
                     "favorite": "Favorite",
                     "unfavorite": "Unfavorite",
                     "menu": "Menu",
-                    "hide": "Hide"
+                    "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",
@@ -174,7 +186,9 @@
                 "unmute": "Unmute",
                 "unmute_user": "Unmute %s",
                 "muted": "Muted",
-                "edit_info": "Edit Info"
+                "edit_info": "Edit Info",
+                "show_reblogs": "Show Reblogs",
+                "hide_reblogs": "Hide Reblogs"
             },
             "timeline": {
                 "filtered": "Filtered",
@@ -204,10 +218,16 @@
             "get_started": "Get Started",
             "log_in": "Log In"
         },
+        "login": {
+            "title": "Welcome back",
+            "subtitle": "Log you in on the server you created your account on.",
+            "server_search_field": {
+              "placeholder": "Enter URL or search for your server"
+            }
+        },
         "server_picker": {
-            "title": "Mastodon is made of users in different communities.",
-            "subtitle": "Pick a community based on your interests, region, or a general purpose one.",
-            "subtitle_extend": "Pick a community based on your interests, region, or a general purpose one. Each community is operated by an entirely independent organization or individual.",
+            "title": "Mastodon is made of users in different servers.",
+            "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.",
             "button": {
                 "category": {
                     "all": "All",
@@ -234,7 +254,7 @@
                 "category": "CATEGORY"
             },
             "input": {
-                "placeholder": "Search communities"
+                "search_servers_or_enter_url": "Search communities or enter URL"
             },
             "empty_state": {
                 "finding_servers": "Finding available servers...",
@@ -244,6 +264,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"
@@ -314,6 +335,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"
@@ -336,7 +358,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": {
@@ -361,7 +387,13 @@
                 "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..."
+                "description_video": "Describe the video for the visually-impaired...",
+                "load_failed": "Load Failed",
+                "upload_failed": "Upload Failed",
+                "can_not_recognize_this_media_attachment": "Can not recognize this media attachment",
+                "attachment_too_large": "Attachment too large",
+                "compressing_state": "Compressing...",
+                "server_processing_state": "Server Processing..."
             },
             "poll": {
                 "duration_time": "Duration: %s",
@@ -371,7 +403,9 @@
                 "one_day": "1 Day",
                 "three_days": "3 Days",
                 "seven_days": "7 Days",
-                "option_number": "Option %ld"
+                "option_number": "Option %ld",
+                "the_poll_is_invalid": "The poll is invalid",
+                "the_poll_has_empty_option": "The poll has empty option"
             },
             "content_warning": {
                 "placeholder": "Write an accurate warning here..."
@@ -392,7 +426,9 @@
                 "custom_emoji_picker": "Custom Emoji Picker",
                 "enable_content_warning": "Enable Content Warning",
                 "disable_content_warning": "Disable Content Warning",
-                "post_visibility_menu": "Post Visibility Menu"
+                "post_visibility_menu": "Post Visibility Menu",
+                "post_options": "Post Options",
+                "posting_as": "Posting as %s"
             },
             "keyboard": {
                 "discard_post": "Discard Post",
@@ -404,6 +440,9 @@
             }
         },
         "profile": {
+            "header": {
+                "follows_you": "Follows You"
+            },
             "dashboard": {
                 "posts": "posts",
                 "following": "following",
@@ -414,6 +453,10 @@
                 "placeholder": {
                     "label": "Label",
                     "content": "Content"
+                },
+                "verified": {
+                    "short": "Verified on %s",
+                    "long": "Ownership of this link was checked on %s"
                 }
             },
             "segmented_control": {
@@ -439,15 +482,41 @@
                 "confirm_unblock_user": {
                     "title": "Unblock Account",
                     "message": "Confirm to unblock %s"
+                },
+                "confirm_show_reblogs": {
+                    "title": "Show Reblogs",
+                    "message": "Confirm to show reblogs"
+                },
+                "confirm_hide_reblogs": {
+                    "title": "Hide Reblogs",
+                    "message": "Confirm to hide reblogs"
                 }
+            },
+            "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": {
@@ -481,6 +550,16 @@
                 "clear": "Clear"
             }
         },
+        "discovery": {
+            "tabs": {
+                "posts": "Posts",
+                "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"
         },
@@ -500,6 +579,12 @@
             "keyobard": {
                 "show_everything": "Show Everything",
                 "show_mentions": "Show Mentions"
+            },
+            "follow_request": {
+                "accept": "Accept",
+                "accepted": "Accepted",
+                "reject": "reject",
+                "rejected": "Rejected"
             }
         },
         "thread": {
@@ -541,7 +626,8 @@
                     "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"
+                    "using_default_browser": "Use default browser to open links",
+                    "open_links_in_mastodon": "Open links in Mastodon"
                 },
                 "boring_zone": {
                     "title": "The Boring Zone",
@@ -573,7 +659,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": {
@@ -591,6 +719,9 @@
             "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"
+        },
+        "bookmark": {
+            "title": "Bookmarks"
         }
     }
-}
+}