Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Language rework reworked #93

Closed
wants to merge 3 commits into from
Closed

Conversation

comradekingu
Copy link
Contributor

No description provided.

<string name="account_select_please">Select the account</string>
<string name="login_failed">Login failed</string>
<string name="file_size_too_big">The file is too big. Maximum limit is %1$dMB.</string>
<string name="login_failed">Clould not log in</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Clould" may be mis spelled.

<string name="search_for">Search %1$s</string>
<string name="spoil_visibility_for_account">Visibility is spoiled for account.</string>
<string name="spoil_visibility_for_account">The account is visible.</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, this message is used when switching account in post composing activity. if switched account has more smaller visibility, visibility selection is changed to spoiled.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this. Could possibly be "spoilt".
What happens exactly?

<string name="confirm_mute_user">Mute %1$s?</string>
<string name="confirm_delete_status">Delete toot?</string>
<string name="nickname_label">Nickname and colour (if specified, it\'s shown instead of full acct)</string>
<string name="color">Colour</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changing from "color" to "colour" is not accepted.

  • "favourite" word is used in Mastodon official.
  • "colour" word is NOT used in Mastodon official.

In this case I should obey to Mastodon wording.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both "favourite" and "colour" are British English. It makes sense to stick those or
"favorite" and "color".

<string name="foreground_color">Foreground color</string>
<string name="hashtag_and_visibility_not_match">this message contains hashtags, but message visibility is not public. normally hashtags are searchable only in public messages. Are you sure?</string>
<string name="foreground_color">Foreground colour</string>
<string name="hashtag_and_visibility_not_match">Send non-public toot containing hashtags, (which are not normally searchable in public messages)?</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sentence will be a problem when translating to other languages.

Copy link
Contributor Author

@comradekingu comradekingu Jan 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How so? In my view it is much less problematic to translate this.
Edit: Originally it is very long, and it is not clear what the user should be sure of, and that comes at the very end of the sentence.

<string name="copy">Copy</string>
<string name="send">Send</string>
<string name="mute_word">Ban word</string>
<string name="select_and_copy">Select and copy</string>
<string name="search_web">Web search</string>
<string name="muted_word">Banned words</string>
<string name="word_was_muted">The word was banned.</string>
<string name="word_was_muted">Banned.</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

too short.

Copy link
Contributor Author

@comradekingu comradekingu Jan 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? In my view "Banned" is enough, because it is already clear that the user is dealing with a word.

<string name="disable_tablet_mode">Turn off tablet mode (app restart required)</string>
<!-- Density-independent pixels, written as dp (pronounced “dips”), are flexible units that scale to have uniform dimensions on any screen. https://material.io/design/layout/understanding-layout.html#pixel-density -->
<string name="minimum_column_width">Minimum column width (default=300 dp), (app restart required)</string>
<string name="media_thumbnail_height">Minimum column width (default=300 dp), (app restart required)</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missed.

Copy link
Contributor Author

@comradekingu comradekingu Jan 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand what I (?) missed? Edit: Fixed.

<string name="app_data_import_desc">You can export data to any app that can receive data, But maybe you can import data only from device\'s storage or Google drive.\nColumn background image may be not exported/imported over device.\nTimeline font is not exported/imported.\nCustom notification sound may be not exported/imported over device.</string>
<string name="app_data_import_confirm">existing data ( before import ) will be cleared. Are you sure?</string>
<string name="user_id_conversion_failed">User id conversion failed.</string>
<string name="app_data_import_desc">You can export data to any app that can receive data, but maybe you can import data only from device\'s storage or a cloud service.\nColumn background image may be not exported/imported over device.\nTimeline font is not exported/imported.\nCustom notification sound may be not exported/imported over device.</string>
Copy link
Owner

@tateisu tateisu Dec 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried some cloud service and only GD can be used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the support is somehow specific to Google Drive?

@tateisu
Copy link
Owner

tateisu commented Dec 17, 2018

Your PR can not be merged at once because changes are so several.
I will modify the wording little by little referring to your pointed out.

<string name="account_sync_failed">Could not sync account.</string>
<string name="list_retry_with_follow">Try to follow and add %1$s to list?</string>
<string name="cant_add_list_follow_requesting">Can\'t add user to list:\nPlease retry 2,3 times. Or if user is \"Locked\", please wait until for approval of follow request.</string>
<string name="cant_add_list_follow_failed">Can\'t add user to list:\nRequest declined.</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, there are some reason for follow request failed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No matter the reason, the end result is a declined request.

<string name="media_attachment_max_byte_size">Media attachment (image) size limit. Unit: MB. The default is 8)</string>
<string name="media_attachment_max_byte_size_movie">Media attachment (movie) size limit. Unit: MB. The default is 40)</string>
<string name="tootsearch">tootsearch (JP)</string>
<string name="cant_handle_uri_of">Cannot open the \"%1$s\" media attachment. Try to open it in a web browser.</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this message is not used to media attachment.

<string name="set_focus_point">set focus point (Mastodon 2.3 or later)</string>
<string name="report_forward_desc">The account is from another instance. Send an anonymized copy of the report there as well?</string>
<string name="set_focus_point">set focus point (Mastodon 2.3+)</string>
<string name="report_forward_desc">The account is from another instance. Send an anonymised copy of the report there as well?</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use "anonymized" to obey Mastodon official.

<string name="filter_word_match">Whole word</string>
<string name="filter_word_match_long">Whole word. Recommended to enable only phrases consisting of alphanumeric characters.</string>
<string name="filter_irreversible_long">Irreversible. Drop instead of hide. Filtered toots are lost forever, even if the filter is removed later.</string>
<string name="filter_word_match">The whole word</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obey to Mastodon official.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a marked noun error if you ask me. What seems to be the issue?

@@ -826,8 +828,7 @@
<string name="about_this_instance">About this instance</string>
<string name="top_page">Top page</string>
<string name="show_instance_ticker">Show #InstanceTicker (column reload required)</string>
<string name="instance_ticker_copyright">#InstanceTicker\nhttps://cdn.weep.me/mastodon/\nCopyright 2018 weepjp, kyori19.</string>
<string name="instance_ticker_copyright">#InstanceTicker\nhttps://cdn.weep.me/mastodon/\nCopyright © 2018 weep.jp and kyori19.</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, this lisence text is specified from weepjp himself.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That isn't how the nickname is spelled elsewhere though…

tateisu added a commit that referenced this pull request Dec 17, 2018
@tateisu
Copy link
Owner

tateisu commented Dec 17, 2018

some strings are cherry-picked at 7402580 .

@tateisu tateisu closed this Dec 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants