fix(translation): add translation for filemanager

* fix duplicateMerge translation of keep

tine20/Filemanager/translations/de.po

@@ -181,7 +181,9 @@ msgstr "Zuletzt geändert von"
 #: Frontend/Download.php:213
 #, fuzzy
 msgid "Folder"
-msgstr "Ordner"
+msgid_plural "Folders"
+msgstr[0] "Ordner"
+msgstr[1] "Ordner"
 
 #: js/NodeGridPanel.js:335
 msgid "Total size of all available revisions"
@@ -219,6 +221,9 @@ msgstr "Datentresor schließen"
 msgid "Upload Failed"
 msgstr "Hochladen fehlgeschlagen"
 
+msgid "Upload File"
+msgstr "Datei hochladen"
+
 #: js/NodeGridPanel.js:917 js/NodeTreePanel.js:569
 msgid "It is not permitted to store files in this folder!"
 msgstr "In diesem Ordner dürfen keine Dateien abgelegt werden!"
@@ -532,7 +537,9 @@ msgstr "Datei bearbeiten"
 #: js/NodeEditDialog.js:61 Frontend/Download.php:239
 #, fuzzy
 msgid "File"
-msgstr "Datei"
+msgid_plural "Files"
+msgstr[0] "Datei"
+msgstr[1] "Dateien"
 
 #: js/NodeEditDialog.js:96
 msgid "Public Links"

tine20/Filemanager/translations/en.po

@@ -172,7 +172,9 @@ msgstr "Last Modified By"
 #: js/NodeGridPanel.js:311 js/NodeEditDialog.js:61 js/FilePicker.js:505
 #: Frontend/Download.php:213
 msgid "Folder"
-msgstr "Folder"
+msgid_plural "Folders"
+msgstr[0] "Folder"
+msgstr[1] "Folders"
 
 #: js/NodeGridPanel.js:335
 msgid "Total size of all available revisions"
@@ -210,6 +212,9 @@ msgstr "Close Data Safe"
 msgid "Upload Failed"
 msgstr "Upload Failed"
 
+msgid "Upload File"
+msgstr "Upload File"
+
 #: js/NodeGridPanel.js:917 js/NodeTreePanel.js:569
 msgid "It is not permitted to store files in this folder!"
 msgstr "It is not permitted to store files in this folder!"
@@ -522,7 +527,9 @@ msgstr "edit file"
 
 #: js/NodeEditDialog.js:61 Frontend/Download.php:239
 msgid "File"
-msgstr "File"
+msgid_plural "Files"
+msgstr[0] "File"
+msgstr[1] "Files"
 
 #: js/NodeEditDialog.js:96
 msgid "Public Links"

tine20/Tinebase/js/widgets/dialog/DuplicateMergeDialog.js

@@ -215,6 +215,7 @@ Tine.widgets.dialog.DuplicateMergeDialog = Ext.extend(Ext.FormPanel, {
                                     ['mergeTheirs', String.format(i18n._('Merge {0}, prefer Second'), recordsName)]
                                 ]
                             });
+                            this.store.resolveStrategy = 'mergeMine';
                             this.actionCombo.setWidth(400);
                             this.onStoreLoad();