diff options
Diffstat (limited to 'po/nb.po')
| -rw-r--r-- | po/nb.po | 1242 |
1 files changed, 670 insertions, 572 deletions
@@ -6,36 +6,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-06-10 22:03+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Bjørn Steensrud" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "[email protected]" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Fra utklippstavla" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Kommandoen for forarbeide blir nå slått av." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Forarbeide-kommandoen for linjesamordning blir nå slått av." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,15 +72,15 @@ msgstr "" "Datatap-feil:\n" "Hvis det kan gjenskapes, vennligst kontakt forfatteren.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Alvorlig intern feil" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Øverste linje" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Slutt" @@ -95,244 +96,248 @@ msgstr "Lenke: " msgid "Size. " msgstr "Størrelse: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Dato og størrelse: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Klarte ikke opprette midlertidig kopi av %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Klarte ikke åpne %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Sammenlikner fil ..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Feil ved lesing fra %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Handling" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Ikkehvitt" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Hvitt" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen og " -"lese gjennom mappa på nytt?" +"Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " +"og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 +#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 +msgid "Warning" +msgstr "" + +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Les på nytt" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsett fletting" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Klarte ikke åpne mapper:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe A «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe B «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe C «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Feil ved åpning av mappe" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Målmappa må være en annen enn A eller B når tre mapper flettes.\n" "Kontroller igjen før du fortsetter." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter-advarsel" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Leser mapper ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Leser mappe A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Leser mappe B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Leser mappe C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Noen undermapper var ikke lesbare i" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Kontroller rettigheter på undermappene." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status for mappesammenlikning" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Antall undermapper:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Antall like filer:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Antall forskjellige filer:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Antall manuelle flettinger:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Dette påvirker alle flettehandlinger." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Endre alle flette-handlinger" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&ortsett" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Arbeider " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Gjenstår." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopier A til B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopier B til A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Slett A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Slett B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Slett A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Flett til A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Flett til B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Flett til A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Slett (hvis det finnes)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Flett sammen" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Feil: Konflikt mellom filtyper" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Feil: Datoene er like, men ikke filene." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Denne handlingen er ikke mulig nå." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Handling ikke mulig" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +351,47 @@ msgstr "" "\n" "Hvis du vet hvordan dette kan gjenskapes, ta kontakt med programforfatteren." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programfeil" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Det oppsto en feil under kopiering.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Det oppsto en feil under kopiering.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 +#, fuzzy +msgid "Error" +msgstr "Feil." + +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Flettefeil" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Feil." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Ferdig." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Ikke lagret." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukjent flettehandling. (Dette må aldri skje!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Ukjent flettehandling." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -400,320 +410,325 @@ msgstr "" "Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET " "INGEN GARANTI! Ta sikkerhetskopi av vitale data!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Starter fletting" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Gjør det" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuler det" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Det markerte elementet har forskjellig type i de forskjellige mappene. Velg hva " -"som skal gjøres." +"Det markerte elementet har forskjellig type i de forskjellige mappene. Velg " +"hva som skal gjøres." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Filene er ulike men har samme dato for siste endring. Velg hva som skal gjøres." +"Filene er ulike men har samme dato for siste endring. Velg hva som skal " +"gjøres." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Denne handlingen er ikke mulig nå fordi en mappefletting pågår." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Det var en feil i siste steg.\n" "Vil du fortsette med elementet som ga feil, eller hoppe over det?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Fortsett fletting etter feil" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Fortsett med siste element" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Hopp over element" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Hoppet over." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Pågår ..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Flettehandling fullført." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Fletting fullført" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Simulert fletting fullført. Se etter om du er enig i de foreslåtte handlingene." +"Simulert fletting fullført. Se etter om du er enig i de foreslåtte " +"handlingene." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "slett mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "slett ( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Feil: rmdir( %1 ) mislyktes." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Feil: sletting mislyktes." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuell fletting( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Feil: kopiering (%1 -> %2) mislyktes. Eksisterende mål kunne ikke slettes." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Feil: copyLink mislyktes." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopier(%1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Feil under navneendring( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "endre navn ( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Feil: navneendring mislyktes." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Lag mappe( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Feil under oppretting av mappe." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Siste endring" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fil ..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "ikke tilgjengelig" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (mål) :" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Lagre status for mappefletting som ..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/fortsett mappefletting" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Kjør handling for gjeldende element" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Sammenlikne valgt fil" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Flett gjeldende fil" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Brett sammen alle undermapper" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Fold ut alle undermapper" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Velg A for alle elementer" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Velg B for alle elementer" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Velg C for alle elementer" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-velg handling for alle elementer" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ingen handling for alle elementer" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Vis forskjellige filer" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Vis filer bare i A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Vis filer bare i B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Vis filer bare i C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Sammenlikne uttrykkelig valgte filer" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Flett uttrykkelig valgte filer" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ikke gjør noe" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Slett A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Flett til A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -721,7 +736,7 @@ msgstr "" "Under forsøk på å lage sikkerhetskopi lyktes det ikke å slette \n" "en tidligere kopi. Filnavn: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -729,417 +744,431 @@ msgstr "" "Under forsøk på å lage sikkerhetskopi lyktes det ikke å endre navn.\n" "Filnavn: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Henter filstatus: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Leser fil: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Slapp opp for minne" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Lager mappe: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Fjerner mappe: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Fjerner fil: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Oppretter symbolsk lenke: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Endrer navn på fil: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopierer fil: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Feil under filkopiering: Klarte ikke åpne fil for lesing. Filnavn: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Feil under filkopiering: Klarte ikke åpne fil for skriving. Filnavn: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Feil under filkopiering: Lesing mislyktes. Filnavn: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Feil under filkopiering: Skriving mislyktes. Filnavn: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Leser mappe: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Lister mappe: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Gjeldende oppsett:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Feil i oppsett:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "--auto brukt, men ingen utdatafil er oppgitt." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "--auto ignorert for mappesammelikning." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Lagring mislyktes." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Klarte ikke åpne disse filene:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Feil ved åpning av fil" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Åpner dokumentere for sammenlikning ..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Lagrer gjeldende dokument som ..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Skriv ut forskjellene" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Avslutter programmet" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut det markerte og legger det på utklippstavla" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopierer det markerte til utklippstavla" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Limer innholdet inn der markøren står" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Velg alt i gjeldende vindu" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Søk etter en streng" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Søk igjen etter strengen" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Slår verktøylinja av/på" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Slår statuslinja av/på" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Sett opp KDiff3 ..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Gå til gjeldende Delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Gå til første Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Gå til siste Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Hopper over forskjeller i tomrom når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Gå til forrige Delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Gå til neste Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Gå til neste konflikt" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Gå til neste uløste konflikt" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Velg linje(r) fra A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Velg linje(r) fra B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Velg linje(r) fra C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatisk til neste uløste konflikt etter at kildene er valgt" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Vis mellomrom og tabulatortegn for forskjeller" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Vis tomrom" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Velg A overalt" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Velg B overalt" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Velg C overalt" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Velg A for alle uløste konflikter" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Velg B for alle uløste konflikter" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Velg C for alle uløste konflikter" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Velg A for alle uløste tomromkonflikter" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Velg B for alle uløste tomromkonflikter" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Velg C for alle uløste tomromkonflikter" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Løs enkle konflikter automatisk" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Sett deltaer til konflikter" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Kjør autofletting med regulære uttrykk" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Løs opp historiekonflikter automatisk" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Splitt differansen ved utvalget" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Slå sammen valgte differ" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Vis vindu A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Vis vindu B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Vis vindu C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokus på neste vindu" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal oversikt" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Oversikt A mot B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Oversikt A mot C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Oversikt B mot C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Ordbryt i diff-vinduer" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Legg til manuell diff-innretting" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Tilbakestill all manuell diff-innretting" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokus på forrige vindu" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Bytt om splitt-orientering" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Mappe og tekst delt visning" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Bytt mellom mappe- og tekstvisning" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Fletteresultatet er ikke lagret." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Lagre og avslutt" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Avslutt uten lagring" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Fletteresultatet kunne ikke lagres." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Lagrer fil ..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Lagrer fil med nytt filnavn ..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Skriver ut ..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Utskrift avbrutt." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Utvalg" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Utskrift fullført." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Avslutter ..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Slår verktøylinje av/på ..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Slå statuslinje av/på ..." @@ -1154,12 +1183,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Fant ikke vår part!\n" -"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i " -"README-fila i kildekoden." +"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i README-" +"fila i kildekoden." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1237,19 +1266,18 @@ msgstr "fil 3 som skal åpnes" msgid "Ignored. (User defined.)" msgstr "Ignorert. (Selvvalgt.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Mange takk til dem som rapporterte feil og bidro med ideer!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antall uløste konflikter som gjenstår: %1 ( herav %2 tomrom )" @@ -1261,55 +1289,30 @@ msgstr "" "Utdata er blitt endret.\n" "Hvis du fortsetter mister du endringene dine." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alle inn-filer er binært like." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alle inn-filer inneholder samme tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Filer A og B er binært like.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Filer A og B har lik tekst. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Filer A og C er binært like.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Filer A og C har lik tekst. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Filer B og C er binært like.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Filene %1 og %2 er binært like.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Filer B og C har lik tekst. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Filer A og B har lik tekst. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Totalt antall konflikter: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1317,7 +1320,7 @@ msgstr "" "\n" "Antall automatisk løste konflikter: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1325,23 +1328,23 @@ msgstr "" "\n" "Antall uløste konflikter :" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "<No src line>" msgstr "<Ingen kildelinje>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "<Merge Conflict (Whitespace only)>" msgstr "<Flettekonflikt (bare tomrom)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "<Merge Conflict>" msgstr "<Flettekonflikt>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1349,11 +1352,11 @@ msgstr "" "Ikke alle konflikter er løst ennå.\n" "Fila er ikke lagret.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Gjenstående konflikter" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1363,29 +1366,29 @@ msgstr "" "\n" "Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Feil ved fillagring" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Feil ved skriving." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Utdata" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Endret]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Filkoding for A :" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1405,6 +1408,15 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig." +#: optiondialog.cpp:455 +#, fuzzy +msgid "Configure" +msgstr "Sett opp ..." + +#: optiondialog.cpp:510 +msgid "Font" +msgstr "" + #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Skrift for redigering og utdata" @@ -1530,10 +1542,8 @@ msgid "Auto indentation" msgstr "Automatisk innrykk" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"På: Innrykket for forrige linje brukes for en ny linje.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "På: Innrykket for forrige linje brukes for en ny linje.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1569,60 +1579,53 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Innstillinger for Diff og fletting" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Bevar vognretur" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Vis tegn «\\r» for vognretur hvis de finnes.\n" -"Hjelper å sammenlikne filer som ble endret i forskjellige operativsystemer." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Behandle kommentarer i C/C++ som tomrom." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorer tall" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignorer sifre når linjene søkes opp. (Likner Ignorer tomrom)\n" "Kan hjelpe til å sammenlikne filer med numeriske data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorer C/C++-kommentarer" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Behandle kommentarer i C/C++ som tomrom." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ikke ta hensyn til store/små bokstaver" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Behandle endringer små/store som endring i tomrom («a»<=>«A»)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Forarbeide-kommando:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Selvvalgt forarbeide. (Detaljer finnes i dokumentasjonen)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Linjesøkende forarbeide, kommando:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1630,11 +1633,11 @@ msgstr "" "Denne forbehandleren brukes bare når linjer søkes.\n" "(Detaljer i dokumentasjonen)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Grundig (langsommere)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1642,11 +1645,16 @@ msgstr "" "Slår på --minimal for det eksterne diff-programmet.\n" "Analyse av store filer blir mye langsommere." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Innstillinger for Diff og fletting" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Forsinkelse for auto-avansering (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1654,40 +1662,35 @@ msgstr "" "Når det brukes auto-avansering vises resultatet av gjeldende utvalg \n" "i oppgitt tid, før det hoppes til neste konflikt. Verdiområde fra 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Innstillinger for Diff og fletting" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Standard for 2-fils tomromsfletting:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manuelt valg" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Tillat flettealgoritmen å velge inn-data automatisk for endringer som bare " "gjelder tomrom." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Standard for 3-fils tomromsfletting:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automatisk fletting med regulært uttrykk" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Regulært uttrykk for automatisk fletting:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1698,11 +1701,11 @@ msgstr "" "Når en linje med konflikt stemmer med det regulære uttrykket, så \n" "velges C hvis tilgjengelig, ellers B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Kjør autofletting med regulære uttrykk ved flettestart" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1710,15 +1713,15 @@ msgstr "" "Kjør autoflettingen med regulære uttrykk med en\n" "gang når en fletting begynner.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Fletting av historien fra versjonskontroll" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Regulært uttrykk for start på historien:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1728,17 +1731,18 @@ msgstr "" "Denne linja inneholder som regel \"$Log$\"-nøkkelordet.\n" "Standard: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Regulært uttrykk for start på historieoppføring:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "En historieoppføring består av flere linjer.\n" @@ -1748,19 +1752,19 @@ msgstr "" "historieoppføringene.\n" "Se i dokumentasjonen etter detaljer." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Flettesortering av historien" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Sorter versjonskontroll-historien etter en nøkkel." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Nøkkelrekkefølge for sortering av historiestart:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1769,30 +1773,40 @@ msgid "" "If left empty, then no sorting will be done.\n" "See the documentation for details." msgstr "" -"Hver parentes brukt i det regulære uttrykket for start på historieoppføringen\n" +"Hver parentes brukt i det regulære uttrykket for start på " +"historieoppføringen\n" "definerer en nøkkel som kan brukes til sortering.\n" "Oppgi en liste over nøkler (nummerert i den rekkefølge de opptrer\n" "med start på 1), med «,» som skilletegn (f.eks. \"4,5,6,1,2,3,7\").\n" "Står dette tomt blir det ikke sortert.\n" "Detaljer finnes i dokumentasjonen." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Flett versjonshistorien når flettingen begynner" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "Kjør autofletting på versjonshistorien når fletting begynner." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Antall undermapper:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Test de regulære uttrykkene" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Irrelevant flettekommando:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1802,23 +1816,35 @@ msgstr "" "autofletting når ingen andre relevante endringer \n" "ble funnet. Kalles med parametre filnavn1 filnavn2 filnavn3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Mappefletting" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursive mapper" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Om undermapper skal analyseres eller ikke." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Filmønster(e):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1828,11 +1854,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Fil-antimønster(e):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1842,11 +1868,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Mappe-antimønster(e) :" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1856,11 +1882,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Bruk .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1868,23 +1894,23 @@ msgstr "" "Utvider antimønsteret til alt som CVS ville ignorere.\n" "Dette kan gjøres pr. mappe med lokale «.cvsignore»-filer." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Finn skjulte filer og mapper" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Finner filer og mapper som har attributten «skjult." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Finner filer og mapper med navn som begynner med «.»." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Følg fil-lenker" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1892,11 +1918,11 @@ msgstr "" "På: Sammenlikne filer som lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Følg mappelenker" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1904,11 +1930,11 @@ msgstr "" "På: Sammenlikne mapper lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Store/små bokstaver i filnavn" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1916,26 +1942,26 @@ msgid "" "off, otherwise on.)" msgstr "" "Mappesammenlikningen behandler filer og mapper når navnene er like.\n" -"Slå på dette hvis navnene er versalvâre - dvs store/små bokstaver må være like. " -"(Standard for Windows er av, ellers på.)v" +"Slå på dette hvis navnene er versalvâre - dvs store/små bokstaver må være " +"like. (Standard for Windows er av, ellers på.)v" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Hvordan filer sammenliknes" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binær sammenlikning" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binær sammenlikning av hver fil. (Standard)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Full analyse" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1943,24 +1969,45 @@ msgstr "" "Gjør en full analyse og vis statistikk i ekstra kolonner.\n" "(Langsommere enn binær sammenlikning, mye langsommere for binære filer.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Stol på endringsdatoen (utrygt)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" +"Nyttig for store mapper eller langsomme nett." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" "Nyttig for store mapper eller langsomme nett." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Stol på størrelsen (utrygt)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1970,11 +2017,11 @@ msgstr "" "Nyttig for store mapper eller langsomme nett når datoen endres under " "nedlasting." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synkroniser mapper" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1984,11 +2031,11 @@ msgstr "" "mappene er like etterpå. Dette virker bare hvis\n" "to mapper sammenliknes uten å oppgi et mål." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Tomromsforskjeller betraktes som like" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1996,11 +2043,11 @@ msgstr "" "Hvis filer er forskjellige bare i tomrom, betrakt dem som\n" "like. Dette er bare aktivt når det kjøres full analyse." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopier den nyeste i stedet for å flette (utrygt)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2010,11 +2057,11 @@ msgstr "" "(Bruk dette bare når du vet hva du gjør!)\n" "Bare virksomt når to mapper sammenliknes." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Ta sikkerhetskopi av filer (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2022,15 +2069,15 @@ msgstr "" "Når en ny fil ville bli lagret oppå en gammel, så får den gamle\n" "fila nytt navn med «.orig» til slutt i stedet for å bli slettet." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionale innstillinger" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Språk (krever omstart av KDiff3)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2038,72 +2085,73 @@ msgstr "" "Velg språk for GUI-strengene, eller «Auto».\n" "KDiff3 må stoppes og startes på nytt for at dette skal få virkning." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Bruk samme koding for alt:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"Hvis dette er slått på kan alle kodinger endres ved bare å endre den første.\n" +"Hvis dette er slått på kan alle kodinger endres ved bare å endre den " +"første.\n" "Slå av hvis det trengs separate innstillinger." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Merk: Lokal koding er " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Filkoding for A :" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Filkoding for B :" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Filkoding for C :" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Filkoding for flettet resultat og lagring:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Autokopier utvalg" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Filkoding for forbehandlingsfiler:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Høyre mot venstre-språk" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2111,19 +2159,19 @@ msgstr "" "Noen språk leses fra høyre mot venstre.\n" "Denne innstillingen endrer visning og redigering tilsvarende." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrasjon" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integrasjonsinnstillinger" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Kommandolinjeparametre som skal ignoreres:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2135,7 +2183,27 @@ msgstr "" "Flere verdier kan oppgis atskilt med «;»\n" "Da forsvinner feilmeldingen «Ukjent parameter»." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2151,19 +2219,19 @@ msgstr "" "\n" "Vil du fortsette, eller vil du velge en annen skrift." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Ikke kompatibel skrift" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Fortsett på egen risiko" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Velg en annen skrift" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Dette tilbakestiller alle valg, ikke bare dem i dette emnet." @@ -2172,10 +2240,8 @@ msgid "PreprocessorCmd: " msgstr "Forbehandlingskommando :" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Følgende innstillinger som er valgt kan endre data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Følgende innstillinger som er valgt kan endre data:\n" #: pdiff.cpp:264 msgid "" @@ -2239,17 +2305,9 @@ msgstr "Linjediff A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Alle inn-filene inneholder samme tekst, men er ikke binært like." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Filene %1 og %2 er binært like.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Filene %1 og %2 har lik tekst, men er ikke binært like. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Filene %1 og %2 har lik tekst, men er ikke binært like. \n" #: pdiff.cpp:530 msgid "" @@ -2261,108 +2319,54 @@ msgstr "" "Merk at KDiff3-fletting ikke er beregnet for binære data.\n" "Fortsett på egen risiko." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Åpner filer ..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Feil ved filåpning" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Klipper ut utvalget ..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopierer utvalg til utklippstavla ..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Setter inn fra utklippstavla ..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Lagre og fortsett" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Fortsett uten lagring" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Søk fullført." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Søk fullført" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Ingenting er valgt i noe av inndata-vinduene." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Feil oppsto ved tillegg av manuelt diff-område" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Sett opp KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "M&appe" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Flettehandling på gjeldende element" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synk-handling på gjeldende element" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "F&lytting" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffvisning" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Flett" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Vindu" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Basis):" @@ -2405,6 +2409,10 @@ msgstr "Utdata (valgfri):" msgid "Configure..." msgstr "Sett opp ..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Søketekst:" @@ -2483,6 +2491,14 @@ msgstr "" msgid "Sort key result:" msgstr "Resulterende sorteringsnøkler:" +#: smalldialogs.cpp:493 +msgid "OK" +msgstr "" + +#: smalldialogs.cpp:497 +msgid "Cancel" +msgstr "" + #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Tilslag." @@ -2495,6 +2511,88 @@ msgstr "Ikke tilslag." msgid "Opening and closing parentheses don't match in regular expression." msgstr "Begynn- og sluttparenteser stemmer ikke overens i regulært uttrykk." +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "Sett opp KDiff3" + +#: kdiff3_shell.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Fil ..." + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "M&appe" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Flettehandling på gjeldende element" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synk-handling på gjeldende element" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "F&lytting" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffvisning" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Flett" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Vindu" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Filer A og B er binært like.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Filer A og C er binært like.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Filer A og C har lik tekst. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Filer B og C er binært like.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Filer B og C har lik tekst. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Bevar vognretur" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Vis tegn «\\r» for vognretur hvis de finnes.\n" +#~ "Hjelper å sammenlikne filer som ble endret i forskjellige " +#~ "operativsystemer." + #~ msgid "Diff and Merge" #~ msgstr "Diff og fletting" |