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

Change Preferences → Preferences to Preferences → General #2237

Merged
merged 4 commits into from Jul 26, 2016
Merged

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Jul 25, 2016

I also updated the deployment target for the Preferences NIB. It looks like the entire file was rewritten, but really, that’s all I did.

@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Jul 25, 2016

What a simple but good idea! ;-)

A few things:

  • I assume with all these changes/PRs (mainly NIBs) you're keeping track of things so you don't get merge conflicts?
  • Can you add the 'General' string to Localizable.strings
  • Should the 'Preferences -> General -> Application -> General' title now be changed? Since two Generals in there might be confusing. Perhaps it should just be split up into two sections: "Log-in", and "Dock & Menu Bar"

@skurfer
Copy link
Member Author

@skurfer skurfer commented Jul 26, 2016

I assume with all these changes/PRs (mainly NIBs) you're keeping track of things so you don't get merge conflicts?

I’ll avoid them where I can (so far, I think it’s just date sorting and proxy icons, and that one’s easy), but keeping the commits easy to understand is the priority.

Can you add the 'General' string to Localizable.strings

Is that necessary for the English ones? It’ll just use the key.

Should the 'Preferences -> General -> Application -> General' title now be changed?

I thought about that for a minute, but couldn’t come up with what to call it. I guess we could split it, but there are only 4 things there.

@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Jul 26, 2016

Is that necessary for the English ones? It’ll just use the key.
It’s the English that provides the keys (in Transifex) for all the other languages. If it’s not there, then translators on Transifex will never know that string exists ;-)

I thought about that for a minute, but couldn’t come up with what to call it. I guess we could split it, but there are only 4 things there.

Alright, not a biggy for now

On 26 Gorff 2016, at 08:38, Rob McBroom notifications@github.com wrote:

I assume with all these changes/PRs (mainly NIBs) you're keeping track of things so you don't get merge conflicts?

I’ll avoid them where I can (so far, I think it’s just date sorting and proxy icons, and that one’s easy), but keeping the commits easy to understand is the priority.

Can you add the 'General' string to Localizable.strings

Is that necessary for the English ones? It’ll just use the key.

Should the 'Preferences -> General -> Application -> General' title now be changed?

I thought about that for a minute, but couldn’t come up with what to call it. I guess we could split it, but there are only 4 things there.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub #2237 (comment), or mute the thread https://github.com/notifications/unsubscribe-auth/AAJLny9YA01NOeOGN4yRBazzyVdhYB6Vks5qZVbpgaJpZM4JUc7n.

@skurfer
Copy link
Member Author

@skurfer skurfer commented Jul 26, 2016

Localized, rebased (because I like green checks), and pushed.

@skurfer
Copy link
Member Author

@skurfer skurfer commented Jul 26, 2016

I wonder if the strings files confound the indent checker. So much for my green check. 😢

@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Jul 26, 2016

Or it’s the .travis.yml settings.
Try adding this line to it then pushing to this PR:

osx_image: xcode7.2

If all goes well, I’m happy for you to merge this PR. I’m off to bed now

On 26 Jul 2016, at 22:33, Rob McBroom notifications@github.com wrote:

I wonder if the strings files confound the indent checker. So much for my green check. 😢


You are receiving this because you commented.
Reply to this email directly, view it on GitHub #2237 (comment), or mute the thread https://github.com/notifications/unsubscribe-auth/AAJLnynVv2h4u8b4vv84vi_7MNcP6le5ks5qZhqjgaJpZM4JUc7n.

@pjrobertson pjrobertson merged commit 48b58d6 into master Jul 26, 2016
2 checks passed
@pjrobertson pjrobertson deleted the general branch Jul 26, 2016
@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Jul 26, 2016

Green is the way forward. Except in Chinese culture it's red. Now I'm confused as to what I want to see!
Glad it's working :)

skurfer added a commit that referenced this issue Jul 26, 2016
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