Merge branch 'maint'

* maint:
  git-gui: Avoid using bold text in entire gui for some fonts

diff --cc git-gui.sh
index 3243037861b762686cd987ede89f38aa52d3e336,28d7c21692fe74ebdfe39c31a4cd27745cdf855f..db1507cdece56fa1031d5036e9887e39a98caf5f
--- 1/git-gui.sh
--- 2/git-gui.sh
+++ b/git-gui.sh
@@@ -1669,10 -1648,10 +1669,10 @@@ proc apply_config {} 
                set font [lindex $option 1]
                if {[catch {
                        foreach {cn cv} $repo_config(gui.$name) {
-                               font configure $font $cn $cv
+                               font configure $font $cn $cv -weight normal
                        }
                        } err]} {
 -                      error_popup "Invalid font specified in gui.$name:\n\n$err"
 +                      error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
                }
                foreach {cn cv} [font configure $font] {
                        font configure ${font}bold $cn $cv