5
5
#
6
6
msgid ""
7
7
msgstr ""
8
- "Project-Id-Version : git 1.7.12 \n "
8
+ "Project-Id-Version : git 1.8.1 \n "
9
9
"
Report-Msgid-Bugs-To :
Git Mailing List <[email protected] >\n "
10
- "POT-Creation-Date : 2012-11-23 14:27 +0800\n "
11
- "PO-Revision-Date : 2012-11-23 08:53 +0100\n "
10
+ "POT-Creation-Date : 2012-11-30 12:40 +0800\n "
11
+ "PO-Revision-Date : 2012-11-30 10:49 +0100\n "
12
12
"
Last-Translator :
Peter Krefting <[email protected] >\n "
13
13
"
Language-Team :
Swedish <[email protected] >\n "
14
14
"Language : sv\n "
@@ -316,7 +316,12 @@ msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
316
316
msgid " Unknown dirstat parameter '%s'\n"
317
317
msgstr " Okänd dirstat-parameter \" %s\" \n"
318
318
319
- #: diff.c:219
319
+ #: diff.c:194
320
+ #, c-format
321
+ msgid "Unknown value for 'diff.submodule' config variable: '%s'"
322
+ msgstr "Okänt värde för konfigurationsvariabeln \" diff.submodule\" : \" %s\" "
323
+
324
+ #: diff.c:237
320
325
#, c-format
321
326
msgid ""
322
327
"Found errors in 'diff.dirstat' config variable:\n"
@@ -325,7 +330,7 @@ msgstr ""
325
330
"Hittade fel i konfigurationsvariabeln \" diff.dirstat\" :\n"
326
331
"%s"
327
332
328
- #: diff.c:3467
333
+ #: diff.c:3494
329
334
#, c-format
330
335
msgid ""
331
336
"Failed to parse --dirstat/-X option parameter:\n"
@@ -334,6 +339,11 @@ msgstr ""
334
339
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
335
340
"%s"
336
341
342
+ #: diff.c:3508
343
+ #, c-format
344
+ msgid "Failed to parse --submodule option parameter: '%s'"
345
+ msgstr "Misslyckades tolka argument till flaggan --submodule: \" %s\" "
346
+
337
347
#: gpg-interface.c:59
338
348
msgid "could not run gpg."
339
349
msgstr "kunde inte köra gpg."
@@ -707,7 +717,11 @@ msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
707
717
msgstr[ 0 ] "Din gren ligger före \" %s\" med %d incheckning.\n"
708
718
msgstr[ 1 ] "Din gren ligger före \" %s\" med %d incheckningar.\n"
709
719
710
- #: remote.c:1638
720
+ #: remote.c:1637
721
+ msgid " (use \" git push\" to publish your local commits)\n"
722
+ msgstr " (använd \" git push\" för att publicera dina lokala incheckningar)\n"
723
+
724
+ #: remote.c:1640
711
725
#, c-format
712
726
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
713
727
msgid_plural ""
@@ -717,7 +731,11 @@ msgstr[0] ""
717
731
msgstr[ 1 ] ""
718
732
"Din gren ligger efter \" %s\" med %d incheckningar, och kan snabbspolas.\n"
719
733
720
- #: remote.c:1646
734
+ #: remote.c:1647
735
+ msgid " (use \" git pull\" to update your local branch)\n"
736
+ msgstr " (använd \" git pull\" för att uppdatera din lokala gren)\n"
737
+
738
+ #: remote.c:1650
721
739
#, c-format
722
740
msgid ""
723
741
"Your branch and '%s' have diverged,\n"
@@ -732,6 +750,10 @@ msgstr[1] ""
732
750
"Din gren och \" %s\" har divergerat,\n"
733
751
"och har %d respektive %d olika incheckningar.\n"
734
752
753
+ #: remote.c:1659
754
+ msgid " (use \" git pull\" to merge the remote branch into yours)\n"
755
+ msgstr " (använd \" git pull\" för att slå ihop fjärrgrenen med din egen)\n"
756
+
735
757
#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
736
758
#: builtin/merge.c:994
737
759
#, c-format
@@ -1383,7 +1405,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
1383
1405
msgid "Unstaged changes after refreshing the index:"
1384
1406
msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
1385
1407
1386
- #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260
1408
+ #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
1387
1409
#, c-format
1388
1410
msgid "pathspec '%s' did not match any files"
1389
1411
msgstr "sökvägsangivelsen \" %s\" motsvarade inte några filer"
@@ -1512,7 +1534,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"
1512
1534
msgid "index file corrupt"
1513
1535
msgstr "indexfilen trasig"
1514
1536
1515
- #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355
1537
+ #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370
1516
1538
msgid "Unable to write new index file"
1517
1539
msgstr "Kunde inte skriva ny indexfil"
1518
1540
@@ -7082,7 +7104,7 @@ msgstr "git remote rename <gammal> <ny>"
7082
7104
msgid "git remote remove <name>"
7083
7105
msgstr "git remote remove <namn>"
7084
7106
7085
- #: builtin/remote.c:15
7107
+ #: builtin/remote.c:15 builtin/remote.c:42
7086
7108
msgid "git remote set-head <name> (-a | -d | <branch>)"
7087
7109
msgstr "git remote set-head <namn> (-a | -d | <gren>)"
7088
7110
@@ -7120,10 +7142,6 @@ msgstr "git remote set-url --delete <namn> <url>"
7120
7142
msgid "git remote add [<options>] <name> <url>"
7121
7143
msgstr "git remote add [<flaggor>] <namn> <url>"
7122
7144
7123
- #: builtin/remote.c:42
7124
- msgid "git remote set-head <name> (-a | -d | <branch>])"
7125
- msgstr "git remote set-head <namn> (-a | -d | <gren>])"
7126
-
7127
7145
#: builtin/remote.c:47
7128
7146
msgid "git remote set-branches <name> <branch>..."
7129
7147
msgstr "git remote set-branches <namn> <gren>..."
@@ -7887,12 +7905,12 @@ msgstr "tillåt rekursiv borttagning"
7887
7905
msgid "exit with a zero status even if nothing matched"
7888
7906
msgstr "avsluta med nollstatus även om inget träffades"
7889
7907
7890
- #: builtin/rm.c:268
7908
+ #: builtin/rm.c:283
7891
7909
#, c-format
7892
7910
msgid "not removing '%s' recursively without -r"
7893
7911
msgstr "tar inte bort \" %s\" rekursivt utan -r"
7894
7912
7895
- #: builtin/rm.c:307
7913
+ #: builtin/rm.c:322
7896
7914
#, c-format
7897
7915
msgid "git rm: unable to remove %s"
7898
7916
msgstr "git rm: kan inte ta bort %s"
@@ -9423,6 +9441,9 @@ msgstr "# Undermodulers ändringar att checka in:"
9423
9441
msgid "Synchronizing submodule url for '$prefix$sm_path'"
9424
9442
msgstr "Synkroniserar undermodul-url för \" $prefix$sm_path\" "
9425
9443
9444
+ #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9445
+ #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])"
9446
+
9426
9447
#~ msgid " 0 files changed"
9427
9448
#~ msgstr " 0 filer ändrade"
9428
9449
0 commit comments