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

App strings reworked #751

Merged
merged 1 commit into from
May 28, 2021
Merged

Conversation

comradekingu
Copy link
Contributor

No description provided.

Copy link
Collaborator

@robinlinden robinlinden left a comment

Choose a reason for hiding this comment

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

This looks great, thank you! Sorry about forcing you over to GitHub from Weblate. :) Editing the English version over there led to very annoying conflicts and to the Weblate continously getting frozen. :P

Just the two minor punctuation nitpicks.

@@ -122,20 +122,20 @@
<string name="pref_heading_address">Address</string>
<string name="pref_heading_port">Port</string>
<string name="pref_heading_proxy">Proxy</string>
<string name="warn_proxy_broken">Bad proxy configured. Fix or disable before using app.</string>
<string name="warn_proxy_broken">Set up your proxy correctly (or turn it off) before using the app.</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you remove the full stop now that this is a single sentence?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reluctantly, yes.

Copy link
Collaborator

Choose a reason for hiding this comment

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

If you want, we can talk about how the text is set up in the app, but that might be better suited to IRC or Tox than GitHub comments? :P Right now, the only text that has any full stops at the end are the ones that are multiple sentences.

<string name="pref_nospam">Nospam</string>
<string name="pref_nospam_description">Changing your nospam means that your Tox ID changes, and that your current Tox ID can no longer be used to send you friend requests</string>
<string name="pref_nospam">NoSpam</string>
<string name="pref_nospam_description">Changing your NoSpam alters your Tox ID, meaning friend requests must be sent to the updated one.</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please drop the full stop here too. :P

@robinlinden
Copy link
Collaborator

Oh, I see you made the changes in the GitHub webgui. If you're fine with it, I can make the changes locally and push to your branch?

@comradekingu
Copy link
Contributor Author

@robinlinden Works now? Unless you want me to squash?

@robinlinden
Copy link
Collaborator

I squashed it for you, no worries. I don't think the GitHub webgui supports it! Will merge once the PR checks have gone through. :) I appreciate the text rework! I'm mainly a programmer, so both the text and the UI/UX are a bit work-in-progress. All help with this stuff is greatly appreciated!

@robinlinden robinlinden merged commit 70d4964 into evilcorpltd:master May 28, 2021
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.

2 participants