Merge.rc: Rename the checkbox "Filter Comments" to "Ignore comment differences"

[winmerge-jp/winmerge-jp.git] / Translations / WinMerge / Norwegian.po

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index ad34df2..cb4e995 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1,4 +1,4 @@
-# This file is part from WinMerge <https://winmerge.org/>
+# This file is part from WinMerge <https://winmerge.org/>
 # Released under the "GNU General Public License"
 #
 # Translators:
@@ -76,17 +76,14 @@ msgstr "Gå &til..."
 msgid "Op&en"
 msgstr "&Åpne"
 
-#, c-format
-msgid "with &Registered Application"
-msgstr "med &registrert program"
+msgid "With &Registered Application"
+msgstr "Med &registrert program"
 
-#, c-format
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
 msgstr ""
 
-#, c-format
-msgid "&with..."
-msgstr "&med..."
+msgid "&With..."
+msgstr "&Med..."
 
 msgid "S&hell Menu"
 msgstr ""
@@ -133,6 +130,10 @@ msgid "&Zoom"
 msgstr "&Zoom"
 
 #, c-format
+msgid "25%"
+msgstr ""
+
+#, c-format
 msgid "Zoom &In\tCtrl++"
 msgstr "Zoom &inn\tCtrl++"
 
@@ -169,10 +170,19 @@ msgstr "&Flytt"
 msgid "&Adjust Offset"
 msgstr ""
 
+msgid "&Vertical Wipe"
+msgstr ""
+
+msgid "&Horizontal Wipe"
+msgstr ""
+
 #, c-format
 msgid "&Set Background Color"
 msgstr ""
 
+msgid "&Vector Image Scaling"
+msgstr ""
+
 #, c-format
 msgid "&File"
 msgstr "&Fil"
@@ -446,7 +456,7 @@ msgid "Select &Font..."
 msgstr "Velg &skrifttype..."
 
 #, c-format
-msgid "Use Default F&ont"
+msgid "Use Default Font"
 msgstr "Bruk standard s&krifttype"
 
 #, c-format
@@ -454,8 +464,8 @@ msgid "Sw&ap Panes"
 msgstr "&Bytt om paneler"
 
 #, c-format
-msgid "Compa&re Statistics"
-msgstr "Sammen&lign statistikker"
+msgid "Com&pare Statistics..."
+msgstr "Sammen&lign statistikker..."
 
 #, c-format
 msgid "Refre&sh\tF5"
@@ -568,7 +578,7 @@ msgid "&Convert Line Endings to"
 msgstr "&Konverter linjeslutt til"
 
 #, c-format
-msgid "&Merge Mode\tF9"
+msgid "Mer&ge Mode\tF9"
 msgstr "Sammenslå-&modus\tF9"
 
 #, c-format
@@ -580,13 +590,16 @@ msgid "&File Encoding..."
 msgstr "Filko&ding..."
 
 #, c-format
-msgid "Recompare As"
+msgid "Reco&mpare As"
 msgstr ""
 
 #, c-format
 msgid "&Text"
 msgstr ""
 
+msgid "T&able"
+msgstr ""
+
 #, c-format
 msgid "&XML"
 msgstr "&XML"
@@ -715,6 +728,9 @@ msgstr "&Lås paneler"
 msgid "&View Whitespace"
 msgstr "&Vis blanktegn"
 
+msgid "View E&OL"
+msgstr ""
+
 #, c-format
 msgid "Vie&w Line Differences"
 msgstr "Vis linjefo&rksjell"
@@ -955,8 +971,7 @@ msgstr "&Åpne venstre"
 msgid "with &External Editor"
 msgstr "med &eksternt redigeringsprogram"
 
-#, c-format
-msgid "&Parent Folder"
+msgid "Open &Parent Folder..."
 msgstr ""
 
 #, c-format
@@ -1016,10 +1031,6 @@ msgid "Differences to... (%1 of %2)"
 msgstr ""
 
 #, c-format
-msgid "&Refresh"
-msgstr "&Gjenoppfrisk"
-
-#, c-format
 msgid "Left Shell menu"
 msgstr "Venstre skallmeny"
 
@@ -1242,9 +1253,8 @@ msgstr "Generelt"
 msgid "Automatically &scroll to first difference"
 msgstr "Automatisk &rulling til første forskjell"
 
-#, c-format
-msgid "Cl&ose windows with ESC"
-msgstr "L&ukk vinduer med ESC"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "L&ukk vinduer med 'Esc':"
 
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
@@ -1278,8 +1288,7 @@ msgstr "Auto-fullførelse for Å&pne-dialog:"
 msgid "Language:"
 msgstr ""
 
-#, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
 msgstr "WinMerge tillater å skjule noen vanlige meldingsbokser. Trykk tilbakestill-knappen for å gjøre alle meldingsboksene synlige igjen."
 
 #, c-format
@@ -1405,6 +1414,9 @@ msgstr "Fjern"
 msgid "Colors"
 msgstr "Farger"
 
+msgid "Color Scheme:"
+msgstr ""
+
 #, c-format
 msgid "Background"
 msgstr "Bakgrunn"
@@ -1453,10 +1465,6 @@ msgstr "Ordforskjell:"
 msgid "Selected Word Diff:"
 msgstr "Valgt ordforskjell:"
 
-#, c-format
-msgid "Defaults"
-msgstr "Standardverdier"
-
 msgid "&Use folder compare colors"
 msgstr ""
 
@@ -1473,6 +1481,10 @@ msgid "Items filtered:"
 msgstr ""
 
 #, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
 msgid "System"
 msgstr "System"
 
@@ -1557,6 +1569,10 @@ msgid "Open to e&xternal editor"
 msgstr "Åpne i e&ksternt redigeringsprogram"
 
 #, c-format
+msgid "Defaults"
+msgstr "Standardverdier"
+
+#, c-format
 msgid "Display Columns"
 msgstr "Visningskolonner"
 
@@ -1576,9 +1592,8 @@ msgstr "Velg utpakker"
 msgid "File unpacker:"
 msgstr "Filutpakker:"
 
-#, c-format
-msgid "Display all unpackers, don't check the extension"
-msgstr "Vis alle utpakkere, ikke kontroller filtype"
+msgid "Display all unpackers, don't check the extension."
+msgstr "Vis alle utpakkere, ikke kontroller filtype."
 
 #, c-format
 msgid "Extensions list:"
@@ -1645,7 +1660,7 @@ msgid "Compare"
 msgstr "Sammenlign"
 
 #, c-format
-msgid "Whitespace"
+msgid "Whitespaces"
 msgstr "Blanktegn"
 
 #, c-format
@@ -1668,6 +1683,9 @@ msgstr "Ignorer blan&ke linjer"
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bokstaver"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&Aktiver flyttet blokk-oppdagelse"
@@ -1683,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentarer"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filter-kommentarer"
-
-#, c-format
 msgid "Editor"
 msgstr "Redigering"
 
@@ -1742,6 +1752,9 @@ msgstr "&Ord-nivå:"
 msgid "W&ord break characters:"
 msgstr ""
 
+msgid "&Rendering Mode:"
+msgstr ""
+
 #, c-format
 msgid "Filefilters"
 msgstr "Filfiltere"
@@ -1790,7 +1803,7 @@ msgid "Sa&ve changes"
 msgstr ""
 
 #, c-format
-msgid "Disca&rd changes"
+msgid "Discard c&hanges"
 msgstr ""
 
 #, c-format
@@ -1821,16 +1834,12 @@ msgstr "Standard tegnsett"
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "Velg standard tegnsett som blir antatt når det lastes ikke-Unicode filer:"
 
-#, c-format
-msgid ""
-"Detect codepage info for these files: .html, .rc, .xml \n"
-"need to restart session"
+msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
 msgstr ""
-"Oppdag tegnsett-info for disse filer: .html, .rc, .xml \n"
+"Oppdag tegnsett-info for disse filer: .html, .rc, .xml\n"
 "nødvendig å starte programmet på nytt"
 
-#, c-format
-msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
+msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
 msgstr ""
 
 #, c-format
@@ -1850,10 +1859,6 @@ msgid "Options"
 msgstr "Innstillinger"
 
 #, c-format
-msgid " Categories"
-msgstr "Kategorier"
-
-#, c-format
 msgid "Import..."
 msgstr "Importer..."
 
@@ -1906,10 +1911,6 @@ msgid "Bold"
 msgstr "Fet"
 
 #, c-format
-msgid "Marker colors"
-msgstr ""
-
-#, c-format
 msgid "Search Marker:"
 msgstr ""
 
@@ -2065,8 +2066,8 @@ msgstr "&Avbryt"
 msgid "Test Filter"
 msgstr "Test filter"
 
-msgid "Testing filter..."
-msgstr "Tester filter..."
+msgid "Testing filter:"
+msgstr "Tester filter:"
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2088,15 +2089,35 @@ msgstr "&Test"
 msgid "&Close"
 msgstr "&Lukk"
 
+msgid "Table"
+msgstr ""
+
+msgid "File type"
+msgstr ""
+
+msgid "&CSV"
+msgstr ""
+
+msgid "&TSV"
+msgstr ""
+
+msgid "Custom &Delimiter-Separated Values"
+msgstr ""
+
+msgid "D&elimiter character:"
+msgstr ""
+
+msgid "&Allow newlines in quotes"
+msgstr ""
+
+msgid "&Quote character:"
+msgstr ""
+
 #, c-format
 msgid "&Use customized text colors"
 msgstr "&Bruk egendefinerte tekstfarger"
 
 #, c-format
-msgid "Custom text colors"
-msgstr "Egendefinerte tekstfarger"
-
-#, c-format
 msgid "Whitespace:"
 msgstr "Blanktegn:"
 
@@ -2109,10 +2130,6 @@ msgid "Selection:"
 msgstr "Markering:"
 
 #, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
 msgid "Backup Files"
 msgstr "Sikkerhetskopifiler"
 
@@ -2144,8 +2161,7 @@ msgstr "&Global sikkerhetskopi-mappe:"
 msgid "Backup filename:"
 msgstr "Sikkerhetskopi-filnavn:"
 
-#, c-format
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "&Legg til .bak -endelse"
 
 #, c-format
@@ -2169,6 +2185,10 @@ msgid "To right"
 msgstr "Til høyre"
 
 #, c-format
+msgid "Don't ask this &question again."
+msgstr "Ikke still dette &spørsmålet igjen."
+
+#, c-format
 msgid "Yes"
 msgstr "Ja"
 
@@ -2251,6 +2271,18 @@ msgstr ""
 msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
+msgid "&CSV File Patterns:"
+msgstr ""
+
+msgid "&TSV File Patterns:"
+msgstr ""
+
+msgid "Custom Delimiter-Separated Values"
+msgstr ""
+
+msgid "File Patterns:"
+msgstr ""
+
 msgctxt "Options dialog|Categories"
 msgid "Binary"
 msgstr "Binær"
@@ -2282,6 +2314,9 @@ msgstr ""
 msgid "Image File &Patterns:"
 msgstr ""
 
+msgid "&Enable image compare in folder compare"
+msgstr ""
+
 #, c-format
 msgid "&Hex View"
 msgstr ""
@@ -2322,13 +2357,11 @@ msgstr ""
 msgid "\nSave (Ctrl+S)"
 msgstr ""
 
-#, c-format
-msgid "Unknown error attempting to open project file"
-msgstr "Ukjent feil ved forsøk på å åpne prosjektfil"
+msgid "Unknown error attempting to open project file."
+msgstr "Ukjent feil ved forsøk på å åpne prosjektfil."
 
-#, c-format
-msgid "Unknown error attempting to save project file"
-msgstr "Ukjent feil ved forsøk på å lagre prosjektfil"
+msgid "Unknown error attempting to save project file."
+msgstr "Ukjent feil ved forsøk på å lagre prosjektfil."
 
 #, c-format
 msgid "Project file successfully loaded."
@@ -2439,12 +2472,10 @@ msgstr "Hopp over &alle"
 msgid "Don't display this &message again."
 msgstr "Ikke vis denne &meldingen igjen."
 
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "Ikke still dette &spørsmålet igjen."
+msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgstr ""
 
-#, c-format
-msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
+msgid "Color Schemes"
 msgstr ""
 
 #, c-format
@@ -2478,6 +2509,12 @@ msgstr "Fra høyre:"
 msgid "To right:"
 msgstr "Til høyre:"
 
+msgid "From middle:"
+msgstr ""
+
+msgid "To middle:"
+msgstr ""
+
 #, c-format
 msgid "Version %1"
 msgstr "Versjon %1"
@@ -2632,15 +2669,11 @@ msgstr "Filter-fil eksisterer allerede. Overskrive eksisterende filter?"
 msgid "Regular expression"
 msgstr "Regulære uttrykk"
 
-#, c-format
-msgid ""
-"Filters were updated. Do you want to refresh all open folder compares?\n"
-"\n"
-"If you do not want to refresh all compares now you can select No and refresh compares later."
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select 'No' and refresh compares later."
 msgstr ""
 "Filtre ble oppdaterte. Vil du gjenoppfriske alle åpne mappesammenligninger?\n"
 "\n"
-"Om du ikke vil gjenoppfriske alle sammenligninger nå kan du velge Nei og gjenoppfriske sammenligninger senere."
+"Om du ikke vil gjenoppfriske alle sammenligninger nå kan du velge 'Nei' og gjenoppfriske sammenligninger senere."
 
 #, c-format
 msgid "Folder Comparison Results"
@@ -2711,9 +2744,8 @@ msgstr "Objekt %1 av %2"
 msgid "Items: %1"
 msgstr "Objekter: %1"
 
-#, c-format
-msgid "Select two existing folders or files to compare"
-msgstr "Velg to eksisterende mapper eller filer for å sammenligne"
+msgid "Select two existing folders or files to compare."
+msgstr "Velg to eksisterende mapper eller filer for å sammenligne."
 
 #, c-format
 msgid "Folder Selection"
@@ -2759,8 +2791,7 @@ msgstr ""
 msgid "All paths are invalid!"
 msgstr ""
 
-#, c-format
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
 msgstr ""
 
 #, c-format
@@ -2801,6 +2832,9 @@ msgstr ""
 "%1\n"
 "er ikke en konfliktfil."
 
+msgid "You are about to compare very large files.\nShowing the contents of the files requires a very large amount of memory.\nDo you want to show only the comparison results, not the contents of the files?\n\n"
+msgstr ""
+
 #, c-format
 msgid "Save As"
 msgstr "Lagre som"
@@ -2810,7 +2844,7 @@ msgid "Save changes to %1?"
 msgstr "Lagre endringer til %1?"
 
 #, c-format
-msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
 msgstr "%1 er merket som skrivebeskyttet. Vil du overskrive den skrivebeskyttede filen? (Nei for å lagre filen med et annet navn.)"
 
 #, c-format
@@ -2830,13 +2864,13 @@ msgstr ""
 "Fortsette likevel?"
 
 #, c-format
-msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press OK)\n\t- abort the current operation (Press Cancel)?"
 msgstr ""
 "Lagring av fil feilet.\n"
 "%1\n"
 "%2\n"
 "Vil du:\n"
-"\t- bruk et annet filnavn (Klikk Ok)\n"
+"\t- bruk et annet filnavn (Klikk OK)\n"
 "\t- avbryt den aktuelle operasjonen (Klikk Avbryt)?"
 
 #, c-format
@@ -3039,13 +3073,12 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#, c-format
-msgid "Are you sure you want to copy:"
-msgstr "Er du sikker på at du vil kopiere:"
+msgid "Are you sure you want to copy?"
+msgstr "Er du sikker på at du vil kopiere?"
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Er du sikker på at du vil kopiere %d objekter:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "Er du sikker på at du vil kopiere %d objekter?"
 
 #, c-format
 msgid ""
@@ -3065,13 +3098,12 @@ msgstr ""
 "\n"
 "Gjenoppfrisk sammenligning."
 
-#, c-format
-msgid "Are you sure you want to move:"
-msgstr "Er du sikker på at du vil flytte:"
+msgid "Are you sure you want to move?"
+msgstr "Er du sikker på at du vil flytte?"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Er du sikker på at du vil flytte %d objekter:"
+msgid "Are you sure you want to move %d items?"
+msgstr "Er du sikker på at du vil flytte %d objekter?"
 
 #, c-format
 msgid "Confirm Move"
@@ -3312,6 +3344,12 @@ msgstr ""
 msgid "Text files are different"
 msgstr "Tekstfiler er forskjellige"
 
+msgid "Image files are identical"
+msgstr ""
+
+msgid "Image files are different"
+msgstr ""
+
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Forløpt tid: %ld ms"
@@ -3489,6 +3527,9 @@ msgstr ""
 msgid "The report has been created successfully."
 msgstr "Rapporten er opprettet vellykket"
 
+msgid "Cannot add a synchronization point at this line."
+msgstr ""
+
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Samme filen er åpen i begge paneler."
@@ -3505,19 +3546,13 @@ msgstr "Det skjedde en feil under sammenligning av filene."
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Midlertidige filer kan ikke opprettes. Sjekk TEMP-mappebane innstillinger."
 
-#, c-format
-msgid ""
-"These files use different carriage return types.\n"
-"\n"
-"Do you want to treat all carriage return types as equivalent for this comparison?\n"
-"\n"
-"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
+msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in the Compare tab of the options dialog (available under Edit/Options)."
 msgstr ""
 "Disse filene har forskjellig linjeskifttype.\n"
 "\n"
 "Vil du behandle alle linjeskifttypene likt for denne sammenligningen?\n"
 "\n"
-"Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer forskjell i linjeskift' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)."
+"Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer linjebruddforskjeller (Windows/Unix/Mac)' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)."
 
 #, c-format
 msgid "The selected folder is invalid."
@@ -3593,31 +3628,26 @@ msgid "Replaced %1 string(s)."
 msgstr "Erstattet %1 streng(er)."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Kan ikke finne strengen \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr "Kan ikke finne strengen \"%s\"."
 
-#, c-format
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
 msgstr ""
 
 #, c-format
 msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
 msgstr ""
 
-#, c-format
-msgid "The change of codepage has been merged"
+msgid "The change of codepage has been merged."
 msgstr ""
 
-#, c-format
-msgid "The changes of codepage are conflicting"
+msgid "The changes of codepage are conflicting."
 msgstr ""
 
-#, c-format
-msgid "The change of EOL has been merged"
+msgid "The change of EOL has been merged."
 msgstr ""
 
-#, c-format
-msgid "The changes of EOL are conflicting"
+msgid "The changes of EOL are conflicting."
 msgstr ""
 
 #, c-format
@@ -3632,13 +3662,11 @@ msgstr "Forskjellspanel"
 msgid "Patch file successfully written."
 msgstr "Fil med rettelser vellykket skrevet."
 
-#, c-format
-msgid "1. item is not found or is directory!"
-msgstr "1. objekt ikke funnet eller er mappe!"
+msgid "1. item is not found!"
+msgstr ""
 
-#, c-format
-msgid "2. item is not found or is directory!"
-msgstr "2. objekt ikke funnet eller er mappe!"
+msgid "2. item is not found!"
+msgstr ""
 
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
@@ -3668,9 +3696,8 @@ msgstr "Kunne ikke skrive til fil %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Den spesifiserte utdata-bane er ikke en absolutt bane: %1"
 
-#, c-format
-msgid "Specify an output file"
-msgstr "Spesifiser en utdata-fil"
+msgid "Specify an output file."
+msgstr "Spesifiser en utdata-fil."
 
 #, c-format
 msgid "Cannot create a patch file from binary files."
@@ -3751,6 +3778,13 @@ msgid "None"
 msgstr "Ingen"
 
 #, c-format
+msgid "Marker Color %d"
+msgstr ""
+
+msgid "New Pattern"
+msgstr ""
+
+#, c-format
 msgid "Type"
 msgstr "Type"
 
@@ -3834,9 +3868,8 @@ msgstr ""
 msgid "\nAuto Merge (Ctrl+Alt+M)"
 msgstr ""
 
-#, c-format
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Den tilpassede utpakkeren brukes på begge filer (bare en fil behøver filendelsen)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
+msgstr "Den tilpassede utpakkeren brukes på begge filer (bare en fil behøver filendelsen)."
 
 #, c-format
 msgid "No prediffer (normal)"
@@ -3854,8 +3887,7 @@ msgstr "Andre programtillegg"
 msgid "Private Build: %1"
 msgstr "Privat Build: %1"
 
-#, c-format
-msgid "Your software is up to date"
+msgid "Your software is up to date."
 msgstr ""
 
 #, c-format
@@ -3895,7 +3927,7 @@ msgid "From file system"
 msgstr "Fra filsystem"
 
 #, c-format
-msgid "From MRU list"
+msgid "From Most Recently Used list"
 msgstr "Fra MRU-liste"
 
 #, c-format
@@ -3957,3 +3989,126 @@ msgstr ""
 msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
 msgstr ""
 
+msgid "default"
+msgstr ""
+
+msgid "minimal"
+msgstr ""
+
+msgid "patience"
+msgstr ""
+
+msgid "histogram"
+msgstr ""
+
+msgid "GDI"
+msgstr ""
+
+msgid "DirectWrite Default"
+msgstr ""
+
+msgid "DirectWrite Aliased"
+msgstr ""
+
+msgid "DirectWrite GDI Classic"
+msgstr ""
+
+msgid "DirectWrite GDI Natural"
+msgstr ""
+
+msgid "DirectWrite Natural"
+msgstr ""
+
+msgid "DirectWrite Natural Symmetric"
+msgstr ""
+
+msgid "MDI child window or main window"
+msgstr ""
+
+msgid "MDI child window only"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Diff"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Highlight"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Blink"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Block Size"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Block Alpha"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "CD Threshold"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Ins/Del Detection"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "None"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Vertical"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Horizontal"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Overlay"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Alpha"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "XOR"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Alpha Blend"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Alpha Animation"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Zoom"
+msgstr ""
+
+msgctxt "ImgMergeFrame|LocationPane"
+msgid "Page:"
+msgstr ""
+
+#, c-format
+msgid "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
+msgstr ""
+
+#, c-format
+msgid "Dist: %g  "
+msgstr ""
+
+#, c-format
+msgid "Dist: %g, %g  "
+msgstr ""
+
+#, c-format
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
+msgstr ""
+