[meld] Update Norwegian Bokmål translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Norwegian Bokmål translation
- Date: Wed, 23 Mar 2022 14:39:31 +0000 (UTC)
commit d087e579ba07e782486f39906f9b1d686b6df708
Author: Kjell Cato Heskjestad <cato heskjestad xyz>
Date: Wed Mar 23 14:39:29 2022 +0000
Update Norwegian Bokmål translation
po/nb.po | 2587 +++++++++++++++++++++++++++++---------------------------------
1 file changed, 1190 insertions(+), 1397 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 3b2d9ac8..43b3c0a0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-09-24 19:00+0000\n"
-"PO-Revision-Date: 2019-10-15 16:57+0200\n"
+"POT-Creation-Date: 2019-10-12 06:50+0000\n"
+"PO-Revision-Date: 2019-10-13 11:59+0200\n"
"Last-Translator: Kjell Cato Heskjestad <cato heskjestad xyz>\n"
"Language-Team: Norwegian/Bokmaal <i18n-nb lister ping uio no>\n"
"Language: nb\n"
@@ -17,16 +17,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2.1\n"
-#: ../bin/meld:194
+#: bin/meld:194
msgid "Cannot import: "
msgstr "Kan ikke importere: "
-#: ../bin/meld:197
+#: bin/meld:197
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld krever %s eller høyere."
-#: ../bin/meld:243
+#: bin/meld:276
#, c-format
msgid ""
"Couldn’t load Meld-specific CSS (%s)\n"
@@ -35,30 +35,25 @@ msgstr ""
"Klarte ikke laste Meld-spesifikk CSS (%s)\n"
"%s"
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
+#: data/org.gnome.meld.desktop.in:3 data/org.gnome.meld.appdata.xml.in:8
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in:4
msgid "Diff Viewer"
msgstr "Vis forskjeller"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld: visning av forskjeller"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in:5 data/org.gnome.meld.appdata.xml.in:9
msgid "Compare and merge your files"
msgstr "Sammenligne og flett sammen dine filer"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in:7
msgid "diff;merge;"
msgstr "forskjell;flett;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in:11
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -70,7 +65,7 @@ msgstr ""
"tilbyr to- og treveissammenligninger av både filer og mapper, og støtter "
"mange versjonskontrollsystemer, bl.a. Git, Mercurial, Bazaar og Subversion."
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in:18
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
@@ -78,51 +73,35 @@ msgstr ""
"Meld lar deg gjennomgå kodeforandringer, oppdateringsfiler («patcher») og "
"gjør svære flettekonflikter litt lettere."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in:48
msgid "The GNOME Project"
msgstr "GNOME-prosjektet"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Meld sammenligningsbeskrivelse"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Vinduets standardbredde"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Vinduets standardhøyde"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Er vinduet maksimert som standard"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Er vinduet i fullskjermmodus som standard"
-#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "Vis verktøylinja"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "If true, the window toolbar is visible."
-msgstr "Hvis sann så vil verktøyslinja være synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "Vis statuslinje"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-msgid "If true, the window statusbar is visible."
-msgstr "Hvis sann så vil vinduets statuslinje være synlig."
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Flere automatisk gjenkjente tegnkodinger"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:59
msgid ""
"Meld will use these text encodings to try to decode loaded text files before "
"trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -134,35 +113,35 @@ msgstr ""
"så vil alltid UTF-8 og tegnkodingen til gjeldende regionaltilpasning kunne "
"brukes. Andre tegnkodinger vil kunne forsøkes avhengig av brukerens region."
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
msgstr "Innrykksbredde"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:67
msgid "The number of spaces to use for a single indent step"
msgstr "Antall mellomrom i et enkelt innrykk"
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:71
msgid "Whether to indent using spaces or tabs"
msgstr "Om innrykket består av mellomrom eller tabulatortegn"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:72
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr "Hvis sann så vil nye innrykk bruke mellomrom istedenfor tabulatortegn."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Vis linjenummer"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:77
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "Velg for å vise linjenummer i filsammenligninger."
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Syntaksmerking"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:82
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -170,31 +149,31 @@ msgstr ""
"Velg for å bruke fargekodet syntaksmerking i sammenligninger. Dette er slått "
"av som standard fordi Meld bruker sin egen utheving med farger."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:86
msgid "Color scheme to use for syntax highlighting"
msgstr "Fargeskjema for syntaksmerking"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:87
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr "Brukes av GtkSourceView til å bestemme farger for syntaksmerking"
-#: ../data/org.gnome.meld.gschema.xml.h:21
-msgid "Displayed whitespace"
-msgstr "Blanktegn som vises"
+#: data/org.gnome.meld.gschema.xml:91
+msgid "Draw whitespace"
+msgstr "Tegn blanktegn"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:92
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-"Utvalg av typer blanktegn som vises. Mulige verdier er «space», «tab», "
-"«newline» og «nbsp»."
+"Velg for å tegne blanktegn i sammenligninger selv om de ikke er i et område "
+"som er endret."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Type linjebryting"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:102
msgid ""
"Lines in file comparisons will be wrapped according to this setting, either "
"not at all ('none'), at any character ('char') or only at the end of words "
@@ -203,32 +182,32 @@ msgstr ""
"Linjer i filsammenligninger vil brytes i henhold til denne innstillingen. "
"Enten ikke i det hele tatt, i et vilkårlig tegn, eller kun i slutten av ord."
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Uthev gjeldende linje"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr "Velg for å utheve linja med skrivemerket i filsammenligninger."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
msgstr "Bruk systemets skrift med fast bredde"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:115
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
"Fravelg for å bruke en selvvalgt skrift istedenfor systemets skrift med fast "
"bredde."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Tilpasset skrift"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:120
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -236,20 +215,39 @@ msgstr ""
"Den selvvalgte skriften som skal brukes. Lagres og tolkes som en tekststreng "
"i Pango-format."
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Show overview source map"
+msgstr "Vis oversiktsstolpe"
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Hvis sann så vil filsammenligninger vise to fargekodede stolper som "
+"illustrerer forskjeller og likheter mellom filene."
+
+#: data/org.gnome.meld.gschema.xml:132
+msgid "Style of overview map"
+msgstr "Oversiktsstolpens stil"
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Style options for how the overview map is displayed."
+msgstr "Velg hvordan oversiktsstolpen skal vises."
+
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr "Hopp over tomme linjer når filer sammenlignes"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:140
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr "Velg for å fjerne tomme linjer når endringer mellom filene utheves."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
msgstr "Bruk systemets forvalgte redigeringsprogram"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:148
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -257,11 +255,11 @@ msgstr ""
"Fravelg for å bruke en tilpasset redigeringskommando istedenfor systemets "
"forvalgte redigeringsprogram når filer åpnes eksternt."
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: data/org.gnome.meld.gschema.xml:152
msgid "The custom editor launch command"
msgstr "Kommando som starter det selvvalgte redigeringsprogrammet"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:153
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -269,22 +267,22 @@ msgstr ""
"Kommandoen som starter det selvvalgte redigeringsprogrammet. Symbolene "
"«{file}» og «{line}» vil erstattes med riktig verdi."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Vis disse kolonnene"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr ""
"Liste med kolonnenavn i mappesammenligninger og hvorvidt de skal vises."
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Ignorer symbolske lenker"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:165
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -292,11 +290,11 @@ msgstr ""
"Velg for å ikke følge symbolske lenker når mappetreet gjennomsøkes i "
"mappesammenligninger."
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Bruk grunn sammenligning"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:170
msgid ""
"If true, folder comparisons compare files based solely on size and mtime, "
"considering files to be identical if their size and mtime match, and "
@@ -305,11 +303,11 @@ msgstr ""
"Velg for å sjekke kun størrelse og «mtime» når mapper sammenlignes. Filer er "
"like hvis størrelse og «mtime» er like, ellers er de forskjellige."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:174
msgid "File timestamp resolution"
msgstr "Oppløsning til filenes tidsstempler"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:175
msgid ""
"When comparing based on mtime, this is the minimum difference in nanoseconds "
"between two files before they’re considered to have different mtimes. This "
@@ -321,11 +319,11 @@ msgstr ""
"Dette er nyttig når en sammenligner filer mellom filsystemer som har ulik "
"oppløsning for tidsstempel."
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr "Bruk tekstfiltre når mapper sammenlignes"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:180
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -335,21 +333,21 @@ msgstr ""
"aktive tekstfiltre, b) fjerne tomme linjer og c) se bort fra forskjell i "
"linjeavslutninger."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Filtre for filstatus"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:185
msgid "List of statuses used to filter visible files in folder comparison."
msgstr ""
"Liste med statuser som brukes til å filtrere synlige filer når mapper "
"sammenlignes."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:191
msgid "Show the version control console output"
msgstr "Vis versjonskontrollens konsollutdata"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:192
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -357,11 +355,11 @@ msgstr ""
"Hvis sann så vil konsollutdata vises i versjonskontrollmodus. Her vil "
"kommandoene som kjøres for versjonskontrollering vises."
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:196
msgid "Version control pane position"
msgstr "Posisjonen til versjonskontrollruta"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:197
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -369,11 +367,11 @@ msgstr ""
"Dette er høyden til hovedtreet for versjonskontrollering når konsollruta "
"vises."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:201
msgid "Present version comparisons as left-local/right-remote"
msgstr "Vis versjonssammenligninger som venstre-lokal/høyre-ekstern"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:202
msgid ""
"If true, version control comparisons will use a left-is-local, right-is-"
"remote scheme to determine what order to present files in panes. Otherwise, "
@@ -383,11 +381,11 @@ msgstr ""
"er-lokal og høyre-er-ekstern. Ellers vil rekkefølgen være venstre-er deres, "
"høyre-er-mitt."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:206
msgid "Order for files in three-way version control merge comparisons"
msgstr "Filrekkefølge i flettesammenligninger i treveis-versjonskontrollering"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:207
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -398,11 +396,11 @@ msgstr ""
"fra versjonskontrollvisningen, så den brukes kun til sammenfletting/"
"konfliktløsing i Meld."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:211
msgid "Show margin in commit message editor"
msgstr "Vis margen i redigeringsboksen for innleggingsmeldinger"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:212
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -410,11 +408,11 @@ msgstr ""
"Hvis sann så vil en hjelpelinje vise i hvilken kolonne margen er i "
"redigeringsboksen for innleggingsmeldinger til versjonskontrollen."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:216
msgid "Margin column in commit message editor"
msgstr "Margkolonne i redigeringsboks for innleggingsmeldinger"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -422,11 +420,11 @@ msgstr ""
"Den kolonnen som margen skal vises i redigeringsboksen til "
"innleggingsmeldinger."
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "Bryt automatisk tekst i innleggingsmeldinger"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:222
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -434,22 +432,22 @@ msgstr ""
"Hvis sann så vil redigeringsboksen til innleggingsmeldinger sette inn "
"linjeskift i margen før innlegging."
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Statusfiltre til versjonskontroll"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:227
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
"En liste med statuser som brukes til å filtrere synlige filer i "
"versjonskontrollsammenligninger."
-#: ../data/org.gnome.meld.gschema.xml.h:65
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Filnavnbaserte filtre"
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: data/org.gnome.meld.gschema.xml:242
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -457,11 +455,11 @@ msgstr ""
"En liste med forhåndsvalgte filnavnbaserte filtre. Hvis de slås på så vil de "
"fjerne samsvarende filer fra en mappesammenligning."
-#: ../data/org.gnome.meld.gschema.xml.h:67
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Tekstbaserte filtre"
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: data/org.gnome.meld.gschema.xml:257
msgid ""
"List of predefined text-based regex filters that, if active, will remove "
"text from being used in a file comparison. The text will still be displayed, "
@@ -471,413 +469,611 @@ msgstr ""
"vil de utelate tekst fra filsammenligninger. Teksten vil fortsatt vises, men "
"vil ikke bidra til selve sammenligningen."
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Meld grunnleggende skjema"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Klassisk (Meld)"
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Grunnleggende fargeskjema for Melds uthevinger"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Meld mørkt skjema"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Mørkt fargeskjema for Melds uthevinger"
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "Om Meld"
+#: meld/resources/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generelt"
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Opphavsrett © 2002-2009 Stephen Kennedy\n"
-"Opphavsrett © 2009-2017 Kai Willadsen"
+#: meld/resources/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Ny sammenligning"
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Nettside"
+#: meld/resources/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Lukk en sammenligning"
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Kjartan Maraas <kmaraas gnome org> 2001-2012\n"
-"Kjell Cato Heskjestad <cato heskjestad xyz> 2019"
+#: meld/resources/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Avslutt Meld"
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "_Innstillinger"
+#: meld/resources/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Stopp gjeldende handling"
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "_Hjelp"
+#: meld/resources/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Oppdater sammenligningen"
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "Hurtigtaster"
+#: meld/resources/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Fullskjerm"
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "_Om"
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Ruter"
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "_Avslutt"
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Forrige sammenligningsrute"
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Sammenlign"
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Neste sammenligningsrute"
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Sammenlign valgte filer"
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Endringer"
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Fold sammen rekursivt"
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Gå til forrige endring"
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "Fold sammen valgt mappe og alle undermapper"
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Gå til neste endring"
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Fold ut rekursivt"
+#: meld/resources/gtk/help-overlay.ui:105
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Faner"
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "Fold ut valgt mappe og alle undermapper"
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Gå til forrige fane"
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Kopier til _venstre"
+#: meld/resources/gtk/help-overlay.ui:117
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Gå til neste fane"
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "Kopier til venstre"
+#: meld/resources/gtk/help-overlay.ui:124
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Bytt til fane"
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Kopier til _høyre"
+#: meld/resources/gtk/help-overlay.ui:131
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Flytt fane til venstre"
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "Kopier til høyre"
+#: meld/resources/gtk/help-overlay.ui:138
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Flytt fane til høyre"
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "Slett valgte"
+#: meld/resources/gtk/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redigering"
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:912 ../meld/filediff.py:1499
-msgid "Hide"
-msgstr "Skjul"
+#: meld/resources/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Angre"
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Skjul valgte"
+#: meld/resources/gtk/help-overlay.ui:159
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Gjør om"
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Ikke skill store/små bokstaver i filnavn"
+#: meld/resources/gtk/help-overlay.ui:166
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Klipp ut"
-#: ../data/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Betrakt filnavn med ulik bokstavstørrelse som ellers er identiske som samme "
-"fil"
+#: meld/resources/gtk/help-overlay.ui:173
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopier"
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Samme"
+#: meld/resources/gtk/help-overlay.ui:180
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Lim inn"
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Vis identiske"
+#: meld/resources/gtk/help-overlay.ui:187
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Søk"
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Ny"
+#: meld/resources/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Finn neste"
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Vis ny"
+#: meld/resources/gtk/help-overlay.ui:201
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Finn forrige"
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Endret"
+#: meld/resources/gtk/help-overlay.ui:208
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Erstatt"
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Vis endret"
+#: meld/resources/gtk/help-overlay.ui:217
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Sammenligning av filer"
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtre"
+#: meld/resources/gtk/help-overlay.ui:222
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Lagre gjeldende fil"
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Sett aktive filtre"
+#: meld/resources/gtk/help-overlay.ui:229
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Lagre gjeldende fil til ny sti"
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Redigerbar liste"
+#: meld/resources/gtk/help-overlay.ui:236
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Lagre alle filer i sammenligning"
-#: ../data/ui/EditableList.ui.h:2
-msgid "Active"
-msgstr "Aktiv"
+#: meld/resources/gtk/help-overlay.ui:243
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Forrige konflikt"
-#: ../data/ui/EditableList.ui.h:3
-msgid "Column Name"
-msgstr "Kolonnenavn"
+#: meld/resources/gtk/help-overlay.ui:250
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Neste konflikt"
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "_Legg til"
+#: meld/resources/gtk/help-overlay.ui:257
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Dytt endringen til venstre"
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
-msgid "_Remove"
-msgstr "Fje_rn"
+#: meld/resources/gtk/help-overlay.ui:264
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Dytt endringen til høyre"
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item up"
-msgstr "Flytt oppføring opp"
+#: meld/resources/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Dra endring fra venstre"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Move _Up"
-msgstr "Flytt _opp"
+#: meld/resources/gtk/help-overlay.ui:278
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Dra endring fra høyre"
-#: ../data/ui/EditableList.ui.h:8
-msgid "Move item down"
-msgstr "Flytt oppføring ned"
+#: meld/resources/gtk/help-overlay.ui:285
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopier endringen ovenfor til venstre"
-#: ../data/ui/EditableList.ui.h:9
-msgid "Move _Down"
-msgstr "Flytt ne_d"
+#: meld/resources/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopier endringen nedenfor til venstre"
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:412
-msgid "Name"
-msgstr "Navn"
+#: meld/resources/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopier endringen ovenfor til høyre"
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Mønster"
+#: meld/resources/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopier endringen nedenfor til høyre"
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Legg til nytt filter"
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Slett endring"
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Fjern valgt filter"
+#: meld/resources/gtk/help-overlay.ui:322
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Sammenligning av mapper"
-#: ../data/ui/encoding-selector.ui.h:1
-msgid "Search text encoding…"
-msgstr "Søk etter tegnkoding …"
+#: meld/resources/gtk/help-overlay.ui:327
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopier til venstre"
-#: ../data/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Formater som endringsfil …"
+#: meld/resources/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopier til høyre"
-#: ../data/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Lag en endringsfil ut fra forskjellene mellom filene"
+#: meld/resources/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Sammenligning av versjoner"
-#: ../data/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "Lagre _alle"
+#: meld/resources/gtk/help-overlay.ui:355
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Legg inn til versjonskontroll"
-#: ../data/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "Lagre alle filer i gjeldende sammenligning"
+#: meld/resources/gtk/help-overlay.ui:362
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Vis/skjul konsollutdata"
-#: ../data/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Tilbakestill filer til lagret versjon"
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Oppdater"
-#: ../data/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Legg til synkroniseringspunkt"
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Stopp"
-#: ../data/ui/filediff.ui.h:7
-msgid "Add a synchronization point for changes between files"
-msgstr "Legg til et synkroniseringspunkt for endringer mellom filer"
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Fullskjerm"
-#: ../data/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Tøm synkroniseringspunkt"
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Lagre som …"
-#: ../data/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "Tøm synkroniseringspunkt for endringer mellom filer"
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Lagre _alle"
-#: ../data/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Forrige konflikt"
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Gjenopprett filer …"
-#: ../data/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Gå til forrige konflikt"
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Åpne eksternt"
-#: ../data/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Neste konflikt"
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Søk …"
-#: ../data/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Gå til neste konflikt"
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Erstatt …"
-#: ../data/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Dytt til venstre"
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Vis"
-#: ../data/ui/filediff.ui.h:15
-msgid "Push current change to the left"
-msgstr "Dytt gjeldende endring til venstre"
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Oversiktsstolpe"
-#: ../data/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Dytt til høyre"
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Versjonskontroll-konsoll"
-#: ../data/ui/filediff.ui.h:17
-msgid "Push current change to the right"
-msgstr "Dytt gjeldende endring til høyre"
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Lås rulling"
-#: ../data/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Dra fra venstre"
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Sammenligning"
-#: ../data/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Dra endring fra venstre"
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Flett alle fra venstre"
-#: ../data/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Dra fra høyre"
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Flett alle fra høyre"
-#: ../data/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Dra endring fra høyre"
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Flett alle"
-#: ../data/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Kopier over til venstre"
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "Legg til synkroniseringspunkt"
-#: ../data/ui/filediff.ui.h:23
-msgid "Copy change above the left chunk"
-msgstr "Kopier endring over det venstre stykket"
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "Tøm synkroniseringspunkt"
-#: ../data/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Kopier under til venstre"
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Formater som endringsfil …"
-#: ../data/ui/filediff.ui.h:25
-msgid "Copy change below the left chunk"
-msgstr "Kopier endring under det venstre stykket"
+#: meld/resources/gtk/menus.ui:112
+msgid "_Preferences"
+msgstr "_Innstillinger"
-#: ../data/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Kopier over til høyre"
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "Hurtigtaster"
-#: ../data/ui/filediff.ui.h:27
-msgid "Copy change above the right chunk"
-msgstr "Kopier endring over det høyre stykket"
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "_Hjelp"
-#: ../data/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Kopier under til høyre"
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "_Om Meld"
-#: ../data/ui/filediff.ui.h:29
-msgid "Copy change below the right chunk"
-msgstr "Kopier endring under det høyre stykket"
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Filstatus"
-#: ../data/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Slett"
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Samme"
-#: ../data/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Slett endring"
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Ny"
-#: ../data/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Flett alle fra venstre"
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Endret"
-#: ../data/ui/filediff.ui.h:33
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Flett alle endringer uten konflikter fra venstre"
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Ikke skill store/små bokstaver i filnavn"
-#: ../data/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Flett alle fra høyre"
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "Normal"
-#: ../data/ui/filediff.ui.h:35
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Flett alle endringer uten konflikter fra høyre"
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Ikke versjonert"
-#: ../data/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Flett alle"
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Ignorert"
+
+#: meld/resources/gtk/menus.ui:186
+msgid "Flatten folders"
+msgstr "Forflat mapper"
+
+#: meld/resources/ui/about-dialog.ui:8
+msgid "About Meld"
+msgstr "Om Meld"
+
+#: meld/resources/ui/about-dialog.ui:12
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Opphavsrett © 2002-2009 Stephen Kennedy\n"
+"Opphavsrett © 2009-2017 Kai Willadsen"
-#: ../data/ui/filediff.ui.h:37
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Flett alle endringer uten konflikter fra venstre og høyre paneler"
+#: meld/resources/ui/about-dialog.ui:15
+msgid "Website"
+msgstr "Nettside"
-#: ../data/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Forrige rute"
+#: meld/resources/ui/about-dialog.ui:19
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas gnome org> 2001-2012\n"
+"Kjell Cato Heskjestad <cato heskjestad xyz> 2019"
-#: ../data/ui/filediff.ui.h:39
-msgid "Move keyboard focus to the previous document in this comparison"
-msgstr "Flytt tastaturfokus til forrige dokument i denne sammenligningen"
+#: meld/resources/ui/appwindow.ui:30
+msgid "Start a new comparison"
+msgstr "Start en ny sammenligning"
-#: ../data/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Neste rute"
+#: meld/resources/ui/appwindow.ui:46
+msgid "Open a recent comparison"
+msgstr "Åpne en nylig sammenligning"
-#: ../data/ui/filediff.ui.h:41
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Flytt tastaturfokus til neste dokument i denne sammenligningen"
+#: meld/resources/ui/appwindow.ui:74
+msgid "Go to the previous change"
+msgstr "Gå til forrige endring"
-#: ../data/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Lås rulling"
+#: meld/resources/ui/appwindow.ui:94
+msgid "Go to the next change"
+msgstr "Gå til neste endring"
-#: ../data/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Lås rulling av alle panelene"
+#: meld/resources/ui/appwindow.ui:124
+msgid "Go to the previous conflict"
+msgstr "Gå til forrige konflikt"
-#: ../data/ui/filediff.ui.h:44
-msgid "Save changes to documents before closing?"
-msgstr "Lagre endringer i dokumentene før avslutning?"
+#: meld/resources/ui/appwindow.ui:144
+msgid "Go to the next conflict"
+msgstr "Gå til neste konflikt"
-#: ../data/ui/filediff.ui.h:45
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "Hvis du ikke lagrer så vil endringene gå tapt."
+#: meld/resources/ui/appwindow.ui:192
+msgid "Version Filters"
+msgstr "Versjonsfiltre"
-#: ../data/ui/filediff.ui.h:46
-msgid "Close _without Saving"
-msgstr "Lukk _uten å lagre"
+#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "Filfiltre"
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:993 ../meld/iohelpers.py:56
-#: ../meld/iohelpers.py:106
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "Tekstfiltre"
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "_Lagre"
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
+msgid "Active"
+msgstr "Aktiv"
+
+#: meld/resources/ui/column-list.ui:50
+msgid "Column Name"
+msgstr "Kolonnenavn"
+
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
+msgid "Move item up"
+msgstr "Flytt oppføring opp"
+
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
+msgid "Move _Up"
+msgstr "Flytt _opp"
+
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
+msgid "Move item down"
+msgstr "Flytt oppføring ned"
+
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
+msgid "Move _Down"
+msgstr "Flytt ne_d"
+
+#: meld/resources/ui/commit-dialog.ui:8
+msgid "Commit"
+msgstr "Legg inn"
+
+#: meld/resources/ui/commit-dialog.ui:36
+msgid "Commit Files"
+msgstr "Legg inn filer"
+
+#: meld/resources/ui/commit-dialog.ui:117
+msgid "Log Message"
+msgstr "Loggmelding"
-#: ../data/ui/filediff.ui.h:49
+#: meld/resources/ui/commit-dialog.ui:181
+msgid "Previous logs:"
+msgstr "Forrige logger:"
+
+#: meld/resources/ui/commit-dialog.ui:259
+msgid "Co_mmit"
+msgstr "_Legg inn"
+
+#: meld/resources/ui/dirdiff-actions.ui:20
+msgid "Copy to left"
+msgstr "Kopier til venstre"
+
+#: meld/resources/ui/dirdiff-actions.ui:42
+msgid "Copy to right"
+msgstr "Kopier til høyre"
+
+#: meld/resources/ui/dirdiff-actions.ui:66
+msgid "Delete selected"
+msgstr "Slett valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:7
+msgid "_Compare selected files"
+msgstr "_Sammenlign valgte filer"
+
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "Copy to _left"
+msgstr "Kopier til _venstre"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "Kopier til _høyre"
+
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "_Slett valgte"
+
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Fold sammen rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Fold ut rekursivt"
+
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "Åpne e_ksternt"
+
+#: meld/resources/ui/encoding-selector.ui:31
+msgid "Search text encoding…"
+msgstr "Søk etter tegnkoding …"
+
+#: meld/resources/ui/filediff-actions.ui:20
+msgid "Push current change to the left"
+msgstr "Dytt gjeldende endring til venstre"
+
+#: meld/resources/ui/filediff-actions.ui:42
+msgid "Push current change to the right"
+msgstr "Dytt gjeldende endring til høyre"
+
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "Kopier stykker"
+
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Slett endring"
+
+#: meld/resources/ui/filediff-menus.ui:7
+msgid "Copy change above the left chunk"
+msgstr "Kopier endring over det venstre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:11
+msgid "Copy change below the left chunk"
+msgstr "Kopier endring under det venstre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:15
+msgid "Copy change above the right chunk"
+msgstr "Kopier endring over det høyre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:19
+msgid "Copy change below the right chunk"
+msgstr "Kopier endring under det høyre stykket"
+
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "_Angre"
+
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "_Gjør om"
+
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Kopier"
+
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "_Lim inn"
+
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:99
+#: meld/resources/ui/filediff.ui:165
msgid ""
"This file can not be written to. You may click here to unlock this file and "
"make changes anyway, but these changes must be saved to a new file."
@@ -885,237 +1081,310 @@ msgstr ""
"Kan ikke skrive til fila. Du kan klikke her for å låse opp fila og endre den "
"likevel, men disse endringene må lagres til en ny fil."
-#: ../data/ui/filediff.ui.h:50
+#: meld/resources/ui/filediff.ui:71
msgid "File 3"
msgstr "Fil 3"
-#: ../data/ui/filediff.ui.h:51
+#: meld/resources/ui/filediff.ui:137
msgid "File 2"
msgstr "Fil 2"
-#: ../data/ui/filediff.ui.h:52
+#: meld/resources/ui/filediff.ui:199
msgid "File 1"
msgstr "Fil 1"
-#: ../data/ui/filediff.ui.h:53
-msgid "Discard unsaved changes to documents?"
-msgstr "Forkast endringer i dokumentene som ikke er lagret?"
-
-#: ../data/ui/filediff.ui.h:54
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "Endringer i følgende dokumenter vil gå tapt:"
-
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:994 ../meld/iohelpers.py:107
-msgid "_Replace"
-msgstr "_Erstatt"
-
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Erstatt _alle"
+#. Create icon and filename CellRenderer
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:507
+msgid "Name"
+msgstr "Navn"
-#: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "Forri_ge"
+#: meld/resources/ui/filter-list.ui:68
+msgid "Pattern"
+msgstr "Mønster"
-#: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Neste"
+#: meld/resources/ui/filter-list.ui:110
+msgid "Add new filter"
+msgstr "Legg til nytt filter"
-#: ../data/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Søk:"
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+msgid "_Add"
+msgstr "_Legg til"
-#: ../data/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Erstatt _med:"
+#: meld/resources/ui/filter-list.ui:126
+msgid "Remove selected filter"
+msgstr "Fjern valgt filter"
-#: ../data/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "Skill store og sm_å bokstaver"
-#: ../data/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "_Hele ord"
-#: ../data/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "Regul_ært uttrykk"
-#: ../data/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Søk rundt"
-#: ../data/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Erstatt _alle"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1040 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "_Erstatt"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Bytt mellom «søk» og «søk og erstatt»"
+
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Modus for søkeutheving …"
-#: ../data/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:338
+#: meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "Ny sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:72
+msgid "File"
+msgstr "Fil"
+
+#: meld/resources/ui/new-diff-tab.ui:121
+msgid "Folder"
+msgstr "Mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:170
+msgid "Version control"
+msgstr "Versjonskontroll"
+
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+msgid "_3-way comparison"
+msgstr "_3-veis sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:254
+msgid "Select First File"
+msgstr "Velg første fil"
+
+#: meld/resources/ui/new-diff-tab.ui:267
+msgid "Select Second File"
+msgstr "Velg andre fil"
+
+#: meld/resources/ui/new-diff-tab.ui:281
+msgid "Select Third File"
+msgstr "Velg tredje fil"
+
+#: meld/resources/ui/new-diff-tab.ui:316
+msgid "Select First Folder"
+msgstr "Velg første mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:329
+msgid "Select Second Folder"
+msgstr "Velg andre mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:343
+msgid "Select Third Folder"
+msgstr "Velg tredje mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:393
+msgid "Select A Version-Controlled Folder"
+msgstr "Velg en versjonskontrollert mappe"
+
+#: meld/resources/ui/new-diff-tab.ui:442
+msgid "_Blank comparison"
+msgstr "_Blank sammenligning"
+
+#: meld/resources/ui/new-diff-tab.ui:459
+msgid "C_ompare"
+msgstr "_Sammenlign"
+
+#: meld/resources/ui/notebook-label.ui:24
+msgid "Close Tab"
+msgstr "Lukk fane"
+
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Formater som endringsfil"
-#: ../data/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Kopier til utklippstavlen"
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Lagre endringsfil"
-#: ../data/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Bruk forskjeller mellom:"
-#: ../data/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Venstre og midtre rute"
-#: ../data/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Midtre og høyre rute"
-#: ../data/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "_Motsatt endringsretning"
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Brukervalg for Meld"
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
+msgid "Preferences"
+msgstr "Innstillinger"
-#: ../data/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Skrift"
-#: ../data/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "Br_uk systemets skrift med fast bredde"
-#: ../data/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "Skrift for r_edigering:"
-#: ../data/ui/preferences.ui.h:5
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
msgid "Display"
msgstr "Visning"
-#: ../data/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "_Tabulatorbredde:"
-#: ../data/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "Sett _inn mellomrom i stedet for tabulator"
-#: ../data/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Slå på tekst_bryting"
-#: ../data/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Ikke _del ord over to linjer"
-#: ../data/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "_Uthev gjeldende linje"
-#: ../data/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Vis _linjenummer"
-#: ../data/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Vis bla_nktegn"
-#: ../data/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Slå på utheving av s_yntaks"
-#: ../data/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Fargeskjema for syntaksmerking:"
-#: ../data/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+msgid "Code Overview"
+msgstr "Kodeoversikt"
+
+#: meld/resources/ui/preferences.ui:506
+msgid "Show overview map"
+msgstr "Vis oversiktsstolpe"
+
+#: meld/resources/ui/preferences.ui:529
+msgid "Overview map style:"
+msgstr "Oversiktsstolpens stil:"
+
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Eksternt redigeringsprogram"
-#: ../data/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
msgstr "Bruk systemets _forvalgte redigeringsprogram"
-#: ../data/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "_Redigeringskommando:"
-#: ../data/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Redigeringsprogram"
-#: ../data/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Grunn sammenligning"
-#: ../data/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
msgid "C_ompare files based only on size and timestamp"
msgstr "_Sammenlign filer ut fra størrelse og tidsstempel"
-#: ../data/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "Oppløsning til _tidsstempel:"
-#: ../data/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
"Legg merke til at tekstfiltre kan gjøre sammenligning av store filer mye "
"treigere"
-#: ../data/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Symbolske lenker"
-#: ../data/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Synlige kolonner"
-#: ../data/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Sammenlign mapper"
-#: ../data/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Sammenlign versjoner"
-#: ../data/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
msgid "_Order when comparing file revisions:"
msgstr "_Rekkefølge når filrevisjoner sammenlignes:"
-#: ../data/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
msgid "Order when _merging files:"
msgstr "Rekkefølge når filer _flettes:"
-#: ../data/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Innleggingsmeldinger"
-#: ../data/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Vis høyre _marg i:"
-#: ../data/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
msgid "Automatically _break lines at right margin on commit"
msgstr "_Bryt automatisk linjer i høyre marg ved innlegging"
-#: ../data/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Versjonskontroll"
-#: ../data/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Filnavnfiltre"
-#: ../data/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1125,23 +1394,19 @@ msgstr ""
"Hvert mønster er en liste med jokertegn på skallskriptformat som skilles med "
"mellomrom."
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "Filfiltre"
-
-#: ../data/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
msgid "Change trimming"
msgstr "Endre beskjæring"
-#: ../data/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
msgid "Trim blank line differences from the start and end of changes"
msgstr "Beskjær tomme linjeforskjeller fra starten og slutten av endringer"
-#: ../data/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Tekstfiltre"
-#: ../data/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1154,544 +1419,262 @@ msgstr ""
"en tom streng før sammenligningen utføres. Hvis uttrykket inneholder grupper "
"så vil kun gruppene erstattes. Se brukerhåndboka for flere detaljer."
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Tekstfiltre"
-
-#: ../data/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Venstre er ekstern, høyre er lokal"
-#: ../data/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Venstre er lokal, høyre er ekstern"
-#: ../data/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+msgid "Simple change map"
+msgstr "Enkelt endringskart"
+
+#: meld/resources/ui/preferences.ui:1709
+msgid "Compact source map"
+msgstr "Lite kildekart"
+
+#: meld/resources/ui/preferences.ui:1713
+msgid "Full source map"
+msgstr "Stort kildekart"
+
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Ekstern, flett, lokal"
-#: ../data/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Lokal, flett, ekstern"
-#: ../data/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1 ns (ext4)"
-#: ../data/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100 ns (NTFS)"
-#: ../data/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1 s (ext2/ext3)"
-#: ../data/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
msgid "2s (VFAT)"
msgstr "2 s (VFAT)"
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Generelt"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Ny sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Lukk en sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Avslutt Meld"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Stopp gjeldende handling"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Oppdater sammenligningen"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Fullskjerm"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Faner"
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Gå til forrige fane"
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Gå til neste fane"
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Bytt til fane"
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Flytt fane til venstre"
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Flytt fane til høyre"
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Endringer"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Gå til forrige endring"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Gå til neste endring"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Redigering"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Angre"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Gjør om"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Kopier"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Lim inn"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Søk"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Finn neste"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Finn forrige"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Erstatt"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Sammenligning av filer"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Lagre gjeldende fil"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Lagre gjeldende fil til ny sti"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Lagre alle filer i sammenligning"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Forrige konflikt"
-
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Neste konflikt"
-
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Dytt endringen til venstre"
-
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Dytt endringen til høyre"
-
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Dra endring fra venstre"
-
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Dra endring fra høyre"
-
-#: ../data/ui/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Kopier endringen ovenfor til venstre"
-
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Kopier endringen nedenfor til venstre"
-
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Kopier endringen ovenfor til høyre"
-
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Kopier endringen nedenfor til høyre"
-
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Slett endring"
-
-#: ../data/ui/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Forrige sammenligningsrute"
-
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Neste sammenligningsrute"
-
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Sammenligning av mapper"
-
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Kopier til venstre"
-
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Kopier til høyre"
-
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Sammenligning av versjoner"
-
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Legg inn til versjonskontroll"
-
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Vis/skjul konsollutdata"
-
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Ny sammenligning"
+#: meld/resources/ui/push-dialog.ui:9
+msgid "Push local commits to remote?"
+msgstr "Dytt lokale innlegginger eksternt?"
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Sammenligning av filer"
+#: meld/resources/ui/push-dialog.ui:10
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Versjonskontrollsystemet bestemmer hvilke innlegginger som skal dyttes."
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Sammenligning av mapper"
+#: meld/resources/ui/push-dialog.ui:38
+msgid "_Push commits"
+msgstr "_Dytt innlegginger"
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Versjonskontroll-visning"
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "Søk nylige sammenligninger …"
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_3-veis sammenligning"
+#: meld/resources/ui/revert-dialog.ui:9
+msgid "Discard unsaved changes to documents?"
+msgstr "Forkast endringer i dokumentene som ikke er lagret?"
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Velg tredje fil"
+#: meld/resources/ui/revert-dialog.ui:10
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "Endringer i følgende dokumenter vil gå tapt:"
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Velg andre fil"
+#: meld/resources/ui/revert-dialog.ui:39
+msgid "_Discard"
+msgstr "_Forkast"
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Velg første fil"
+#: meld/resources/ui/save-confirm-dialog.ui:9
+msgid "Save changes to documents before closing?"
+msgstr "Lagre endringer i dokumentene før avslutning?"
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Velg første mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:10
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer så vil endringene gå tapt."
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Velg andre mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:24
+msgid "Close _without Saving"
+msgstr "Lukk _uten å lagre"
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Velg tredje mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1039
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
+msgid "_Cancel"
+msgstr "_Avbryt"
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Velg en versjonskontrollert mappe"
+#: meld/resources/ui/save-confirm-dialog.ui:52
+msgid "_Save"
+msgstr "_Lagre"
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "_Blank sammenligning"
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "Vis blanktegn"
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "_Sammenlign"
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "Tekstbryting"
-#: ../data/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Sammenligne"
+
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "_Legg inn …"
-#: ../data/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "_Oppdater"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "_Tilbakestill"
+
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "Slett"
+
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "_Merk som løst"
+
+#: meld/resources/ui/vcview.ui:73
+msgid "Commit…"
+msgstr "Legg inn …"
+
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Legg inn endringer til versjonskontroll"
-#: ../data/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "_Oppdater"
+#: meld/resources/ui/vcview.ui:86
+msgid "Update"
+msgstr "Oppdater"
-#: ../data/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
msgid "Update working copy from version control"
msgstr "Oppdater arbeidskopi fra versjonskontroll"
-#: ../data/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Dytt"
+#: meld/resources/ui/vcview.ui:99
+msgid "Push"
+msgstr "Dytt"
-#: ../data/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
msgstr "Dytt lokale endringer til ekstern"
-#: ../data/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:112
+msgid "Add"
+msgstr "Legg til"
+
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Legg til versjonskontroll"
-#: ../data/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:125
+msgid "Remove"
+msgstr "Fjern"
+
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Fjern fra versjonskontroll"
-#: ../data/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "_Merk som løst"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "Merk som løst"
-#: ../data/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Merk som løst i versjonskontroll"
-#: ../data/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "_Tilbakestill"
+#: meld/resources/ui/vcview.ui:151
+msgid "Revert"
+msgstr "Tilbakestill"
-#: ../data/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Tilbakestill arbeidskopien til opprinnelig tilstand"
-#: ../data/ui/vcview.ui.h:17
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Slett fra arbeidskopi"
-#: ../data/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Konsoll"
-
-#: ../data/ui/vcview.ui.h:19
-msgid "Show or hide the version control console output pane"
-msgstr "Vis eller skjul rute med versjonskontrollens konsollutdata"
-
-#: ../data/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Forflat"
-
-#: ../data/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Forflat mapper"
-
-#: ../data/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Endret"
-
-#: ../data/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Vis endrede filer"
-
-#: ../data/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../data/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Vis normale filer"
-
-#: ../data/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "_Ikke versjonert"
-
-#: ../data/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Vis filer som ikke er versjonerte"
-
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
-msgid "Ignored"
-msgstr "Ignorert"
-
-#: ../data/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Vis ignorerte filer"
-
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Legg inn"
-
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Legg inn filer"
-
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Loggmelding"
-
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Forrige logger:"
-
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "_Legg inn"
-
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
msgid "Location"
msgstr "Plassering"
-#: ../data/ui/vcview.ui.h:37
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Status"
-#: ../data/ui/vcview.ui.h:38
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Ekstra"
-#: ../data/ui/vcview.ui.h:39
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Konsollutdata"
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "Dytt lokale innlegginger eksternt?"
-
-#: ../data/ui/vcview.ui.h:41
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
-"Versjonskontrollsystemet bestemmer hvilke innlegginger som skal dyttes."
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Kopier _opp"
-#: ../data/ui/vcview.ui.h:42
-msgid "_Push commits"
-msgstr "_Dytt innlegginger"
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Kopier _ned"
-#: ../meld/const.py:12
+#: meld/const.py:25
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: meld/const.py:26
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: meld/const.py:27
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:433 ../meld/preferences.py:81
+#: meld/dirdiff.py:528 meld/preferences.py:132
msgid "Size"
msgstr "Størrelse"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:441 ../meld/preferences.py:82
+#: meld/dirdiff.py:536 meld/preferences.py:133
msgid "Modification time"
msgstr "Endringstid"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:449 ../meld/preferences.py:83
+#: meld/dirdiff.py:544 meld/preferences.py:134
msgid "Permissions"
msgstr "Rettigheter"
-#: ../meld/dirdiff.py:580
-#, python-format
-msgid "Hide %s"
-msgstr "Skjul %s"
-
-#: ../meld/dirdiff.py:721 ../meld/dirdiff.py:744
+#: meld/dirdiff.py:767 meld/dirdiff.py:790
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Leter gjennom %s"
-#: ../meld/dirdiff.py:879
+#: meld/dirdiff.py:926
#, python-format
msgid "[%s] Done"
msgstr "[%s] Ferdig"
-#: ../meld/dirdiff.py:887
+#: meld/dirdiff.py:933
msgid "Folders have no differences"
msgstr "Mappene er ikke forskjellige"
-#: ../meld/dirdiff.py:889
+#: meld/dirdiff.py:935
msgid "Contents of scanned files in folders are identical."
msgstr "Innholdet i de gjennomsøkte filene i mappene er likt."
-#: ../meld/dirdiff.py:891
+#: meld/dirdiff.py:937
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1699,39 +1682,43 @@ msgstr ""
"De gjennomsøkte filene i mappene fremstår som identiske, men selve innholdet "
"er ikke gjennomsøkt."
-#: ../meld/dirdiff.py:894
+#: meld/dirdiff.py:940
msgid "File filters are in use, so not all files have been scanned."
msgstr "Filfiltre er i bruk, så ikke alle filer er gjennomsøkte."
-#: ../meld/dirdiff.py:896
+#: meld/dirdiff.py:942
msgid "Text filters are in use and may be masking content differences."
msgstr "Tekstfiltre er i bruk og kan skjule forskjeller i innholdet."
-#: ../meld/dirdiff.py:914 ../meld/filediff.py:1501 ../meld/filediff.py:1531
-#: ../meld/filediff.py:1533 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:958 meld/filediff.py:1758
+msgid "Hide"
+msgstr "Skjul"
+
+#: meld/dirdiff.py:960 meld/filediff.py:1760 meld/filediff.py:1790
+#: meld/filediff.py:1792 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "_Skjul"
-#: ../meld/dirdiff.py:923
+#: meld/dirdiff.py:969
msgid "Multiple errors occurred while scanning this folder"
msgstr "Det oppstod flere feil mens mappen ble gjennomsøkt"
-#: ../meld/dirdiff.py:924
+#: meld/dirdiff.py:970
msgid "Files with invalid encodings found"
msgstr "Fant filer med ugyldig tegnkoding"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:926
+#: meld/dirdiff.py:972
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "Noen filer har ugyldig tegnkoding. Filnavnene er noe sånt som:"
-#: ../meld/dirdiff.py:928
+#: meld/dirdiff.py:974
msgid "Files hidden by case insensitive comparison"
msgstr ""
"Filer som skjules av sammenligning som ikke skiller store/små bokstaver"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:930
+#: meld/dirdiff.py:976
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1739,17 +1726,17 @@ msgstr ""
"Du kjører en sammenligning som ikke skiller store/små bokstaver på et "
"filsystem som gjør det. De følgende filene i mappa er skjult:"
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:987
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "«%s» skjules av «%s»"
-#: ../meld/dirdiff.py:997
+#: meld/dirdiff.py:1043
#, python-format
msgid "Replace folder “%s”?"
msgstr "Erstatt mappen «%s»?"
-#: ../meld/dirdiff.py:999
+#: meld/dirdiff.py:1045
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1758,11 +1745,11 @@ msgstr ""
"Det finnes allerede en mappe med dette navnet i «%s».\n"
"Hvis du erstatter denne mappen så vil alle filene i den slettes."
-#: ../meld/dirdiff.py:1012
+#: meld/dirdiff.py:1058
msgid "Error copying file"
msgstr "Klarte ikke kopiere fil"
-#: ../meld/dirdiff.py:1013
+#: meld/dirdiff.py:1059
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1775,19 +1762,19 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1038 ../meld/vcview.py:703
+#: meld/dirdiff.py:1084 meld/vcview.py:758
msgid "Error deleting {}"
msgstr "Klarte ikke slette {}"
-#: ../meld/dirdiff.py:1549
+#: meld/dirdiff.py:1563
msgid "No folder"
msgstr "Ingen mappe"
-#: ../meld/filediff.py:836
+#: meld/filediff.py:1068
msgid "Comparison results will be inaccurate"
msgstr "Sammenligningsresultatene vil være unøyaktige"
-#: ../meld/filediff.py:838
+#: meld/filediff.py:1070
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1795,64 +1782,64 @@ msgstr ""
"Et filter endret antall linjer i fila, dette støttes ikke. Sammenligningen "
"vil være unøyaktig."
-#: ../meld/filediff.py:907
+#: meld/filediff.py:1142
msgid "Mark conflict as resolved?"
msgstr "Merk konflikten som løst?"
-#: ../meld/filediff.py:909
+#: meld/filediff.py:1144
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr "Du kan nå merke konflikten som løst dersom den er ordnet."
-#: ../meld/filediff.py:911
+#: meld/filediff.py:1146
msgid "Cancel"
msgstr "Avbryt"
-#: ../meld/filediff.py:912
+#: meld/filediff.py:1147
msgid "Mark _Resolved"
msgstr "Merk som l_øst"
-#: ../meld/filediff.py:1216
+#: meld/filediff.py:1466
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Klarte ikke åpne fila «%s»."
-#: ../meld/filediff.py:1224
+#: meld/filediff.py:1474
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Fila %s er tilsynelatende en binær fil."
-#: ../meld/filediff.py:1226
+#: meld/filediff.py:1476
msgid "Do you want to open the file using the default application?"
msgstr "Vil du åpne fila med standardprogrammet?"
-#: ../meld/filediff.py:1228
+#: meld/filediff.py:1478
msgid "Open"
msgstr "Åpne"
-#: ../meld/filediff.py:1244
+#: meld/filediff.py:1494
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beregner forskjeller"
-#: ../meld/filediff.py:1305
+#: meld/filediff.py:1553
#, python-format
msgid "File %s has changed on disk"
msgstr "Fila %s er endret på disken"
-#: ../meld/filediff.py:1306
+#: meld/filediff.py:1554
msgid "Do you want to reload the file?"
msgstr "Vil du laste fila på nytt?"
-#: ../meld/filediff.py:1308
+#: meld/filediff.py:1556
msgid "_Reload"
msgstr "_Last på nytt"
-#: ../meld/filediff.py:1464
+#: meld/filediff.py:1723
msgid "Files are identical"
msgstr "Filene er identiske"
-#: ../meld/filediff.py:1477
+#: meld/filediff.py:1736
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1860,11 +1847,11 @@ msgstr ""
"Tekstfiltre er i bruk og kan skjule forskjeller mellom filene. Vil du "
"sammenligne de ufiltrerte filene?"
-#: ../meld/filediff.py:1482
+#: meld/filediff.py:1741
msgid "Files differ in line endings only"
msgstr "Filene har kun forskjellige linjeavslutninger"
-#: ../meld/filediff.py:1484
+#: meld/filediff.py:1743
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1873,15 +1860,15 @@ msgstr ""
"Filene er identiske, bortsett fra ulike linjeavslutninger:\n"
"%s"
-#: ../meld/filediff.py:1504
+#: meld/filediff.py:1763
msgid "Show without filters"
msgstr "Vis uten filtre"
-#: ../meld/filediff.py:1526
+#: meld/filediff.py:1785
msgid "Change highlighting incomplete"
msgstr "Fullførte ikke utheving av endringer"
-#: ../meld/filediff.py:1527
+#: meld/filediff.py:1786
msgid ""
"Some changes were not highlighted because they were too large. You can force "
"Meld to take longer to highlight larger changes, though this may be slow."
@@ -1889,19 +1876,19 @@ msgstr ""
"Noen endringer er ikke uthevet fordi de er for store. Du kan tvinge Meld til "
"å bruke mer tid til å utheve dem, men dette kan gå treigt."
-#: ../meld/filediff.py:1535
+#: meld/filediff.py:1794
msgid "Keep highlighting"
msgstr "Fortsett utheving"
-#: ../meld/filediff.py:1537
+#: meld/filediff.py:1796
msgid "_Keep highlighting"
msgstr "_Fortsett utheving"
-#: ../meld/filediff.py:1550
+#: meld/filediff.py:1809
msgid "Saving failed"
msgstr "Klarte ikke lagre"
-#: ../meld/filediff.py:1551
+#: meld/filediff.py:1810
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1909,36 +1896,36 @@ msgstr ""
"Vurder å kopiere viktige endringer til et annet program eller fil for å "
"unngå datatap."
-#: ../meld/filediff.py:1560
+#: meld/filediff.py:1819
msgid "Save Left Pane As"
msgstr "Lagre venstre rute som"
-#: ../meld/filediff.py:1562
+#: meld/filediff.py:1821
msgid "Save Middle Pane As"
msgstr "Lagre midtre rute som"
-#: ../meld/filediff.py:1564
+#: meld/filediff.py:1823
msgid "Save Right Pane As"
msgstr "Lagre høyre rute som"
-#: ../meld/filediff.py:1577
+#: meld/filediff.py:1834
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "Fila %s er blitt endret på disk etter at den ble åpnet"
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1836
msgid "If you save it, any external changes will be lost."
msgstr "Hvis du lagrer den så vil eksterne endringer gå tapt."
-#: ../meld/filediff.py:1582
+#: meld/filediff.py:1839
msgid "Save Anyway"
msgstr "Lagre likevel"
-#: ../meld/filediff.py:1583
+#: meld/filediff.py:1840
msgid "Don’t Save"
msgstr "Ikke lagre"
-#: ../meld/filediff.py:1625
+#: meld/filediff.py:1882
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -1946,7 +1933,7 @@ msgstr ""
"Fila «{}» inneholder tegn som ikke kan kodes med dens gjeldende tegnkoding "
"«{}»."
-#: ../meld/filediff.py:1629 ../meld/patchdialog.py:131
+#: meld/filediff.py:1886 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1955,16 +1942,20 @@ msgstr ""
"Klarte ikke lagre fila fordi:\n"
"%s"
-#: ../meld/filediff.py:1633 ../meld/patchdialog.py:130
+#: meld/filediff.py:1890 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Klarte ikke lagre fila %s."
-#: ../meld/filediff.py:2016
+#: meld/filediff.py:1951
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: meld/filediff.py:2295
msgid "Live comparison updating disabled"
msgstr "Sanntidsoppdatering av endringer er slått av"
-#: ../meld/filediff.py:2017
+#: meld/filediff.py:2296
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1975,45 +1966,37 @@ msgstr ""
"manuelt, og sanntidsoppdateringen vil fortsette når synkroniseringspunktene "
"er blitt tømt."
-#: ../meld/filemerge.py:37
+#: meld/filemerge.py:37
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Fletter filer"
-#: ../meld/gutterrendererchunk.py:216
-msgid "Copy _up"
-msgstr "Kopier _opp"
-
-#: ../meld/gutterrendererchunk.py:217
-msgid "Copy _down"
-msgstr "Kopier _ned"
-
-#: ../meld/iohelpers.py:41
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr "Eksterne mapper kan ikke slettes"
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Ikke en fil eller mappe"
-#: ../meld/iohelpers.py:47
+#: meld/iohelpers.py:47
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr "Kan ikke legge «{}» i papirkurven. Vil du slette den nå?"
-#: ../meld/iohelpers.py:52
+#: meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
msgstr "Denne eksterne plasseringen kan ikke legge elementer i papirkurven."
-#: ../meld/iohelpers.py:57
+#: meld/iohelpers.py:57
msgid "_Delete Permanently"
msgstr "Slett _permanent"
-#: ../meld/iohelpers.py:100
+#: meld/iohelpers.py:108
#, python-format
msgid "Replace file “%s”?"
msgstr "Erstatt fila «%s»?"
-#: ../meld/iohelpers.py:102
+#: meld/iohelpers.py:110
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2022,312 +2005,124 @@ msgstr ""
"Det finnes allerede en fil med dette navnet i «%s».\n"
"Hvis du erstatter denne fila så vil innholdet gå tapt."
-#: ../meld/meldapp.py:181
+#: meld/meldapp.py:168
msgid "wrong number of arguments supplied to --diff"
msgstr "feil antall argumenter gitt til --diff"
-#: ../meld/meldapp.py:186
+#: meld/meldapp.py:173
msgid "Start with an empty window"
msgstr "Start med tomt vindu"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+#: meld/meldapp.py:174 meld/meldapp.py:176
msgid "file"
msgstr "fil"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+#: meld/meldapp.py:174 meld/meldapp.py:178
msgid "folder"
msgstr "mappe"
-#: ../meld/meldapp.py:188
+#: meld/meldapp.py:175
msgid "Start a version control comparison"
msgstr "Start en sammenligning av versjoner"
-#: ../meld/meldapp.py:190
+#: meld/meldapp.py:177
msgid "Start a 2- or 3-way file comparison"
msgstr "Start en 2- eller 3-veis filsammenligning"
-#: ../meld/meldapp.py:192
+#: meld/meldapp.py:179
msgid "Start a 2- or 3-way folder comparison"
msgstr "Start en 2- eller 3-veis mappesammenligning"
-#: ../meld/meldapp.py:235
+#: meld/meldapp.py:222
#, python-format
msgid "Error: %s\n"
msgstr "Feil: %s\n"
-#: ../meld/meldapp.py:242
+#: meld/meldapp.py:229
msgid "Meld is a file and directory comparison tool."
msgstr "Meld er et verktøy for sammenligning av filer og mapper."
-#: ../meld/meldapp.py:246
+#: meld/meldapp.py:233
msgid "Set label to use instead of file name"
msgstr "Angi en etikett som skal brukes istedenfor filnavn"
-#: ../meld/meldapp.py:249
+#: meld/meldapp.py:236
msgid "Open a new tab in an already running instance"
msgstr "Åpne en ny fane i en Meld som allerede kjører"
-#: ../meld/meldapp.py:252
+#: meld/meldapp.py:239
msgid "Automatically compare all differing files on startup"
msgstr "Sammenlign automatisk alle ulike filer ved oppstart"
-#: ../meld/meldapp.py:255
+#: meld/meldapp.py:242
msgid "Ignored for compatibility"
msgstr "Ignorert pga. kompatibilitet"
-#: ../meld/meldapp.py:259
+#: meld/meldapp.py:246
msgid "Set the target file for saving a merge result"
msgstr "Velg målfilen der fletteresultatet skal lagres"
-#: ../meld/meldapp.py:262
+#: meld/meldapp.py:249
msgid "Automatically merge files"
msgstr "Automatisk flett filer"
-#: ../meld/meldapp.py:266
+#: meld/meldapp.py:253
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Last en lagret sammenligning fra en Meld-sammenligningsfil"
-#: ../meld/meldapp.py:270
+#: meld/meldapp.py:257
msgid "Create a diff tab for the supplied files or folders"
msgstr "Lager en fane med forskjeller for angitte filer eller mapper"
-#: ../meld/meldapp.py:290
+#: meld/meldapp.py:277
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "for mange argumenter (ønsket 0-3, fikk %d)"
-#: ../meld/meldapp.py:293
+#: meld/meldapp.py:280
msgid "can’t auto-merge less than 3 files"
msgstr "kan ikke autoflette mindre enn 3 filer"
-#: ../meld/meldapp.py:295
+#: meld/meldapp.py:282
msgid "can’t auto-merge directories"
msgstr "kan ikke autoflette mapper"
-#: ../meld/meldapp.py:309
+#: meld/meldapp.py:297
msgid "Error reading saved comparison file"
msgstr "Klarte ikke lese lagret sammenligningsfil"
-#: ../meld/meldapp.py:326
+#: meld/meldapp.py:314
#, python-format
msgid "invalid path or URI “%s”"
msgstr "ugyldig sti eller adresse «%s»"
-#: ../meld/meldapp.py:332
+#: meld/meldapp.py:320
msgid "remote folder “{}” not supported"
msgstr "ekstern mappe «{}» støttes ikke"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:124
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<uten navn>"
-#: ../meld/melddoc.py:68
+#: meld/melddoc.py:60
msgid "untitled"
msgstr "uten navn"
-#: ../meld/meldwindow.py:47
-msgid "_File"
-msgstr "_Fil"
-
-#: ../meld/meldwindow.py:48
-msgid "_New Comparison…"
-msgstr "Ny sammenligning …"
-
-#: ../meld/meldwindow.py:49
-msgid "Start a new comparison"
-msgstr "Start en ny sammenligning"
-
-#: ../meld/meldwindow.py:52
-msgid "Save the current file"
-msgstr "Lagre gjeldende fil"
-
-#: ../meld/meldwindow.py:54
-msgid "Save As…"
-msgstr "Lagre som …"
-
-#: ../meld/meldwindow.py:55
-msgid "Save the current file with a different name"
-msgstr "Lagre gjeldende fil med nytt navn"
-
-#: ../meld/meldwindow.py:58
-msgid "Close the current file"
-msgstr "Lukk gjeldende fil"
-
-#: ../meld/meldwindow.py:61
-msgid "_Edit"
-msgstr "_Rediger"
-
-#: ../meld/meldwindow.py:63
-msgid "Undo the last action"
-msgstr "Angre forrige handling"
-
-#: ../meld/meldwindow.py:66
-msgid "Redo the last undone action"
-msgstr "Gjør om sist angrede handling"
-
-#: ../meld/meldwindow.py:68
-msgid "Cut the selection"
-msgstr "Klipp ut utvalg"
-
-#: ../meld/meldwindow.py:70
-msgid "Copy the selection"
-msgstr "Kopier utvalg"
-
-#: ../meld/meldwindow.py:72
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavla"
-
-#: ../meld/meldwindow.py:74
-msgid "Find…"
-msgstr "Søk …"
-
-#: ../meld/meldwindow.py:74
-msgid "Search for text"
-msgstr "Søk etter tekst"
-
-#: ../meld/meldwindow.py:76
-msgid "Find Ne_xt"
-msgstr "Finn _neste"
-
-#: ../meld/meldwindow.py:77
-msgid "Search forwards for the same text"
-msgstr "Let framover etter samme tekst"
-
-#: ../meld/meldwindow.py:79
-msgid "Find _Previous"
-msgstr "Finn _forrige"
-
-#: ../meld/meldwindow.py:80
-msgid "Search backwards for the same text"
-msgstr "Let bakover etter samme tekst"
-
-#: ../meld/meldwindow.py:83
-msgid "_Replace…"
-msgstr "_Erstatt …"
-
-#: ../meld/meldwindow.py:84
-msgid "Find and replace text"
-msgstr "Søk og erstatt tekst"
-
-#: ../meld/meldwindow.py:86
-msgid "Go to _Line"
-msgstr "Gå til _linje"
-
-#: ../meld/meldwindow.py:87
-msgid "Go to a specific line"
-msgstr "Gå til en bestemt linje"
-
-#: ../meld/meldwindow.py:90
-msgid "_Changes"
-msgstr "End_ringer"
-
-#: ../meld/meldwindow.py:91
-msgid "Next Change"
-msgstr "Neste endring"
-
-#: ../meld/meldwindow.py:92
-msgid "Go to the next change"
-msgstr "Gå til neste endring"
-
-#: ../meld/meldwindow.py:94
-msgid "Previous Change"
-msgstr "Gå til forrige endring"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to the previous change"
-msgstr "Gå til forrige endring"
-
-#: ../meld/meldwindow.py:97
-msgid "Open Externally"
-msgstr "Åpne eksternt"
-
-#: ../meld/meldwindow.py:98
-msgid "Open selected file or directory in the default external application"
-msgstr "Åpne valgt fil eller mappe i forvalgt eksternt program"
+#: meld/meldwindow.py:144
+msgid "Filename"
+msgstr "Filnavn"
-#: ../meld/meldwindow.py:102
-msgid "_View"
-msgstr "_Vis"
-
-#: ../meld/meldwindow.py:103
-msgid "File Status"
-msgstr "Filstatus"
-
-#: ../meld/meldwindow.py:104
-msgid "Version Status"
-msgstr "Versjonsstatus"
-
-#: ../meld/meldwindow.py:107
-msgid "Stop the current action"
-msgstr "Stopp gjeldende handling"
-
-#: ../meld/meldwindow.py:110
-msgid "Refresh the view"
-msgstr "Oppdater visning"
-
-#: ../meld/meldwindow.py:114
-msgid "Fullscreen"
-msgstr "Fullskjerm"
-
-#: ../meld/meldwindow.py:115
-msgid "View the comparison in fullscreen"
-msgstr "Vis sammenligningen i fullskjerm"
-
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "Verkt_øylinje"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "Vis eller skjul verktøylinja"
-
-#: ../meld/meldwindow.py:127
-msgid "Open Recent"
-msgstr "Åpne nylig"
-
-#: ../meld/meldwindow.py:128
-msgid "Open recent files"
-msgstr "Åpne nylige filer"
-
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "Avslutt programmet"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "_Innstillinger"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "Sett opp programmet"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "Åpne Meld-håndboka"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "Om dette programmet"
-
-#: ../meld/meldwindow.py:602
+#: meld/meldwindow.py:373
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "Trenger tre filer for å autoflette, fikk: %r"
-#: ../meld/meldwindow.py:623
+#: meld/meldwindow.py:394
msgid "Cannot compare a mixture of files and directories"
msgstr "Kan ikke sammenligne en blanding av filer og mapper"
-#: ../meld/misc.py:135
+#: meld/misc.py:151
msgid ""
"{}\n"
"\n"
@@ -2339,244 +2134,239 @@ msgstr ""
"Det oppstod en kritisk feil i Meld under kjøring av:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:254
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr "Fant ikke fargeskjemadetaljer for %s-%s. Forsøk å installere på nytt."
-
-#: ../meld/misc.py:325
+#: meld/misc.py:202
msgid "[None]"
msgstr "[Ingen]"
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "etikett"
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "mønster"
-#: ../meld/recent.py:105
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Versjonskontroll:"
-#: ../meld/ui/bufferselectors.py:32
+#: meld/style.py:90
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr "Fant ikke fargeskjemadetaljer for %s-%s. Forsøk å installere på nytt."
+
+#: meld/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Ren tekst"
-#: ../meld/ui/filechooser.py:69
+#: meld/ui/filechooser.py:68
msgid "Autodetect Encoding"
msgstr "Gjenkjenn tegnkoding"
-#: ../meld/ui/filechooser.py:72
+#: meld/ui/filechooser.py:71
msgid "Current Locale ({})"
msgstr "Gjeldende lokaltilpassing ({})"
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Lukk fane"
-
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
#, python-format
msgid "Ln %i, Col %i"
msgstr "Ln %i, kol %i"
-#: ../meld/ui/statusbar.py:177
+#: meld/ui/statusbar.py:183
msgid "Line you want to move the cursor to"
msgstr "Linje som du vil flytte skrivemerket til"
-#: ../meld/ui/vcdialogs.py:48
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Ingen filer vil legges inn"
#. Translators: First %s is replaced by translated "%d unpushed
#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
#, python-format
msgid "%s in %s"
msgstr "%s i %s"
#. Translators: These messages cover the case where there is
#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
msgstr[0] "%d udyttet innlegging"
msgstr[1] "%d udyttede innlegginger"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "%d grein"
msgstr[1] "%d greiner"
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Endret modus fra %s til %s"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Partially staged"
msgstr "Delvis køet"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Staged"
msgstr "Køet"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
msgid "None"
msgstr "Ingen"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
#, python-format
msgid "Rev %s"
msgstr "Rev. %s"
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Flettet"
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Base"
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Lokal"
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Ekstern"
-#: ../meld/vc/_vc.py:70
-msgid "Unversioned"
-msgstr "Ikke versjonert"
-
-#: ../meld/vc/_vc.py:73
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Feil"
-#: ../meld/vc/_vc.py:75
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Nylig lagt til"
-#: ../meld/vc/_vc.py:77
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Har fått nytt navn"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "Konflikt"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Fjernet"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Mangler"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Ikke til stede"
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:332
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (fant ikke)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: meld/vcview.py:336
#, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr "%(name)s (%(cmd)s er ikke installert)"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:252
+#: meld/vcview.py:340
#, python-format
-msgid "%(name)s (Invalid repository)"
+msgid "%(name)s (invalid repository)"
msgstr "%(name)s (ugyldig depot)"
-#: ../meld/vcview.py:273
+#: meld/vcview.py:354
msgid "No valid version control system found in this folder"
msgstr "Fant ikke et gyldig versjonskontrollsystem i denne mappa"
-#: ../meld/vcview.py:275
-msgid "Only one version control system found in this folder"
-msgstr "Fant kun ett versjonskontrollsystem i denne mappa"
-
-#: ../meld/vcview.py:277
+#: meld/vcview.py:356
msgid "Choose which version control system to use"
msgstr "Velg hvilket versjonskontrollsystem som skal brukes"
#. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:331
+#: meld/vcview.py:410
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:338
+#: meld/vcview.py:417
msgid "Scanning repository"
msgstr "Gjennomsøker depot"
-#: ../meld/vcview.py:367
+#: meld/vcview.py:446
#, python-format
msgid "Scanning %s"
msgstr "Gjennomsøker %s"
-#: ../meld/vcview.py:406
+#: meld/vcview.py:485
msgid "(Empty)"
msgstr "(Tom)"
-#: ../meld/vcview.py:450
+#: meld/vcview.py:532
#, python-format
msgid "%s — local"
msgstr "%s – lokal"
-#: ../meld/vcview.py:451
+#: meld/vcview.py:533
#, python-format
msgid "%s — remote"
msgstr "%s – ekstern"
-#: ../meld/vcview.py:459
+#: meld/vcview.py:541
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokal, flett, ekstern)"
-#: ../meld/vcview.py:464
+#: meld/vcview.py:546
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (ekstern, flett, lokal)"
-#: ../meld/vcview.py:475
+#: meld/vcview.py:557
#, python-format
msgid "%s — repository"
msgstr "%s – depot"
-#: ../meld/vcview.py:481
+#: meld/vcview.py:563
#, python-format
msgid "%s (working, repository)"
msgstr "%s (arbeidskopi, depot)"
-#: ../meld/vcview.py:485
+#: meld/vcview.py:567
#, python-format
msgid "%s (repository, working)"
msgstr "%s (depot, arbeidskopi)"
-#: ../meld/vcview.py:674
+#: meld/vcview.py:729
msgid "Remove folder and all its files?"
msgstr "Fjern mappe og alle filene i den?"
-#: ../meld/vcview.py:676
+#: meld/vcview.py:731
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2584,135 +2374,10 @@ msgstr ""
"Dette vil fjerne alle valgte filer og mapper, og alle filer inni valgte "
"mapper fra versjonskontrollsystemet."
-#: ../meld/vcview.py:785
+#: meld/vcview.py:844
msgid "Clear"
msgstr "Tøm"
-#~ msgid ""
-#~ "If true, whitespace characters will be drawn in comparisons even if they "
-#~ "are not in a changed area."
-#~ msgstr ""
-#~ "Velg for å tegne blanktegn i sammenligninger selv om de ikke er i et "
-#~ "område som er endret."
-
-#~ msgid "Show overview source map"
-#~ msgstr "Vis oversiktsstolpe"
-
-#~ msgid ""
-#~ "If true, file comparisons will have paired source maps for compared files."
-#~ msgstr ""
-#~ "Hvis sann så vil filsammenligninger vise to fargekodede stolper som "
-#~ "illustrerer forskjeller og likheter mellom filene."
-
-#~ msgid "Style of overview map"
-#~ msgstr "Oversiktsstolpens stil"
-
-#~ msgid "Style options for how the overview map is displayed."
-#~ msgstr "Velg hvordan oversiktsstolpen skal vises."
-
-#~ msgid "Classic (Meld)"
-#~ msgstr "Klassisk (Meld)"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Panes"
-#~ msgstr "Ruter"
-
-#~ msgid "Stop"
-#~ msgstr "Stopp"
-
-#~ msgid "Revert files…"
-#~ msgstr "Gjenopprett filer …"
-
-#~ msgid "Overview Map"
-#~ msgstr "Oversiktsstolpe"
-
-#~ msgid "Version control console"
-#~ msgstr "Versjonskontroll-konsoll"
-
-#~ msgid "Comparison"
-#~ msgstr "Sammenligning"
-
-#~ msgid "_Delete selected"
-#~ msgstr "_Slett valgte"
-
-#~ msgid "_Open Externally"
-#~ msgstr "Åpne e_ksternt"
-
-#~ msgid "Copy chunks"
-#~ msgstr "Kopier stykker"
-
-#~ msgid "_Undo"
-#~ msgstr "_Angre"
-
-#~ msgid "_Redo"
-#~ msgstr "_Gjør om"
-
-#~ msgid "Cu_t"
-#~ msgstr "Klipp _ut"
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopier"
-
-#~ msgid "_Paste"
-#~ msgstr "_Lim inn"
-
-#~ msgid "Switch between Find and Find-and-Replace"
-#~ msgstr "Bytt mellom «søk» og «søk og erstatt»"
-
-#~ msgid "Folder"
-#~ msgstr "Mappe"
-
-#~ msgid "Code Overview"
-#~ msgstr "Kodeoversikt"
-
-#~ msgid "Show overview map"
-#~ msgstr "Vis oversiktsstolpe"
-
-#~ msgid "Overview map style:"
-#~ msgstr "Oversiktsstolpens stil:"
-
-#~ msgid "Simple change map"
-#~ msgstr "Enkelt endringskart"
-
-#~ msgid "Compact source map"
-#~ msgstr "Lite kildekart"
-
-#~ msgid "Full source map"
-#~ msgstr "Stort kildekart"
-
-#~ msgid "Search recent comparisons…"
-#~ msgstr "Søk nylige sammenligninger …"
-
-#~ msgid "Show whitespace"
-#~ msgstr "Vis blanktegn"
-
-#~ msgid "Text wrapping"
-#~ msgstr "Tekstbryting"
-
-#~ msgid "Commit…"
-#~ msgstr "Legg inn …"
-
-#~ msgid "Update"
-#~ msgstr "Oppdater"
-
-#~ msgid "Add"
-#~ msgstr "Legg til"
-
-#~ msgid "Remove"
-#~ msgstr "Fjern"
-
-#~ msgid "Mark as Resolved"
-#~ msgstr "Merk som løst"
-
-#~ msgid "Revert"
-#~ msgstr "Tilbakestill"
-
-#~ msgid "Filename"
-#~ msgstr "Filnavn"
-
-#~ msgid "%(name)s (not found)"
-#~ msgstr "%(name)s (fant ikke)"
-
#~ msgid "org.gnome.meld"
#~ msgstr "org.gnome.meld"
@@ -2750,6 +2415,15 @@ msgstr "Tøm"
#~ msgid "Updated translations"
#~ msgstr "Oppdaterte oversettelser"
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld: visning av forskjeller"
+
+#~ msgid "Editable List"
+#~ msgstr "Redigerbar liste"
+
+#~ msgid "Save modified files?"
+#~ msgstr "Lagre endrede filer?"
+
#~ msgid ""
#~ "Some files have been modified.\n"
#~ "Which ones would you like to save?"
@@ -2760,9 +2434,18 @@ msgstr "Tøm"
#~ msgid "_Save Selected"
#~ msgstr "_Lagre valgt"
+#~ msgid "_Previous"
+#~ msgstr "Forri_ge"
+
+#~ msgid "_Next"
+#~ msgstr "_Neste"
+
#~ msgid "_Search for"
#~ msgstr "_Søk etter"
+#~ msgid "Replace _With"
+#~ msgstr "Erstatt _med"
+
#~ msgid "Choose Files"
#~ msgstr "Velg filer"
@@ -2778,6 +2461,9 @@ msgstr "Tøm"
#~ msgid "Other"
#~ msgstr "Andre"
+#~ msgid "_Directory Comparison"
+#~ msgstr "Sammenlign _mapper"
+
#~ msgid "Select VC Directory"
#~ msgstr "Velg katalog under versjonskontroll"
@@ -2790,6 +2476,9 @@ msgstr "Tøm"
#~ msgid "Create a patch"
#~ msgstr "Lag en endringsfil («patch»)"
+#~ msgid "Meld Preferences"
+#~ msgstr "Brukervalg for Meld"
+
#~ msgid "Ignore changes which insert or delete blank lines"
#~ msgstr "Se bort fra endringer som setter inn eller sletter tomme linjer"
@@ -2807,6 +2496,9 @@ msgstr "Tøm"
#~ msgid "VC Log"
#~ msgstr "Vis logg"
+#~ msgid "Hide selected"
+#~ msgstr "Skjul valgte"
+
#, fuzzy
#~ msgid "Case"
#~ msgstr "Lukk"
@@ -2815,6 +2507,24 @@ msgstr "Tøm"
#~ msgid "Ignore case of entries"
#~ msgstr "Ignorer kataloger:"
+#~ msgid "Show identical"
+#~ msgstr "Vis identiske"
+
+#~ msgid "Show new"
+#~ msgstr "Vis ny"
+
+#~ msgid "Show modified"
+#~ msgstr "Vis endret"
+
+#~ msgid "Filters"
+#~ msgstr "Filtre"
+
+#~ msgid "Set active filters"
+#~ msgstr "Sett aktive filtre"
+
+#~ msgid "Hide %s"
+#~ msgstr "Skjul %s"
+
#~ msgid ""
#~ "'%s' exists.\n"
#~ "Overwrite?"
@@ -2873,9 +2583,24 @@ msgstr "Tøm"
#~ msgstr[0] "%i år"
#~ msgstr[1] "%i år"
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Lag en endringsfil ut fra forskjellene mellom filene"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Flett alle endringer uten konflikter fra venstre"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Flett alle endringer uten konflikter fra høyre"
+
#~ msgid "Merge all non-conflicting"
#~ msgstr "Flett alle uten konflikter"
+#~ msgid "Merge all non-conflicting changes from left and right panes"
+#~ msgstr "Flett alle endringer uten konflikter fra venstre og høyre paneler"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Lås rulling av alle panelene"
+
#~ msgid "INS"
#~ msgstr "INS"
@@ -2955,6 +2680,45 @@ msgstr "Tøm"
#~ msgid "_New..."
#~ msgstr "_Ny …"
+#~ msgid "Close the current file"
+#~ msgstr "Lukk gjeldende fil"
+
+#~ msgid "Quit the program"
+#~ msgstr "Avslutt programmet"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Gjør om sist angrede handling"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut utvalg"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopier utvalg"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Lim inn fra utklippstavla"
+
+#~ msgid "Search for text"
+#~ msgstr "Søk etter tekst"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Let framover etter samme tekst"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Let bakover etter samme tekst"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Søk og erstatt tekst"
+
+#~ msgid "Configure the application"
+#~ msgstr "Sett opp programmet"
+
+#~ msgid "Next change"
+#~ msgstr "Neste endring"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "_Forrige fane"
+
#~ msgid "Activate previous tab"
#~ msgstr "Aktiver forrige fane"
@@ -2970,6 +2734,12 @@ msgstr "Tøm"
#~ msgid "Move current tab to right"
#~ msgstr "Flytt gjeldende fane til høyre"
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Åpne Meld-håndboka"
+
#~ msgid "Report _Bug"
#~ msgstr "Rapporter _feil"
@@ -2979,6 +2749,18 @@ msgstr "Tøm"
#~ msgid "About this program"
#~ msgstr "Om programmet"
+#~ msgid "View the comparison in full screen"
+#~ msgstr "Vis sammenligningen i fullskjerm"
+
+#~ msgid "_Toolbar"
+#~ msgstr "Verkt_øylinje"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Vis eller skjul verktøylinja"
+
+#~ msgid "_Statusbar"
+#~ msgstr "_Statuslinje"
+
#~ msgid "Show or hide the statusbar"
#~ msgstr "Vis eller skjul statuslinja"
@@ -3038,6 +2820,17 @@ msgstr "Tøm"
#~ msgid "Delete locally"
#~ msgstr "Slett lokalt"
+#, fuzzy
+#~ msgid "_Flatten"
+#~ msgstr "_Fil"
+
+#, fuzzy
+#~ msgid "_Modified"
+#~ msgstr "Endret"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Vis ignorerte filer"
+
#, fuzzy
#~ msgid "Rev"
#~ msgstr "Fjern"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
