' + i18n._('Tine 2.0 does not understand all kind of files you might want to upload. You will have to manually adjust your file so Tine 2.0 can handle it.').replace(/Tine 2\.0/g, Tine.title) + '
' + i18n._('Following you find a list of all supported import formats and a sample file, how Tine 2.0 expects your file to look like.').replace(/Tine 2\.0/g, Tine.title) + '
' + importText + '
' + i18n._('Please select the import format of the file you want to upload').replace(/Tine 2\.0/g, Tine.title) + '
' @@ -313,7 +313,6 @@ Tine.widgets.dialog.ImportDialog = Ext.extend(Tine.widgets.dialog.WizardPanel, { html: example ? ('' + i18n._('Download example file') + '
') : '' }, { xtype: 'displayfield', -// fieldLabel: i18n._('Import description'), ref: '../../definitionDescription', height: 70, value: description, @@ -483,13 +482,7 @@ Tine.widgets.dialog.ImportDialog = Ext.extend(Tine.widgets.dialog.WizardPanel, { frame: true, ref: '../conflictsPanel', canonicalName: 'ImportResolveConflicts', - items: [/*{ - xtype: 'label', - ref: '../conflictsLabel', - rawText: '
' + i18n._('There are {0} {1} that might already exist.') + '
', - html: '', - height: 20 - },*/ { + items: [{ xtype: 'paging', ref: '../conflictPagingToolbar', pageSize: 1, @@ -661,14 +654,8 @@ Tine.widgets.dialog.ImportDialog = Ext.extend(Tine.widgets.dialog.WizardPanel, { return this.summaryPanel; } var exceptionExpander = new Ext.ux.grid.RowExpander({ - tpl : new Ext.XTemplate('{[this.showClientRecord(values)]}', { showClientRecord: function(values) { + tpl : new Ext.XTemplate('{[this.showClientRecord(values)]}', { function(values) { if (values && values.exception && values.exception.clientRecord) { - // there is no generic detailsPanel retirval yet -// if (Ext.isObject(values.exception.clientRecord)) { -// var detailsPanel = new Tine.Addressbook.ContactGridDetailsPanel({}); -// -// return detailsPanel.tpl.apply(values.exception.clientRecord); -// } return Ext.util.Format.htmlEncode(Ext.encode(values.exception.clientRecord)); } else { return i18n._('No Detail Informations'); @@ -858,8 +845,7 @@ Tine.widgets.dialog.ImportDialog.openWindow = function (config) { height: 600, name: Tine.widgets.dialog.ImportDialog.windowNamePrefix + Ext.id(), contentPanelConstructor: 'Tine.widgets.dialog.ImportDialog', - contentPanelConstructorConfig: config//, -// modal: true + contentPanelConstructorConfig: config }); return window; }; diff --git a/tine20/Tinebase/translations/de.po b/tine20/Tinebase/translations/de.po index 97763f8fddb..27bb9f47c00 100644 --- a/tine20/Tinebase/translations/de.po +++ b/tine20/Tinebase/translations/de.po @@ -3894,6 +3894,9 @@ msgstr "Konfiguriere was mit den Daten gelöschter Benutzer geschehen soll" msgid "Delete personal containers" msgstr "Lösche persönliche Ordner" +msgid "Personal container" +msgstr "Persönlicher Ordner" + #: Config.php:953 msgid "Delete file folders and files" msgstr "Dateien und Ordner löschen" @@ -6474,8 +6477,9 @@ msgstr "Bild in ausgewählter Größe einfügen" msgid "Image size" msgstr "Bildgröße" -msgid "Personal container" -msgstr "Persönlicher Ordner" +msgid "Following you find a list of all supported import formats." +msgstr "" +"Nachfolgend finden Sie eine Liste mit allen unterstützten Import-Formaten." msgid "Reload the application" msgstr "Anwendung neu laden"