Do not break git-gui messages into multiple lines.
Many git-gui messages were broken into a multiple lines to make good paragraph width. Unfortunately in reality it breaks the paragraph width completely, because the dialog window width does not coincide with the paragraph width created by the current font. Tcl/Tk's standard dialog boxes are breaking the long lines automatically, so it is better to make long lines and let the interpreter do the job. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Eygene Ryabinkin committed
Mar 27, 2007 at 14:31 UTC
53a291a435a173a18969011753104f8ab41234c8
1 file changed
+18
-46
git-gui.sh
+18
-46
@@ -735,12 +735,9 @@ proc handle_empty_diff {} {
735
736
[short_path $path] has no changes.
737
738
-The modification date of this file was updated
739
-by another application, but the content within
740
-the file was not changed.
738
+The modification date of this file was updated by another application, but the content within the file was not changed.
739
742
-A rescan will be automatically started to find
743
-other files which may have the same state."
740
+A rescan will be automatically started to find other files which may have the same state."
741
742
clear_diff
743
display_file $path __
@@ -1041,8 +1038,7 @@ proc load_last_commit {} {
1038
if {[llength $PARENT] == 0} {
1039
error_popup {There is nothing to amend.
1040
1044
-You are about to create the initial commit.
1045
-There is no commit before this to amend.
1041
+You are about to create the initial commit. There is no commit before this to amend.
1042
}
1043
return
1044
}
@@ -1051,10 +1047,7 @@ There is no commit before this to amend.
1047
if {$curType eq {merge}} {
1048
error_popup {Cannot amend while merging.
1049
1054
-You are currently in the middle of a merge that
1055
-has not been fully completed. You cannot amend
1056
-the prior commit unless you first abort the
1057
-current merge activity.
1050
+You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.
1051
}
1052
return
1053
}
@@ -1144,9 +1137,7 @@ proc commit_tree {} {
1137
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1138
info_popup {Last scanned state does not match repository state.
1139
1147
-Another Git program has modified this repository
1148
-since the last scan. A rescan must be performed
1149
-before another commit can be created.
1140
+Another Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created.
1141
1142
The rescan will be automatically started now.
1143
}
@@ -1167,8 +1158,7 @@ The rescan will be automatically started now.
1158
U? {
1159
error_popup "Unmerged files cannot be committed.
1160
1170
-File [short_path $path] has merge conflicts.
1171
-You must resolve them and add the file before committing.
1161
+File [short_path $path] has merge conflicts. You must resolve them and add the file before committing.
1162
"
1163
unlock_index
1164
return
@@ -1284,8 +1274,7 @@ proc commit_committree {fd_wt curHEAD msg} {
1274
if {$tree_id eq $old_tree} {
1275
info_popup {No changes to commit.
1276
1287
-No files were modified by this commit and it
1288
-was not a merge commit.
1277
+No files were modified by this commit and it was not a merge commit.
1278
1279
A rescan will be automatically started now.
1280
}
@@ -2403,9 +2392,7 @@ proc switch_branch {new_branch} {
2392
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2393
info_popup {Last scanned state does not match repository state.
2394
2406
-Another Git program has modified this repository
2407
-since the last scan. A rescan must be performed
2408
-before the current branch can be changed.
2395
+Another Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.
2396
2397
The rescan will be automatically started now.
2398
}
@@ -2496,12 +2483,9 @@ Staying on branch '$current_branch'."
2483
if {[catch {git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2484
error_popup "Failed to set current branch.
2485
2499
-This working directory is only partially switched.
2500
-We successfully updated your files, but failed to
2501
-update an internal Git file.
2486
+This working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.
2487
2503
-This should not have occurred. [appname] will now
2504
-close and give up.
2488
+This should not have occurred. [appname] will now close and give up.
2489
2490
$err"
2491
do_quit
@@ -2817,8 +2801,7 @@ proc can_merge {} {
2801
if {[string match amend* $commit_type]} {
2802
info_popup {Cannot merge while amending.
2803
2820
-You must finish amending this commit before
2821
-starting any type of merge.
2804
+You must finish amending this commit before starting any type of merge.
2805
}
2806
return 0
2807
}
@@ -2832,9 +2815,7 @@ starting any type of merge.
2815
if {$commit_type ne $curType || $HEAD ne $curHEAD} {
2816
info_popup {Last scanned state does not match repository state.
2817
2835
-Another Git program has modified this repository
2836
-since the last scan. A rescan must be performed
2837
-before a merge can be performed.
2818
+Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
2819
2820
The rescan will be automatically started now.
2821
}
@@ -2853,9 +2834,7 @@ The rescan will be automatically started now.
2834
2835
File [short_path $path] has merge conflicts.
2836
2856
-You must resolve them, add the file, and commit to
2857
-complete the current merge. Only then can you
2858
-begin another merge.
2837
+You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
2838
"
2839
unlock_index
2840
return 0
@@ -2865,9 +2844,7 @@ begin another merge.
2844
2845
File [short_path $path] is modified.
2846
2868
-You should complete the current commit before
2869
-starting a merge. Doing so will help you abort
2870
-a failed merge, should the need arise.
2847
+You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
2848
"
2849
unlock_index
2850
return 0
@@ -2943,13 +2920,11 @@ proc finish_merge {revcnt w ok} {
2920
2921
Your merge of $revcnt branches has failed.
2922
2946
-There are file-level conflicts between the
2947
-branches which must be resolved manually.
2923
+There are file-level conflicts between the branches which must be resolved manually.
2924
2925
The working directory will now be reset.
2926
2951
-You can attempt this merge again
2952
-by merging only one branch at a time." $w
2927
+You can attempt this merge again by merging only one branch at a time." $w
2928
2929
set fd [open "| git read-tree --reset -u HEAD" r]
2930
fconfigure $fd -blocking 0 -translation binary
@@ -3062,8 +3037,7 @@ You must finish amending this commit.
3037
3038
if {[ask_popup "Abort $op?
3039
3065
-Aborting the current $op will cause
3066
-*ALL* uncommitted changes to be lost.
3040
+Aborting the current $op will cause *ALL* uncommitted changes to be lost.
3041
3042
Continue with aborting the current $op?"] eq {yes}} {
3043
set fd [open "| git read-tree --reset -u HEAD" r]
@@ -6069,9 +6043,7 @@ if {[is_enabled multicommit]} {
6043
if {[ask_popup \
6044
"This repository currently has $objects_current loose objects.
6045
6072
-To maintain optimal performance it is strongly
6073
-recommended that you compress the database
6074
-when more than $object_limit loose objects exist.
6046
+To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
6047
6048
Compress the database now?"] eq yes} {
6049
do_gc