Tag: cws_src680_dbwizard3 User: bc Date: 05/02/18 03:22:57 Modified: /dba/dbaccess/source/ui/dlg/ dbadminsetup.src
Log: ## merge conflict resolved File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadminsetup.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadminsetup.src?r1=1.2.32.2&r2=1.2.32.3 Delta lines: +3 -8 ------------------- --- dbadminsetup.src 17 Feb 2005 17:45:25 -0000 1.2.32.2 +++ dbadminsetup.src 18 Feb 2005 11:22:53 -0000 1.2.32.3 @@ -2,9 +2,9 @@ * * $RCSfile: dbadminsetup.src,v $ * - * $Revision: 1.2.32.2 $ + * $Revision: 1.2.32.3 $ * - * last change: $Author: bc $ $Date: 2005/02/17 17:45:25 $ + * last change: $Author: bc $ $Date: 2005/02/18 11:22:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -725,13 +725,8 @@ String STR_SPREADSHEET_HELPTEXT{ -<<<<<<< dbadminsetup.src Text[ de ] = "Klicken Sie auf 'Durchsuchen...' um auf Daten aus %PRODUCTNAME Tabellen-Dokumente oder Microsoft Excel Arbeitsmappen zu zugreifen.\n%PRODUCTNAME greift auf die Daten der Tabellendokumente nur lesend zu."; Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ; -======= - Text[ de ] = "Klicken Sie auf 'Suchen' um auf Daten aus %PRODUCTNAME Tabellen-Dokumente oder Microsoft Excel Arbeitsmappen zu zugreifen.\n%PRODUCTNAME greift auf die Daten der Tabellendokumente nur lesend zu."; - Text[ en-US ] = "Click 'Browse' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ; ->>>>>>> 1.3 }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
