1 files changed, 126 insertions, 0 deletions
diff --git a/tests/results/merge1.xml b/tests/results/merge1.xml
new file mode 100644
index 0000000..2da84f4
--- /dev/null
+++ b/tests/results/merge1.xml
@@ -0,0 +1,126 @@
+<Root>
+    <strings>
+        <str name="MSG_SaveFailed"
+            value="Could not write to the file %s."/>
+	<str name="MSG_SaveFailedWrite"
+	    value.-_:="Writing error when attempting to save %s"/>
+	<str name="MSG_SaveFailedWrite-test"
+	    value.-_:="Kunne ikke skrive til filen %s."/>
+	<str name="MSG_SaveFailedExport"
+	    value="Error while attempting to save %s: could not construct exporter"/>
+	<str name="MSG_SaveFailedExport-test"
+	    value="Kunne ikke skrive til &amp; filen &quot;%s&quot; -- \."/>
+    </strings>
+
+    <commands>
+	<cmd name="DLG_FileClose"
+	    label="_Close"
+	    tip="Close the current file"
+	    pixtype="stock" pixname="Close"
+	    accel="*Control*w"/>
+	<cmd name="DLG_FileClose-test"
+	    label="Luk"
+	    tip="Close the current file"
+	    pixtype="stock" pixname="Close"
+	    accel="*Control*w"/>
+    </commands>
+
+    <menu>
+	<submenu name="DLG_File" label="_File">
+	    <menuitem name="DLG_FileNew" verb=""/>
+
+	    <separator/>
+
+	    <menuitem name="FileClose" verb=""/>
+
+	    <menuitem name="ViewZoom" verb=""
+		label="_Zoom..."
+		tip="Zoom the spreadsheet in or out"/>
+
+	    <menuitem name="ViewNewShared" verb=""
+		label="New _Shared"
+		tip="Create a new shared view of the workbook"/>
+
+	    <placeholder name="BuiltMenuItems"/>
+
+	    <menuitem name="HelpAbout" verb=""/>
+
+	</submenu>
+
+    </menu>
+
+    <dockitem name="StandardToolbar" behavior="exclusive" homogeneous="0"
+	band_num="1" look="icon" relief="none">
+
+	<toolitem name="New"
+	    pixtype="stock" pixname="New"
+	    label="New"
+	     tip="Create a new workbook"
+	    verb="FileNew"/>
+	<toolitem name="New-test"
+	    pixtype="stock" pixname="New"
+	    label="Ny"
+	     tip="Create a new workbook"
+	    verb="FileNew"/>
+
+	<separator/>
+
+	<toolitem name="Print"
+	    pixtype="stock" pixname="Print"
+	    label="Print"
+	    tip="Print the workbook"
+	    verb="FilePrint"/>
+	<toolitem name="Print-test"
+	    pixtype="stock" pixname="Print"
+	    label="Udskriv"
+	    tip="Print the workbook"
+	    verb="FilePrint"/>
+
+	<toolitem name="PrintPreview"
+	    pixtype="file" pixname="font-bold-f.png"
+	    label="Print Preview"
+	    tip="Print preview"
+	    verb="FilePrintPreview"/>
+	<toolitem name="PrintPreview-test"
+	    pixtype="file" pixname="font-bold-f.png"
+	    label="Vis udskrift"
+	    tip="Print preview"
+	    verb="FilePrintPreview"/>
+
+	<separator/>
+
+	<toolitem name="Copy"
+	    pixtype="stock" pixname="Copy"
+	    label="Copy"
+	    tip="Copy the current selection to the clipboard"
+	    verb="EditCopy"/>
+	<toolitem name="Copy-test"
+	    pixtype="stock" pixname="Copy"
+	    label="Kopiér"
+	    tip="Copy the current selection to the clipboard"
+	    verb="EditCopy"/>
+
+	<control name="EditUndo" tip="Undo the last action"/>
+
+	<control name="EditRedo" tip="Redo the undone action"/>
+
+	<separator/>
+
+	<toolitem name="Sum"
+	    pixtype="stock" pixname="Gnumeric_AutoSum"
+	    label="Sum"
+	    tip="Sum into the current cell"
+	    verb="AutoSum"/>
+	    verb="InsertShapedComponent" behavior="pack-end"/>
+
+	<control name="SheetZoom"
+	    tip="Zoom the spreadsheet in or out"
+	    vdisplay="none" behavior="pack-end"/>
+    </dockitem>
+
+    <status>
+	<item name="main"/>
+	<control name="Progress"/>
+	<control name="AutoExpr"/>
+    </status>
+</Root>