[PATCH] spelling fix

Pang Yan Han pangyanhan at gmail.com
Wed Aug 17 03:55:35 CDT 2011


# HG changeset patch
# User Pang Yan Han <pangyanhan at gmail.com>
# Date 1313570474 -28800
# Node ID 4e29cc36ce6a2d883e5807244ca991882b4679d9
# Parent  c981f4a9ea74ef0a40da1e8bfb41ce3dc9570d34
spelling fix

diff --git a/i18n/da.po b/i18n/da.po
--- a/i18n/da.po
+++ b/i18n/da.po
@@ -8780,7 +8780,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/de.po b/i18n/de.po
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -10681,7 +10681,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/it.po b/i18n/it.po
--- a/i18n/it.po
+++ b/i18n/it.po
@@ -8224,7 +8224,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -10001,7 +10001,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
@@ -10911,7 +10911,7 @@
 "    - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/ro.po b/i18n/ro.po
--- a/i18n/ro.po
+++ b/i18n/ro.po
@@ -9224,7 +9224,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/ru.po b/i18n/ru.po
--- a/i18n/ru.po
+++ b/i18n/ru.po
@@ -9543,7 +9543,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/sv.po b/i18n/sv.po
--- a/i18n/sv.po
+++ b/i18n/sv.po
@@ -9469,7 +9469,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/i18n/zh_TW.po b/i18n/zh_TW.po
--- a/i18n/zh_TW.po
+++ b/i18n/zh_TW.po
@@ -7653,7 +7653,7 @@
 "specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4075,7 +4075,7 @@
     - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
       files, discarding any previous merge attempts. Re-merging is not
       performed for files already marked as resolved. Use ``--all/-a``
-      to selects all unresolved files. ``--tool`` can be used to specify
+      to select all unresolved files. ``--tool`` can be used to specify
       the merge tool used for the given files. It overrides the HGMERGE
       environment variable and your configuration files.
 


More information about the Mercurial-devel mailing list