|
5 | 5 | #
|
6 | 6 | msgid ""
|
7 | 7 | msgstr ""
|
8 |
| -"Project-Id-Version: git 1.7.3\n" |
| 8 | +"Project-Id-Version: git 1.7.10\n" |
9 | 9 | " Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
|
10 |
| -"POT-Creation-Date: 2012-03-08 10:19+0800\n" |
11 |
| -"PO-Revision-Date: 2012-03-08 10:53+0100\n" |
| 10 | +"POT-Creation-Date: 2012-03-16 20:18+0800\n" |
| 11 | +"PO-Revision-Date: 2012-03-26 07:00+0100\n" |
12 | 12 | " Last-Translator: Peter Krefting <[email protected]>\n"
|
13 | 13 | " Language-Team: Swedish <[email protected]>\n"
|
14 | 14 | "Language: sv\n"
|
@@ -463,11 +463,11 @@ msgid " (commit or discard the untracked or modified content in submodules)"
|
463 | 463 | msgstr ""
|
464 | 464 | " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
|
465 | 465 |
|
466 |
| -# %s är ett verb ("Untracked"/"Ignored"). |
| 466 | +# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. |
467 | 467 | #: wt-status.c:187
|
468 | 468 | #, c-format
|
469 | 469 | msgid "%s files:"
|
470 |
| -msgstr "%s filer:" |
| 470 | +msgstr "%se filer:" |
471 | 471 |
|
472 | 472 | #: wt-status.c:190
|
473 | 473 | #, c-format
|
@@ -1886,7 +1886,7 @@ msgid ""
|
1886 | 1886 | "some local refs could not be updated; try running\n"
|
1887 | 1887 | " 'git remote prune %s' to remove any old, conflicting branches"
|
1888 | 1888 | msgstr ""
|
1889 |
| -"några lokala referenser kunde inte uppdateras; testa att köra\n" |
| 1889 | +"vissa lokala referenser kunde inte uppdateras; testa att köra\n" |
1890 | 1890 | " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
|
1891 | 1891 |
|
1892 | 1892 | #: builtin/fetch.c:540
|
@@ -2872,7 +2872,7 @@ msgstr "Sänder till %s\n"
|
2872 | 2872 | #: builtin/push.c:135
|
2873 | 2873 | #, c-format
|
2874 | 2874 | msgid "failed to push some refs to '%s'"
|
2875 |
| -msgstr "misslyckades sända några referenser till \"%s\"" |
| 2875 | +msgstr "misslyckades sända vissa referenser till \"%s\"" |
2876 | 2876 |
|
2877 | 2877 | #: builtin/push.c:143
|
2878 | 2878 | #, c-format
|
@@ -3251,50 +3251,50 @@ msgstr "Patchformatet $patch_format stöds inte."
|
3251 | 3251 | msgid "Patch format detection failed."
|
3252 | 3252 | msgstr "Misslyckades detektera patchformat."
|
3253 | 3253 |
|
3254 |
| -#: git-am.sh:409 |
| 3254 | +#: git-am.sh:411 |
3255 | 3255 | msgid "-d option is no longer supported. Do not use."
|
3256 | 3256 | msgstr "Flaggan -d stöds inte lägre. Använd inte."
|
3257 | 3257 |
|
3258 |
| -#: git-am.sh:472 |
| 3258 | +#: git-am.sh:474 |
3259 | 3259 | #, sh-format
|
3260 | 3260 | msgid "previous rebase directory $dotest still exists but mbox given."
|
3261 | 3261 | msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."
|
3262 | 3262 |
|
3263 |
| -#: git-am.sh:477 |
| 3263 | +#: git-am.sh:479 |
3264 | 3264 | msgid "Please make up your mind. --skip or --abort?"
|
3265 | 3265 | msgstr "Bestäm dig. --skip eller --abort?"
|
3266 | 3266 |
|
3267 |
| -#: git-am.sh:504 |
| 3267 | +#: git-am.sh:506 |
3268 | 3268 | msgid "Resolve operation not in progress, we are not resuming."
|
3269 | 3269 | msgstr "Lösningsoperation pågår inte, vi återupptar inte."
|
3270 | 3270 |
|
3271 |
| -#: git-am.sh:570 |
| 3271 | +#: git-am.sh:572 |
3272 | 3272 | #, sh-format
|
3273 | 3273 | msgid "Dirty index: cannot apply patches (dirty: $files)"
|
3274 | 3274 | msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)"
|
3275 | 3275 |
|
3276 |
| -#: git-am.sh:746 |
| 3276 | +#: git-am.sh:748 |
3277 | 3277 | msgid "cannot be interactive without stdin connected to a terminal."
|
3278 | 3278 | msgstr ""
|
3279 | 3279 | "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
|
3280 | 3280 |
|
3281 | 3281 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
3282 | 3282 | #. in your translation. The program will only accept English
|
3283 | 3283 | #. input at this point.
|
3284 |
| -#: git-am.sh:757 |
| 3284 | +#: git-am.sh:759 |
3285 | 3285 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
3286 | 3286 | msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "
|
3287 | 3287 |
|
3288 |
| -#: git-am.sh:793 |
| 3288 | +#: git-am.sh:795 |
3289 | 3289 | #, sh-format
|
3290 | 3290 | msgid "Applying: $FIRSTLINE"
|
3291 | 3291 | msgstr "Applicerar: $FIRSTLINE"
|
3292 | 3292 |
|
3293 |
| -#: git-am.sh:838 |
| 3293 | +#: git-am.sh:840 |
3294 | 3294 | msgid "No changes -- Patch already applied."
|
3295 | 3295 | msgstr "Inga ändringar -- Patchen har redan applicerats."
|
3296 | 3296 |
|
3297 |
| -#: git-am.sh:864 |
| 3297 | +#: git-am.sh:866 |
3298 | 3298 | msgid "applying to an empty history"
|
3299 | 3299 | msgstr "applicerar på en tom historik"
|
3300 | 3300 |
|
@@ -3539,11 +3539,16 @@ msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
|
3539 | 3539 | msgid "No submodule mapping found in .gitmodules for path '$path'"
|
3540 | 3540 | msgstr "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$path\""
|
3541 | 3541 |
|
3542 |
| -#: git-submodule.sh:173 |
| 3542 | +#: git-submodule.sh:149 |
3543 | 3543 | #, sh-format
|
3544 | 3544 | msgid "Clone of '$url' into submodule path '$path' failed"
|
3545 | 3545 | msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\""
|
3546 | 3546 |
|
| 3547 | +#: git-submodule.sh:159 |
| 3548 | +#, sh-format |
| 3549 | +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" |
| 3550 | +msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt" |
| 3551 | + |
3547 | 3552 | #: git-submodule.sh:247
|
3548 | 3553 | #, sh-format
|
3549 | 3554 | msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
|
0 commit comments