RE: [PATCH 2/2] Add Swedish translation.
- From
Peter Krefting <peter@softwolves.pp.se>
- Date
- Sep 15, 2010, 10:24 UTC
- Message-ID
- <alpine.DEB.2.00.1009151124100.11791@ds9.cixit.se>
- In-Reply-To
- <A612847CFE53224C91B23E3A5B48BAC749BF60444B@xmail3.se.axis.com>
Peter Kjellerstedt:
> Mainly comments on the Swedish translation below, but there are a few > references to the English messages as well.
Thanks.
Cc'ing TP-SV as I posted the translation for review there as well.
>> +#: wt-status.c:100 >> +msgid "# (commit or discard the untracked or modified content in submodules)" >> +msgstr "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" > Wouldn't "följa" be a better translation than "spåra" for "track"?
Yeah, perhaps it would. We already use "spåra" in the git-gui/gitk translations, though, so it needs to be changed everywhere.
Show 7 quoted lines
> [cut] > >> +#: builtin/add.c:41 >> +#, c-format >> +msgid "unexpected diff status %c" >> +msgstr "diff-status %c förväntades inte" > "oväntad diff-status %c" ?
Changed.
Show 5 quoted lines
>> +#: builtin/add.c:77 >> +#, c-format >> +msgid "remove '%s'\n" >> +msgstr "ta bort \"%s\"\n" > Any particular reason to change ' to " in the Swedish translation?
Yes, Swedish usually uses double-quotes, while English often uses single.
> +#: builtin/add.c:191 > +msgid "Unstaged changes after refreshing the index:" > +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" > "Ospårade" -> "Icke-köade"
Changing to "oköade".
Show 5 quoted lines
>> +#: builtin/archive.c:17 >> +#, c-format >> +msgid "could not create archive file '%s'" >> +msgstr "Kunde inte skapa arkivfilen \"%s\"" > "Kunde" -> "kunde"
Fixed.
Show 8 quoted lines
>> +#: builtin/branch.c:136 >> +#, c-format >> +msgid "" >> +"deleting branch '%s' that has been merged to\n" >> +" '%s', but it is not yet merged to HEAD." >> +msgstr "" >> +"tar bort grenen \"%s\" som inte har slagits ihop med\n" > Remove "inte".
Fixed.
Show 10 quoted lines
>> +" \"%s\", men som ännu inte slagits ihop med HEAD." >> + >> +#: builtin/branch.c:140 >> +#, c-format >> +msgid "" >> +"not deleting branch '%s' that is not yet merged to\n" >> +" '%s', even though it is merged to HEAD." >> +msgstr "" >> +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n" > "som inte" -> "som ännu inte"
Fixed.
Show 5 quoted lines
>> +#: builtin/branch.c:198 >> +#, c-format >> +msgid "Couldn't look up commit object for '%s'" >> +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" > "incheckningsobjekt" -> "incheckningsobjektet"?
Fixed.
>> +#: builtin/branch.c:557 >> +msgid "cannot rename the current branch while not on any." >> +msgstr "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." > "kunde" -> "kan"
Fixed.
Show 5 quoted lines
>> +#: builtin/branch.c:567 builtin/branch.c:571 >> +#, c-format >> +msgid "Invalid branch name: '%s'" >> +msgstr "Felaktigt namn på gren: \"%s\"" > "namn på gren" -> "grennamn"
Changed. I thought mine was easier to read, though :-)
Show 5 quoted lines
>> +#: builtin/branch.c:574 >> +#, c-format >> +msgid "A branch named '%s' already exists." >> +msgstr "Det finns redan en gren som heter \"%s\"" > Add missing period.
Fixed.
Show 5 quoted lines
>> +#: builtin/checkout.c:554 >> +#, c-format >> +msgid "Switched to and reset branch '%s'\n" >> +msgstr "Växlade till och nollställde grenen \"%s\"\n" > "Växlade" -> "Bytte" ?
Changed "växla" to "byta" globally.
>> +#: builtin/checkout.c:603 >> +msgid "You are on a branch yet to be born" >> +msgstr "Du är på en gren som ännu inte är född" > "är född" -> "finns" ?
Yes, sounds better. Changed.
>> +#: builtin/checkout.c:744 >> +msgid "--track needs a branch name" >> +msgstr "--track behöver ett namn på en gren" > "namn på en gren" -> "grennamn"
Changed.
>> +#: builtin/checkout.c:757 >> +msgid "--orphan and -b|-B are mutually exclusive" >> +msgstr "--orphan och --b|-B kan inte användas samtidigt" > "--b" -> "-b"
Fixed.
Show 5 quoted lines
>> +#: builtin/checkout.c:904 >> +#, c-format >> +msgid "git checkout: we do not like '%s' as a branch name." >> +msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren." > "namn på en gren" -> "grennamn"
Fixed.
>> +#: builtin/commit.c:380 >> +msgid "cannot do a partial commit during a merge." >> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning." > "delvis" -> "partiell"
Is that better? Sounds a bit to technical to me.
>> +#: builtin/commit.c:456 builtin/commit.c:1294 >> +msgid "could not parse HEAD commit" >> +msgstr "kunde inte tolka HEAD:s incheckning" > "HEAD:s incheckning" -> "HEAD-incheckningen" ?
Yeah, probably better. Changed the other "HEAD:s" translation as well.
Show 18 quoted lines
>> +#: builtin/commit.c:650 >> +#, c-format >> +msgid "" >> +"#\n" >> +"# It looks like you may be committing a MERGE.\n" >> +"# If this is not correct, please remove the file\n" >> +"#\t%s\n" >> +"# and try again.\n" >> +"#\n" >> +msgstr "" >> +"#\n" >> +"# Det verkar som du checkar in en SAMMANSLAGNING.\n" >> +"# Om det inte stämmer tar du bort filen\n" >> +"#\t%s\n" >> +"# och försöker igen.\n" >> +"#\n" > "tar du bort filen" -> "så ta bort filen" and > "försöker" -> "försök".
OK. Changed.
Show 19 quoted lines
>> +#: builtin/commit.c:659 >> +#, c-format >> +msgid "" >> +"\n" >> +"# Please enter the commit message for your changes." >> +msgstr "" >> +"\n" >> +"# Ange ett incheckningsmeddelande för dina ändringar." >> + >> +#: builtin/commit.c:663 >> +#, c-format >> +msgid "" >> +" Lines starting\n" >> +"# with '#' will be ignored, and an empty message aborts the commit.\n" >> +msgstr "" >> +" Rader som inleds\n" >> +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" >> +"" > "kommer ignoreras" -> "kommer att ignoreras"
Changed. Now just fits in <80 characters.
Show 11 quoted lines
>> +#: builtin/commit.c:668 >> +#, c-format >> +msgid "" >> +" Lines starting\n" >> +"# with '#' will be kept; you may remove them yourself if you want to.\n" >> +"# An empty message aborts the commit.\n" >> +msgstr "" >> +" Rader som inleds\n" >> +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" >> +"# Ett tomt meddelande avbryter incheckningen.\n" > "kommer behållas" -> "kommer att behållas"
Changed.
>> +#: builtin/commit.c:737 >> +msgid "Error building trees" >> +msgstr "Fel vid byggande av träd" > "byggande av träd" -> "trädbygge" ?
That sounds even weirder to me.
Show 5 quoted lines
>> +#: builtin/commit.c:752 builtin/tag.c:321 >> +#, c-format >> +msgid "Please supply the message using either -m or -F option.\n" >> +msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" > "meddelandet en" -> "meddelandet med en"
Fixed.
>> +#: builtin/commit.c:880 >> +msgid "You are in the middle of a merge -- cannot amend." >> +msgstr "Du är i mitten av en incheckning -- kan inte utöka." > "incheckning" -> "ihopslagning"
Good catch. Using "sammanslagning" as elsewhere.
Show 8 quoted lines
>> +#: builtin/commit.c:941 >> +msgid "Clever... amending the last one with dirty index." >> +msgstr "Smart... utöka den senaste med smutsigt index." >> + >> +#: builtin/commit.c:943 >> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." >> +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..." > "--only-paths" -> "--only-sökvägar"
Oh... Good catch.
Show 5 quoted lines
>> +#: builtin/commit.c:1142 >> +msgid "couldn't look up newly created commit" >> +msgstr "kunde inte slå upp en precis skapad incheckning" > "slå upp" -> "hitta" ? I have seen this translation for lookup > in some other places, and I think "hitta" is a better translation.
Yeah.
> "precis skapad" -> "nyskapad"
Both changed.
Show 6 quoted lines
>> +#: builtin/commit.c:1375 >> +msgid "cannot lock HEAD ref" >> +msgstr "kunde inte låsa HEAD-referens" > > "kunde" -> "kan" > "referens" -> "referensen" ?
Changed (in both).
Show 5 quoted lines
>> +#: builtin/describe.c:205 >> +#, c-format >> +msgid "annotated tag %s not available" >> +msgstr "den dekorerade taggen %s inte tillgänglig" > "dekorerade" -> "annoterade"
Is that a word?
>> +#: builtin/fetch.c:230 >> +msgid "[up to date]" >> +msgstr "[àjour]" > "[àjour]" -> "[à jour]" ?
Changed.
Show 5 quoted lines
>> +#: builtin/fetch.c:325 builtin/fetch.c:648 >> +#, c-format >> +msgid "cannot open %s: %s\n" >> +msgstr "kan inte öppna %s. %s\n" > "%s." -> "%s:"
Fixed.
>> +#: builtin/fetch.c:917 >> +msgid "Fetching a group and specifying refspecs does not make sense" >> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer" > "från" -> "en" ?
Well, I was thinking "fetch" -> "hämta från", and just dropped the "en".
Show 7 quoted lines
>> +#: builtin/gc.c:63 >> +#, c-format >> +msgid "Invalid %s: '%s'" >> +msgstr "Felaktigt %s: \"%s\"" > I think this should be "Felaktig". This could use a TRANSLATORS > comment to avoid having to check the code to find out what the > first %s is referring to.
OK, changing.
Show 5 quoted lines
>> +#: builtin/grep.c:252 >> +#, c-format >> +msgid "grep: failed to create thread: %s" >> +msgstr "grep: misslyckades skapa tråd. %s" > "." -> ":"
Fixed.
Show 6 quoted lines
>> +#: builtin/grep.c:581 >> +#, c-format >> +msgid "Failed to chdir: %s" >> +msgstr "Kunde inte byta katalog (chdir): %s" > I think you can skip the " (chdir)" explanation without > loss of information.
As long as the original string uses the system call reference, and not the action, I will keep it in the translation.
Show 5 quoted lines
>> +#: builtin/grep.c:703 >> +#, c-format >> +msgid "unable to grep from object of type %s" >> +msgstr "Kunde inte \"grep\" från objekt av typen %s" > "\"grep\"" -> "greppa" ?
That's a word that means something else... I don't really have any good idea on how to translate "grep" when used as a verb...
Show 5 quoted lines
>> +#: builtin/grep.c:755 >> +#, c-format >> +msgid "switch `%c' expects a numerical value" >> +msgstr "flaggan \"%c\" antar ett numeriskt värde" > "antar" -> "förväntar sig"
Changed (without "sig").
Show 5 quoted lines
>> +#: builtin/init-db.c:34 >> +#, c-format >> +msgid "Could not make %s writable by group" >> +msgstr "Kunde inte göra %s skrivbar för grubben" > "grubben" -> "gruppen"
Fixed.
Show 11 quoted lines
>> +#: builtin/init-db.c:79 >> +#, c-format >> +msgid "cannot opendir '%s'" >> +msgstr "kan inte öppna katalogen (opendir) \"%s\"" > Skip " (opendir)". > >> +#: builtin/init-db.c:96 >> +#, c-format >> +msgid "cannot readlink '%s'" >> +msgstr "kan inte läsa länk (readlink) \"%s\"" > "länk (readlink)" -> "länken"
Keeping them for the same reason as above. Changing "länk" to "länken", though.
>> +#: builtin/init-db.c:357 >> +msgid " shared" >> +msgstr " delat" > " delat" -> " och delat" ?
OK.
>> +#: builtin/init-db.c:376 >> +msgid "cannot tell cwd" >> +msgstr "kan inte läsa aktuell katalog (cwd)" > "läsa aktuell katalog (cwd)" -> "avgöra aktuell katalog"
Changing, but keeping cwd as above.
Show 5 quoted lines
>> +#: builtin/log.c:630 >> +msgid "name of output directory is too long" >> +msgstr "namn på utdatakatalogen är för lång" > "namn" -> "namnet" > "lång" -> "långt"
I think this is where I started to get a bit tired :-)
Fixed.
Show 5 quoted lines
>> +#: builtin/log.c:825 >> +#, c-format >> +msgid "insane in-reply-to: %s" >> +msgstr "tokigt in-reply-to: %s" > "tokigt" -> "tokig"
My sense of language says that it should be "neutrum", so "tokigt".
>> +#: builtin/log.c:1166 >> +msgid "standard output, or directory, which one?" >> +msgstr "standard ut, eller katalog, vilken skall det vara?" > "vilken" -> "vilket" ?
Fixed.
>> +#: builtin/merge.c:223 >> +msgid "could not run stash." >> +msgstr "kunde köra stash." > "kunde köra" -> "kund inte köra"
Fixed.
Show 5 quoted lines
>> +#: builtin/merge.c:396 >> +#, c-format >> +msgid "'%s' does not point to a commit" >> +msgstr "\"%s\" verkar inte peka på en incheckning" > "verkar inte peka " -> "pekar inte
Fixed.
Show 5 quoted lines
>> +#: builtin/merge.c:651 >> +#, c-format >> +msgid "Unknown option for merge-recursive: -X%s" >> +msgstr "Felaktig flagga för merge-recursive: -X%s" > "merge-recursive" -> "rekursiv ihopslagning" ?
No, merge-recursive is a name of a merge strategy.
Show 5 quoted lines
>> +#: builtin/merge.c:1271 >> +#, c-format >> +msgid "Using the %s to prepare resolving by hand.\n" >> +msgstr "Använder %s för att förbereda lösning för hand.\n" > "%s" -> "strategin %s" ?
Yeah. The English string should probably also be fixed, though.
Show 5 quoted lines
>> +#: builtin/mv.c:206 >> +#, c-format >> +msgid "Renaming %s to %s\n" >> +msgstr "Byter namn på %s till %s\n" > "Byter namn på" -> "Döper om" ?
I've used "byta namn" in other places, so if I change here, I should change it globally.
Show 5 quoted lines
>> +#: builtin/mv.c:209 >> +#, c-format >> +msgid "renaming '%s' failed" >> +msgstr "misslyckades byta namn på \"%s\"" > "namnbytet av \"%s\" misslyckades"
Changed.
Show 5 quoted lines
>> +#: builtin/notes.c:122 >> +#, c-format >> +msgid "unable to start 'show' for object '%s'" >> +msgstr "kunde int estarta \"show\" för objektet \"%s\"" > "int estarta" -> "inte starta"
Fixed.
>> +#: builtin/notes.c:128 >> +msgid "can't fdopen 'show' output fd" > Horrible English error message...
Yeah.
Show 5 quoted lines
>> +#: builtin/notes.c:234 builtin/tag.c:445 >> +#, c-format >> +msgid "cannot read '%s'" >> +msgstr "kunde inte läsa \"%s\"" > "kunde" -> "kan"
Fixed.
> "list" -> "lista" (assuming this is the first argument to the message from > builtin/notes.c:481 above.)
As I mentioned in 1/2, I though these were used as command names (as one of them was unified with a command name that I removed). I will try fixing these.
Show 6 quoted lines
>> +#: builtin/push.c:77 >> +#, c-format >> +msgid "The current branch %s is tracking multiple branches, refusing >> to push." >> +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." > "sända" -> "trycka iväg" ?
"Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui translation of "Push". As long as git doesn't grow a "git send" command, I think that should be OK.
Show 11 quoted lines
>> +#: builtin/push.c:132 >> +#, c-format >> +msgid "" >> +"To prevent you from losing history, non-fast-forward updates were rejected\n" >> +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" >> +"'Note about fast-forwards' section of 'git push --help' for details.\n" >> +msgstr "" >> +"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n" >> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n" >> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n" > "icke snabbspolande" -> "icke-snabbspolande"
Changed.
> "t.ex" -> "t ex"
I think it looks clearer with the full stop.
>> +#: builtin/reset.c:97 >> +msgid "Failed to find tree of HEAD." >> +msgstr "Kunde inte hitta träder för HEAD." > "träder" -> "trädet"
Fixed (both of them).
Show 5 quoted lines
>> +#: builtin/reset.c:307 >> +#, c-format >> +msgid "Could not parse object '%s'." >> +msgstr "Kan inte tolka objektet \"%s\"" > "Kan" -> "Kunde"
Fixed.
>> +#: builtin/reset.c:321 >> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." >> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." > "." -> " istället."
I dropped it to fit an 80 character line.
Show 11 quoted lines
>> +#: builtin/revert.c:270 >> +#, c-format >> +msgid "Error wrapping up %s" >> +msgstr "Fel vid ombrytning av %s" > > I do not think this "wrapping up" refers to reformatting of the commit > message. I think it refers to finishing writing the message (a rephrasing > of the English message is advisable). Thus the Swedish translation should > probably be: > > "Fel vid avslutandet av %s"
Are you sure about that? I was unable to figure it out when I looked at it.
Show 8 quoted lines
>> +#: builtin/revert.c:290 >> +msgid "" >> +"Your local changes would be overwritten by revert.\n" >> +"Please, commit your changes or stash them to proceed." >> +msgstr "" >> +"Dina lokala ändringar skulle skrivas över av \"revert\".\n" >> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." > "stash" -> "git stash" ?
Changed (both).
Show 6 quoted lines
>> +#: builtin/revert.c:449 >> +#, c-format >> +msgid "Mainline was specified but commit %s is not a merge." >> +msgstr "Huvudlinje angavs, men incheckningen %s är inte en >> sammanslagning" > "Huvudlinje" -> "Huvudspår" ?
Changing, fits closer to the railway analogy.
Show 9 quoted lines
>> +#: builtin/rm.c:118 >> +#, c-format >> +msgid "" >> +"'%s' has staged content different from both the file and the HEAD\n" >> +"(use -f to force removal)" >> +msgstr "" >> +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" >> +"(använd -f för att tvinga borttagning)" > "köat" -> "köade"
"%s" expands to a file name, so you are right. It is "%s" that contains the changes, not "%s" that has staged them.
Show 5 quoted lines
>> +#: builtin/shortlog.c:161 >> +#, c-format >> +msgid "Missing author: %s" >> +msgstr "Saknad författare: %s" > "Saknad" -> "Saknar"
I think "missing" it is an adjective and not a verb here. The message is clear either way.
Show 5 quoted lines
>> +#: builtin/tag.c:123 builtin/tag.c:464 >> +#, c-format >> +msgid "tag name too long: %.*s..." >> +msgstr "taggnamnet för långt: %.*s..." > "taggnamnet för" -> "taggnamnet är för"
Changed. Should probably be changed in English as well.
>> +#: builtin/tag.c:170 >> +msgid "committer info too long." >> +msgstr "incheckarinformation för lång." > "incheckarinformation för" -> "incheckarinformation är för"
Changed. Bad English again.
>> +#: builtin/tag.c:196 >> +msgid "gpg did not accept the tag data" >> +msgstr "gpg godtog inte taggdata" > "taggdata" -> "taggdatan"
"taggdatana" in that case. "data" is always plural.
>> +#: builtin/tag.c:203 >> +msgid "gpg failed to sign the tag" >> +msgstr "gpg misslyckades signera taggen" > "signera" -> "att signera"
Fixed.
Show 5 quoted lines
>> +#: builtin/tag.c:226 >> +#, c-format >> +msgid "signing key value too long (%.10s...)" >> +msgstr "signeringsnyckelvärdet för långt (%.10s...)" > "för" -> "är för"
Fixed.
>> +#: builtin/tag.c:302 >> +msgid "tag header too big." >> +msgstr "tagghuvud för stort." > "tagghuvud för stort." - "för stort tagghuvud."
Changed.
Show 5 quoted lines
>> +#: builtin/tag.c:335 >> +#, c-format >> +msgid "The tag message has been left in %s\n" >> +msgstr "Taggmeddelandet har lämnats i %s\n" > "lämnats" -> "lämnats kvar"
Much better. Changed.
>> +#: builtin/tag.c:428 >> +msgid "-n option is only allowed with -l." >> +msgstr "Flaggan -n är endast tillåten tillsammans med -l." > "Flaggan" -> "flaggan" (guess based on other error messages)
Yes, changed (both).
Show 8 quoted lines
>> +#: git-am.sh:120 >> +msgid "" >> +"Did you hand edit your patch?\n" >> +"It does not apply to blobs recorded in its index." >> +msgstr "" >> +"Vill du handredigera din patch?\n" >> +"Den kan inte appliceras på blobbar som antecknats i dess index." > "Vill du handredigera" -> "Handredigerade du"
Fixed.
> "antecknats" -> "finns"
That's ambiguous. Changed second sentence to: "Den kan inte appliceras på de blobbar som beskrivs i dess index."
-- \\// Peter - http://www.softwolves.pp.se/