diff options
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/fr.po | 5 | ||||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/quilt.pot | 2 | ||||
-rw-r--r-- | quilt/add.in | 4 | ||||
-rw-r--r-- | quilt/annotate.in | 2 | ||||
-rw-r--r-- | quilt/diff.in | 6 | ||||
-rw-r--r-- | quilt/graph.in | 2 | ||||
-rw-r--r-- | quilt/header.in | 2 | ||||
-rw-r--r-- | quilt/pop.in | 10 | ||||
-rw-r--r-- | quilt/push.in | 6 | ||||
-rw-r--r-- | quilt/refresh.in | 2 | ||||
-rw-r--r-- | quilt/remove.in | 4 | ||||
-rw-r--r-- | quilt/upgrade.in | 2 |
14 files changed, 26 insertions, 25 deletions
@@ -946,7 +946,7 @@ msgid "" "\n" "--interactive\n" "\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the \n" +"\tthis option is not given, the -f option will be passed to the\n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" @@ -665,7 +665,8 @@ msgstr "Les en-têtes des patches diffèrent :\\n" #: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" -msgstr "Veuillez utiliser -d {o|a|n} pour spécifier quel(s) en-tête(s) conserver.\\n" +msgstr "" +"Veuillez utiliser -d {o|a|n} pour spécifier quel(s) en-tête(s) conserver.\\n" #: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" @@ -954,7 +955,7 @@ msgid "" "\n" "--interactive\n" "\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the \n" +"\tthis option is not given, the -f option will be passed to the\n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" @@ -927,7 +927,7 @@ msgid "" "\n" "--interactive\n" "\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the \n" +"\tthis option is not given, the -f option will be passed to the\n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" diff --git a/po/quilt.pot b/po/quilt.pot index 0f87dd1..e21c6e6 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -652,7 +652,7 @@ msgid "" "\n" "--interactive\n" "\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the \n" +"\tthis option is not given, the -f option will be passed to the\n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" diff --git a/quilt/add.in b/quilt/add.in index d9a3d12..4f375d3 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -113,8 +113,8 @@ do status=1 continue fi - - if [ -L $SUBDIR$file ] + + if [ -L $SUBDIR$file ] then printf $"Cannot add symbolic link %s\n" "$SUBDIR$file" >&2 status=1 diff --git a/quilt/annotate.in b/quilt/annotate.in index 666817e..ceed55d 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -156,7 +156,7 @@ trap "rm -f $template" EXIT # (which has no context, and removes lines that are removed without # caring for the line's contents) is generated. In that diff, all line # additions are replaced with the identifier of the patch (1, 2, ...). -# These patches are then applied to the empty file. +# These patches are then applied to the empty file. # # Finally, the annotations listing is merged with the source file line # by line. diff --git a/quilt/diff.in b/quilt/diff.in index a80cc85..0287c16 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -22,7 +22,7 @@ setup_colors usage() { printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [file ...]\n" - + if [ x$1 = x-h ] then printf $" @@ -100,7 +100,7 @@ do_diff() new_file=$old_file old_file=$f fi - + if [ -n "$opt_diff" ] then [ -s "$old_file" ] || old_file=/dev/null @@ -327,7 +327,7 @@ then # the patch will fail. Also, if a patch was force # applied, we know that it won't apply cleanly. In # all other cases, print a warning. - + if [ ! -e $QUILT_PC/$last_patch~refresh -a \ ${#opt_files[@]} -eq 0 ] then diff --git a/quilt/graph.in b/quilt/graph.in index 675258f..16b7061 100644 --- a/quilt/graph.in +++ b/quilt/graph.in @@ -86,7 +86,7 @@ do --lines) opt_lines=${2:-2} shift 2 ;; - + --edge-labels) if [ "$2" != files ] then diff --git a/quilt/header.in b/quilt/header.in index 9014c5e..a7bd4f9 100644 --- a/quilt/header.in +++ b/quilt/header.in @@ -154,7 +154,7 @@ else maybe_strip_diffstat < $tmp \ | maybe_strip_trailing_whitespace > $tmp2 - + cat_file "$patch_file_or_null" | patch_body >> $tmp2 || exit 1 if ( [ -z "$QUILT_BACKUP" -o ! -e $patch_file ] || \ diff --git a/quilt/pop.in b/quilt/pop.in index 4fc924f..f47e649 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -67,14 +67,14 @@ files_may_have_changed() { local patch=$1 file local patch_file=$(patch_file_name $patch) - + if [ $? -ne 0 -o ! -e "$patch_file" \ -o ! -e "$QUILT_PC/$patch/.timestamp" \ -o "$QUILT_PC/$patch/.timestamp" -ot "$patch_file" ] then return 0 fi - + for file in $(files_in_patch $patch) do [ "$QUILT_PC/$patch/.timestamp" -ot $file ] && return 0 @@ -108,7 +108,7 @@ check_for_pending_changes() find $workdir -type f -size 0 -exec rm -f '{}' ';' fi - + if [ -s $patch_file ] then if ! cat_file $patch_file \ @@ -125,7 +125,7 @@ check_for_pending_changes() fi fi fi - + local file failed for file2 in $(files_in_patch $patch) do @@ -134,7 +134,7 @@ check_for_pending_changes() [ -e $file2 ] || file2=/dev/null diff -q $file $file2 > /dev/null || failed=1 done - + if [ -n "$failed" ] then printf $"Patch %s does not remove cleanly (refresh it or enforce with -f)\n" \ diff --git a/quilt/push.in b/quilt/push.in index 0c7a1e0..7413782 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -46,7 +46,7 @@ be used. --interactive Allow the patch utility to ask how to deal with conflicts. If - this option is not given, the -f option will be passed to the + this option is not given, the -f option will be passed to the patch program. --color[=always|auto|never] @@ -92,7 +92,7 @@ push_patch_args() { local patch=$1 - if [ -z "$opt_reverse" ] + if [ -z "$opt_reverse" ] then patch_args "$patch" else @@ -198,7 +198,7 @@ add_patch() else touch $QUILT_PC/$patch~refresh fi - + if [ -e "$QUILT_PC/$patch" ] then touch $QUILT_PC/$patch/.timestamp diff --git a/quilt/refresh.in b/quilt/refresh.in index 9c140f4..c1737f4 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -20,7 +20,7 @@ fi usage() { printf $"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\n" - + if [ x$1 = x-h ] then printf $" diff --git a/quilt/remove.in b/quilt/remove.in index cd9a931..8932f5e 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -67,7 +67,7 @@ patch=$(find_applied_patch "$opt_patch") || exit 1 status=0 for file in $* -do +do if ! file_in_patch $SUBDIR$file $patch then printf $"File %s is not in patch %s\n" \ @@ -101,7 +101,7 @@ do # patch permanently. touch $QUILT_PC/$patch~refresh fi - + printf $"File %s removed from patch %s\n" \ "$SUBDIR$file" "$(print_patch $patch)" done diff --git a/quilt/upgrade.in b/quilt/upgrade.in index d8e2dad..58278f7 100644 --- a/quilt/upgrade.in +++ b/quilt/upgrade.in @@ -65,7 +65,7 @@ fi if version_check then printf $"The quilt meta-data in %s are already in the version %s format; nothing to do\n" "$QUILT_PC/" "$DB_VERSION" - exit 0 + exit 0 fi printf $"Converting meta-data to version %s\n" "$DB_VERSION" |