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

Rename "Diff Region" to "Diff Hunk" or just "Hunk"? #328

Closed
living180 opened this Issue Jul 21, 2014 · 5 comments

Comments

Projects
None yet
4 participants
@living180
Contributor

living180 commented Jul 21, 2014

Recently "Stage Section"/"Revert Section" were renamed to "Stage Diff Region"/"Revert Diff Region". I agree that the change made the wording less ambiguous, but it still seems like foreign terminology to me. "Hunk" is something I'm familiar with, and is the terminology used by the Git CLI, for example with git add --patch. I did see in the git history that "Hunk" had been used previously and was dropped in favor of "Section" back in 2011, so I can understand if you don't want to go back to that. Feel free to close this issue in that case. But, I just wanted to give my input that "Hunk" in my mind is very clear and unambiguous, whereas "Diff Region" seems rather nebulous to me.

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Jul 22, 2014

Member

I agree that Hunk may be better since it's familiar to patch heads and git gui users. @Vdragon do you have an opinion? This was changed in #297 to make things less ambiguous.

If we do make this change then we should do it in a way that does not invalidate the existing translations in po/*.po. If you want to change it then it should be safe to update the strings in the po/ files to match the new strings since the translation should still be valid, though technically slightly inaccurate.

We should also update the documentation as well so that we don't have several ways to name the same thing. "Stage Diff Hunk" and "Revert Diff Hunk" seem pretty clear and unambiguous to me.

Once we sort out this best way to go for this issue then I'll let that be the last topic before I tag v2.0.5 next week.

Member

davvid commented Jul 22, 2014

I agree that Hunk may be better since it's familiar to patch heads and git gui users. @Vdragon do you have an opinion? This was changed in #297 to make things less ambiguous.

If we do make this change then we should do it in a way that does not invalidate the existing translations in po/*.po. If you want to change it then it should be safe to update the strings in the po/ files to match the new strings since the translation should still be valid, though technically slightly inaccurate.

We should also update the documentation as well so that we don't have several ways to name the same thing. "Stage Diff Hunk" and "Revert Diff Hunk" seem pretty clear and unambiguous to me.

Once we sort out this best way to go for this issue then I'll let that be the last topic before I tag v2.0.5 next week.

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Jul 22, 2014

Member

I forgot to mention -- "Stage Diff Hunk" and "Revert Diff Hunk" would be the replacement strings for "Stage Diff Region" and "Revert Diff Region", etc.

Member

davvid commented Jul 22, 2014

I forgot to mention -- "Stage Diff Hunk" and "Revert Diff Hunk" would be the replacement strings for "Stage Diff Region" and "Revert Diff Region", etc.

@ugtar

This comment has been minimized.

Show comment
Hide comment
@ugtar

ugtar Jul 22, 2014

Member

"hunk" is also consistent with the currently assigned shortcut key ('h' for
staging the current diff hunk, 's' for staging the current selection').

On Tue, Jul 22, 2014 at 1:19 AM, David Aguilar notifications@github.com
wrote:

I forgot to mention -- "Stage Diff Hunk" and "Revert Diff Hunk" would be
the replacement strings for "Stage Diff Region" and "Revert Diff Region",
etc.


Reply to this email directly or view it on GitHub
#328 (comment).

Uri

Please consider the environment before printing this message.
http://wwf.panda.org/savepaper/

Member

ugtar commented Jul 22, 2014

"hunk" is also consistent with the currently assigned shortcut key ('h' for
staging the current diff hunk, 's' for staging the current selection').

On Tue, Jul 22, 2014 at 1:19 AM, David Aguilar notifications@github.com
wrote:

I forgot to mention -- "Stage Diff Hunk" and "Revert Diff Hunk" would be
the replacement strings for "Stage Diff Region" and "Revert Diff Region",
etc.


Reply to this email directly or view it on GitHub
#328 (comment).

Uri

Please consider the environment before printing this message.
http://wwf.panda.org/savepaper/

@Vdragon

This comment has been minimized.

Show comment
Hide comment
@Vdragon

Vdragon Jul 22, 2014

Contributor

"Diff Hunk" is great, we should also replace the strings mentioned in git-cola's documentation for consistency.

Contributor

Vdragon commented Jul 22, 2014

"Diff Hunk" is great, we should also replace the strings mentioned in git-cola's documentation for consistency.

@davvid davvid closed this in 3ecc84f Jul 23, 2014

@Vdragon

This comment has been minimized.

Show comment
Hide comment
@Vdragon

Vdragon Jul 23, 2014

Contributor

@davvid Next time we should just invalidate those translations. No translation is better than inaccurate ones.

Contributor

Vdragon commented Jul 23, 2014

@davvid Next time we should just invalidate those translations. No translation is better than inaccurate ones.

Vdragon added a commit that referenced this issue Aug 7, 2014

zh_TW translation: fix "Hunk" translation.
As the comment in
#328 (comment)
, no translation is better than inaccurate ones.
This commit fixes the translations that were not properly marked as
"fuzzy".

Signed-off-by: V字龍(Vdragon) <Vdragon.Taiwan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment