git-gui: update Italian translation

[git.git] / lib / checkout_op.tcl

diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index 05711151287b4a4ae595b8e73fd99575c2972073..6e1411711bd46df08c09fd2bc371b017050a8368 100644 (file)
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -76,7 +76,7 @@ method run {} {
                _toplevel $this {Refreshing Tracking Branch}
                set w_cons [::console::embed \
                        $w.console \
                _toplevel $this {Refreshing Tracking Branch}
                set w_cons [::console::embed \
                        $w.console \

-                       "Fetching $r_name from $remote"]
+                       [mc "Fetching %s from %s" $r_name $remote]]

                pack $w.console -fill both -expand 1
                $w_cons exec $cmd [cb _finish_fetch]
 
                pack $w.console -fill both -expand 1
                $w_cons exec $cmd [cb _finish_fetch]
 


@@ -124,7 +124,7 @@ method _finish_fetch {ok} {
                }
                if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
                        set ok 0
                }
                if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
                        set ok 0

-                       $w_cons insert "fatal: Cannot resolve $l_trck"
+                       $w_cons insert [mc "fatal: Cannot resolve %s" $l_trck]

                        $w_cons insert $err
                }
        }
                        $w_cons insert $err
                }
        }


@@ -137,7 +137,7 @@ method _finish_fetch {ok} {
                destroy $w
                set w {}
        } else {
                destroy $w
                set w {}
        } else {

-               button $w.close -text Close -command [list destroy $w]
+               button $w.close -text [mc Close] -command [list destroy $w]

                pack $w.close -side bottom -anchor e -padx 10 -pady 10
        }
 
                pack $w.close -side bottom -anchor e -padx 10 -pady 10
        }
 


@@ -166,7 +166,7 @@ method _update_ref {} {
                # Assume it does not exist, and that is what the error was.
                #
                if {!$create} {
                # Assume it does not exist, and that is what the error was.
                #
                if {!$create} {

-                       _error $this "Branch '$newbranch' does not exist."
+                       _error $this [mc "Branch '%s' does not exist." $newbranch]

                        return 0
                }
 
                        return 0
                }
 


@@ -176,7 +176,7 @@ method _update_ref {} {
                # We were told to create it, but not do a merge.
                # Bad.  Name shouldn't have existed.
                #
                # We were told to create it, but not do a merge.
                # Bad.  Name shouldn't have existed.
                #

-               _error $this "Branch '$newbranch' already exists."
+               _error $this [mc "Branch '%s' already exists." $newbranch]

                return 0
        } elseif {!$create && $merge_type eq {none}} {
                # We aren't creating, it exists and we don't merge.
                return 0
        } elseif {!$create && $merge_type eq {none}} {
                # We aren't creating, it exists and we don't merge.


@@ -201,8 +201,9 @@ method _update_ref {} {
                                        # The current branch is actually newer.
                                        #
                                        set new $cur
                                        # The current branch is actually newer.
                                        #
                                        set new $cur

+                                       set new_hash $cur

                                } else {
                                } else {

-                                       _error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required."
+                                       _error $this [mc "Branch '%s' already exists.\n\nIt cannot fast-forward to %s.\nA merge is required." $newbranch $new_expr]

                                        return 0
                                }
                        }
                                        return 0
                                }
                        }


@@ -216,7 +217,7 @@ method _update_ref {} {
                                }
                        }
                        default {
                                }
                        }
                        default {

-                               _error $this "Merge strategy '$merge_type' not supported."
+                               _error $this [mc "Merge strategy '%s' not supported." $merge_type]

                                return 0
                        }
                        }
                                return 0
                        }
                        }


@@ -235,7 +236,7 @@ method _update_ref {} {
                if {[catch {
                                git update-ref -m $reflog_msg $ref $new $cur
                        } err]} {
                if {[catch {
                                git update-ref -m $reflog_msg $ref $new $cur
                        } err]} {

-                       _error $this "Failed to update '$newbranch'.\n\n$err"
+                       _error $this [strcat [mc "Failed to update '%s'." $newbranch] "\n\n$err"]

                        return 0
                }
        }
                        return 0
                }
        }


@@ -247,7 +248,7 @@ method _checkout {} {
        if {[lock_index checkout_op]} {
                after idle [cb _start_checkout]
        } else {
        if {[lock_index checkout_op]} {
                after idle [cb _start_checkout]
        } else {

-               _error $this "Index is already locked."
+               _error $this [mc "Staging area (index) is already locked."]

                delete_this
        }
 }
                delete_this
        }
 }


@@ -262,12 +263,12 @@ method _start_checkout {} {
                && $curType eq {normal}
                && $curHEAD eq $HEAD} {
        } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
                && $curType eq {normal}
                && $curHEAD eq $HEAD} {
        } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {

-               info_popup {Last scanned state does not match repository state.
+               info_popup [mc "Last scanned state does not match repository state.

 
 Another Git program has modified this repository since the last scan.  A rescan must be performed before the current branch can be changed.
 
 The rescan will be automatically started now.
 
 Another Git program has modified this repository since the last scan.  A rescan must be performed before the current branch can be changed.
 
 The rescan will be automatically started now.

-}
+"]

                unlock_index
                rescan ui_ready
                delete_this
                unlock_index
                rescan ui_ready
                delete_this


@@ -279,7 +280,7 @@ The rescan will be automatically started now.
        } elseif {[is_config_true gui.trustmtime]} {
                _readtree $this
        } else {
        } elseif {[is_config_true gui.trustmtime]} {
                _readtree $this
        } else {

-               ui_status {Refreshing file status...}
+               ui_status [mc "Refreshing file status..."]

                set fd [git_read update-index \
                        -q \
                        --unmerged \
                set fd [git_read update-index \
                        -q \
                        --unmerged \


@@ -318,8 +319,8 @@ method _readtree {} {
 
        set readtree_d {}
        $::main_status start \
 
        set readtree_d {}
        $::main_status start \

-               "Updating working directory to '[_name $this]'..." \
-               {files checked out}
+               [mc "Updating working directory to '%s'..." [_name $this]] \
+               [mc "files checked out"]

 
        set fd [git_read --stderr read-tree \
                -m \
 
        set fd [git_read --stderr read-tree \
                -m \


@@ -349,12 +350,12 @@ method _readtree_wait {fd} {
        if {[catch {close $fd}]} {
                set err $readtree_d
                regsub {^fatal: } $err {} err
        if {[catch {close $fd}]} {
                set err $readtree_d
                regsub {^fatal: } $err {} err

-               $::main_status stop "Aborted checkout of '[_name $this]' (file level merging is required)."
-               warn_popup "File level merge required.
+               $::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
+               warn_popup [strcat [mc "File level merge required."] "

 
 $err
 
 
 $err
 

-Staying on branch '$current_branch'."
+" [mc "Staying on branch '%s'." $current_branch]]

                unlock_index
                delete_this
                return
                unlock_index
                delete_this
                return


@@ -384,22 +385,24 @@ method _after_readtree {} {
        set rn [string length $rh]
        if {[string equal -length $rn $rh $new_ref]} {
                set new_branch [string range $new_ref $rn end]
        set rn [string length $rh]
        if {[string equal -length $rn $rh $new_ref]} {
                set new_branch [string range $new_ref $rn end]

-               append log " to $new_branch"
-
-               if {[catch {
-                               git symbolic-ref -m $log HEAD $new_ref
-                       } err]} {
-                       _fatal $this $err
+               if {$is_detached || $current_branch ne $new_branch} {
+                       append log " to $new_branch"
+                       if {[catch {
+                                       git symbolic-ref -m $log HEAD $new_ref
+                               } err]} {
+                               _fatal $this $err
+                       }
+                       set current_branch $new_branch
+                       set is_detached 0

                }
                }

-               set current_branch $new_branch
-               set is_detached 0

        } else {
        } else {

-               append log " to $new_expr"
-
-               if {[catch {
-                               _detach_HEAD $log $new_hash
-                       } err]} {
-                       _fatal $this $err
+               if {!$is_detached || $new_hash ne $HEAD} {
+                       append log " to $new_expr"
+                       if {[catch {
+                                       _detach_HEAD $log $new_hash
+                               } err]} {
+                               _fatal $this $err
+                       }

                }
                set current_branch HEAD
                set is_detached 1
                }
                set current_branch HEAD
                set is_detached 1


@@ -423,9 +426,9 @@ method _after_readtree {} {
        }
 
        if {$is_detached} {
        }
 
        if {$is_detached} {

-               info_popup "You are no longer on a local branch.
+               info_popup [mc "You are no longer on a local branch.

 
 

-If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."
+If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."]

        }
 
        # -- Update our repository state.  If we were previously in
        }
 
        # -- Update our repository state.  If we were previously in


@@ -440,11 +443,11 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che
                $ui_comm delete 0.0 end
                $ui_comm edit reset
                $ui_comm edit modified false
                $ui_comm delete 0.0 end
                $ui_comm edit reset
                $ui_comm edit modified false

-               rescan [list ui_status "Checked out '$name'."]
+               rescan [list ui_status [mc "Checked out '%s'." $name]]

        } else {
                repository_state commit_type HEAD MERGE_HEAD
                set PARENT $HEAD
        } else {
                repository_state commit_type HEAD MERGE_HEAD
                set PARENT $HEAD

-               ui_status "Checked out '$name'."
+               ui_status [mc "Checked out '%s'." $name]

        }
        delete_this
 }
        }
        delete_this
 }


@@ -472,7 +475,7 @@ method _confirm_reset {cur} {
        pack [label $w.msg1 \
                -anchor w \
                -justify left \
        pack [label $w.msg1 \
                -anchor w \
                -justify left \

-               -text "Resetting '$name' to $new_expr will lose the following commits:" \
+               -text [mc "Resetting '%s' to '%s' will lose the following commits:" $name $new_expr]\

                ] -anchor w
 
        set list $w.list.l
                ] -anchor w
 
        set list $w.list.l


@@ -494,21 +497,21 @@ method _confirm_reset {cur} {
        pack [label $w.msg2 \
                -anchor w \
                -justify left \
        pack [label $w.msg2 \
                -anchor w \
                -justify left \

-               -text {Recovering lost commits may not be easy.} \
+               -text [mc "Recovering lost commits may not be easy."] \

                ]
        pack [label $w.msg3 \
                -anchor w \
                -justify left \
                ]
        pack [label $w.msg3 \
                -anchor w \
                -justify left \

-               -text "Reset '$name'?" \
+               -text [mc "Reset '%s'?" $name] \

                ]
 
        frame $w.buttons
        button $w.buttons.visualize \
                ]
 
        frame $w.buttons
        button $w.buttons.visualize \

-               -text Visualize \
+               -text [mc Visualize] \

                -command $gitk
        pack $w.buttons.visualize -side left
        button $w.buttons.reset \
                -command $gitk
        pack $w.buttons.visualize -side left
        button $w.buttons.reset \

-               -text Reset \
+               -text [mc Reset] \

                -command "
                        set @reset_ok 1
                        destroy $w
                -command "
                        set @reset_ok 1
                        destroy $w


@@ -516,7 +519,7 @@ method _confirm_reset {cur} {
        pack $w.buttons.reset -side right
        button $w.buttons.cancel \
                -default active \
        pack $w.buttons.reset -side right
        button $w.buttons.cancel \
                -default active \

-               -text Cancel \
+               -text [mc Cancel] \

                -command [list destroy $w]
        pack $w.buttons.cancel -side right -padx 5
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
                -command [list destroy $w]
        pack $w.buttons.cancel -side right -padx 5
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10


@@ -572,13 +575,13 @@ method _toplevel {title} {
 }
 
 method _fatal {err} {
 }
 
 method _fatal {err} {

-       error_popup "Failed to set current branch.
+       error_popup [strcat [mc "Failed to set current branch.

 
 This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.
 
 
 This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.
 

-This should not have occurred.  [appname] will now close and give up.
+This should not have occurred.  %s will now close and give up." [appname]] "

 
 

-$err"
+$err"]

        exit 1
 }
 
        exit 1
 }