Merge remote-tracking branch 'upstream/develop' into a11y-attributes

Author: j-f1

.gitignore

@@ -131,3 +131,6 @@ env/**/**
 ## Ruby ###
 vendor/
 .bundle/
+
+## IntelliJ IDEA ##
+.idea

.ruby-version

@@ -0,0 +1 @@
+3.0.3

Documentation/Setup.md

@@ -12,36 +12,26 @@ Install the latest version of Xcode from the App Store or Apple Developer Downlo
 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 [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
-gem install bundler
-bundle install
-```
-
-#### M1 Mac
+The app use [CocoaPods]() and [Arkana](https://github.com/rogerluan/arkana). Ruby Gems are managed through Bundler. Make sure you have [Rosetta](https://support.apple.com/en-us/HT211861) installed if you are using the M1 Mac.
 
 ```zsh
 # install the rbenv
 brew install rbenv
+
+# configure the terminal
 which ruby
 # > /usr/bin/ruby
 echo 'eval "$(rbenv init -)"' >> ~/.zprofile
 source ~/.zprofile
 which ruby
 # > /Users/mainasuk/.rbenv/shims/ruby
 
-# select ruby
-rbenv install --list
-# here we use the latest 3.0.x version
-rbenv install 3.0.3
-rbenv global 3.0.3
-ruby --version
-# > ruby 3.0.3p157 (2021-11-24 revision 3fb7d2cadc) [arm64-darwin21]
+# restart the terminal
+
+# install ruby (we use the version defined in .ruby-version)
+rbenv install
 
-gem install bundler
+# install gem dependencies
 bundle install
 ```
 

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

@@ -186,7 +186,7 @@
                     "translated_from": "Translated from %s using %s",
                     "unknown_language": "Unknown",
                     "unknown_provider": "Unknown",
-                    "show_original": "Shown Original"
+                    "show_original": "Show Original"
                 },
                 "media": {
                     "accessibility_label": "%s, attachment %d of %d",
@@ -485,6 +485,12 @@
                 "toggle_content_warning": "Toggle Content Warning",
                 "append_attachment_entry": "Add Attachment - %s",
                 "select_visibility_entry": "Select Visibility - %s"
+            },
+            "language": {
+                "title": "Post Language",
+                "suggested": "Suggested",
+                "recent": "Recent",
+                "other": "Other Language…"
             }
         },
         "profile": {

Localization/app.json

@@ -186,7 +186,7 @@
                     "translated_from": "Translated from %s using %s",
                     "unknown_language": "Unknown",
                     "unknown_provider": "Unknown",
-                    "show_original": "Shown Original"
+                    "show_original": "Show Original"
                 },
                 "media": {
                     "accessibility_label": "%s, attachment %d of %d",
@@ -502,6 +502,12 @@
                 "toggle_content_warning": "Toggle Content Warning",
                 "append_attachment_entry": "Add Attachment - %s",
                 "select_visibility_entry": "Select Visibility - %s"
+            },
+            "language": {
+                "title": "Post Language",
+                "suggested": "Suggested",
+                "recent": "Recent",
+                "other": "Other Language…"
             }
         },
         "profile": {
@@ -810,5 +816,31 @@
         "open_in": {
             "invalid_link_error": "This doesn't seem to be a valid Mastodon link."
         }
+    },
+    "widget": {
+        "common": {
+            "unsupported_widget_family": "Sorry but this Widget family is unsupported.",
+            "user_not_logged_in": "Please open Mastodon to log in to an Account."
+        },
+        "followers_count": {
+            "configuration_display_name": "Followers",
+            "configuration_description": "Show number of followers.",
+            "title": "FOLLOWERS",
+            "followers_today": "%s followers today"
+        },
+        "multiple_followers": {
+            "configuration_display_name": "Multiple followers",
+            "configuration_description": "Show number of followers for multiple accounts.",
+            "mock_user": {
+                "display_name": "Another follower",
+                "account_name": "another@follower.social"
+            }
+        },
+        "latest_followers": {
+            "configuration_display_name": "Latest followers",
+            "configuration_description": "Show latest followers.",
+            "title": "Latest followers",
+            "last_update": "Last update: %s"
+        }
     }
 }