summaryrefslogtreecommitdiffstats
path: root/po/nb.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po81
1 files changed, 16 insertions, 65 deletions
diff --git a/po/nb.po b/po/nb.po
index b71b132..ef5056e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
"PO-Revision-Date: 2006-06-10 22:03+0200\n"
"Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -153,11 +153,6 @@ msgstr ""
"Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen "
"og lese gjennom mappa på nytt?"
-#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622
-#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732
-msgid "Warning"
-msgstr ""
-
#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
msgid "Rescan"
msgstr "Les på nytt"
@@ -261,11 +256,6 @@ msgstr "Endre alle flette-handlinger"
msgid "C&ontinue"
msgstr "F&ortsett"
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
#: directorymergewindow.cpp:1236
msgid "Processing "
msgstr "Arbeider "
@@ -359,13 +349,6 @@ msgstr "Programfeil"
msgid "An error occurred while copying.\n"
msgstr "Det oppsto en feil under kopiering.\n"
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "Feil."
-
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
msgid "Merge Error"
msgstr "Flettefeil"
@@ -599,11 +582,6 @@ msgstr "Siste endring"
msgid "Link-Destination"
msgstr "Lenkemål"
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "Fil ..."
-
#: directorymergewindow.cpp:2729
msgid "not available"
msgstr "ikke tilgjengelig"
@@ -856,10 +834,6 @@ msgstr "Feil ved åpning av fil"
msgid "Opens documents for comparison..."
msgstr "Åpner dokumentere for sammenlikning ..."
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
#: kdiff3.cpp:439
msgid "Saves the merge result. All conflicts must be solved!"
msgstr "Lagrer fletteresultatet. Alle konflikter må løses!"
@@ -1128,10 +1102,6 @@ msgid ""
"You are currently doing a directory merge. Are you sure, you want to abort?"
msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?"
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
#: kdiff3.cpp:644
msgid "Saving file..."
msgstr "Lagrer fil ..."
@@ -1140,10 +1110,6 @@ msgstr "Lagrer fil ..."
msgid "Saving file with a new filename..."
msgstr "Lagrer fil med nytt filnavn ..."
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
#: kdiff3.cpp:751
msgid "Printing..."
msgstr "Skriver ut ..."
@@ -1408,15 +1374,6 @@ msgstr "Latin1"
msgid "Change this if non-ASCII characters are not displayed correctly."
msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig."
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "Sett opp ..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
#: optiondialog.cpp:510
msgid "Editor & Diff Output Font"
msgstr "Skrift for redigering og utdata"
@@ -2409,10 +2366,6 @@ msgstr "Utdata (valgfri):"
msgid "Configure..."
msgstr "Sett opp ..."
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
#: smalldialogs.cpp:347
msgid "Search text:"
msgstr "Søketekst:"
@@ -2491,14 +2444,6 @@ msgstr ""
msgid "Sort key result:"
msgstr "Resulterende sorteringsnøkler:"
-#: smalldialogs.cpp:493
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:497
-msgid "Cancel"
-msgstr ""
-
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
msgid "Match success."
msgstr "Tilslag."
@@ -2521,11 +2466,6 @@ msgstr "&KDiff3"
msgid "Configure KDiff3"
msgstr "Sett opp KDiff3"
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "Fil ..."
-
#: kdiff3_shell.rc:7
#, no-c-format
msgid "&Directory"
@@ -2561,10 +2501,21 @@ msgstr "&Flett"
msgid "&Window"
msgstr "&Vindu"
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Feil."
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Fil ..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "Sett opp ..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "Fil ..."
#~ msgid "Files A and B are binary equal.\n"
#~ msgstr "Filer A og B er binært like.\n"