owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing the sk references. Readding them for easier translation

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-09 19:58:33 -03:00
parent 290b7db7e4
commit 83f12b0840
6 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/layout/item_settings_color_picker.xml
View File

@@ -27,7 +27,7 @@
android:textSize="16sp"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/settings_color_picker"/>
android:text="@string/sk_settings_color_picker"/>
<Button
android:id="@+id/color_picker_button"
@@ -41,6 +41,6 @@
android:stateListAnimator="@null"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
tools:text="@string/pink_color" />
tools:text="@string/sk_color_theme_pink" />
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>

12
mastodon/src/main/res/menu/color_picker.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/purple_color" android:title="@string/purple_color"/>
<item android:id="@+id/pink_color" android:title="@string/pink_color"/>
<item android:id="@+id/green_color" android:title="@string/green_color"/>
<item android:id="@+id/blue_color" android:title="@string/blue_color"/>
<item android:id="@+id/orange_color" android:title="@string/orange_color"/>
<item android:id="@+id/yellow_color" android:title="@string/yellow_color"/>
<item android:id="@+id/purple_color" android:title="@string/sk_color_theme_purple"/>
<item android:id="@+id/pink_color" android:title="@string/sk_color_theme_pink"/>
<item android:id="@+id/green_color" android:title="@string/sk_color_theme_green"/>
<item android:id="@+id/blue_color" android:title="@string/sk_color_theme_blue"/>
<item android:id="@+id/orange_color" android:title="@string/sk_color_theme_brown"/>
<item android:id="@+id/yellow_color" android:title="@string/sk_color_theme_yellow"/>
</menu>

92
mastodon/src/main/res/values/strings.xml
View File

@@ -397,13 +397,13 @@
<string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="disable_marquee">Disable scrolling text in title bars</string>
<string name="settings_contribute_fork">Contribute to Moshidon</string>
<string name="settings_color_picker">Color theme:</string>
<string name="pink_color">Pink</string>
<string name="purple_color">Purple</string>
<string name="green_color">Green</string>
<string name="blue_color">Blue</string>
<string name="orange_color">Orange</string>
<string name="yellow_color">Yellow</string>
<!-- <string name="settings_color_picker">Color theme:</string>-->
<!-- <string name="pink_color">Pink</string>-->
<!-- <string name="purple_color">Purple</string>-->
<!-- <string name="green_color">Green</string>-->
<!-- <string name="blue_color">Blue</string>-->
<!-- <string name="orange_color">Orange</string>-->
<!-- <string name="yellow_color">Yellow</string>-->
<string name="translate">Translate</string>
<string name="login_title">Welcome Back</string>
<string name="login_subtitle">Log in with the server where you created your account.</string>
@@ -411,44 +411,44 @@
<!-- <string name="app_name">Megalodon</string>-->
<string name="pinned_posts">Pinned</string>
<string name="delete_and_redraft">Delete and re-draft</string>
<string name="confirm_delete_and_redraft_title">Delete and re-draft Post</string>
<string name="confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
<string name="pin_post">Pin to profile</string>
<string name="confirm_pin_post_title">Pin post to profile</string>
<string name="confirm_pin_post">Do you want to pin this post to your profile?</string>
<string name="pinning">Pinning post…</string>
<string name="unpin_post">Unpin from profile</string>
<string name="confirm_unpin_post_title">Unpin post from profile</string>
<string name="confirm_unpin_post">Are you sure you want to unpin this post?</string>
<string name="unpinning">Unpinning post…</string>
<string name="image_description">Image description</string>
<string name="visibility_unlisted">Unlisted</string>
<string name="settings_show_replies">Show replies</string>
<string name="settings_show_boosts">Show boosts</string>
<string name="settings_load_new_posts">Automatically load new posts</string>
<string name="settings_show_interaction_counts">Show interaction counts</string>
<!-- <string name="settings_app_version">Megalodon v%1$s (%2$d)</string>-->
<string name="mark_media_as_sensitive">Mark media as sensitive</string>
<string name="user_post_notifications_on">Turned on post notifications for %s</string>
<string name="user_post_notifications_off">Turned off post notifications for %s</string>
<string name="federated_timeline">Federation</string>
<string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
<!-- <string name="update_available">Megalodon %s is ready to download.</string>-->
<!-- <string name="update_ready">Megalodon %s is downloaded and ready to install.</string>-->
<string name="check_for_update">Check for update</string>
<string name="no_update_available">No update available</string>
<string name="list_timelines">Lists</string>
<string name="follow_requests">Follow requests</string>
<string name="accept_follow_request">Accept follow request</string>
<string name="reject_follow_request">Reject follow request</string>
<string name="lists_with_user">Lists with %s</string>
<!-- <string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>-->
<!-- <string name="disable_marquee">Disable scrolling text in title bars</string>-->
<!-- <string name="settings_contribute">Contribute to Megalodon</string>-->
<string name="settings_show_federated_timeline">Show federated timeline</string>
<string name="notification_type_status">Posts</string>
<string name="notify_posts">Post notifications</string>
<!-- <string name="pinned_posts">Pinned</string>-->
<!-- <string name="delete_and_redraft">Delete and re-draft</string>-->
<!-- <string name="confirm_delete_and_redraft_title">Delete and re-draft Post</string>-->
<!-- <string name="confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>-->
<!-- <string name="pin_post">Pin to profile</string>-->
<!-- <string name="confirm_pin_post_title">Pin post to profile</string>-->
<!-- <string name="confirm_pin_post">Do you want to pin this post to your profile?</string>-->
<!-- <string name="pinning">Pinning post…</string>-->
<!-- <string name="unpin_post">Unpin from profile</string>-->
<!-- <string name="confirm_unpin_post_title">Unpin post from profile</string>-->
<!-- <string name="confirm_unpin_post">Are you sure you want to unpin this post?</string>-->
<!-- <string name="unpinning">Unpinning post…</string>-->
<!-- <string name="image_description">Image description</string>-->
<!-- <string name="visibility_unlisted">Unlisted</string>-->
<!-- <string name="settings_show_replies">Show replies</string>-->
<!-- <string name="settings_show_boosts">Show boosts</string>-->
<!-- <string name="settings_load_new_posts">Automatically load new posts</string>-->
<!-- <string name="settings_show_interaction_counts">Show interaction counts</string>-->
<!--&lt;!&ndash; <string name="settings_app_version">Megalodon v%1$s (%2$d)</string>&ndash;&gt;-->
<!-- <string name="mark_media_as_sensitive">Mark media as sensitive</string>-->
<!-- <string name="user_post_notifications_on">Turned on post notifications for %s</string>-->
<!-- <string name="user_post_notifications_off">Turned off post notifications for %s</string>-->
<!-- <string name="federated_timeline">Federation</string>-->
<!-- <string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>-->
<!--&lt;!&ndash; <string name="update_available">Megalodon %s is ready to download.</string>&ndash;&gt;-->
<!--&lt;!&ndash; <string name="update_ready">Megalodon %s is downloaded and ready to install.</string>&ndash;&gt;-->
<!-- <string name="check_for_update">Check for update</string>-->
<!-- <string name="no_update_available">No update available</string>-->
<!-- <string name="list_timelines">Lists</string>-->
<!-- <string name="follow_requests">Follow requests</string>-->
<!-- <string name="accept_follow_request">Accept follow request</string>-->
<!-- <string name="reject_follow_request">Reject follow request</string>-->
<!-- <string name="lists_with_user">Lists with %s</string>-->
<!--&lt;!&ndash; <string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>&ndash;&gt;-->
<!--&lt;!&ndash; <string name="disable_marquee">Disable scrolling text in title bars</string>&ndash;&gt;-->
<!--&lt;!&ndash; <string name="settings_contribute">Contribute to Megalodon</string>&ndash;&gt;-->
<!-- <string name="settings_show_federated_timeline">Show federated timeline</string>-->
<!-- <string name="notification_type_status">Posts</string>-->
<!-- <string name="notify_posts">Post notifications</string>-->
</resources>

8
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name" translatable="false">Moshidon</string>
<string name="sk_pinned_posts">Pinned</string>
<string name="sk_delete_and_redraft">Delete and re-draft</string>
<string name="sk_confirm_delete_and_redraft_title">Delete and re-draft Post</string>
@@ -25,8 +25,8 @@
<string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
<string name="sk_federated_timeline">Federation</string>
<string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
<string name="sk_update_available">Megalodon %s is ready to download.</string>
<string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
<string name="sk_update_available">Moshidon %s is ready to download.</string>
<string name="sk_update_ready">Moshidon %s is downloaded and ready to install.</string>
<string name="sk_check_for_update">Check for update</string>
<string name="sk_no_update_available">No update available</string>
<string name="sk_list_timelines">Lists</string>
@@ -45,6 +45,6 @@
<string name="sk_color_theme_purple">Purple</string>
<string name="sk_color_theme_green">Green</string>
<string name="sk_color_theme_blue">Blue</string>
<string name="sk_color_theme_brown">Brown</string>
<string name="sk_color_theme_brown">Orange</string>
<string name="sk_color_theme_yellow">Yellow</string>
</resources>