msgid "with &Registered Application"
msgstr "&Erregistratutako Aplikazioarekin"
-#: Merge.rc:46724E8D
+#: Merge.rc:321D741E
#, c-format
-msgid "with &External Editor"
-msgstr "&Kanpoko Editorearekin"
+msgid "with &External Editor\tCtrl+Alt+E"
+msgstr ""
#: Merge.rc:AC3AA12
#, c-format
msgid "Alpha &Blend Animation"
msgstr ""
+#: Merge.rc:5806E58F
+#, c-format
+msgid "Dragging &Mode"
+msgstr ""
+
+#: Merge.rc:43017E45
+#, c-format
+msgid "&Move"
+msgstr "&Mugitu"
+
+#: Merge.rc:5A9A713A
+#, c-format
+msgid "&Adjust Offset"
+msgstr ""
+
#: Merge.rc:100AAFAC
#, c-format
msgid "&Set Background Color"
msgstr ""
-#: Merge.rc:43017E45
+#: Merge.rc:43017E46
#, c-format
msgid "&File"
msgstr "&Agiria"
msgid "E&xit"
msgstr "Ir&ten"
-#: Merge.rc:43017E46
+#: Merge.rc:43017E47
#, c-format
msgid "&Edit"
msgstr "&Editatu"
msgid "&Options..."
msgstr "&Aukerak..."
-#: Merge.rc:43017E47
+#: Merge.rc:43017E48
#, c-format
msgid "&View"
msgstr "&Ikusi"
msgid "&Big"
msgstr "&Handia"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Huge"
msgstr ""
msgid "&Cascade"
msgstr "&Urjauzia"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Help"
msgstr "&Laguntza"
msgid "&WinMerge Help\tF1"
msgstr "WinMerge &Laguntza\tF1"
+#: Merge.rc:1B17601E
+#, c-format
+msgid "R&elease Notes"
+msgstr ""
+
+#: Merge.rc:6E470BE7
+#, c-format
+msgid "&Translations"
+msgstr ""
+
#: Merge.rc:3938FFC2
#, c-format
msgid "&Check For Updates"
msgid "Generate &Report..."
msgstr "Sortu &Jakinarazpena..."
-#: Merge.rc:6E470BE7
+#: Merge.rc:6E470BE8
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Gorde\tCtrl+S"
msgid "&Binary"
msgstr "&Binarioa"
-#: Merge.rc:6E470BE8
+#: Merge.rc:6E470BE9
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Desegin\tCtrl+Z"
-#: Merge.rc:6E470BE9
+#: Merge.rc:6E470BEA
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Birre&gin\tCtrl+Y"
msgid "Cu&t\tCtrl+X"
msgstr "&Ebaki\tCtrl+X"
-#: Merge.rc:6E470BEA
+#: Merge.rc:6E470BEB
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopiatu\tCtrl+C"
-#: Merge.rc:5A9A713A
+#: Merge.rc:5A9A713B
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Itsatsi\tCtrl+V"
msgid "Repla&ce...\tCtrl+H"
msgstr "&Ordeztu...\tCtrl+H"
+#: Merge.rc:4B91C2D1
+#, c-format
+msgid "&Marker...\tCtrl+Shift+M"
+msgstr ""
+
#: Merge.rc:669F87F4
#, c-format
msgid "Advanced"
msgid "Syntax Highlight"
msgstr "Joskera Nabar&mentzea"
-#: Merge.rc:6E470BEB
+#: Merge.rc:6E470BEC
#, c-format
msgid "&Diff Context"
msgstr ""
msgid "Right to... (%1 of %2)"
msgstr "Eskuina hona... (%1 %2-tik)"
-#: Merge.rc:43017E4A
-#, c-format
-msgid "&Move"
-msgstr "&Mugitu"
-
#: Merge.rc:89AF4FA
#, c-format
msgid "&Delete"
msgid "&Open Left"
msgstr "&Ireki Ezkerrekoa"
+#: Merge.rc:46724E8D
+#, c-format
+msgid "with &External Editor"
+msgstr "&Kanpoko Editorearekin"
+
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
#: Merge.rc:761E6872
#, c-format
msgid "Open Midd&le"
msgid "Prediffer Settings"
msgstr "Aurrezberdintasun Ezarpenak"
-#: Merge.rc:6E470BEC
+#: Merge.rc:6E470BED
#, c-format
msgid "&No prediffer"
msgstr "&Ez aurrezberd"
msgid "B&rowse..."
msgstr "Bi&latu..."
-#: Merge.rc:6E470BED
+#: Merge.rc:6E470BEE
#, c-format
msgid "&3(Optional):"
msgstr ""
msgid "Replace"
msgstr "Ordeztu"
-#: Merge.rc:1B17601E
+#: Merge.rc:1B17601F
#, c-format
msgid "Re&place with:"
msgstr "Ordez&tu honekin:"
msgid "Replace &All"
msgstr "Ordeztu &Dena"
+#: Merge.rc:2FC0BA7B
+#, c-format
+msgid "Markers"
+msgstr ""
+
+#: Merge.rc:61E8009D
+#, c-format
+msgid "Enable &Markers"
+msgstr ""
+
+#: Merge.rc:24A380
+#, c-format
+msgid "New"
+msgstr "Berria"
+
+#: Merge.rc:3938FFC5
+#, c-format
+msgid "&Background color:"
+msgstr ""
+
+#: Merge.rc:1D2E49FB
+#, c-format
+msgid "&Apply"
+msgstr "&Ezarri"
+
#: Merge.rc:4C3E0A2D
#, c-format
msgid "CheckOut"
msgid "Regular Expressions (one per line):"
msgstr "Adierazpen Arruntak (bat lerroko)"
-#: Merge.rc:24A380
-#, c-format
-msgid "New"
-msgstr "Berria"
-
#: Merge.rc:3ECBF05
#, c-format
msgid "Edit"
msgid "&Swap"
msgstr "A&ldaketa"
-#: Merge.rc:4B91C2D1
+#: Merge.rc:4B91C2D2
#, c-format
msgid "&Append to existing file"
msgstr "E&rantsi dagoen agirira"
msgid "&Difference"
msgstr "&Ezberdintasuna"
-#: Merge.rc:1D2E49FB
+#: Merge.rc:1D2E49FC
#, c-format
msgid "&Go To"
msgstr "&Joan Hona"
msgid "&Compare"
msgstr "Al&deratu"
-#: Merge.rc:5A9A713B
+#: Merge.rc:5A9A713D
#, c-format
msgid "&Ignore change"
msgstr "&Ezikusi aldaketa"
msgid "Left side file"
msgstr "Ezkerralde agiria"
-#: Merge.rc:6E470BEE
+#: Merge.rc:6E470BEF
#, c-format
msgid "&Save changes"
msgstr "Gor&de aldaketak"
msgid "Bold"
msgstr "Lodia"
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "&Include File Compare Report"
msgstr ""
-#: Merge.rc:3938FFC5
+#: Merge.rc:3938FFC6
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopiatu Gakoan"
msgid "Close"
msgstr "Itxi"
-#: Merge.rc:2FC0BA7B
+#: Merge.rc:2FC0BA7C
#, c-format
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Hautatu Kode-orrialdea"
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713E
#, c-format
msgid "&File Loading:"
msgstr "&Agiria Gertatzen:"
msgid "&Use same codepage for both"
msgstr "Erabili &kode-orrialde bera bientzat"
-#: Merge.rc:1D2E49FC
-#, c-format
-msgid "&Apply"
-msgstr "&Ezarri"
-
#: Merge.rc:89AF4FE
#, c-format
msgid "&Cancel"
msgid "Selection:"
msgstr "Hautapena:"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Margin:"
+msgstr ""
+
#: Merge.rc:D109E01
#, c-format
msgid "Paths"
msgid "No VSS database(s) found!"
msgstr "Ez da aurkitu VSS datubaserik!"
-#: Merge.rc:61E8009D
+#: Merge.rc:61E8009E
#, c-format
msgid "Error from VSS:"
msgstr "Akatsa VSS-tik:"
msgid "Left Encoding"
msgstr "Ezker Kodeaketa"
-#: Merge.rc:1B17601F
+#: Merge.rc:1B176020
#, c-format
msgid "Right Encoding"
msgstr "Eskuin Kodeaketa"
msgid "Middle only: %1"
msgstr ""
-#: Merge.rc:1B176020
+#: Merge.rc:1B176021
#, c-format
msgid "Right only: %1"
msgstr "Eskuina bakarrik: %1"
msgid "frhed(http://frhed.sourceforge.net/) not installed"
msgstr ""
+#: Merge.rc:73B321AA
+#, c-format
+msgid "%1 does not exist. Do you want to create it?"
+msgstr ""
+
+#: Merge.rc:3A5D5964
+#, c-format
+msgid "Failed to create folder."
+msgstr ""
+