changeset 11739:a614666bbba4

Merge with stable

--- a/.hgsigs	Mon Aug 02 10:55:51 2010 -0500
+++ b/.hgsigs	Mon Aug 02 13:31:43 2010 -0500
@@ -25,3 +25,4 @@
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
+c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf

--- a/.hgtags	Mon Aug 02 10:55:51 2010 -0500
+++ b/.hgtags	Mon Aug 02 13:31:43 2010 -0500
@@ -37,3 +37,4 @@
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
+c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2

--- a/i18n/pt_BR.po	Mon Aug 02 10:55:51 2010 -0500
+++ b/i18n/pt_BR.po	Mon Aug 02 13:31:43 2010 -0500
@@ -1849,8 +1849,8 @@
 msgid "%s: unknown repository type"
 msgstr "%s: tipo de repositório desconhecido"
 
-msgid "retrieving file"
-msgstr "obtendo arquivo"
+msgid "getting files"
+msgstr "obtendo arquivos"
 
 msgid "revisions"
 msgstr "revisões"

--- a/i18n/sv.po	Mon Aug 02 10:55:51 2010 -0500
+++ b/i18n/sv.po	Mon Aug 02 13:31:43 2010 -0500
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2010-07-25 09:57+0200\n"
-"PO-Revision-Date: 2010-07-25 10:50+0200\n"
+"POT-Creation-Date: 2010-08-01 22:36+0200\n"
+"PO-Revision-Date: 2010-08-01 22:42+0200\n"
 "Last-Translator: Jens Bäckman <[e-mail]>\n"
 "Language-Team: Swedish\n"
 "Language: Swedish\n"
@@ -337,6 +337,9 @@
 msgid "bookmark name cannot contain newlines"
 msgstr ""
 
+msgid "bookmark names cannot consist entirely of whitespace"
+msgstr "bokmärksnamn kan inte bestå enbart av blanktecken"
+
 msgid "a bookmark cannot have the name of an existing branch"
 msgstr ""
 
@@ -3108,9 +3111,8 @@
 msgid "patch series already fully applied\n"
 msgstr ""
 
-#, python-format
-msgid "patch '%s' not found"
-msgstr "patchen '%s' hittades inte"
+msgid "please specify the patch to move"
+msgstr "ange patchen som ska flyttas"
 
 msgid "cleaning up working directory..."
 msgstr ""
@@ -3250,8 +3252,12 @@
 msgstr ""
 
 #, python-format
+msgid "unable to read file %s"
+msgstr "kan inte läsa filen %s"
+
+#, python-format
 msgid "adding %s to series file\n"
-msgstr ""
+msgstr "lägger till %s till seriefilen\n"
 
 msgid "remove patches from queue"
 msgstr ""
@@ -8377,6 +8383,9 @@
 msgid "tag names must be unique"
 msgstr "märkesnamn måste vara unika"
 
+msgid "tag names cannot consist entirely of whitespace"
+msgstr "märkesnamn kan inte bara bestå av blanktecken"
+
 msgid "--rev and --remove are incompatible"
 msgstr "--rev och --remove är inkompatibla"
 
@@ -8674,7 +8683,7 @@
 msgstr "ignorera blanktecken när rader jämförs"
 
 msgid "ignore changes in the amount of white space"
-msgstr "ignorera ändringar av antalet blanktäcken"
+msgstr "ignorera ändringar av antalet blanktecken"
 
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorera ändringar vars rader är tomma"
@@ -9577,8 +9586,12 @@
 msgstr ""
 
 #, python-format
+msgid "error getting current working directory: %s"
+msgstr "fel när nuvarande arbetskatalog hämtades: %s"
+
+#, python-format
 msgid "extension '%s' overrides commands: %s\n"
-msgstr ""
+msgstr "utökningen '%s' tar över dessa kommandon: %s\n"
 
 msgid "Option --config may not be abbreviated!"
 msgstr ""
@@ -12040,6 +12053,9 @@
 msgid "&Deleted"
 msgstr ""
 
+msgid "updating"
+msgstr "uppdaterar"
+
 #, python-format
 msgid "update failed to remove %s: %s!\n"
 msgstr ""