##// END OF EJS Templates
Merge with stable
Matt Mackall -
r11739:a614666b merge default
parent child Browse files
Show More
@@ -25,3 +25,4 b' fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a'
25 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
25 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
26 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
26 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
27 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
27 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
28 c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
@@ -37,3 +37,4 b' fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a'
37 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
37 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
38 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
38 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
39 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
39 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
40 c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
@@ -1849,8 +1849,8 b' msgstr "convert: %s\\n"'
1849 msgid "%s: unknown repository type"
1849 msgid "%s: unknown repository type"
1850 msgstr "%s: tipo de repositório desconhecido"
1850 msgstr "%s: tipo de repositório desconhecido"
1851
1851
1852 msgid "retrieving file"
1852 msgid "getting files"
1853 msgstr "obtendo arquivo"
1853 msgstr "obtendo arquivos"
1854
1854
1855 msgid "revisions"
1855 msgid "revisions"
1856 msgstr "revisões"
1856 msgstr "revisões"
@@ -13,8 +13,8 b' msgid ""'
13 msgstr ""
13 msgstr ""
14 "Project-Id-Version: Mercurial\n"
14 "Project-Id-Version: Mercurial\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2010-07-25 09:57+0200\n"
16 "POT-Creation-Date: 2010-08-01 22:36+0200\n"
17 "PO-Revision-Date: 2010-07-25 10:50+0200\n"
17 "PO-Revision-Date: 2010-08-01 22:42+0200\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 "Language-Team: Swedish\n"
19 "Language-Team: Swedish\n"
20 "Language: Swedish\n"
20 "Language: Swedish\n"
@@ -337,6 +337,9 b' msgstr ""'
337 msgid "bookmark name cannot contain newlines"
337 msgid "bookmark name cannot contain newlines"
338 msgstr ""
338 msgstr ""
339
339
340 msgid "bookmark names cannot consist entirely of whitespace"
341 msgstr "bokmärksnamn kan inte bestå enbart av blanktecken"
342
340 msgid "a bookmark cannot have the name of an existing branch"
343 msgid "a bookmark cannot have the name of an existing branch"
341 msgstr ""
344 msgstr ""
342
345
@@ -3108,9 +3111,8 b' msgstr ""'
3108 msgid "patch series already fully applied\n"
3111 msgid "patch series already fully applied\n"
3109 msgstr ""
3112 msgstr ""
3110
3113
3111 #, python-format
3114 msgid "please specify the patch to move"
3112 msgid "patch '%s' not found"
3115 msgstr "ange patchen som ska flyttas"
3113 msgstr "patchen '%s' hittades inte"
3114
3116
3115 msgid "cleaning up working directory..."
3117 msgid "cleaning up working directory..."
3116 msgstr ""
3118 msgstr ""
@@ -3250,8 +3252,12 b' msgid "need --name to import a patch fro'
3250 msgstr ""
3252 msgstr ""
3251
3253
3252 #, python-format
3254 #, python-format
3255 msgid "unable to read file %s"
3256 msgstr "kan inte läsa filen %s"
3257
3258 #, python-format
3253 msgid "adding %s to series file\n"
3259 msgid "adding %s to series file\n"
3254 msgstr ""
3260 msgstr "lägger till %s till seriefilen\n"
3255
3261
3256 msgid "remove patches from queue"
3262 msgid "remove patches from queue"
3257 msgstr ""
3263 msgstr ""
@@ -8377,6 +8383,9 b' msgstr ""'
8377 msgid "tag names must be unique"
8383 msgid "tag names must be unique"
8378 msgstr "märkesnamn måste vara unika"
8384 msgstr "märkesnamn måste vara unika"
8379
8385
8386 msgid "tag names cannot consist entirely of whitespace"
8387 msgstr "märkesnamn kan inte bara bestå av blanktecken"
8388
8380 msgid "--rev and --remove are incompatible"
8389 msgid "--rev and --remove are incompatible"
8381 msgstr "--rev och --remove är inkompatibla"
8390 msgstr "--rev och --remove är inkompatibla"
8382
8391
@@ -8674,7 +8683,7 b' msgid "ignore white space when comparing'
8674 msgstr "ignorera blanktecken när rader jämförs"
8683 msgstr "ignorera blanktecken när rader jämförs"
8675
8684
8676 msgid "ignore changes in the amount of white space"
8685 msgid "ignore changes in the amount of white space"
8677 msgstr "ignorera ändringar av antalet blanktäcken"
8686 msgstr "ignorera ändringar av antalet blanktecken"
8678
8687
8679 msgid "ignore changes whose lines are all blank"
8688 msgid "ignore changes whose lines are all blank"
8680 msgstr "ignorera ändringar vars rader är tomma"
8689 msgstr "ignorera ändringar vars rader är tomma"
@@ -9577,8 +9586,12 b' msgid "malformed --config option: %r (us'
9577 msgstr ""
9586 msgstr ""
9578
9587
9579 #, python-format
9588 #, python-format
9589 msgid "error getting current working directory: %s"
9590 msgstr "fel när nuvarande arbetskatalog hämtades: %s"
9591
9592 #, python-format
9580 msgid "extension '%s' overrides commands: %s\n"
9593 msgid "extension '%s' overrides commands: %s\n"
9581 msgstr ""
9594 msgstr "utökningen '%s' tar över dessa kommandon: %s\n"
9582
9595
9583 msgid "Option --config may not be abbreviated!"
9596 msgid "Option --config may not be abbreviated!"
9584 msgstr ""
9597 msgstr ""
@@ -12040,6 +12053,9 b' msgstr ""'
12040 msgid "&Deleted"
12053 msgid "&Deleted"
12041 msgstr ""
12054 msgstr ""
12042
12055
12056 msgid "updating"
12057 msgstr "uppdaterar"
12058
12043 #, python-format
12059 #, python-format
12044 msgid "update failed to remove %s: %s!\n"
12060 msgid "update failed to remove %s: %s!\n"
12045 msgstr ""
12061 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now