Skip to content

String improvements #4315

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.

Sign up for GitHub

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

Merged
TobiGr merged 2 commits into from
Sep 27, 2020
Merged

String improvements #4315

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c4c10
String improvements
comradekingu Sep 25, 2020
7ab323b
Spelling: Back to browser
comradekingu Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<string name="install">Install</string>
<string name="cancel">Cancel</string>
<string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
<string name="open_in_browser">Open in browser</string>
<string name="open_in_browser">Open in web-browser</string>
Copy link
Copy Markdown
Contributor Author

@comradekingu comradekingu Sep 25, 2020

Choose a reason for hiding this comment

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

?

Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Sep 25, 2020

Choose a reason for hiding this comment

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

We should keep the old version, because it is shorter and there should be any room for confusion with a file browser.

Copy link
Copy Markdown
Contributor Author

@comradekingu comradekingu Sep 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@TobiGr The problem that arises when there "is any room for confusion" is sometimes you will have specifically "web-browser" as a translation, and other times you end up with specifically "file-browser". Thus removing the desired(?) ambiguity in languages that don't have it.

Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Sep 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

This context should be clarified through weblate. (I can do that later today)

Copy link
Copy Markdown
Collaborator

@opusforlife2 opusforlife2 Sep 26, 2020

Choose a reason for hiding this comment

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

and there should be any room for confusion

He meant "shouldn't"

Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Sep 27, 2020

Choose a reason for hiding this comment

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

Looks like this now:
https://hosted.weblate.org/translate/newpipe/strings/en/?checksum=7f6f1617954bdd58

Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Sep 27, 2020

Choose a reason for hiding this comment

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

I posted a comment to notify all translators, too. @comradekingu Are you okay with that? If yes, I'd suggest to revert your change back to "browser" and merge this pr.

Copy link
Copy Markdown
Contributor Author

@comradekingu comradekingu Sep 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@TobiGr Done. If you can add https://hosted.weblate.org/user/kingu/ as admin in https://hosted.weblate.org/access/newpipe/ I can add source comments and upload screenshots so that no confusion arises. I can announce deadlines for new releases too.

Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Sep 27, 2020

Choose a reason for hiding this comment

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

Thank you for the offer. Done.
Btw. do you know, if i can restrict your permissions? I can only choose admin and review. But according to the docs, there should be more groups.

Copy link
Copy Markdown
Contributor Author

@comradekingu comradekingu Sep 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@TobiGr I think those are available as top level (Weblate) admins to do (on Hosted), so only for self-hosted instances. There is "review" access, but I don't think there are any more rights attached to it. I got admin access for the ones in https://hosted.weblate.org/user/kingu/#managed Won't touch anything without approval first :)
Can get the setup working a bit better some time later, right now there isn't fastlane support and a few other things could be better.

<string name="open_in_popup_mode">Open in popup mode</string>
<string name="share">Share</string>
<string name="download">Download</string>
<string name="controls_download_desc">Download stream file</string>
<string name="search">Search</string>
<string name="settings">Settings</string>
<string name="did_you_mean">Did you mean: %1$s?</string>
<string name="did_you_mean">Did you mean \"%1$s\"?</string>
<string name="search_showing_result_for">Showing results for: %s</string>
<string name="share_dialog_title">Share with</string>
<string name="choose_browser">Choose browser</string>
Expand Down Expand Up @@ -73,8 +73,8 @@
<string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision. Seeking for 5, 15 or 25 seconds doesn\'t work with this.</string>
<string name="seek_duration_title">Fast-forward/-rewind seek duration</string>
<string name="clear_queue_confirmation_title">Ask for confirmation before clearing a queue</string>
<string name="clear_queue_confirmation_summary">After switching from one player to another your queue may be replaced</string>
<string name="clear_queue_confirmation_description">Queue from the active player will be replaced</string>
<string name="clear_queue_confirmation_summary">Switching from one player to another may replace your queue</string>
<string name="clear_queue_confirmation_description">The active player queue will be replaced</string>
<string name="download_thumbnail_title">Load thumbnails</string>
<string name="show_comments_title">Show comments</string>
<string name="show_comments_summary">Turn off to hide comments</string>
Expand Down Expand Up @@ -112,7 +112,7 @@
<string name="show_hold_to_append_title">Show \"Hold to append\" tip</string>
<string name="show_hold_to_append_summary">Show tip when pressing the background or the popup button in video \"Details:\"</string>
<string name="unsupported_url">Unsupported URL</string>
<string name="unsupported_url_dialog_message">NewPipe could not recognize the provided url. Open it with another method?</string>
<string name="unsupported_url_dialog_message">Could not recognize the URL. Open with another app?</string>
<string name="default_content_country_title">Default content country</string>
<string name="service_title">Service</string>
<string name="content_language_title">Default content language</string>
Expand All @@ -127,8 +127,8 @@
<string name="peertube_instance_add_exists">Instance already exists</string>
<string name="settings_category_player_title">Player</string>
<string name="settings_category_player_behavior_title">Behavior</string>
<string name="settings_category_video_audio_title">Video &amp; audio</string>
<string name="settings_category_history_title">History &amp; cache</string>
<string name="settings_category_video_audio_title">Video and audio</string>
<string name="settings_category_history_title">History and cache</string>
<string name="settings_category_popup_title">Popup</string>
<string name="settings_category_appearance_title">Appearance</string>
<string name="settings_category_other_title">Other</string>
Expand All @@ -144,7 +144,7 @@
<string name="show_age_restricted_content_title">Age restricted content</string>
<string name="video_is_age_restricted">Show age restricted video. Future changes are possible from the settings.</string>
<string name="youtube_restricted_mode_enabled_title">YouTube restricted mode</string>
<string name="restricted_video">This video is age restricted.\n\nIf you want to view it, enable \"Age restricted content\" in the settings.</string>
<string name="restricted_video">This video is age restricted.\n\nTurn on \"Age restricted content\" in the settings if you want to see it.</string>
<string name="duration_live">Live</string>
<string name="downloads">Downloads</string>
<string name="downloads_title">Downloads</string>
Expand Down Expand Up @@ -241,9 +241,9 @@
<string name="guru_meditation" translatable="false">Guru Meditation.</string>
<string name="error_report_button_text">Report this error via e-mail</string>
<string name="copy_for_github">Copy formatted report</string>
<string name="error_report_open_issue_button_text">Report error on GitHub</string>
<string name="error_report_open_issue_button_text">Report on GitHub</string>
<string name="error_report_open_github_notice">Please check whether an issue discussing your crash already exists. When creating duplicate tickets, you take time from us which we could spend with fixing the actual bug.</string>
<string name="error_snackbar_message">Sorry, some errors occurred.</string>
<string name="error_snackbar_message">Sorry, something went wrong.</string>
<string name="error_snackbar_action">Report</string>
<string name="what_device_headline">Info:</string>
<string name="what_happened_headline">What happened:</string>
Expand Down Expand Up @@ -423,7 +423,7 @@
<string name="kiosk">Kiosk</string>
<string name="trending">Trending</string>
<string name="top_50">Top 50</string>
<string name="new_and_hot">New &amp; hot</string>
<string name="new_and_hot">New and hot</string>
<string name="local">Local</string>
<string name="recently_added">Recently added</string>
<string name="most_liked">Most liked</string>
Expand Down