OSDN Git Service

[ 791487 ] Norwegian (bokm�l) translation
authorChristian List <list1974@hotmail.com>
Wed, 20 Aug 2003 13:31:55 +0000 (13:31 +0000)
committerChristian List <list1974@hotmail.com>
Wed, 20 Aug 2003 13:31:55 +0000 (13:31 +0000)
17 files changed:
Src/Languages/Norwegian/MergeNorwegian.rc [new file with mode: 0644]
Src/Languages/Norwegian/res/Merge.ico [new file with mode: 0644]
Src/Languages/Norwegian/res/Merge.rc2 [new file with mode: 0644]
Src/Languages/Norwegian/res/MergeDoc.ico [new file with mode: 0644]
Src/Languages/Norwegian/res/Toolbar.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/binary.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/binarydiff.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/equal.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/lfile.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/mg_cur.cur [new file with mode: 0644]
Src/Languages/Norwegian/res/notequal.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/rfile.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/rfolder.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/splash1.bmp [new file with mode: 0644]
Src/Languages/Norwegian/res/unknown.bmp [new file with mode: 0644]
Src/Languages/Norwegian/resource.h [new file with mode: 0644]
Src/readme.txt

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
new file mode 100644 (file)
index 0000000..45c3621
--- /dev/null
@@ -0,0 +1,1002 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Norwegian (bokmål) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
+#ifdef _WIN32
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif\r\n"
+    "#include ""res\\Merge.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#include ""afxprint.rc""       // printing/print preview resources\r\n"
+    "#endif\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON    DISCARDABLE     "res\\Merge.ico"
+IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+BEGIN
+    POPUP "_POPUP_"
+    BEGIN
+        MENUITEM "Kopier til den andre siden",          ID_POPUP_COPYTOOTHERSIDE
+        MENUITEM "Kopier fra den andre siden",        ID_POPUP_COPYFROMOTHERSIDE
+        MENUITEM SEPARATOR
+        MENUITEM "Kopier alle forskjellene til den andre siden...",
+                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
+
+        MENUITEM "Kopier alle forskjellene fra den andre siden...",
+                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+
+        MENUITEM SEPARATOR
+        MENUITEM "Angre",                        ID_UNDO
+        MENUITEM SEPARATOR
+        MENUITEM "Lagre endringer...",             ID_POPUP_SAVE
+    END
+END
+
+IDR_MAINFRAME MENU PRELOAD DISCARDABLE
+BEGIN
+    POPUP "&Filer"
+    BEGIN
+        MENUITEM "&Åpne...\tCtrl+O",            ID_FILE_OPEN
+        MENUITEM "&Lagre\tCtrl+S",               ID_FILE_SAVE
+        MENUITEM SEPARATOR
+        MENUITEM "L&ukk\tEsc",                  ID_APP_EXIT
+    END
+    POPUP "&Rediger"
+    BEGIN
+        MENUITEM "&Angre\tCtrl+Z",               ID_EDIT_UNDO
+        MENUITEM "&Gjenopprett\tCtrl+Y",               ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "&Klipp ut\tCtrl+X",                ID_EDIT_CUT
+        MENUITEM "Ko&pier\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "&Lim inn\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "&Neste forskjell\tAlt+Down",  ID_NEXTDIFF
+        MENUITEM "&Forrige forskjell\tAlt+Up", ID_PREVDIFF
+        MENUITEM SEPARATOR
+        MENUITEM "F&ørste forskjell\tAlt+Home", ID_FIRSTDIFF
+        MENUITEM "&Aktuell forskjell\tAlt+Enter", ID_CURDIFF
+        MENUITEM "&Siste forskjell\tAlt+End",   ID_LASTDIFF
+        MENUITEM SEPARATOR
+        MENUITEM "Kopier til &høyre\tAlt+Høyre", ID_L2R
+        MENUITEM "Kopier til &venstre\tAlt+Venstre", ID_R2L
+        MENUITEM SEPARATOR
+        MENUITEM "Kopier alt &til høyre",       ID_ALL_RIGHT
+        MENUITEM "Kopier alt til ve&nstre",     ID_ALL_LEFT
+        MENUITEM SEPARATOR
+        MENUITEM "Sø&k...\tCtrl+F",             ID_EDIT_FIND
+        MENUITEM "&Erstatt...\tCtrl+H",          ID_EDIT_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "&Egenskaper...",              ID_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "&Opdater\tF5",                ID_REFRESH
+    END
+    POPUP "&Vis"
+    BEGIN
+        MENUITEM "Vis &identiske filer",        ID_OPTIONS_SHOWIDENTICAL
+        MENUITEM "Vis &forskjellige filer",      ID_OPTIONS_SHOWDIFFERENT
+        MENUITEM "Vis &venstre unike filer",   ID_OPTIONS_SHOWUNIQUELEFT
+        MENUITEM "Vis &høyre unike filer",     ID_OPTIONS_SHOWUNIQUERIGHT
+        MENUITEM "Vis &binære filer",           ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Skjul *.&BAK filer",            ID_HIDE_BACKUP_FILES
+        MENUITEM SEPARATOR
+        MENUITEM "Velg &skrifttype...",         ID_VIEW_SELECTFONT
+        MENUITEM "Bruk standard s&krifttype",   ID_VIEW_USEDEFAULTFONT
+        MENUITEM SEPARATOR
+        MENUITEM "&Vis mellomrom",              ID_VIEW_WHITESPACE
+        MENUITEM SEPARATOR
+        MENUITEM "&Værktøylinje",              ID_VIEW_TOOLBAR
+        MENUITEM "S&tatuslinje",                ID_VIEW_STATUS_BAR
+        MENUITEM SEPARATOR
+        MENUITEM "S&pråk...",                   ID_VIEW_LANGUAGE
+    END
+    POPUP "&Vindu"
+    BEGIN
+        MENUITEM "Lukk",                         ID_FILE_CLOSE
+        MENUITEM SEPARATOR
+        MENUITEM "&Horisontale vinduer",        ID_WINDOW_TILE_HORZ
+        MENUITEM "&Vertikale vinduer",          ID_WINDOW_TILE_VERT
+        MENUITEM "&Kaskade",                    ID_WINDOW_CASCADE
+    END
+    POPUP "&Hjelp"
+    BEGIN
+        MENUITEM "&Innhold...",                 ID_HELP_CONTENTS
+        MENUITEM SEPARATOR
+        MENUITEM "GNU General Public License...", ID_HELP_GNULICENSE
+        MENUITEM "&Om WinMerge...",             ID_APP_ABOUT
+    END
+END
+
+IDR_POPUP_DIRVIEW MENU DISCARDABLE
+BEGIN
+    POPUP "_POPUP_"
+    BEGIN
+        MENUITEM "Kopier fil til venstre",      ID_DIR_COPY_FILE_TO_LEFT
+        MENUITEM "Kopier fil til høyre",        ID_DIR_COPY_FILE_TO_RIGHT
+        MENUITEM "Slett venstre fil",            ID_DIR_DEL_LEFT
+        MENUITEM "Slett høyre fil",              ID_DIR_DEL_RIGHT
+        MENUITEM "Slett begge filer",            ID_DIR_DEL_BOTH
+        MENUITEM SEPARATOR
+        MENUITEM "Åpne venstre",                ID_DIR_OPEN_LEFT
+        MENUITEM "Åpne venstre med...",         ID_DIR_OPEN_LEFT_WITH
+        MENUITEM "Åpne høyre",                  ID_DIR_OPEN_RIGHT
+        MENUITEM "Åpne høyre med...",           ID_DIR_OPEN_RIGHT_WITH
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+BEGIN
+    "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT
+    "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
+    "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL, NOINVERT
+    "H",            ID_EDIT_REPLACE,        VIRTKEY, CONTROL, NOINVERT
+    "N",            ID_FILE_NEW,            VIRTKEY, CONTROL, NOINVERT
+    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
+    "P",            ID_FILE_PRINT,          VIRTKEY, CONTROL, NOINVERT
+    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
+    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
+    "Y",            ID_EDIT_REDO,           VIRTKEY, CONTROL, NOINVERT
+    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
+    VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
+    VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
+    VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
+    VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
+    VK_F3,          ID_EDIT_REPEAT,         VIRTKEY, NOINVERT
+    VK_F3,          ID_EDIT_FIND_PREVIOUS,  VIRTKEY, SHIFT, NOINVERT
+    VK_F5,          ID_REFRESH,             VIRTKEY, NOINVERT
+    VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
+    VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
+    VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT
+    VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
+    VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT, NOINVERT
+    VK_LEFT,        ID_R2L,                 VIRTKEY, ALT, NOINVERT
+    VK_RETURN,      ID_CURDIFF,             VIRTKEY, ALT, NOINVERT
+    VK_RIGHT,       ID_L2R,                 VIRTKEY, ALT, NOINVERT
+    VK_UP,          ID_PREVDIFF,            VIRTKEY, ALT, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 223, 122
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Om WinMerge"
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,24,14,21,20
+    LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
+    DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
+    LTEXT           "Version 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
+    LTEXT           "Alle rettigheter forbeholdes",IDC_STATIC,7,60,170,8
+    LTEXT           "Besøk WinMerge sin hjemmeside!",IDC_WWW,7,107,209,8
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
+    LTEXT           "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8
+    LTEXT           "Syntax Highlighting Edit View by Andrei Stcherbatchenko ",
+                    IDC_STATIC,7,71,209,8
+    LTEXT           "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81,
+                    209,8
+END
+
+IDD_OPEN DIALOGEX 0, 0, 352, 98
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Velg filer eller mapper..."
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    LTEXT           "&Venstre:",IDC_STATIC,25,25,27,8
+    COMBOBOX        IDC_LEFT_COMBO,56,22,176,94,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
+                    WS_EX_ACCEPTFILES
+    PUSHBUTTON      "&Åpne...",IDC_LEFT_BUTTON,235,22,44,12
+    LTEXT           "&Høyre:",IDC_STATIC,33,40,20,8
+    COMBOBOX        IDC_RIGHT_COMBO,56,38,175,95,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
+                    WS_EX_ACCEPTFILES
+    PUSHBUTTON      "Å&pne...",IDC_RIGHT_BUTTON,241,38,38,12
+    LTEXT           "E&xtensions:",IDC_STATIC,16,56,37,8
+    COMBOBOX        IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Re&kursivt",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX |
+                    WS_TABSTOP,35,77,46,10
+    DEFPUSHBUTTON   "OK",IDOK,295,11,50,14
+    PUSHBUTTON      "Avbrytt",IDCANCEL,295,28,50,14
+    GROUPBOX        "Filer eller mapper som skal sammenlignes",IDC_STATIC,7,
+                    7,279,84
+END
+
+IDD_VSS DIALOG DISCARDABLE  0, 0, 258, 149
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Visual SourceSafe"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "",IDC_STATIC,7,7,244,47,SS_SUNKEN
+    LTEXT           "IDS_SAVEVSS_FMT",IDC_MESSAGE,14,13,231,34
+    DEFPUSHBUTTON   "Check Out",IDOK,33,121,50,14
+    PUSHBUTTON      "Avbrytt",IDCANCEL,173,121,50,14
+    PUSHBUTTON      "Lagre som...",IDSAVEAS,103,121,50,14
+    LTEXT           "Prosjekt:",IDC_STATIC,9,61,25,8
+    COMBOBOX        IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN |
+                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Bruker:",IDC_STATIC,7,82,24,8
+    EDITTEXT        IDC_USER,36,78,58,14,ES_AUTOHSCROLL
+    LTEXT           "Passord:",IDC_STATIC,127,79,34,8
+    EDITTEXT        IDC_PASSWORD,162,78,70,14,ES_PASSWORD | ES_AUTOHSCROLL
+END
+
+IDD_PROP_VSS DIALOG DISCARDABLE  0, 0, 259, 157
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Versjonsstyringssystem"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Innstillinger",IDC_STATIC,7,7,245,54
+    LTEXT           "&Sti til cleartool.exe:",IDC_VSS_L1,13,41,60,8
+    EDITTEXT        IDC_PATH_EDIT,88,40,112,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Åpne...",IDC_BROWSE_BUTTON,202,40,46,12
+    COMBOBOX        IDC_VER_SYS,88,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "&Versjonsstyringssystem",IDC_STATIC,13,22,75,10
+END
+
+IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Generelt"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Innstillinger",IDC_STATIC,7,7,245,94
+    CONTROL         "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,81,10
+    CONTROL         "Automatisk &scroll til første forskjell",IDC_SCROLL_CHECK,
+                    "Knapp",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,117,10
+    CONTROL         "Ignorer blan&ke linjer",IDC_IGNBLANKS_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,77,10
+    CONTROL         "Ignorer store/små &bokstaver",IDC_IGNCASE_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,105,10
+    CONTROL         "Sensitive for &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,71,10
+    CONTROL         "&Fjern oppstartsbilde",IDC_DISABLE_SPLASH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,79,10
+    CONTROL         "Automatisk &oppdatering",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
+    CONTROL         "Sammenlign &mellomrom",IDC_WHITESPACE,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,44,89,10
+    CONTROL         "Ignorer e&ndringer av mellomrom",IDC_WHITE_CHANGE,"Button",
+                    BS_AUTORADIOBUTTON,128,55,108,10
+    CONTROL         "Ignorer &alle mellomrom",IDC_ALL_WHITE,"Button",
+                    BS_AUTORADIOBUTTON,128,65,85,10
+    GROUPBOX        "Tabulator",IDC_STATIC,7,105,245,30,WS_GROUP
+    LTEXT           "&Tabulatorstørrelse:",IDC_STATIC,15,119,61,8
+    EDITTEXT        IDC_TAB_EDIT,81,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
+    CONTROL         "Sett inn tabulatorer",IDC_PROP_INSERT_TABS,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,113,73,10
+    CONTROL         "Sett inn mellomrom",IDC_PROP_INSERT_SPACES,"Button",
+                    BS_AUTORADIOBUTTON,128,122,73,10
+END
+
+IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Språk"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "OK",IDOK,154,16,52,14
+    PUSHBUTTON      "Avbrytt",IDCANCEL,154,33,52,14
+    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,141,LBS_NOINTEGRALHEIGHT |
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Tilgjengelige språk:",IDC_STATIC,7,7,63,8
+END
+
+IDD_EDIT_FIND DIALOG FIXED IMPURE  30, 73, 236, 68
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Søk"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    COMBOBOX        IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL |
+                    WS_TABSTOP
+    CONTROL         "Sammenlign bare &hele ord",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12
+    CONTROL         "Sammenlign store/små &bokstaver",IDC_EDIT_MATCH_CASE,
+                    "Knapp",BS_AUTOCHECKBOX | WS_TABSTOP,4,40,121,12
+    CONTROL         "Regulært &uttrykk",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12
+    CONTROL         "&Opp",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
+                    WS_GROUP,135,34,25,12
+    CONTROL         "&Ned",IDC_EDIT_DIRECTION_DOWN,"Button",
+                    BS_AUTORADIOBUTTON,135,44,32,12
+    DEFPUSHBUTTON   "&Finn neste",IDOK,182,5,50,14,WS_GROUP
+    PUSHBUTTON      "Avbryt",IDCANCEL,182,23,50,14
+    LTEXT           "F&inn hva:",IDC_STATIC,4,8,36,8
+    GROUPBOX        "Retning",IDC_STATIC,131,26,44,38,WS_GROUP
+END
+
+IDD_EDIT_REPLACE DIALOG FIXED IMPURE  36, 44, 230, 89
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Erstatt"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    COMBOBOX        IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT |
+                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN |
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Sammenlign bare &hele ord",IDC_EDIT_WHOLE_WORD,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12
+    CONTROL         "Sammenlign store/små &bokstaver",IDC_EDIT_MATCH_CASE,
+                    "Knapp",BS_AUTOCHECKBOX | WS_TABSTOP,5,60,107,12
+    CONTROL         "Regulært &uttrykk",IDC_EDIT_REGEXP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,5,74,77,12
+    CONTROL         "&Valgte",IDC_EDIT_SCOPE_SELECTION,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,121,56,40,10
+    CONTROL         "He&le filen",IDC_EDIT_SCOPE_WHOLE_FILE,"Button",
+                    BS_AUTORADIOBUTTON,121,67,46,10
+    DEFPUSHBUTTON   "&Finn neste",IDC_EDIT_SKIP,174,4,50,14,WS_GROUP
+    PUSHBUTTON      "&Erstatt",IDC_EDIT_REPLACE,174,21,50,14
+    PUSHBUTTON      "Erstatt &alt",IDC_EDIT_REPLACE_ALL,174,38,50,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,174,55,50,14
+    LTEXT           "F&inn hva:",IDC_STATIC,4,9,48,8
+    LTEXT           "Ers&tatt med:",IDC_STATIC,4,26,48,8
+    GROUPBOX        "Erstatt i",IDC_STATIC,116,46,52,39,WS_GROUP
+END
+
+IDD_CLEARCASE DIALOG DISCARDABLE  0, 0, 279, 111
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Rational Clearcase"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "CheckOut",IDOK,35,90,50,14
+    PUSHBUTTON      "Avbrytt",IDCANCEL,194,90,50,14
+    PUSHBUTTON      "Skul som...",IDSAVEAS,114,90,50,14
+    EDITTEXT        IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
+                    ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+    LTEXT           "Kommentarer",IDC_STATIC,18,7,47,10
+END
+
+IDD_PROPSYNTAX DIALOG DISCARDABLE  0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Uthev"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Uthev syntaksen",IDC_HILITE_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,80,10
+END
+
+IDD_PROPPAGE_FILTER DIALOG DISCARDABLE  0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Filter"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Ignorer linjer som følger det følgende mønster",
+                    IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    7,221,15
+    LTEXT           "Regulære uttrykk (ett pr linje):",IDC_STATIC,7,28,221,8
+    EDITTEXT        IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
+                    ES_AUTOHSCROLL | ES_WANTRETURN
+    LTEXT           "Filfilter:",IDC_STATIC,7,128,60,10
+    COMBOBOX        IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST |
+                    WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Farger"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    LTEXT           "Forskjeller:",IDC_STATIC,15,18,36,8
+    CONTROL         "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT |
+                    WS_EX_CLIENTEDGE
+    LTEXT           "Valgte forskjeller:",IDC_STATIC,14,36,51,8
+    CONTROL         "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+                    WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT |
+                    WS_EX_CLIENTEDGE
+END
+
+IDD_OUTPUT DIALOG DISCARDABLE  0, 0, 278, 157
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,106,136,50,14
+    EDITTEXT        IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
+                    WS_VSCROLL
+END
+
+IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Registreringer"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Assosiert med mapper",IDC_ASSOC_DIRECTORY,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+END
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,9,1,4
+ PRODUCTVERSION 1,9,1,4
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x9L
+#else
+ FILEFLAGS 0x8L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "041404b0"
+        BEGIN
+            VALUE "Comments", "Translated by Hans Fredrik Nordhaug\0"
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "WinMerge Application\0"
+            VALUE "FileVersion", "000.000.000.000\0"
+            VALUE "InternalName", "WinMerge\0"
+            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WinMerge.EXE\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "WinMerge\0"
+            VALUE "ProductVersion", "000.000.000.000\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x414, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 216
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 115
+    END
+
+    IDD_OPEN, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 345
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 91
+    END
+
+    IDD_VSS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 251
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 141
+    END
+
+    IDD_PROP_VSS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 252
+        VERTGUIDE, 85
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 150
+    END
+
+    IDD_PROPPAGE_LARGE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        VERTGUIDE, 125
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_CLEARCASE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 272
+        VERTGUIDE, 18
+        VERTGUIDE, 35
+        VERTGUIDE, 244
+        VERTGUIDE, 261
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 104
+    END
+
+    IDD_PROPSYNTAX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_PROPPAGE_FILTER, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_PROPPAGE_COLORS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_MAINFRAME TOOLBAR DISCARDABLE  16, 15
+BEGIN
+    BUTTON      ID_FILE_OPEN
+    BUTTON      ID_FILE_SAVE
+    SEPARATOR
+    BUTTON      ID_EDIT_UNDO
+    BUTTON      ID_EDIT_REDO
+    SEPARATOR
+    BUTTON      ID_NEXTDIFF
+    BUTTON      ID_PREVDIFF
+    BUTTON      ID_LASTDIFF
+    BUTTON      ID_CURDIFF
+    BUTTON      ID_FIRSTDIFF
+    SEPARATOR
+    BUTTON      ID_L2R
+    BUTTON      ID_R2L
+    SEPARATOR
+    BUTTON      ID_OPTIONS
+    SEPARATOR
+    BUTTON      ID_ALL_RIGHT
+    BUTTON      ID_ALL_LEFT
+    SEPARATOR
+    BUTTON      ID_REFRESH
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
+IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"
+IDB_UNKNOWN             BITMAP  DISCARDABLE     "res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP  DISCARDABLE     "res\\binary.bmp"
+IDB_LFILE               BITMAP  DISCARDABLE     "res\\lfile.bmp"
+IDB_RFILE               BITMAP  DISCARDABLE     "res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP  DISCARDABLE     "res\\binarydiff.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_PROP_VSS DLGINIT
+BEGIN
+    IDC_VER_SYS, 0x403, 5, 0
+0x6f4e, 0x656e, "\000"
+    IDC_VER_SYS, 0x403, 34, 0
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
+    IDC_VER_SYS, 0x403, 34, 0
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
+    IDC_VER_SYS, 0x403, 19, 0
+0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
+"\000"
+    0
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDR_MARGIN_CURSOR       CURSOR  DISCARDABLE     "res\\mg_cur.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE PRELOAD DISCARDABLE
+BEGIN
+    IDR_MAINFRAME           "WinMerge"
+    IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
+    IDS_WINMERGE_THIS_DIRECTORY "WinMerge denne folder"
+END
+
+STRINGTABLE PRELOAD DISCARDABLE
+BEGIN
+    IDS_VERSION_FMT         "Version %1"
+    IDS_ALLFILES            "Alle filer (*.*)|*.*||"
+    IDS_CONFIRM_ALL_LEFT    "Er du sikker på du vil kopiere alle forskjeller til den venstre filen?"
+    IDS_CONFIRM_ALL_RIGHT   "Er du sikker på du vil kopiere alle forskjeller til den høyre filen?"
+    IDS_ERRORS_TITLE        "%1 feil"
+    IDS_CONFIRM_COPY2DIR    "Er du sikker på du vil kopiere %1 av %2 valgte?"
+    IDS_FONT_CHANGE         "Den valgte endring av skrifttype vil ikke kunne ses i allerede åpne vinduer."
+    IDS_DIRECTORY_WINDOW_TITLE "Resultat av sammenligning av mapper"
+    IDS_DIRECTORY_WINDOW_STATUS_FMT "Resultater for %1 og %2"
+    IDS_FILES_ARE_DIFFERENT "Filer er forskjellige"
+    IDS_BIN_FILES_DIFF      "Binære filer er forskjellige"
+    IDS_ONLY_IN_FMT         "Kun i %1"
+    IDS_IDENTICAL           "Identiske"
+    IDS_CANT_COMPARE_FILES  "Kan ikke sammenligne filer"
+END
+
+STRINGTABLE PRELOAD DISCARDABLE
+BEGIN
+    AFX_IDS_APP_TITLE       "WinMerge"
+    AFX_IDS_IDLEMESSAGE     "Klar"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_INDICATOR_EXT        "EXT"
+    ID_INDICATOR_CAPS       "CAP"
+    ID_INDICATOR_NUM        "NUM"
+    ID_INDICATOR_SCRL       "SCRL"
+    ID_INDICATOR_OVR        "OVR"
+    ID_INDICATOR_REC        "REC"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_FILE_NEW             "Lag et nytt dokument\nNy"
+    ID_FILE_OPEN            "Åpne et eksisterende dokumentet\nÅpne (Ctrl+O)"
+    ID_FILE_CLOSE           "Lukk det aktive dokumentet\nLukk"
+    ID_FILE_SAVE            "Skjul det aktive dokumentet\nSkjul (Ctrl+S)"
+    ID_FILE_SAVE_AS         "Skjul det aktive dokumentet med et nytt navn\nSkjul som"
+    ID_FILE_PAGE_SETUP      "Endrer skriverens indstillinger\nSideoppsett"
+    ID_FILE_PRINT_SETUP     "Endrer skriver og skriverens indstillinger\nSkriveroppsett"
+    ID_FILE_PRINT           "Skriv ut det aktive dokumentet\nSkriv ut"
+    ID_FILE_PRINT_PREVIEW   "Vis de fulle sidene\nUtskriftsforhåndsvisning"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_APP_ABOUT            "Vis programinformasjon, versjonsnummer og opphavsrett\nOm"
+    ID_APP_EXIT             "Avslutt programmet; spør om man vil lagre dokumenter\nAvslutt"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_FILE_MRU_FILE1       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE2       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE3       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE4       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE5       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE6       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE7       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE8       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE9       "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE10      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE11      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE12      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE13      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE14      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE15      "Åpne dette dokumentet"
+    ID_FILE_MRU_FILE16      "Åpne dette dokumentet"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_NEXT_PANE            "Skift til det neste vinduet\nNeste vindu"
+    ID_PREV_PANE            "Skift til det forrige vinduet\nForrige vindu"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_WINDOW_NEW           "Åpne et nytt vindu til det aktive dokumentet\nNytt vindu"
+    ID_WINDOW_ARRANGE       "Arranger ikonene i bunnen av vinduet\nArranger ikoner"
+    ID_WINDOW_CASCADE       "Arranger vinduene så de overlapper\nKaskade vinduer"
+    ID_WINDOW_TILE_HORZ     "Arranger vinduene som ikke-overlappende brikker\nBrikker vinduer"
+    ID_WINDOW_TILE_VERT     "Arranger vinduene som ikke-overlappende brikker\nBrikker vinduer"
+    ID_WINDOW_SPLIT         "Del det aktive vinduet\nDel"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_EDIT_CLEAR           "Slett det valgte\nSlett"
+    ID_EDIT_CLEAR_ALL       "Slett alt\nSlett alt"
+    ID_EDIT_COPY            "Kopier det valgte og sett det i utklippsbeholderen\nKopier"
+    ID_EDIT_CUT             "Klipp det valgte ut og sett det i utklippsbeholderen\nKlipp"
+    ID_EDIT_FIND            "Finn den angitte teksten\nFinn"
+    ID_EDIT_PASTE           "Sett inn utklippsbeholderens innhold\nSett inn"
+    ID_EDIT_REPEAT          "Gjenta den siste handlingen\nGjenta"
+    ID_EDIT_REPLACE         "Erstatt den angitte teksten med en annen tekst\nErstatt"
+    ID_EDIT_SELECT_ALL      "Velg hele dokumentet\nVelg alt"
+    ID_EDIT_UNDO            "Angre den siste handlingen\nAngre"
+    ID_EDIT_REDO            "Gjenopprett den forrige handlingen\nGjenopprett"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_VIEW_TOOLBAR         "Vis eller skjul værktøylinjen\nVis værktøylinjen"
+    ID_VIEW_STATUS_BAR      "Vis eller skjul statuslinjen\nVis statuslinjen"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    AFX_IDS_SCSIZE          "Endre vindusstørrelse"
+    AFX_IDS_SCMOVE          "Endre vindusposisjon"
+    AFX_IDS_SCMINIMIZE      "Minimer vinduet til et ikon"
+    AFX_IDS_SCMAXIMIZE      "Maximer vinduet til full størrelse"
+    AFX_IDS_SCNEXTWINDOW    "Skift til det neste dokumentvinduet"
+    AFX_IDS_SCPREVWINDOW    "Skift til det forrige dokumentvinduet"
+    AFX_IDS_SCCLOSE         "Lukk det aktive vinduet og spør om dokumenter skal lagres"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    AFX_IDS_SCRESTORE       "Gjenopprett vinduet til normal størrelse"
+    AFX_IDS_SCTASKLIST      "Liste med aktive vinduer"
+    AFX_IDS_MDICHILD        "Aktiver dette vinduet"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    AFX_IDS_PREVIEW_CLOSE   "Lukk utskriftsforhåndsvisning\nAvbryt forhåndsvisning"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_L2R                  "Kopier den valgte teksten til den høyre filen\nKopier høyre (Alt Høyre)"
+    ID_R2L                  "Kopier den valgte teksten til den venstre filen\nKopier venstre (Alt Venstre)"
+    ID_OPTIONS_SHOWIDENTICAL "Viser filer som er helt like"
+    ID_OPTIONS_SHOWDIFFERENT "Viser filer som har forskjeller"
+    ID_PREVDIFF             "Scroll til den forrige forskjellen\nForrige forskjell (Alt Opp)"
+    ID_NEXTDIFF             "Scroll til den neste forskjellen\nNeste forskjell (Alt Ned)"
+    ID_OPTIONS_BACKUPORIGINALFILE
+                            "Lagre en kopi av originalen som *.bak\nBackup"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
+                            "Scroll automatisk til den første forskjellen\nScroll første"
+    ID_OPTIONS_IGNOREWHITESPACE
+                            "Ignorerer mellomrom under sammenligning av filer"
+    ID_HIDE_BACKUP_FILES    "Skjul filer med extension BAK"
+    ID_HELP_GNULICENSE      "Vis GNU general public license"
+    ID_USEVSS               "Forsøker å sjekke skrivebeskyttede filer ut fra SourceSafe"
+    ID_OPTIONS              "Sett programinnstillinger\nInnstillinger"
+    ID_ALL_LEFT             "Kopier alle forskjeller til den venstre filen\nAlt til venstre"
+    ID_ALL_RIGHT            "Kopier alle forskjeller til den høyre filen\nAlt til høyre"
+    ID_VIEW_SELECTFONT      "Velg skrifttype til vinduene\nVelg skrifttype"
+    ID_VIEW_USEDEFAULTFONT  "Bruk standard skrifttype for vinduene\nStandard skrifttype"
+    ID_DIR_COPY_FILE_TO_LEFT "Kopier den valgte filen til den angitte mappen"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_DIR_COPY_FILE_TO_RIGHT "Kopier den valgte filen til den angitte mappen"
+    ID_VIEW_LANGUAGE        "Velg språk til brukergrensesnittet\nSpråk"
+    ID_HELP_CONTENTS        "Vis hjelpen for WinMerge\nHjelp"
+    ID_FIRSTDIFF            "Scroll til den første forskjellen\nFørste forskjell (Alt+Home)"
+    ID_CURDIFF              "Scroll til den aktuelle forskjellen\nAktuelle forskjell (Alt+Enter)"
+    ID_LASTDIFF             "Scroll til den siste forskjellen\nSiste forskjell (Alt+End)"
+    ID_DIFFNUM              "plassholder"
+    ID_DIR_DEL_LEFT         "Slett valgte elementer til venstre"
+    ID_DIR_DEL_RIGHT        "Slett valgte elementer til høyre"
+    ID_DIFFSTATUS           "plassholder for statusteller"
+    ID_OPTIONS_SHOWUNIQUELEFT "Viser filer som kun eksisterer på venstre side"
+    ID_OPTIONS_SHOWUNIQUERIGHT "Viser filer som kun eksisterer på høyre side"
+    ID_DIR_DEL_BOTH         "Slett de valgte element(er) på begge sider"
+    ID_DIR_OPEN_LEFT        "Åpne venstre fil"
+    ID_DIR_OPEN_LEFT_WITH   "Åpne venstre fil med ..."
+    ID_DIR_OPEN_RIGHT       "Åpne høyre fil"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SAVE_AS_TITLE       "Lagre som"
+    IDS_SELECT_FILES_OR_FOLDERS
+                            "Du skal velge enten utelukkende filer, eller utelukkende mapper."
+    IDS_BACKUP_FAILED_PROMPT
+                            "Kan ikke ta backup av den originale filen.\nVil du fortsette allikevel?"
+    IDS_OPTIONS_TITLE       "Egenskaper"
+    IDS_OPEN_TITLE          "Åpne"
+    IDS_CONFIRM_DELETE_FILE "Slett fil %1?"
+    IDS_EDIT_WINDOW_TITLE_FMT "Rediger %1"
+    IDS_FILESSAME           "De valgte filene er identiske."
+    IDS_FILEUNIQUE          "Den valgte filen eksisterer ikke i begge mapper og kan derfor ikke sammenlignes"
+    IDS_FILEERROR           "Det skjedde en feil under sammenligning av filene."
+    IDS_SAVEREADONLY_FMT    "%1 er markert som skrivebeskyttet. Vil du lagre filen under et annet navn?"
+    IDS_SAVE_FMT            "Lagre endringer til %1?"
+    IDS_FILEBINARY          "Binære filer kan ikke sammenlignes visuelt."
+    IDS_SAVEVSS_FMT         "%1 er markert som skrivebeskyttet. Vil du sjekke filen ut fra et versjonsstyringssystem, eller lagre den under et annet navn?"
+    IDS_VSSERROR            "Versjonsstyringssystemet returnerte en feil under forsøket på å sjekke filen ut. Kan ikke fortsette..."
+    IDS_NOPROJECT           "Du skal angi en SourceSafe prosjektsti for å fortsette (ie:  $/MitProjekt)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_FILENAME_HEADER     "Filnavn"
+    IDS_DIR_HEADER          "Mappe"
+    IDS_RESULT_HEADER       "Resultat av sammenligningen"
+    IDS_FILE_COMPARISON_TITLE "Filsammenligning"
+    IDS_DIFF_NUMBER_STATUS_FMT "Forskjell %1 av %2"
+    IDS_NO_DIFF_SEL_FMT     "%1 forskjeller funnet"
+    IDS_FILEISDIR           "Mapper kan ikke sammenlignes visuelt."
+    IDS_CC_CMD              "&Sti til cleartool.exe :"
+    IDS_VSS_CMD             "&Sti til SS.EXE :"
+    IDS_VSS_RUN_ERROR       "Feil under utførelse av versjonsstyringssystemkommando."
+    IDS_DIFF_OPEN_NO_SET_PROPS
+                            "Det er gjort endringer i noen innstillinger, som kan ha innflytelse på allerede åpne vinduer. Noen av disse innstillinger virker muligens ikke før vinduene er gjenåpnet."
+    IDS_LTIME_HEADER        "Venstre dato"
+    IDS_RTIME_HEADER        "Høyre dato"
+    IDS_EXTENSION_HEADER    "Extension"
+    IDS_CONFIRM_DELETE_ITEMS
+                            "Er du sikker på at du vil slette %1 av %2 valgte element(er)?"
+    IDS_DEL_LEFT_FMT        "Slett venstre side %1 av %2 valgte element(er)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DEL_RIGHT_FMT       "Slett høyre side %1 av %2 valgte element(er)"
+    IDS_DELETE_FILE_FAILED  "Slett fil %1 feilet: %2"
+    IDS_CONFIRM_DELETE_DIR  "Slett mappen %1?"
+    IDS_REMOVE_DIR_FAILED   "Slett mappe feilet: %1"
+    IDS_COPY_TO_LEFT        "Kopier til venstre side %1 av %2 valgte element(er)"
+    IDS_DEL_BOTH_FMT        "Slett begge sider %1 av %2 valgte element(er)"
+    IDS_COPY_TO_RIGHT       "Kopier til høyre side %1 av %2 valgte element(er)"
+    IDS_DELETE_DIR_FAILED   "Slett mappen %1 feilet: %s"
+    IDS_COPY_FILE_FAILED    "Kopiering av filen %1 feilet: %2"
+    IDS_COPY_DIR_FAILED     "Kopiering av mappen %1 feilet: %2"
+    IDS_ERROR_FILE_WRITEABLE "Sjekk skrivebeskyttelsen på destinasjonen"
+    IDS_ERROR_BACKUP        "Feil under backup av filen"
+    IDS_CONFIRM_COPY_SINGLE "Er du sikker på at du vil kopiere %1 til %2?"
+    IDS_CONFIRM_DELETE_SINGLE "Er du sikker på at du vil slette %1?"
+    IDS_BIN_FILES_SAME      "Binære filer er identiske"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_DIR_OPEN_RIGHT_WITH  "Åpne høyre fil med ..."
+    ID_OPTIONS_SHOWBINARIES "Viser binære filer"
+    ID_VIEW_WHITESPACE      "Viser et tegn for mellomrom"
+    ID_REFRESH              "Oppdater visning\nOppdater (F5)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_FILESAVE_FAILED     "Lagring av %1 feilet. Vil du lagre filen under et annet navn?"
+    IDS_ERROR_FILE_NOT_FOUND "Fil ikke funnet: %1"
+    IDS_ERROR_INCOMPARABLE  "Velg to eksisterende mapper eller filer for å sammenligne"
+    IDS_STATUS_RESCANNING   "Skanner filer..."
+    IDS_STATUS_OPENING_SELECTION "Åpner valgte"
+    IDS_STATUS_COPYL2R      "Kopierer venstre til høyre"
+    IDS_STATUS_COPYR2L      "Kopierer høyre til venstre"
+    IDS_STATUS_COPYALL2L    "Kopierer alt til venstre"
+    IDS_STATUS_COPYALL2R    "Kopierer alt til høyre"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_NUM_REPLACED        "Erstattet %1 streng(er)."
+    IDS_EDIT_TEXT_NOT_FOUND "Kan ikke finne strengen ""%s"""
+END
+
+#endif    // Norwegian (Bokmal) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
+#ifdef _WIN32
+LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif
+#include "res\Merge.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#include "afxprint.rc"       // printing/print preview resources
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/Src/Languages/Norwegian/res/Merge.ico b/Src/Languages/Norwegian/res/Merge.ico
new file mode 100644 (file)
index 0000000..dfeca88
Binary files /dev/null and b/Src/Languages/Norwegian/res/Merge.ico differ
diff --git a/Src/Languages/Norwegian/res/Merge.rc2 b/Src/Languages/Norwegian/res/Merge.rc2
new file mode 100644 (file)
index 0000000..35654dd
--- /dev/null
@@ -0,0 +1,13 @@
+//
+// MERGE.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+       #error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/Src/Languages/Norwegian/res/MergeDoc.ico b/Src/Languages/Norwegian/res/MergeDoc.ico
new file mode 100644 (file)
index 0000000..3672482
Binary files /dev/null and b/Src/Languages/Norwegian/res/MergeDoc.ico differ
diff --git a/Src/Languages/Norwegian/res/Toolbar.bmp b/Src/Languages/Norwegian/res/Toolbar.bmp
new file mode 100644 (file)
index 0000000..b7e74b9
Binary files /dev/null and b/Src/Languages/Norwegian/res/Toolbar.bmp differ
diff --git a/Src/Languages/Norwegian/res/binary.bmp b/Src/Languages/Norwegian/res/binary.bmp
new file mode 100644 (file)
index 0000000..4f6ce66
Binary files /dev/null and b/Src/Languages/Norwegian/res/binary.bmp differ
diff --git a/Src/Languages/Norwegian/res/binarydiff.bmp b/Src/Languages/Norwegian/res/binarydiff.bmp
new file mode 100644 (file)
index 0000000..ce1ac70
Binary files /dev/null and b/Src/Languages/Norwegian/res/binarydiff.bmp differ
diff --git a/Src/Languages/Norwegian/res/equal.bmp b/Src/Languages/Norwegian/res/equal.bmp
new file mode 100644 (file)
index 0000000..9761d55
Binary files /dev/null and b/Src/Languages/Norwegian/res/equal.bmp differ
diff --git a/Src/Languages/Norwegian/res/lfile.bmp b/Src/Languages/Norwegian/res/lfile.bmp
new file mode 100644 (file)
index 0000000..bb7cf6c
Binary files /dev/null and b/Src/Languages/Norwegian/res/lfile.bmp differ
diff --git a/Src/Languages/Norwegian/res/mg_cur.cur b/Src/Languages/Norwegian/res/mg_cur.cur
new file mode 100644 (file)
index 0000000..5691efb
Binary files /dev/null and b/Src/Languages/Norwegian/res/mg_cur.cur differ
diff --git a/Src/Languages/Norwegian/res/notequal.bmp b/Src/Languages/Norwegian/res/notequal.bmp
new file mode 100644 (file)
index 0000000..d747084
Binary files /dev/null and b/Src/Languages/Norwegian/res/notequal.bmp differ
diff --git a/Src/Languages/Norwegian/res/rfile.bmp b/Src/Languages/Norwegian/res/rfile.bmp
new file mode 100644 (file)
index 0000000..1333733
Binary files /dev/null and b/Src/Languages/Norwegian/res/rfile.bmp differ
diff --git a/Src/Languages/Norwegian/res/rfolder.bmp b/Src/Languages/Norwegian/res/rfolder.bmp
new file mode 100644 (file)
index 0000000..09f8095
Binary files /dev/null and b/Src/Languages/Norwegian/res/rfolder.bmp differ
diff --git a/Src/Languages/Norwegian/res/splash1.bmp b/Src/Languages/Norwegian/res/splash1.bmp
new file mode 100644 (file)
index 0000000..e302533
Binary files /dev/null and b/Src/Languages/Norwegian/res/splash1.bmp differ
diff --git a/Src/Languages/Norwegian/res/unknown.bmp b/Src/Languages/Norwegian/res/unknown.bmp
new file mode 100644 (file)
index 0000000..eddf957
Binary files /dev/null and b/Src/Languages/Norwegian/res/unknown.bmp differ
diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
new file mode 100644 (file)
index 0000000..db4495b
--- /dev/null
@@ -0,0 +1,364 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by MergeNorwegian.rc
+//
+#define IDC_CUT                         3
+#define IDC_COPY                        4
+#define IDC_PASTE                       5
+#define IDC_UNDO                        6
+#define IDSAVEAS                        7
+#define IDD_ABOUTBOX                    100
+#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_DIRVIEW               102
+#define IDD_PROP_VSS                    103
+#define IDR_MAINFRAME                   104
+#define IDR_MERGETYPE                   105
+#define IDD_OPEN                        106
+#define IDS_WINMERGE_THIS_DIRECTORY     106
+#define IDD_EDITFILE                    107
+#define IDD_VSS                         108
+#define IDD_PROPPAGE_LARGE              109
+#define IDD_CLEARCASE                   110
+#define IDD_PROPPAGE_FILTER             111
+#define IDD_OUTPUT                      112
+#define IDD_PROPPAGE_REGISTRY           113
+#define IDS_VERSION_FMT                 130
+#define IDS_ALLFILES                    131
+#define IDS_CONFIRM_ALL_LEFT            132
+#define IDS_CONFIRM_ALL_RIGHT           133
+#define IDS_ERRORS_TITLE                134
+#define IDS_CONFIRM_COPY2DIR            135
+#define IDS_FONT_CHANGE                 136
+#define IDS_DIRECTORY_WINDOW_TITLE      137
+#define IDS_DIRECTORY_WINDOW_STATUS_FMT 138
+#define IDS_FILES_ARE_DIFFERENT         139
+#define IDS_BIN_FILES_DIFF              140
+#define IDS_ONLY_IN_FMT                 141
+#define IDS_IDENTICAL                   142
+#define IDS_CANT_COMPARE_FILES          143
+#define IDS_SAVE_AS_TITLE               144
+#define IDS_SELECT_FILES_OR_FOLDERS     145
+#define IDS_BACKUP_FAILED_PROMPT        146
+#define IDS_OPTIONS_TITLE               147
+#define IDS_OPEN_TITLE                  148
+#define IDS_CONFIRM_DELETE              149
+#define IDS_CONFIRM_DELETE_FILE         149
+#define IDS_EDIT_WINDOW_TITLE_FMT       150
+#define IDS_FILESSAME                   151
+#define IDS_FILEUNIQUE                  152
+#define IDS_FILEERROR                   153
+#define IDS_SAVEREADONLY_FMT            154
+#define IDS_SAVE_FMT                    155
+#define IDS_FILEBINARY                  156
+#define IDS_SAVEVSS_FMT                 157
+#define IDS_VSSERROR                    158
+#define IDS_NOPROJECT                   159
+#define IDS_FILENAME_HEADER             160
+#define IDS_DIR_HEADER                  161
+#define IDS_RESULT_HEADER               162
+#define IDS_FILE_COMPARISON_TITLE       163
+#define IDS_DIFF_NUMBER_STATUS_FMT      164
+#define IDS_NO_DIFF_SEL                 165
+#define IDS_NO_DIFF_SEL_FMT             165
+#define IDS_FILEISDIR                   166
+#define IDS_CC_CMD                      167
+#define IDS_VSS_CMD                     168
+#define IDS_VSS_RUN_ERROR               169
+#define IDS_DIFF_OPEN_NO_SET_PROPS      170
+#define IDS_LTIME_HEADER                171
+#define IDS_RTIME_HEADER                172
+#define IDS_EXTENSION_HEADER            173
+#define IDS_CONFIRM_DELETE_ITEMS        174
+#define IDS_DEL_LEFT_FMT                175
+#define IDS_DEL_RIGHT_FMT               176
+#define IDS_DELETE_FAILED               177
+#define IDS_DELETE_FILE_FAILED          177
+#define IDS_CONFIRM_DELETE_DIR          178
+#define IDS_REMOVE_DIR_FAILED           179
+#define IDS_COPY_TO_LEFT                180
+#define IDS_COPY_TO_LEFT_MAIN           181
+#define IDS_DEL_BOTH_FMT                181
+#define IDS_COPY_TO_RIGHT               182
+#define IDS_COPY_TO_RIGHT_MAIN          183
+#define IDS_DELETE_DIR_FAILED           184
+#define IDS_COPY_FILE_FAILED            185
+#define IDS_COPY_DIR_FAILED             186
+#define IDS_ERROR_FILE_WRITEABLE        187
+#define IDS_ERROR_BACKUP                188
+#define IDS_CONFIRM_COPY_SINGLE         189
+#define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
+#define IDS_FILESAVE_FAILED             192
+#define IDS_ERROR_FILE_NOT_FOUND        193
+#define IDS_ERROR_INCOMPARABLE          194
+#define IDS_STATUS_RESCANNING           195
+#define IDS_STATUS_OPENING_SELECTION    196
+#define IDS_STATUS_COPYL2R              197
+#define IDS_STATUS_COPYR2L              198
+#define IDS_STATUS_COPYALL2L            199
+#define IDS_STATUS_COPYALL2R            200
+#define IDB_EQUAL                       213
+#define IDB_NOTEQUAL                    214
+#define IDB_RFOLDER                     215
+#define IDB_UNKNOWN                     216
+#define IDB_BINARYSAME                  217
+#define IDB_LFILE                       218
+#define IDB_RFILE                       219
+#define IDB_SPLASH                      220
+#define IDB_WINMERGE                    221
+#define IDB_OLDSPLASH                   222
+#define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
+#define IDC_LEFT_EDIT                   1000
+#define IDC_FILE_EDIT                   1000
+#define IDC_LEFT_BUTTON                 1001
+#define IDC_RIGHT_EDIT                  1002
+#define IDC_LEFT_COMBO                  1002
+#define IDC_RIGHT_BUTTON                1003
+#define IDC_RIGHT_COMBO                 1004
+#define IDC_PROJECT_COMBO               1004
+#define IDC_MESSAGE                     1005
+#define IDC_EXT_COMBO                   1005
+#define IDC_DOVSS_CHECK                 1006
+#define IDC_PATH_EDIT                   1007
+#define IDC_BROWSE_BUTTON               1008
+#define IDC_BACKUP_CHECK                1009
+#define IDC_SCROLL_CHECK                1010
+#define IDC_VSS_L1                      1010
+#define IDC_WHITESPACE_CHECK            1011
+#define IDC_RECURS_CHECK                1011
+#define IDC_VERSION                     1012
+#define IDC_IGNBLANKS_CHECK             1012
+#define IDC_TAB_EDIT                    1013
+#define IDC_WWW                         1014
+#define IDC_IGNCASE_CHECK               1014
+#define IDC_EMAIL                       1015
+#define IDC_COMPANY                     1016
+#define IDC_COMMENTS                    1017
+#define IDC_VER_SYS                     1018
+#define IDC_HILITE_CHECK                1019
+#define IDC_IGNOREREGEXP                1020
+#define IDC_EDITPATTERN                 1021
+#define IDC_DISABLE_SPLASH              1023
+#define IDC_ALL_WHITE                   1024
+#define IDC_WHITE_CHANGE                1025
+#define IDC_WHITESPACE                  1026
+#define IDC_USER                        1027
+#define IDC_EOL_SENSITIVE               1027
+#define IDC_PASSWORD                    1028
+#define IDC_DIFFERENCE_COLOR            1031
+#define IDC_SEL_DIFFERENCE_COLOR        1032
+#define IDC_EDIT1                       1033
+#define IDC_PROP_INSERT_TABS            1034
+#define IDC_PROP_INSERT_SPACES          1035
+#define IDC_ASSOC_DIRECTORY             1036
+#define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
+#define IDC_FILE_FILTER                 1039
+#define IDS_NUM_REPLACED                8501
+#define IDS_EDIT_TEXT_NOT_FOUND         8502
+#define IDD_EDIT_FIND                   8601
+#define IDD_EDIT_REPLACE                8602
+#define IDC_EDIT_WHOLE_WORD             8603
+#define IDC_EDIT_MATCH_CASE             8604
+#define IDC_EDIT_FINDTEXT               8605
+#define IDC_EDIT_REGEXP                 8606
+#define IDC_EDIT_REPLACE                8607
+#define IDC_EDIT_REPLACE_ALL            8608
+#define IDC_EDIT_REPLACE_WITH           8609
+#define IDC_EDIT_SKIP                   8610
+#define IDC_EDIT_DIRECTION_UP           8611
+#define IDC_EDIT_DIRECTION_DOWN         8612
+#define IDC_EDIT_SCOPE_SELECTION        8613
+#define IDC_EDIT_SCOPE_WHOLE_FILE       8614
+#define IDR_MARGIN_CURSOR               22900
+#define IDD_LANGUAGE_SELECT             30000
+#define IDD_PROPSYNTAX                  30001
+#define IDD_PROPPAGE_COLORS             30002
+#define IDS_AFRIKAANS                   30003
+#define IDS_ALBANIAN                    30004
+#define IDS_ARABIC_SAUDI                30005
+#define IDS_ARABIC_IRAQ                 30006
+#define IDS_ARABIC_EGYPT                30007
+#define IDS_ARABIC_LIBYA                30008
+#define IDS_ARABIC_ALGERIA              30009
+#define IDS_ARABIC_MOROCCO              30010
+#define IDS_ARABIC_TUNISIA              30011
+#define IDS_ARABIC_OMAN                 30012
+#define IDS_ARABIC_YEMEN                30013
+#define IDS_ARABIC_SYRIA                30014
+#define IDS_ARABIC_JORDAN               30015
+#define IDS_ARABIC_LEBANON              30016
+#define IDS_ARABIC_KUWAIT               30017
+#define IDS_ARABIC_UAE                  30018
+#define IDS_ARABIC_BAHRAIN              30019
+#define IDS_ARABIC_QATAR                30020
+#define IDS_ARMENIAN                    30021
+#define IDS_AZERI_LATIN                 30022
+#define IDS_AZERI_CYRILLIC              30023
+#define IDS_BASQUE                      30024
+#define IDS_BELARUSIAN                  30025
+#define IDS_BULGARIAN                   30026
+#define IDS_CATALAN                     30027
+#define IDS_CHINESE_TRADITIONAL         30028
+#define IDS_CHINESE_SIMPLIFIED          30029
+#define IDS_CHINESE_HONGKONG            30030
+#define IDS_CHINESE_SINGAPORE           30031
+#define IDS_CHINESE_MACAU               30032
+#define IDS_CROATIAN                    30033
+#define IDS_CZECH                       30034
+#define IDS_DANISH                      30035
+#define IDS_DUTCH                       30036
+#define IDS_DUTCH_BELGIAN               30037
+#define IDS_ENGLISH_US                  30038
+#define IDS_ENGLISH_UK                  30039
+#define IDS_ENGLISH_AUS                 30040
+#define IDS_ENGLISH_CAN                 30041
+#define IDS_ENGLISH_NZ                  30042
+#define IDS_ENGLISH_EIRE                30043
+#define IDS_ENGLISH_SOUTH_AFRICA        30044
+#define IDS_ENGLISH_JAMAICA             30045
+#define IDS_ENGLISH_CARIBBEAN           30046
+#define IDS_ENGLISH_BELIZE              30047
+#define IDS_ENGLISH_TRINIDAD            30048
+#define IDS_ENGLISH_ZIMBABWE            30049
+#define IDS_ENGLISH_PHILIPPINES         30050
+#define IDS_ESTONIAN                    30051
+#define IDS_FAEROESE                    30052
+#define IDS_FARSI                       30053
+#define IDS_FINNISH                     30054
+#define IDS_FRENCH                      30055
+#define IDS_FRENCH_BELGIAN              30056
+#define IDS_FRENCH_CANADIAN             30057
+#define IDS_FRENCH_SWISS                30058
+#define IDS_FRENCH_LUXEMBOURG           30059
+#define IDS_FRENCH_MONACO               30060
+#define IDS_GEORGIAN                    30061
+#define IDS_GERMAN                      30062
+#define IDS_GERMAN_SWISS                30063
+#define IDS_GERMAN_AUSTRIAN             30064
+#define IDS_GERMAN_LUXEMBOURG           30065
+#define IDS_GERMAN_LIECHTENSTEIN        30066
+#define IDS_GREEK                       30067
+#define IDS_HEBREW                      30068
+#define IDS_HINDI                       30069
+#define IDS_HUNGARIAN                   30070
+#define IDS_ICELANDIC                   30071
+#define IDS_INDONESIAN                  30072
+#define IDS_ITALIAN                     30073
+#define IDS_ITALIAN_SWISS               30074
+#define IDS_JAPANESE                    30075
+#define IDS_KASHMIRI                    30076
+#define IDS_KAZAK                       30077
+#define IDS_KOREAN                      30078
+#define IDS_KOREAN_JOHAB                30079
+#define IDS_LATVIAN                     30080
+#define IDS_LITHUANIAN                  30081
+#define IDS_MALAY_MALAYSIA              30082
+#define IDS_MALAY_BRUNEI_DARUSSALAM     30083
+#define IDS_MANIPURI                    30084
+#define IDS_NORWEGIAN_BOKMAL            30085
+#define IDS_NORWEGIAN_NYNORSK           30086
+#define IDS_POLISH                      30087
+#define IDS_PORTUGUESE                  30088
+#define IDS_PORTUGUESE_BRAZILIAN        30089
+#define IDS_ROMANIAN                    30090
+#define IDS_RUSSIAN                     30091
+#define IDS_SANSKRIT                    30092
+#define IDS_SERBIAN_LATIN               30093
+#define IDS_SERBIAN_CYRILLIC            30094
+#define IDS_SINDHI                      30095
+#define IDS_SLOVAK                      30096
+#define IDS_SLOVENIAN                   30097
+#define IDS_SPANISH                     30098
+#define IDS_SPANISH_MEXICAN             30099
+#define IDS_SPANISH_MODERN              30100
+#define IDS_SPANISH_GUATEMALA           30101
+#define IDS_SPANISH_COSTA_RICA          30102
+#define IDS_SPANISH_PANAMA              30103
+#define IDS_SPANISH_DOMINICAN           30104
+#define IDS_SPANISH_VENEZUELA           30105
+#define IDS_SPANISH_COLOMBIA            30106
+#define IDS_SPANISH_PERU                30107
+#define IDS_SPANISH_ARGENTINA           30108
+#define IDS_SPANISH_ECUADOR             30109
+#define IDS_SPANISH_CHILE               30110
+#define IDS_SPANISH_URUGUAY             30111
+#define IDS_SPANISH_PARAGUAY            30112
+#define IDS_SPANISH_BOLIVIA             30113
+#define IDS_SPANISH_EL_SALVADOR         30114
+#define IDS_SPANISH_HONDURAS            30115
+#define IDS_SPANISH_NICARAGUA           30116
+#define IDS_SPANISH_PUERTO_RICO         30117
+#define IDS_SWAHILI                     30118
+#define IDS_SWEDISH                     30119
+#define IDS_SWEDISH_FINLAND             30120
+#define IDS_TAMIL                       30121
+#define IDS_TATAR                       30122
+#define IDS_THAI                        30123
+#define IDS_TURKISH                     30124
+#define IDS_UKRANIAN                    30125
+#define IDS_URDU_PAKISTAN               30126
+#define IDS_URDU_INDIA                  30127
+#define IDS_UZBEK_LATIN                 30128
+#define IDS_UZBEK_CYRILLIC              30129
+#define IDS_VIETNAMESE                  30130
+#define ID_L2R                          32771
+#define ID_R2L                          32772
+#define ID_UNDO                         32773
+#define ID_OPTIONS_SHOWIDENTICAL        32774
+#define ID_OPTIONS_SHOWDIFFERENT        32775
+#define ID_OPTIONS_SHOWUNIQUE           32776
+#define ID_POPUP_COPYTOOTHERSIDE        32777
+#define ID_POPUP_COPYFROMOTHERSIDE      32778
+#define ID_PREVDIFF                     32779
+#define ID_POPUP_SAVE                   32780
+#define ID_NEXTDIFF                     32781
+#define ID_OPTIONS_BACKUPORIGINALFILE   32782
+#define ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE 32784
+#define ID_POPUP_EDITFILE               32787
+#define ID_OPTIONS_IGNOREWHITESPACE     32788
+#define ID_HIDE_BACKUP_FILES            32789
+#define ID_HELP_GNULICENSE              32790
+#define ID_USEVSS                       32791
+#define ID_OPTIONS                      32792
+#define ID_ALL_LEFT                     32793
+#define ID_ALL_RIGHT                    32794
+#define ID_VIEW_SELECTFONT              32795
+#define ID_VIEW_USEDEFAULTFONT          32796
+#define ID_POPUP_COPYALLDIFFSTOOTHERSIDE 32797
+#define ID_POPUP_COPYALLDIFFSFROMOTHERSIDE 32798
+#define ID_DIR_COPY_FILE_TO_LEFT        32799
+#define ID_DIR_COPY_FILE_TO_RIGHT       32800
+#define ID_VIEW_LANGUAGE                32801
+#define ID_HELP_CONTENTS                32802
+#define ID_FIRSTDIFF                    32803
+#define ID_CURDIFF                      32804
+#define ID_LASTDIFF                     32805
+#define ID_DIFFNUM                      32806
+#define ID_DIR_DEL_LEFT                 32807
+#define ID_DIR_DEL_RIGHT                32808
+#define ID_DIFFSTATUS                   32809
+#define ID_OPTIONS_SHOWUNIQUELEFT       32810
+#define ID_OPTIONS_SHOWUNIQUERIGHT      32811
+#define ID_DIR_DEL_BOTH                 32812
+#define ID_DIR_OPEN_LEFT                32813
+#define ID_DIR_OPEN_LEFT_WITH           32814
+#define ID_DIR_OPEN_RIGHT               32815
+#define ID_DIR_OPEN_RIGHT_WITH          32816
+#define ID_OPTIONS_SHOWBINARIES         32817
+#define ID_VIEW_WHITESPACE              32818
+#define ID_REFRESH                      32819
+#define ID_EDIT_FIND_PREVIOUS           32820
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_3D_CONTROLS                     1
+#define _APS_NEXT_RESOURCE_VALUE        114
+#define _APS_NEXT_COMMAND_VALUE         32820
+#define _APS_NEXT_CONTROL_VALUE         1040
+#define _APS_NEXT_SYMED_VALUE           108
+#endif
+#endif
index c93a585..0b4482a 100644 (file)
@@ -1,3 +1,7 @@
+2003-08-20 Christian
+ PATCH: [ 791487 ] Norwegian (bokmål) translation
+  Languages: Norwegian added
+
 2003-08-19 WinMerge beta 2.1.0.1 released
 
 2003-08-19 Perry