GNOME.org
 

=?utf-8?q?=5Bmeld=5D_Updated_Norwegian_bokm=C3=A5l_translation?=

commit db4fbeacadb0028ee148e58e96837b13bceaa0d9
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Feb 4 13:15:27 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po | 1872 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1063 insertions(+), 809 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 7f684c9..486494a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,1217 +1,1471 @@
-# Norwegian BokmÃl translation of meld.
+# Norwegian bokmÃl translation of meld.
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas gnome org>, 2001-2008.
+# Kjartan Maraas <kmaraas gnome org>, 2001-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-10-08 20:06+0200\n"
-"PO-Revision-Date: 2008-10-08 20:10+0200\n"
+"POT-Creation-Date: 2012-02-04 13:06+0100\n"
+"PO-Revision-Date: 2012-02-04 13:15+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb lister ping uio no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../dirdiff.py:252 ../dirdiff.py:267
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr ""
+#: ../bin/meld:97
+msgid "Cannot import: "
+msgstr "Kan ikke importere: "
 
-#: ../dirdiff.py:283
-#, python-format
-msgid "Hide %s"
-msgstr "Skjul %s"
+#: ../bin/meld:100
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld krever %s eller hÃyere."
 
-#: ../dirdiff.py:364 ../dirdiff.py:374 ../vcview.py:213 ../vcview.py:241
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr ""
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
-#: ../dirdiff.py:407
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr ""
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "Vis forskjeller"
 
-#: ../dirdiff.py:413
-#, python-format
+#: ../data/meld.desktop.in.h:3
+msgid "Meld Diff Viewer"
+msgstr "Meld visning av forskjeller"
+
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "Sammenligne og flett sammen dine filer"
+
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "Redigerbar liste"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+msgid "Name"
+msgstr "Navn"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Pattern"
+msgstr "MÃnster"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Add new filter"
+msgstr "Legg til nytt filter"
+
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_Legg til"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Remove selected filter"
+msgstr "Fjern valgt filter"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move item up"
+msgstr "Flytt oppfÃring opp"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Move _Up"
+msgstr "Flytt _opp"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "Flytt oppfÃring ned"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "Flytt ne_d"
+
+#: ../data/ui/filediff.ui.h:1
+msgid "Save modified files?"
+msgstr "Lagre endrede filer?"
+
+#: ../data/ui/filediff.ui.h:2
 msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"Some files have been modified.\n"
+"Which ones would you like to save?"
 msgstr ""
 
-#: ../dirdiff.py:487
-#, python-format
-msgid "[%s] Done"
+#: ../data/ui/filediff.ui.h:4
+msgid "_Discard Changes"
 msgstr ""
 
-#: ../dirdiff.py:533
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
-msgstr ""
+#: ../data/ui/filediff.ui.h:5
+msgid "_Save Selected"
+msgstr "_Lagre valgt"
 
-#: ../dirdiff.py:540
-#, python-format
-msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "E_rstatt"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "Erstatt _alle"
+
+#: ../data/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "_Forrige"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "_Neste"
+
+#: ../data/ui/findbar.ui.h:5
+msgid "_Search for"
+msgstr "_SÃk etter"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _With"
+msgstr "Erstatt _med"
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Match Case"
 msgstr ""
 
-#: ../dirdiff.py:558 ../vcview.py:405
-#, python-format
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "He_le ord"
+
+#: ../data/ui/findbar.ui.h:9
+#, fuzzy
+msgid "Regular E_xpression"
+msgstr "Vanlig uttrykk"
+
+#: ../data/ui/meldapp.ui.h:2
 msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
 msgstr ""
 
-#: ../dirdiff.py:565 ../vcview.py:410
-#, fuzzy, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr "Feil under skriving til: %s."
+#: ../data/ui/meldapp.ui.h:4
+msgid "translator-credits"
+msgstr "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../dirdiff.py:576
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "Velg filer"
 
-#: ../dirdiff.py:577
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "_Treveis sammenligning"
 
-#: ../dirdiff.py:578
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] ""
-msgstr[1] ""
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:8
+msgid "Mine"
+msgstr "Min"
 
-#: ../dirdiff.py:579
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] ""
-msgstr[1] ""
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:10
+msgid "Original"
+msgstr "Opprinnelig"
 
-#: ../dirdiff.py:580
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] ""
-msgstr[1] ""
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:12
+msgid "Other"
+msgstr "Andre"
 
-#: ../dirdiff.py:581
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] ""
-msgstr[1] ""
+#: ../data/ui/meldapp.ui.h:13
+msgid "_File Comparison"
+msgstr "_Filsammenligning"
 
-#: ../dirdiff.py:582
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] ""
-msgstr[1] ""
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "_Katalogsammenligning"
+
+#: ../data/ui/meldapp.ui.h:15
+msgid "Select VC Directory"
+msgstr "Velg katalog under versjonskontroll"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:201
+#: ../data/ui/meldapp.ui.h:16
+msgid "Directory"
+msgstr "Katalog"
+
+#: ../data/ui/meldapp.ui.h:17
 #, fuzzy
-msgid "INS,OVR"
-msgstr "OVER"
+msgid "_Version Control Browser"
+msgstr "Git versjonskontroll"
 
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:203
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:1
+#, fuzzy
+msgid "Create Patch"
+msgstr "Opprett"
 
-#: ../filediff.py:261
-#, python-format
-msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:2
+#, fuzzy
+msgid "Create a patch"
+msgstr "Opprett"
 
-#: ../filediff.py:504
-#, fuzzy, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr "Vanlig uttrykk"
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr ""
 
-#: ../filediff.py:516
-#, python-format
-msgid "The regular expression '%s' was not found."
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
 msgstr ""
 
-#: ../filediff.py:518
-#, python-format
-msgid "The text '%s' was not found."
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
 msgstr ""
 
-#: ../filediff.py:571
-#, python-format
-msgid "[%s] Set num panes"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "_Reverse patch direction"
 msgstr ""
 
-#: ../filediff.py:578
-#, fuzzy, python-format
-msgid "[%s] Opening files"
-msgstr "Ãpne fil"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "Kopier til utklippstavlen"
 
-#: ../filediff.py:595 ../filediff.py:609 ../filediff.py:625 ../filediff.py:632
-#, fuzzy, python-format
-msgid "Could not read from '%s'"
-msgstr "Kunne ikke Ãpne %s"
+#: ../data/ui/preferences.ui.h:1
+msgid "Meld Preferences"
+msgstr "Brukervalg for Meld"
 
-#: ../filediff.py:596 ../filediff.py:633
-#, fuzzy
-msgid "The error was:"
-msgstr "feil: "
+#: ../data/ui/preferences.ui.h:2
+msgid "Font"
+msgstr "Skrift"
 
-#: ../filediff.py:601
-#, fuzzy, python-format
-msgid "[%s] Reading files"
-msgstr "Mangler filen %s"
+#: ../data/ui/preferences.ui.h:3
+msgid "_Use the system fixed width font"
+msgstr "Br_uk systemets skrift med fast bredde"
 
-#: ../filediff.py:610
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr ""
+#: ../data/ui/preferences.ui.h:4
+msgid "_Editor font:"
+msgstr "Skrift for r_edigering:"
 
-#: ../filediff.py:626
-#, python-format
-msgid "I tried encodings %s."
-msgstr ""
+#: ../data/ui/preferences.ui.h:5
+msgid "Display"
+msgstr "Visning"
 
-#: ../filediff.py:655
-#, python-format
-msgid "[%s] Computing differences"
-msgstr ""
+#: ../data/ui/preferences.ui.h:6
+msgid "_Tab width:"
+msgstr "_Tabulatorbredde:"
 
-#: ../filediff.py:760
-#, python-format
+#: ../data/ui/preferences.ui.h:7
+msgid "_Insert spaces instead of tabs"
+msgstr "Sett _inn mellomrom i stedet for tabulator"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "Enable text _wrapping"
+msgstr "Slà pà tekst_bryting"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Do not _split words over two lines"
+msgstr "Ikke _del ord over to linjer"
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Show _line numbers"
+msgstr "Vis _linjenummer"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "Show w_hitespace"
+msgstr "Vis _tomrom"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "Use s_yntax highlighting"
+msgstr "Slà pà utheving av s_yntaks"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "External editor"
+msgstr "Eksternt redigeringsprogram"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "Use _default system editor"
+msgstr "Bruk systemets _forvalgte redigeringsprogram"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "Edito_r command:"
+msgstr "_Redigeringskommando:"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Editor"
+msgstr "Editor"
+
+#: ../data/ui/preferences.ui.h:17
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
 msgstr ""
 
-#: ../filediff.py:773
-#, fuzzy, python-format
-msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
-msgstr "Feil under skriving til: %s."
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Ignorer symbolske lenker"
 
-#: ../filediff.py:782
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr ""
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "Filfilter"
 
-#: ../filediff.py:795
-#, python-format
+#: ../data/ui/preferences.ui.h:20
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
 msgstr ""
 
-#: ../filediff.py:811
-#, python-format
-msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore changes which insert or delete blank lines"
 msgstr ""
 
-#. save as
-#: ../filediff.py:862
-#, fuzzy
-msgid "Save patch as..."
-msgstr "Lagrer prosjekt...\n"
+#: ../data/ui/preferences.ui.h:22
+msgid "Text Filters"
+msgstr "Tekstfiltre"
 
-#: ../filediff.py:916
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+#: ../data/ui/preferences.ui.h:23
+msgid "Loading"
+msgstr "Laster"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:1
+#: ../data/ui/preferences.ui.h:25
+msgid "Encoding"
+msgstr "Koder"
+
+#: ../data/ui/vcview.ui.h:1
 #, fuzzy
-msgid "Case"
-msgstr "Lukk"
+msgid "VC Log"
+msgstr "Vis logg"
+
+#: ../data/ui/vcview.ui.h:2
+#, fuzzy
+msgid "Commit Files"
+msgstr "Ko_mpiler fil"
 
-#: ../glade2/dirdiff.glade.h:2
-msgid "Compare"
-msgstr "Sammenligne"
+#: ../data/ui/vcview.ui.h:3
+#, fuzzy
+msgid "Previous Logs"
+msgstr "Forrige hjelp"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Log Message"
+msgstr "Loggmelding"
 
-#: ../glade2/dirdiff.glade.h:3 ../glade2/vcview.glade.h:6
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+msgid "_Compare"
+msgstr "_Sammenligne"
+
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 #, fuzzy
 msgid "Compare selected"
 msgstr "FullfÃrt"
 
-#: ../glade2/dirdiff.glade.h:4
-msgid "Copy To Left"
+#: ../meld/dirdiff.py:233
+msgid "Copy _Left"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:5
-msgid "Copy To Right"
+#: ../meld/dirdiff.py:233
+msgid "Copy to left"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:6
+#: ../meld/dirdiff.py:234
 #, fuzzy
+msgid "Copy _Right"
+msgstr "HÃyre"
+
+#: ../meld/dirdiff.py:234
+msgid "Copy to right"
+msgstr ""
+
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
-msgstr "Slettet"
+msgstr "Slett valgte"
 
-#: ../glade2/dirdiff.glade.h:7 ../glade2/filediff.glade.h:7
-msgid "Edit"
-msgstr "Rediger"
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157
+msgid "Hide"
+msgstr "Skjul"
 
-#: ../glade2/dirdiff.glade.h:8
-#, fuzzy
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
-msgstr "Vennligst oppgi et filnavn!"
+msgstr "Skjul valgte"
 
-#: ../glade2/dirdiff.glade.h:9
-msgid "Hide..."
-msgstr "Skjul ..."
+#: ../meld/dirdiff.py:240
+#, fuzzy
+msgid "Case"
+msgstr "Lukk"
 
-#: ../glade2/dirdiff.glade.h:10
+#: ../meld/dirdiff.py:240
 #, fuzzy
 msgid "Ignore case of entries"
 msgstr "Ignorer kataloger:"
 
-#: ../glade2/dirdiff.glade.h:11
-msgid "Left"
-msgstr "Venstre"
-
-#: ../glade2/dirdiff.glade.h:12
-msgid "Modified"
-msgstr "Endret"
-
-#: ../glade2/dirdiff.glade.h:13 ../glade2/meldapp.glade.h:50
-msgid "New"
-msgstr "Ny"
-
-#: ../glade2/dirdiff.glade.h:14
-msgid "Right"
-msgstr "HÃyre"
-
-#: ../glade2/dirdiff.glade.h:15
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "Samme"
 
-#: ../glade2/dirdiff.glade.h:16
+#: ../meld/dirdiff.py:241
 #, fuzzy
 msgid "Show identical"
 msgstr "Vis signaler fra kjernen"
 
-#: ../glade2/dirdiff.glade.h:17 ../glade2/vcview.glade.h:20
-#, fuzzy
-msgid "Show modified"
-msgstr "Endret"
+#: ../meld/dirdiff.py:242
+msgid "New"
+msgstr "Ny"
 
-#: ../glade2/dirdiff.glade.h:18
+#: ../meld/dirdiff.py:242
 #, fuzzy
 msgid "Show new"
 msgstr "Vis"
 
-#: ../glade2/dirdiff.glade.h:19 ../glade2/meldapp.glade.h:89
-#: ../glade2/vcview.glade.h:28
-#, fuzzy
-msgid "_Compare"
-msgstr "_Kompiler"
+#: ../meld/dirdiff.py:243
+msgid "Modified"
+msgstr "Endret"
 
-#: ../glade2/dirdiff.glade.h:20
-#, fuzzy
-msgid "_Delete Selected"
-msgstr "Slettet"
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+msgid "Show modified"
+msgstr "Vis endret"
 
-#: ../glade2/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
+#: ../meld/dirdiff.py:245
+msgid "Filters"
+msgstr "Filtre"
 
-#: ../glade2/filediff.glade.h:3
-msgid "Copy All To _Left"
-msgstr ""
+#: ../meld/dirdiff.py:245
+msgid "Set active filters"
+msgstr "Sett aktive filtre"
 
-#: ../glade2/filediff.glade.h:4
-msgid "Copy All To _Right"
-msgstr ""
+#: ../meld/dirdiff.py:362
+#, python-format
+msgid "Hide %s"
+msgstr "Skjul %s"
 
-#: ../glade2/filediff.glade.h:5
-msgid "Copy to Clipboard"
+#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
+#: ../meld/vcview.py:346
+#, python-format
+msgid "[%s] Scanning %s"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:6
-#, fuzzy
-msgid "Create Patch"
-msgstr "Opprett"
+#: ../meld/dirdiff.py:577
+#, python-format
+msgid "[%s] Done"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "Finn"
+#: ../meld/dirdiff.py:581
+msgid "Multiple errors occurred while scanning this folder"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:9
-msgid "Match _entire word only"
+#: ../meld/dirdiff.py:582
+msgid "Files with invalid encodings found"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:10
-#, fuzzy
-msgid "Regular e_xpression"
-msgstr "Vanlig uttrykk"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:584
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:11
-#, fuzzy
-msgid "Save modified files?"
-msgstr "Lagre alle filer"
+#: ../meld/dirdiff.py:586
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:12
-#, fuzzy
-msgid "Search for:"
-msgstr "SÃk i:"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:588
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:13
-msgid "_Match case"
+#: ../meld/dirdiff.py:599
+#, python-format
+msgid "'%s' hidden by '%s'"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:14
-msgid "_Wrap around"
+#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161
+msgid "Hi_de"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
+#: ../meld/dirdiff.py:674
+#, python-format
+msgid ""
+"'%s' exists.\n"
+"Overwrite?"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:2
-#, fuzzy
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Alternativer for utskrift</b>"
+#: ../meld/dirdiff.py:681
+#, python-format
+msgid ""
+"Error copying '%s' to '%s'\n"
+"\n"
+"%s."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:3
-#, fuzzy
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Faner for redigering</b>"
+#: ../meld/dirdiff.py:699 ../meld/vcview.py:526
+#, python-format
+msgid ""
+"'%s' is a directory.\n"
+"Remove recursively?"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:4
-#, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Skrift:</b>"
+#: ../meld/dirdiff.py:706 ../meld/vcview.py:531
+#, fuzzy, python-format
+msgid ""
+"Error removing %s\n"
+"\n"
+"%s."
+msgstr "Feil under skriving til: %s."
 
-#: ../glade2/meldapp.glade.h:5
-#, fuzzy
-msgid "<b>Global options</b>"
-msgstr "<b>Alternativer for terminal</b>"
+#: ../meld/dirdiff.py:731
+#, python-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:6
-#, fuzzy
-msgid "<b>Loading</b>"
-msgstr "<b>Kodebretting</b>"
+#: ../meld/dirdiff.py:732
+#, python-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:7
-#, fuzzy
-msgid "<b>Misc</b>"
-msgstr "<b>Forskjellige alternativer</b>"
+#: ../meld/dirdiff.py:733
+#, python-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:8
-#, fuzzy
-msgid "<b>Saving</b>"
-msgstr "<b>Sesjon</b>"
+#: ../meld/dirdiff.py:734
+#, python-format
+msgid "%i day"
+msgid_plural "%i days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:9
-#, fuzzy
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Utseende</b>"
+#: ../meld/dirdiff.py:735
+#, python-format
+msgid "%i week"
+msgid_plural "%i weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:10
-#, fuzzy
-msgid "<b>Update Options</b>"
-msgstr "<b>Alternativer</b>"
+#: ../meld/dirdiff.py:736
+#, python-format
+msgid "%i month"
+msgid_plural "%i months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:11
-#, fuzzy
-msgid "<b>Whitespace</b>"
-msgstr "<b>Filter</b>"
+#: ../meld/dirdiff.py:737
+#, python-format
+msgid "%i year"
+msgid_plural "%i years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#: ../meld/filediff.py:294
+msgid "Format as patch..."
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
+#: ../meld/filediff.py:294
+msgid "Create a patch using differences between files"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr ""
+#: ../meld/filediff.py:295
+msgid "Previous conflict"
+msgstr "Forrige konflikt"
 
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#: ../meld/filediff.py:295
+msgid "Go to the previous conflict"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr ""
+#: ../meld/filediff.py:296
+msgid "Next conflict"
+msgstr "Neste konflikt"
 
-#: ../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#: ../meld/filediff.py:296
+msgid "Go to the next conflict"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#: ../meld/filediff.py:297
+msgid "Push to left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:19
-msgid "Automatically supply missing newline at end of file"
+#: ../meld/filediff.py:297
+msgid "Push current change to the left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:20
-msgid "CVS"
-msgstr "CVS"
-
-#: ../glade2/meldapp.glade.h:21
-#, fuzzy
-msgid "CVS binary"
-msgstr "Tillegg for CVS"
+#: ../meld/filediff.py:298
+msgid "Push to right"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:22
-#, fuzzy
-msgid "Choose Files"
-msgstr "Velg filer:"
+#: ../meld/filediff.py:298
+msgid "Push current change to the right"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:23
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:300
+msgid "Pull from left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:24
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
+#: ../meld/filediff.py:300
+msgid "Pull change from the left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:25
-#, fuzzy
-msgid "Create missing directories (-d)"
-msgstr "Opprett nye kataloger"
+#: ../meld/filediff.py:301
+msgid "Pull from right"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:26
-msgid "Curved: Filled Curves"
+#: ../meld/filediff.py:301
+msgid "Pull change from the right"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:27
-#, fuzzy
-msgid "Custom command"
-msgstr "Kommando"
+#: ../meld/filediff.py:302
+msgid "Copy above left"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Directory"
-msgstr "Katalog"
+#: ../meld/filediff.py:302
+msgid "Copy change above the left chunk"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:29
-#, fuzzy
-msgid "Display"
-msgstr "Hjelpvisning"
+#: ../meld/filediff.py:303
+msgid "Copy below left"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Down"
+#: ../meld/filediff.py:303
+msgid "Copy change below the left chunk"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:31
-#, fuzzy
-msgid "Edit files with:"
-msgstr "Rediger regler"
+#: ../meld/filediff.py:304
+msgid "Copy above right"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:32
-msgid "Editor"
-msgstr "Editor"
+#: ../meld/filediff.py:304
+msgid "Copy change above the right chunk"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:33
-msgid "Encoding"
+#: ../meld/filediff.py:305
+msgid "Copy below right"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:34
-#, fuzzy
-msgid "File Filters"
-msgstr "<b>Filfilter</b>"
+#: ../meld/filediff.py:305
+msgid "Copy change below the right chunk"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:35
-#, fuzzy
-msgid "Find Ne_xt"
-msgstr "Finn _neste"
+#: ../meld/filediff.py:306
+msgid "Delete"
+msgstr "Slett"
 
-#: ../glade2/meldapp.glade.h:36
-#, fuzzy
-msgid "Gnome Default"
-msgstr "Forvalgt"
+#: ../meld/filediff.py:306
+msgid "Delete change"
+msgstr "Slett endring"
 
-#: ../glade2/meldapp.glade.h:37
-msgid "Gnome default editor"
+#: ../meld/filediff.py:307
+msgid "Merge all changes from left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:38
-#, fuzzy
-msgid "Icons Only"
-msgstr "Ikonfil:"
-
-#: ../glade2/meldapp.glade.h:39
-#, fuzzy
-msgid "Ignore .cvsrc (-f)"
-msgstr "Overse .cvsrc-filen (anbefalt)"
-
-#: ../glade2/meldapp.glade.h:40
-msgid "Ignore changes in amount of white space"
+#: ../meld/filediff.py:307
+msgid "Merge all non-conflicting changes from the left"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:41
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
+#: ../meld/filediff.py:308
+msgid "Merge all changes from right"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:42
-msgid "Ignore changes that just insert or delete blank lines"
+#: ../meld/filediff.py:308
+msgid "Merge all non-conflicting changes from the right"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:43
-msgid "Ignore changes which insert or delete blank lines"
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:44
-#, fuzzy
-msgid "Ignore symbolic links"
-msgstr "Ignorer filer:"
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:45
-msgid "Internal editor"
+#: ../meld/filediff.py:310
+msgid "Cycle through documents"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:46
-#, fuzzy
-msgid "Line Wrapping "
-msgstr "Linje_bryting"
+#: ../meld/filediff.py:310
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Mailing _List"
+#: ../meld/filediff.py:314
+msgid "Lock scrolling"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:48
-#, fuzzy
-msgid "Meld"
-msgstr "Gjenles"
+#: ../meld/filediff.py:315
+msgid "Lock scrolling of all panes"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:49
-#, fuzzy
-msgid "Mine"
-msgstr "Linje"
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:396
+msgid "INS"
+msgstr "INS"
 
-#: ../glade2/meldapp.glade.h:51
-#, fuzzy
-msgid "Original"
-msgstr "Signal"
+#: ../meld/filediff.py:396
+msgid "OVR"
+msgstr "OVR"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Other"
-msgstr "Andre"
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:398
+#, python-format
+msgid "Ln %i, Col %i"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:53
-#, fuzzy
-msgid "Preferences : Meld"
-msgstr "_Brukervalg"
+#: ../meld/filediff.py:722
+#, python-format
+msgid ""
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:54
-#, fuzzy
-msgid "Prune empty directories (-P)"
-msgstr "Slett tomme kataloger"
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:809
+msgid "<unnamed>"
+msgstr "<uten navn>"
 
-#: ../glade2/meldapp.glade.h:55
-msgid "Quiet mode (-q)"
+#: ../meld/filediff.py:996
+#, python-format
+msgid "[%s] Set num panes"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:56
-#, fuzzy
-msgid "Redo"
-msgstr "_Gjenopprett"
+#: ../meld/filediff.py:1002
+#, python-format
+msgid "[%s] Opening files"
+msgstr "[%s] Ãpner filer"
 
-#: ../glade2/meldapp.glade.h:57
-msgid "Refresh"
-msgstr "Oppdater"
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
+msgid "Could not read file"
+msgstr "Kunne ikke lese fil"
 
-#: ../glade2/meldapp.glade.h:58
-msgid "Reload"
-msgstr "Gjenles"
+#: ../meld/filediff.py:1027
+#, python-format
+msgid "[%s] Reading files"
+msgstr "[%s] Leser filer"
 
-#: ../glade2/meldapp.glade.h:59
-msgid "Report _Bug"
+#: ../meld/filediff.py:1036
+#, python-format
+msgid "%s appears to be a binary file."
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:60
-msgid "Save"
-msgstr "Lagre"
-
-#: ../glade2/meldapp.glade.h:61
-#, fuzzy
-msgid "Save _As"
-msgstr "L_agre som..."
+#: ../meld/filediff.py:1048
+#, python-format
+msgid "%s is not in encodings: %s"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:62
-msgid "Save in UTF-8 encoding"
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#, python-format
+msgid "[%s] Computing differences"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:63
-#, fuzzy
-msgid "Save in the files original encoding"
-msgstr "Kunne ikke Ãpne fil for skriving"
+#: ../meld/filediff.py:1148
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:64
-msgid "Show line numbers"
-msgstr "Vis linjenummer"
+#: ../meld/filediff.py:1154
+msgid "Files are identical"
+msgstr "Filene er identiske"
 
-#: ../glade2/meldapp.glade.h:65
-msgid "Simple: Lines only"
-msgstr ""
+#: ../meld/filediff.py:1164
+msgid "Show without filters"
+msgstr "Vis uten filtre"
 
-#: ../glade2/meldapp.glade.h:66
-msgid "Solid: Filled Quadilaterals"
+#: ../meld/filediff.py:1354
+#, python-format
+msgid ""
+"\"%s\" exists!\n"
+"Overwrite?"
 msgstr ""
+"Â%s eksisterer!\n"
+"Overskriv?"
 
-#: ../glade2/meldapp.glade.h:67
-msgid "Stop"
-msgstr "Stopp"
+#: ../meld/filediff.py:1367
+#, fuzzy, python-format
+msgid ""
+"Error writing to %s\n"
+"\n"
+"%s."
+msgstr "Feil under skriving til: %s."
 
-#: ../glade2/meldapp.glade.h:68
-msgid "Tab width"
+#: ../meld/filediff.py:1376
+#, python-format
+msgid "Choose a name for buffer %i."
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:69
-msgid "Text Beside Icons"
+#: ../meld/filediff.py:1391
+#, python-format
+msgid ""
+"This file '%s' contains a mixture of line endings.\n"
+"\n"
+"Which format would you like to use?"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:70
-#, fuzzy
-msgid "Text Filters"
-msgstr "Tekst som skal rendres"
-
-#: ../glade2/meldapp.glade.h:71
-#, fuzzy
-msgid "Text Only"
-msgstr "Tekst"
+#: ../meld/filediff.py:1407
+#, python-format
+msgid ""
+"'%s' contains characters not encodable with '%s'\n"
+"Would you like to save as UTF-8?"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:72
-#, fuzzy
-msgid "Text Under Icons"
-msgstr "Tekst som skal rendres"
+#: ../meld/filediff.py:1466
+#, python-format
+msgid ""
+"Reloading will discard changes in:\n"
+"%s\n"
+"\n"
+"You cannot undo this operation."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:73
-#, fuzzy
-msgid "Three way directory"
-msgstr "Velg katalog"
+#: ../meld/filemerge.py:82
+#, fuzzy, python-format
+msgid "[%s] Merging files"
+msgstr "Ãpne fil"
 
-#: ../glade2/meldapp.glade.h:74
-msgid "Three way file"
+#: ../meld/meldapp.py:152
+msgid "wrong number of arguments supplied to --diff"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:75
-#, fuzzy
-msgid "Two way directory"
-msgstr "Velg katalog"
+#: ../meld/meldapp.py:156
+msgid "Start with an empty window"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:76
-#, fuzzy
-msgid "Two way file"
-msgstr "Ny tom fil"
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+msgid "file"
+msgstr "fil"
 
-#: ../glade2/meldapp.glade.h:77
-#, fuzzy
-msgid "Undo"
-msgstr "A_ngre"
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+msgid "dir"
+msgstr "katalog"
 
-#: ../glade2/meldapp.glade.h:78
-msgid "Up"
+#: ../meld/meldapp.py:157
+msgid "Start a version control comparison"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:79
-#, fuzzy
-msgid "Use Compression (-z)"
-msgstr "Bruk revisjon: "
+#: ../meld/meldapp.py:158
+msgid "Start a 2- or 3-way file comparison"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:80
-msgid "Use GNOME monospace font"
+#: ../meld/meldapp.py:159
+msgid "Start a 2- or 3-way directory comparison"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:81
-#, fuzzy
-msgid "Use custom font"
-msgstr "Bruk skrift fra tema"
+#: ../meld/meldapp.py:160
+msgid "Start a comparison between file and dir/file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:82
-#, fuzzy
-msgid "Use syntax highlighting"
-msgstr "Slà av utheving av syntaks"
+#: ../meld/meldapp.py:166
+msgid "Meld is a file and directory comparison tool."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:83
-#, fuzzy
-msgid "Version control view"
-msgstr "Git versjonskontroll"
+#: ../meld/meldapp.py:169
+msgid "Set label to use instead of file name"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:84
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#: ../meld/meldapp.py:171
+msgid "Automatically compare all differing files on startup"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:85
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
+#: ../meld/meldapp.py:173
+msgid "Ignored for compatibility"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:86
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
+#: ../meld/meldapp.py:176
+msgid "Set the target file for saving a merge result"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:87
-msgid "Whitespace is significant"
+#: ../meld/meldapp.py:179
+msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:88
-msgid "Yes"
-msgstr "Ja"
+#: ../meld/meldapp.py:182
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:90
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
 #, fuzzy
-msgid "_Contents"
-msgstr "KjÃr/_Fortsett"
+msgid "can't compare more than three directories"
+msgstr "Opprett nye kataloger"
 
-#: ../glade2/meldapp.glade.h:91
-#, fuzzy
-msgid "_Directory Comparison"
-msgstr "Katalog"
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+msgid "untitled"
+msgstr "uten navn"
 
-#: ../glade2/meldapp.glade.h:92
-msgid "_Down"
+#: ../meld/meldwindow.py:125
+msgid "_File"
+msgstr "_Fil"
+
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_Ny â"
+
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:93 ../glade2/vcview.glade.h:29
-msgid "_Edit"
-msgstr "R_ediger"
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:94
-msgid "_File"
-msgstr "_Fil"
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:95
-msgid "_File Comparison"
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:96
-msgid "_Help"
-msgstr "_Hjelp"
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "R_ediger"
 
-#: ../glade2/meldapp.glade.h:97
-#, fuzzy
-msgid "_Logo"
-msgstr "_GÃ til"
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:98
-#, fuzzy
-msgid "_New..."
-msgstr "_Ny"
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:99
-msgid "_Save"
-msgstr "_Lagre"
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr "Klipp ut utvalg"
 
-#: ../glade2/meldapp.glade.h:100
-#, fuzzy
-msgid "_Stop"
-msgstr "Stopp"
+#: ../meld/meldwindow.py:136
+msgid "Copy the selection"
+msgstr "Kopier utvalg"
 
-#: ../glade2/meldapp.glade.h:101
-msgid "_Three Way Compare"
+#: ../meld/meldwindow.py:137
+msgid "Paste the clipboard"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:102
-#, fuzzy
-msgid "_Up"
-msgstr "_Oppdater"
+#: ../meld/meldwindow.py:138
+msgid "Search for text"
+msgstr "SÃk etter tekst"
 
-#: ../glade2/meldapp.glade.h:103
-#, fuzzy
-msgid "_Version Control Browser"
-msgstr "Git versjonskontroll"
+#: ../meld/meldwindow.py:139
+msgid "Find Ne_xt"
+msgstr "Finn ne_ste"
 
-#: ../glade2/meldapp.glade.h:104
-msgid "_View"
-msgstr "_Visning"
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:1
-#, fuzzy
-msgid "Add _Binary"
-msgstr "Legg _til mÃl"
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "Finn _forrige"
 
-#: ../glade2/vcview.glade.h:2
-#, fuzzy
-msgid "Add to VC"
-msgstr "Legg til i prosjekt"
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:3
-#, fuzzy
-msgid "Commit"
-msgstr "_Sjekk inn"
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:4
-#, fuzzy
-msgid "Commit Files"
-msgstr "Ko_mpiler fil"
+#: ../meld/meldwindow.py:142
+msgid "Prefere_nces"
+msgstr "_Brukervalg"
 
-#: ../glade2/vcview.glade.h:5
-#, fuzzy
-msgid "Compare Options"
-msgstr "Konfigurer alternativer:"
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:7
-#, fuzzy
-msgid "Date"
-msgstr "Ingen dato"
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:8
-#, fuzzy
-msgid "Delete locally"
-msgstr "Slett"
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr "Neste endring"
 
-#: ../glade2/vcview.glade.h:9
-#, fuzzy
-msgid "Flatten directories"
-msgstr "Opprett nye kataloger"
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:10
+#: ../meld/meldwindow.py:146
 #, fuzzy
-msgid "Ignored"
-msgstr "Fje_rn ..."
+msgid "Previous change"
+msgstr "Forrige hjelp"
 
-#: ../glade2/vcview.glade.h:11
-msgid "Local copy against other remote revision"
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:12
-msgid "Local copy against same remote revision"
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "Ãpne eksternt"
+
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:13
-#, fuzzy
-msgid "Log Message"
-msgstr "Loggmelding:"
+#: ../meld/meldwindow.py:149
+msgid "_View"
+msgstr "_Visning"
 
-#: ../glade2/vcview.glade.h:14
-msgid "Non _VC"
+#: ../meld/meldwindow.py:150
+msgid "File status"
+msgstr "Filstatus"
+
+#: ../meld/meldwindow.py:151
+msgid "Version status"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:15
+#: ../meld/meldwindow.py:152
 #, fuzzy
-msgid "Previous Logs"
-msgstr "Forrige hjelp"
+msgid "File filters"
+msgstr "<b>Filfilter</b>"
 
-#: ../glade2/vcview.glade.h:16
-#, fuzzy
-msgid "Remove _Locally"
-msgstr "Fjern alle"
+#: ../meld/meldwindow.py:153
+msgid "Stop the current action"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:17
+#: ../meld/meldwindow.py:154
 #, fuzzy
-msgid "Remove from VC"
-msgstr "Fjern fra prosjekt"
+msgid "Refresh the view"
+msgstr "Oppdater"
 
-#: ../glade2/vcview.glade.h:18
-msgid "Revert to original"
+#: ../meld/meldwindow.py:155
+msgid "Reload"
+msgstr "Gjenles"
+
+#: ../meld/meldwindow.py:155
+msgid "Reload the comparison"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:19
-#, fuzzy
-msgid "Show ignored files"
-msgstr "Ignorer filer:"
+#: ../meld/meldwindow.py:157
+msgid "_Tabs"
+msgstr "_Faner"
 
-#: ../glade2/vcview.glade.h:21
-#, fuzzy
-msgid "Show normal"
-msgstr "Vis merker"
+#: ../meld/meldwindow.py:158
+msgid "_Previous Tab"
+msgstr "_Forrige fane"
 
-#: ../glade2/vcview.glade.h:22
-#, fuzzy
-msgid "Show unversioned files"
-msgstr "Vis signaler fra kjernen"
+#: ../meld/meldwindow.py:158
+msgid "Activate previous tab"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:23 ../vcview.py:173
-msgid "Tag"
+#: ../meld/meldwindow.py:159
+msgid "_Next Tab"
+msgstr "_Neste fane"
+
+#: ../meld/meldwindow.py:159
+msgid "Activate next tab"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:24
-msgid "Update"
-msgstr "Oppdater"
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Left"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:25
-#, fuzzy
-msgid "VC Log"
-msgstr "Vis logg"
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to left"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:26
-msgid "_Add"
-msgstr "_Legg til"
+#: ../meld/meldwindow.py:161
+msgid "Move Tab _Right"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:27
-msgid "_Commit"
-msgstr "_Sjekk inn"
+#: ../meld/meldwindow.py:161
+msgid "Move current tab to right"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:30
-#, fuzzy
-msgid "_Flatten"
-msgstr "_Fil"
+#: ../meld/meldwindow.py:163
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../glade2/vcview.glade.h:31
+#: ../meld/meldwindow.py:164
 #, fuzzy
-msgid "_Modified"
-msgstr "Endret"
+msgid "_Contents"
+msgstr "KjÃr/_Fortsett"
 
-#: ../glade2/vcview.glade.h:32
-msgid "_Normal"
+#: ../meld/meldwindow.py:164
+msgid "Open the Meld manual"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:33
-msgid "_Remove"
-msgstr "Fje_rn"
+#: ../meld/meldwindow.py:165
+msgid "Report _Bug"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:34
-msgid "_Update"
-msgstr "_Oppdater"
+#: ../meld/meldwindow.py:165
+msgid "Report a bug in Meld"
+msgstr ""
 
-#: ../meld:60 ../meld:70 ../meld:80
-#, c-format
-msgid "Meld requires %s or higher."
+#: ../meld/meldwindow.py:166
+msgid "About this program"
 msgstr ""
 
-#: ../meld:81
-msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
+#: ../meld/meldwindow.py:169
+msgid "Full Screen"
 msgstr ""
 
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
+#: ../meld/meldwindow.py:169
+msgid "View the comparison in full screen"
 msgstr ""
 
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
+#: ../meld/meldwindow.py:170
+msgid "_Toolbar"
 msgstr ""
 
-#: ../meldapp.py:147
-msgid "label"
-msgstr "etikett"
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the toolbar"
+msgstr ""
 
-#: ../meldapp.py:148
+#: ../meld/meldwindow.py:171
 #, fuzzy
-msgid "pattern"
-msgstr "Oppdater"
+msgid "_Statusbar"
+msgstr "Tilstand"
 
-#. file filters
-#. text filters
-#: ../meldapp.py:249 ../meldapp.py:254 ../vcview.py:153
-msgid "Name"
-msgstr "Navn"
+#: ../meld/meldwindow.py:171
+msgid "Show or hide the statusbar"
+msgstr ""
 
-#: ../meldapp.py:249 ../meldapp.py:254
-msgid "Active"
-msgstr "Aktiv"
+#: ../meld/meldwindow.py:538
+msgid "Switch to this tab"
+msgstr ""
 
-#: ../meldapp.py:249
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:629
 #, fuzzy
-msgid "Pattern"
-msgstr "Palett"
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "Opprett nye kataloger"
 
-#: ../meldapp.py:254
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:174
 #, fuzzy
-msgid "Regex"
-msgstr "Register"
+msgid "[None]"
+msgstr "Ingen"
 
-#: ../meldapp.py:296
-msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
-msgstr ""
+#: ../meld/patchdialog.py:122
+#, fuzzy
+msgid "Save Patch As..."
+msgstr "Lagrer prosjekt...\n"
 
-#: ../meldapp.py:300
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
+#: ../meld/preferences.py:37
+msgid "label"
+msgstr "etikett"
+
+#: ../meld/preferences.py:37
+#, fuzzy
+msgid "pattern"
+msgstr "Oppdater"
+
+#: ../meld/preferences.py:111
+msgid "Only available if you have gnome-python-desktop installed"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:444
+#: ../meld/preferences.py:234
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:446
+#: ../meld/preferences.py:236
 msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:448
+#: ../meld/preferences.py:238
+#, fuzzy, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Git versjonskontroll"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:240
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:450
+#: ../meld/preferences.py:242
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:452
+#: ../meld/preferences.py:244
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:454
+#: ../meld/preferences.py:246
 msgid "C++ comment\t0\t//.*\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:456
+#: ../meld/preferences.py:248
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:458
+#: ../meld/preferences.py:250
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:460
+#: ../meld/preferences.py:252
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:462
+#: ../meld/preferences.py:254
 msgid "Script comment\t0\t#.*"
 msgstr ""
 
-#: ../meldapp.py:781
+#: ../meld/vcview.py:128
 #, fuzzy
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Opprett nye kataloger"
+msgid "Co_mmit"
+msgstr "_Sjekk inn"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:829
-#, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
+#: ../meld/vcview.py:128
+#, fuzzy
+msgid "Commit"
+msgstr "_Sjekk inn"
+
+#: ../meld/vcview.py:129
+msgid "_Update"
+msgstr "_Oppdater"
+
+#: ../meld/vcview.py:129
+msgid "Update"
+msgstr "Oppdater"
+
+#: ../meld/vcview.py:130
+#, fuzzy
+msgid "Add to VC"
+msgstr "Legg til i prosjekt"
+
+#: ../meld/vcview.py:131
+#, fuzzy
+msgid "Add _Binary"
+msgstr "Legg _til mÃl"
+
+#: ../meld/vcview.py:131
+#, fuzzy
+msgid "Add binary to VC"
+msgstr "Legg til i prosjekt"
+
+#: ../meld/vcview.py:132
+#, fuzzy
+msgid "Remove from VC"
+msgstr "Fjern fra prosjekt"
+
+#: ../meld/vcview.py:133
+msgid "_Resolved"
 msgstr ""
 
-#: ../meldapp.py:858
-msgid "Set label to use instead of file name"
+#: ../meld/vcview.py:133
+msgid "Mark as resolved for VC"
 msgstr ""
 
-#: ../meldapp.py:859 ../meldapp.py:860 ../meldapp.py:861 ../meldapp.py:862
-msgid "Ignored for compatibility"
+#: ../meld/vcview.py:134
+msgid "Revert to original"
 msgstr ""
 
-#: ../meldapp.py:888
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
+#: ../meld/vcview.py:135
+#, fuzzy
+msgid "Delete locally"
+msgstr "Slett"
+
+#: ../meld/vcview.py:139
+#, fuzzy
+msgid "_Flatten"
+msgstr "_Fil"
+
+#: ../meld/vcview.py:139
+#, fuzzy
+msgid "Flatten directories"
+msgstr "Opprett nye kataloger"
+
+#: ../meld/vcview.py:140
+#, fuzzy
+msgid "_Modified"
+msgstr "Endret"
+
+#: ../meld/vcview.py:141
+msgid "_Normal"
 msgstr ""
 
-#: ../melddoc.py:45
-msgid "untitled"
+#: ../meld/vcview.py:141
+#, fuzzy
+msgid "Show normal"
+msgstr "Vis merker"
+
+#: ../meld/vcview.py:142
+msgid "Non _VC"
 msgstr ""
 
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:118
+#: ../meld/vcview.py:142
 #, fuzzy
-msgid "[None]"
-msgstr "Ingen"
+msgid "Show unversioned files"
+msgstr "Vis signaler fra kjernen"
+
+#: ../meld/vcview.py:143
+#, fuzzy
+msgid "Ignored"
+msgstr "Fje_rn ..."
+
+#: ../meld/vcview.py:143
+#, fuzzy
+msgid "Show ignored files"
+msgstr "Ignorer filer:"
 
-#: ../vcview.py:170
+#: ../meld/vcview.py:186 ../meld/vcview.py:318
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../vcview.py:171
+#: ../meld/vcview.py:187
 #, fuzzy
 msgid "Status"
 msgstr "Tilstand"
 
-#: ../vcview.py:172
+#: ../meld/vcview.py:188
 #, fuzzy
 msgid "Rev"
 msgstr "Fjern"
 
-#: ../vcview.py:174
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr ""
+
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../vcview.py:257
+#: ../meld/vcview.py:249
+#, fuzzy
+msgid "Choose one Version Control"
+msgstr "Git versjonskontroll"
+
+#: ../meld/vcview.py:250
+msgid "Only one Version Control in this directory"
+msgstr ""
+
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:263
+#, python-format
+msgid "%s Not Installed"
+msgstr ""
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:267
+msgid "Invalid Repository"
+msgstr ""
+
+#: ../meld/vcview.py:276
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:318
+#, python-format
+msgid "%s: %s"
+msgstr ""
+
+#: ../meld/vcview.py:362
 msgid "(Empty)"
 msgstr ""
 
-#: ../vcview.py:294
+#: ../meld/vcview.py:400
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr ""
 
-#: ../vcview.py:301
+#: ../meld/vcview.py:408
 #, python-format
 msgid "[%s] Applying patch"
 msgstr ""
 
-#: ../vcview.py:305
-msgid "No differences found."
+#: ../meld/vcview.py:501
+#, fuzzy
+msgid "Select some files first."
+msgstr "Velg header-fil"
+
+#: ../meld/vcview.py:574
+#, python-format
+msgid ""
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    (no need to actually run it, just provide\n"
+"                    the command line) \n"
+"                    \n"
+"                    Replace 'X.Y.Z' by the actual version for the\n"
+"                    source control software you use.\n"
+"                    "
+msgstr ""
+
+#: ../meld/ui/findbar.py:127
+#, fuzzy, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr "Vanlig uttrykk"
+
+#: ../meld/ui/historyentry.py:293
+msgid "_Browse..."
+msgstr ""
+
+#: ../meld/ui/historyentry.py:301
+msgid "Path"
+msgstr ""
+
+#: ../meld/ui/historyentry.py:302
+msgid "Path to file"
+msgstr ""
+
+#: ../meld/ui/historyentry.py:303
+msgid "Pop up a file selector to choose a file"
 msgstr ""
 
-#: ../vcview.py:382
+#: ../meld/ui/historyentry.py:441
 #, fuzzy
-msgid "Select some files first."
+msgid "Select directory"
+msgstr "Velg katalog"
+
+#: ../meld/ui/historyentry.py:445
+#, fuzzy
+msgid "Select file"
 msgstr "Velg header-fil"
 
-#: ../vcview.py:446
-msgid "Invoking patch failed, you need GNU patch."
+#: ../meld/ui/notebooklabel.py:60
+msgid "Close tab"
 msgstr ""
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:39
+#: ../meld/vc/_vc.py:40
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgstr ""
 
-#: ../vc/cvs.py:153
+#: ../meld/vc/cvs.py:163
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
 "The pattern was '%s'\n"
 "The error was '%s'"
 msgstr ""
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]