git/lib, branch gitgui-0.21.0

Merge branch 'as/bulgarian' into pu

2016-10-20T10:13:42Z

git-gui: Mark 'All' in remote.tcl for translation

2016-10-20T10:13:03Z

Signed-off-by: Alexander Shopov Signed-off-by: Pat Thoyts

Merge branch 'os/preserve-author' into pu

2016-10-20T10:07:24Z

git-gui: avoid persisting modified author identity

2016-10-06T21:18:47Z

Commit 7e71adc77f fixes a problem with git-gui failing to pick up the original author identity during a commit --amend operation. However, the new author details then become persistent for the remainder of the session. This commit fixes this by ensuring the environment variables are reset and the author information reset once the commit is completed. The relevant changes were reworked to reduce global variables. Signed-off-by: Pat Thoyts

git-gui: unicode file name support on windows

2016-10-06T08:21:50Z

Assumes file names in git tree objects are UTF-8 encoded. On most unix systems, the system encoding (and thus the TCL system encoding) will be UTF-8, so file names will be displayed correctly. On Windows, it is impossible to set the system encoding to UTF-8. Changing the TCL system encoding (via 'encoding system ...', e.g. in the startup code) is explicitly discouraged by the TCL docs. Change git-gui functions dealing with file names to always convert from and to UTF-8. Signed-off-by: Karsten Blees Signed-off-by: Pat Thoyts

git-gui: maintain backwards compatibility for merge syntax

2016-10-04T22:14:05Z

Commit b5f325c updated to use the newer merge syntax but continue to support older versions of git. Signed-off-by: Pat Thoyts

git-gui i18n: mark string in lib/error.tcl for translation

2016-10-03T22:40:23Z

Mark string "$hook hook failed:" in lib/error.tcl for translation. Signed-off-by: Vasco Almeida Signed-off-by: Pat Thoyts

git-gui: fix incorrect use of Tcl append command

2016-10-03T22:40:10Z

Fix wrong use of append command in strings marked for translation. According to Tcl/Tk Documentation [1], append varName ?value value value ...? appends all value arguments to the current value of variable varName. This means that append "[appname] ([reponame]): " [mc "File Viewer"] is setting a variable named "[appname] ([reponame]): " to the output of [mc "File Viewer"], rather than returning the concatenation of both expressions as one might expect. The format for some strings enables, for instance, a French translator to translate like "%s (%s) : Create Branch" (space before colon). Conversely, strings already translated will be marked as fuzzy and the translator must update them herself. For some cases, use alternative way for concatenation instead of using strcat procedure defined in git-gui.sh. Reference: 31bb1d1 ("git-gui: Paper bag fix missing translated strings", 2007-09-14) fixes the same issue slightly differently. [1] http://www.tcl.tk/man/tcl/TclCmd/append.htm Signed-off-by: Vasco Almeida Signed-off-by: Pat Thoyts

git-gui i18n: internationalize use of colon punctuation

2016-10-03T22:39:56Z

Internationalize use of colon punctuation ':' in options window, windows titles, database statistics window. Some languages might use a different style, for instance French uses "User Name :" (space before colon). Signed-off-by: Vasco Almeida Signed-off-by: Pat Thoyts

Merge branch 'pt/non-mouse-usage' into pu

2016-10-03T22:30:44Z