.bmp to .png, plus formatting issues.

40 files changed, 255 insertions, 475 deletions

diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index ab325968f..7480e22b2 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -312,43 +312,53 @@ String RID_STR_REPORTS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ;
 };
+
 String RID_STR_FORMS_HELP_TEXT
 {
     Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ;
 };
+
 String RID_STR_REPORT_HELP_TEXT
 {
     Text [ de ] ="Erstellen Sie einen Bericht, indem Sie die Datensatzquelle, Steuerelemente und Steuerelementeigenschaften angeben." ;
     Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ;
 };
+
 String RID_STR_FORMS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT
 {
     Text [ en-US ] = "Create a query by specifying the filters, input tables, field names,  and  properties for sorting or grouping." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT_SQL
 {
     Text [ en-US ] = "Create a query  entering an SQL statement directly." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ;
 };
+
 String RID_STR_TABLES_HELP_TEXT_DESIGN
 {
     Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ;
 };
+
 String RID_STR_TABLES_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ;
 };
+
 String RID_STR_VIEWS_HELP_TEXT_DESIGN
 {
     Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ;
 };
+
 String RID_STR_VIEWS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "Opens the view wizard" ;
@@ -358,28 +368,34 @@ String STR_DATABASE
 {
     Text [ en-US ] = "Database" ;
 };
+
 String STR_TASKS
 {
     Text [ en-US ] = "Tasks" ;
 };
+
 String STR_DESCRIPTION
 {
     Text [ en-US ] = "Description" ;
 };
+
 String STR_PREVIEW
 {
     Text [ en-US ] = "Preview" ;
 };
+
 String STR_DISABLEPREVIEW
 {
     Text [ en-US ] = "Disable Preview" ;
 };
+
 QueryBox APP_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "The database has been modified.\nDo you want to save the changes?" ;
 };
+
 QueryBox APP_CLOSEDOCUMENTS
 {
     Buttons = WB_YES_NO ;
@@ -423,6 +439,7 @@ Menu RID_MENU_APP_PREVIEW
         };
     };
 };
+
 String RID_STR_FORM
 {
     Text [ en-US ] = "Form";
@@ -432,10 +449,12 @@ String RID_STR_REPORT
 {
     Text [ en-US ] = "Report";
 };
+
 String STR_FRM_LABEL
 {
     Text [ en-US ] = "F~orm name" ;
 };
+
 String STR_RPT_LABEL
 {
     Text [ en-US ] = "~Report name" ;
@@ -466,10 +485,12 @@ String RID_STR_EMBEDDED_DATABASE
 {
     Text [ en-US ] = "Embedded database";
 };
+
 String RID_STR_NO_DIFF_CAT
 {
     Text [ en-US ] = "You cannot select different categories.";
 };
+
 String RID_STR_UNSUPPORTED_OBJECT_TYPE
 {
     Text [ en-US ] = "Unsupported object type found ($type$).";
diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src
index 41ccc595f..d5b8401b4 100644
--- a/dbaccess/source/ui/browser/bcommon.src
+++ b/dbaccess/source/ui/browser/bcommon.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,4 +32,3 @@ String RID_STR_TBL_TITLE
 {
     Text [ en-US ] = "Table #" ;
 };
-
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index fc28c1de3..2a748cc01 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,6 @@
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
 #endif
-//	#include <sfx2/sfx.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
 #endif
@@ -63,6 +62,7 @@ String SBA_BROWSER_SETTING_ORDER
 {
     Text [ en-US ] = "Error setting the sort criteria";
 };
+
 String SBA_BROWSER_SETTING_FILTER
 {
     Text [ en-US ] = "Error setting the filter criteria";
@@ -140,13 +140,13 @@ QueryBox QUERY_BRW_DELETE_QUERY_CONFIRM
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The query already exists. Do you want to delete it?" ;
-    };
+};
 
 QueryBox QUERY_CONNECTION_LOST
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ;
-    };
+};
 
 String STR_OPENTABLES_WARNINGS
 {
@@ -161,22 +161,22 @@ String STR_OPENTABLES_WARNINGS_DETAILS
 String STR_CONNECTING_DATASOURCE
 {
     Text [ en-US ] = "Connecting to \"$name$\" ...";
-    };
+};
 
 String STR_LOADING_QUERY
 {
     Text [ en-US ] = "Loading query $name$ ...";
-    };
+};
 
 String STR_LOADING_TABLE
 {
     Text [ en-US ] = "Loading table $name$ ...";
-    };
+};
 
 String STR_NO_TABLE_FORMAT_INSIDE
 {
     Text [ en-US ] = "No table format could be found." ;
-    };
+};
 
 String STR_COULDNOTCONNECT_DATASOURCE
 {
@@ -202,4 +202,3 @@ Menu RID_MENU_REFRESH_DATA
         };
     };
 };
-
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 6c53941d0..ca43b0273 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,10 +102,12 @@ String STR_QRY_TITLE
 {
     Text [ en-US ] = "Query #" ;
 };
+
 String STR_TBL_TITLE
 {
     Text [ en-US ] = "Table #" ;
 };
+
 String STR_VIEW_TITLE
 {
     Text [ en-US ] = "View #" ;
@@ -136,4 +138,3 @@ String STR_DATASOURCE_GRIDCONTROL_DESC
 {
     Text [ en-US ] = "Shows the selected table or query.";
 };
-
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index 9ed55e529..8b870e492 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,6 +53,7 @@ String STR_TABLE_PRIV_ALTER
 {
     Text [ en-US ] = "Alter structure";
 };
+
 String STR_TABLE_PRIV_SELECT
 {
     Text [ en-US ] = "Read data";
@@ -67,30 +68,3 @@ String STR_TABLE_PRIV_DROP
 {
     Text [ en-US ] = "Drop structure";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index 26342fe28..71f3945e2 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,6 @@
 #endif
 #include "browserids.hxx"
 
-
 Menu MENU_TABLETREE_POPUP
 {
     ItemList =
@@ -65,24 +64,28 @@ String STR_COULDNOTCONNECT
 {
     Text [ en-US ] = "No connection could be established for the URL #connurl#.";
 };
+
 String STR_COULDNOTCONNECT_PLEASECHECK
 {
     Text [ en-US ] = "Please check the current settings, for example user name and password.";
 };
+
 String STR_NOTABLEINFO
 {
     Text [ en-US ] = "Successfully connected, but information about database tables is not available.";
 };
+
 String STR_ALL_TABLES
 {
     Text [ en-US ] = "All tables";
 };
+
 String STR_ALL_VIEWS
 {
     Text [ en-US ] = "All views";
 };
+
 String STR_ALL_TABLES_AND_VIEWS
 {
     Text [ en-US ] = "All tables and views";
 };
-
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index 09884a24b..aab44ad5e 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,34 +33,3 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT
 {
     Text [ en-US ] = "Modify SQL statement(s)" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index 774725364..939b736e9 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -199,33 +199,3 @@ String STR_ADABAS_ERROR_SYSTEMTABLES
 {
     Text [ en-US ] = "No information could be displayed because no access rights exist for the required system tables.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index 9036489b3..e43e2a13a 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,13 +69,11 @@ String STR_MSACCESS_MDB_FILE
     Text[ en-US ] = "Microsoft Access database file";
 };
 
-    
 String STR_NO_ADDITIONAL_SETTINGS
 {
     Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button.";
 };
 
-
 String STR_COMMONURL
 {
     Text [ en-US ] = "Datasource URL" ;
@@ -85,18 +83,15 @@ String STR_HOSTNAME
 {
     Text[ en-US ] = "~Host name";
 };
+
 String STR_MOZILLA_PROFILE_NAME
 {
     Text[ en-US ] = "~Mozilla profile name";
 };
+
 String STR_THUNDERBIRD_PROFILE_NAME
 {
     Text[ en-US ] = "~Thunderbird profile name";
 };
 
-
 // -------------------------------------------------------------------------------------------------
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 921a493e5..fb9d9c68d 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -43,14 +43,12 @@
 #define FIXEDLINE_HEIGHT	1
 #define IMG_SIZE			15
 
-
 ModalDialog DLG_COLLECTION_VIEW
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-    //Sizeable = TRUE;
     HelpId = HID_EXPLORERDLG_COLLECTION ;
 
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -128,7 +126,6 @@ ModalDialog DLG_COLLECTION_VIEW
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
     };
 
-
     String STR_PATHNAME
     {
         Text [ en-US ] = "~Path:" ;
@@ -139,11 +136,13 @@ String STR_NEW_FOLDER
 {
     Text [ en-US ] = "Folder" ;
 };
+
 Image IMG_NAVIGATION_BTN_UP_SC
 {
     ImageBitmap = Bitmap { File = "fp010"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
+
 Image IMG_NAVIGATION_CREATEFOLDER_SC
 {
     ImageBitmap = Bitmap { File = "fp015"; };
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 22eed5dee..61515a258 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,10 +54,8 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "General";
     };
 
-
     AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
 
-
     FixedText FT_NO_ADDITIONAL_SETTINGS
     {
         Hide = TRUE;
@@ -66,7 +64,6 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( PAGE_X - 12 , 3*FIXEDTEXT_HEIGHT ) ;
     };
 
-
     FixedText FT_HOSTNAME
     {
         Hide = TRUE;
@@ -75,7 +72,6 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "~Host name";
     };
 
-
     FixedLine FL_SEPARATOR2
     {
         Pos = MAP_APPFONT ( 4 , 3*FIXEDTEXT_HEIGHT + 3*UNRELATED_CONTROLS + RELATED_CONTROLS ) ;
@@ -89,6 +85,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "~User name" ;
     };
+
     Edit ET_USERNAME
     {
         Border = TRUE ;
@@ -96,6 +93,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CB_PASSWORD_REQUIRED
     {
         Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
@@ -118,6 +116,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "~JDBC driver class" ;
     };
+
     Edit ET_JDBCDRIVERCLASS
     {
         Border = TRUE ;
@@ -184,4 +183,3 @@ String STR_MSACCESS_2007_FILTERNAME
 {
     Text [ en-US ] = "MS Access 2007 file";
 };
-
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
index 9944278cd..3cc090c81 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,13 +35,7 @@ String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
     Text [ en-US ] = "To open a report you require the extension Sun™ Report Builder.\n\nClick 'Download...' to download and install the extension.";
-    // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
 };
-// To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
-// String RID_STR_EXTENSION_NAME
-// {
-// 	Text = "Sun(TM) Report Builder";
-// };
 
 ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
 {
@@ -52,7 +46,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
     HelpId = HID_EXTENSION_NOT_PRESENT_DLG;
     Moveable = TRUE ;
     Closeable = TRUE ;
-    
+
     // most of the calulated values here are overridden by the ExtensionNotPresent ctor itself.
     FixedImage FI_WARNING
     {
@@ -60,13 +54,12 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
         Size = (32, 32);
         Fixed=BMP_EXCEPTION_WARNING;
     };
-    
+
 
     FixedText FT_TEXT
     {
         Pos					= MAP_APPFONT ( 32 , CELL_PADDING ) ;
         Size				= MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ;
-        // Border = TRUE ;
         // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
     };
 
@@ -86,4 +79,3 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
         TabStop = TRUE ;
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index f0517f5c9..908cbab62 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,6 @@
 #endif
 #include "dbaccess_helpid.hrc"
 
-
 ModalDialog DLG_REL_PROPERTIES
 {
     OutputSize = TRUE ;
@@ -43,7 +42,6 @@ ModalDialog DLG_REL_PROPERTIES
     Moveable = TRUE ;
     Closeable = TRUE ;
 
-
     Window WND_CONTROL
     {
         Pos = MAP_APPFONT( 0, 0 );
@@ -86,9 +84,6 @@ ModalDialog DLG_REL_PROPERTIES
         };
     };
 
-    
-    
-
     FixedLine FL_CASC_UPD
     {
         Pos = MAP_APPFONT ( 6 , 114 ) ;
@@ -124,7 +119,6 @@ ModalDialog DLG_REL_PROPERTIES
         HelpId  = HID_DLG_REL_CASC_UPD_DEFAULT ;
         Text [ en-US ] = "Set ~default" ;
     };
-// zweite FixedLine
     FixedLine FL_CASC_DEL
     {
         Pos = MAP_APPFONT ( 96 , 114 ) ;
@@ -182,4 +176,3 @@ ModalDialog DLG_REL_PROPERTIES
     };
 
 };
-
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 7ec8120b5..a92a894ee 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,6 @@ TabPage TAB_PAGE_USERADMIN
         HelpId				= HID_TAB_PAGE_LBUSER ;
     };
 
-
     PushButton PB_NEWUSER
     {
         Pos					= MAP_APPFONT ( 12 , 29 ) ;
@@ -150,7 +149,6 @@ ModalDialog DLG_PASSWORD
         Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50 , 8 ) ;
         Text [ en-US ] = "User \"$name$:  $\"";
     };
-
     FixedText FT_OLDPASSWORD
     {
         Pos = MAP_APPFONT ( 6 , 17 ) ;
@@ -191,7 +189,7 @@ ModalDialog DLG_PASSWORD
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
         PassWord = TRUE ;
     };
-    
+
     OKButton BTN_PASSWORD_OK
     {
         Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ;
@@ -207,7 +205,7 @@ ModalDialog DLG_PASSWORD
     {
         Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
-    };	
+    };
     Text [ en-US ] = "Change Password";
 };
 
@@ -215,28 +213,3 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL
 {
     Text [ en-US ] = "The passwords do not match. Please enter the password again.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index bed16e575..5509820d1 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,16 +35,15 @@
 #include "dbu_dlg.hrc"
 #endif
 
-
 TabDialog DLG_DATABASE_USERADMIN
-{																			
+{
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
     Hide = TRUE;
     HelpId = HID_DSADMIN_USERADMIN;
-    
+
     TabControl 1
     {
         OutputSize = TRUE ;
@@ -55,6 +54,6 @@ TabDialog DLG_DATABASE_USERADMIN
     {
         Text[ en-US ] = "User Settings";
     };
-    
+
     Text [ en-US ] = "User administration" ;
 };
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index 69b202644..ecff324d7 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,6 +67,7 @@ ModelessDialog DLG_JOIN_TABADD
         Hide = TRUE;
         Group = TRUE;
     };
+
     PushButton PB_ADDTABLE
     {
         Pos = MAP_APPFONT ( 123 , 6 ) ;
@@ -75,6 +76,7 @@ ModelessDialog DLG_JOIN_TABADD
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
+
     CancelButton PB_CLOSE
     {
         Pos = MAP_APPFONT ( 123 , 22 ) ;
@@ -83,6 +85,7 @@ ModelessDialog DLG_JOIN_TABADD
         Text [ en-US ] = "~Close" ;
         TabStop = TRUE ;
     };
+
     HelpButton PB_HELP
     {
         Pos = MAP_APPFONT ( 123 , 43 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 02389611a..5a956eb27 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -82,7 +82,6 @@
         Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ;				                                            \
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;														\
     };																									\
-                                                                                                        \
     FixedText FT_PORTNUMBER																				\
     {																									\
         Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ;	                \
@@ -725,8 +724,8 @@ TabPage PAGE_TEXT
     HelpId = HID_DSADMIN_PAGE_TEXT;
 
     AUTO_SEPARATORCONTROLGROUP(UNRELATED_CONTROLS, PAGE_X)
-
 };
+
 //.........................................................................
 TabPage PAGE_USERDRIVER
 {
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 2a7c0abb1..5d6ce5494 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,22 +71,27 @@ String STR_ADDRESSBOOK_SYSTEM
 {
     Text[ en-US ] = "Windows address book";
 };
+
 String STR_ADDRESSBOOK_OUTLOOK
 {
     Text[ en-US ] = "MS Outlook";
 };
+
 String STR_ADDRESSBOOK_MOZILLA
 {
     Text[ en-US ] = "Mozilla address book";
 };
+
 String STR_ADDRESSBOOK_THUNDERBIRD
 {
     Text[ en-US ] = "Thunderbird address book";
 };
+
 String STR_ADDRESSBOOK_EVOLUTION
 {
     Text[ en-US ] = "Evolution address book";
 };
+
 String STR_ADDRESSBOOK_LDAP
 {
     Text[ en-US ] = "LDAP address book";
@@ -145,7 +150,7 @@ ModalDialog DLG_DOMAINPASSWORD
     {
         Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
-    };	
+    };
 };
 
 #define PAGE_X_T  (PAGE_X -80)
@@ -158,7 +163,7 @@ TabPage PAGE_TABLESUBSCRIPTION
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ;
     HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION;
-    
+
     Text [ en-US ] = "Tables Filter" ;
 
     FixedLine FL_SEPARATOR1
@@ -185,4 +190,3 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text [ en-US ] = "Mark the tables that should be visible for the applications.";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 00fa1b3cd..f1351216d 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -142,7 +142,6 @@ ModalDialog DLG_DATABASE_WIZARD
     };
 };
 
-
 String STR_DATABASEDEFAULTNAME
 {
     Text[ en-US ]  = "New Database" ;
@@ -164,7 +163,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         WordBreak = TRUE;
     };
 
-
     FixedText FT_MYSQL_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -202,7 +200,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         Text[ en-US ] = "Connect directly" ;
         Hide = TRUE ;
     };
-
 };
 
 #define AUTHENTEDIT_X   (EDIT_X - 10)
@@ -214,7 +211,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-    FixedText FT_AUTHENTIFICATIONHEADERTEXT 
+    FixedText FT_AUTHENTIFICATIONHEADERTEXT
     {
         Pos = MAP_APPFONT ( START_X , 8 ) ;
         Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ;
@@ -222,7 +219,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         WordBreak = TRUE;
     };
 
-
     FixedText FT_AUTHENTIFICATIONHELPTEXT\
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -261,7 +257,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "~Test Connection" ;
     };
-
 };
 
 
@@ -272,7 +267,6 @@ TabPage PAGE_DBWIZARD_FINAL
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     FixedText FT_FINALHEADER
     {
         Pos = MAP_APPFONT ( START_X , 8 ) ;
@@ -289,7 +283,6 @@ TabPage PAGE_DBWIZARD_FINAL
         WordBreak = TRUE ;
     };
 
-
     RadioButton RB_REGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE;
@@ -299,7 +292,6 @@ TabPage PAGE_DBWIZARD_FINAL
         Text[ en-US ] = "~Yes, register the database for me" ;
     };
 
-
     RadioButton RB_DONTREGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ;
@@ -348,7 +340,6 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     String STR_MYSQLJDBC_HEADERTEXT
     {
         Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
@@ -387,7 +378,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
         Text[ en-US ] = "Set up connection to a MySQL database" ;
         WordBreak = TRUE;
     };
- 
+
     FixedText FT_SETUP_WIZARD_HELP
     {
         Pos = MAP_APPFONT ( START_X , INIT_Y ) ;
@@ -410,42 +401,34 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ] = "Set up a connection to dBASE files" ;
     };
 
-
     String STR_DBASE_HELPTEXT
     {
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
     };
 
-     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+    AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
 };
 
-
 TabPage PAGE_DBWIZARD_TEXT
 {
-
     String STR_TEXT_HEADERTEXT
     {
         Text[ en-US ]   = "Set up a connection to text files" ;
     };
 
-
     String STR_TEXT_HELPTEXT
     {
         Text[ en-US ]   = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ;
     };
 
-
     String STR_TEXT_PATH_OR_FILE{
         Text[ en-US ]  = "Path to text files";
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
-
-
 TabPage PAGE_DBWIZARD_MSACCESS
 {
     SVLook = TRUE ;
@@ -458,17 +441,14 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
     };
 
-
     String STR_MSACCESS_HELPTEXT
     {
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
-// FT_MSACCESS_MDB_FILE
 };
 
-
 TabPage PAGE_DBWIZARD_LDAP
 {
     SVLook = TRUE ;
@@ -484,7 +464,6 @@ TabPage PAGE_DBWIZARD_LDAP
         WordBreak = TRUE;
     };
 
-
     FixedText FT_LDAP_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -509,7 +488,6 @@ TabPage PAGE_DBWIZARD_LDAP
     };
 };
 
-
 TabPage PAGE_DBWIZARD_ADABAS
 {
     SVLook = TRUE ;
@@ -522,7 +500,6 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ]   = "Set up a connection to an Adabas D database" ;
     };
 
-
     String STR_ADABAS_HELPTEXT{
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
@@ -530,7 +507,6 @@ TabPage PAGE_DBWIZARD_ADABAS
     AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
 };
 
-
 TabPage PAGE_DBWIZARD_ADO
 {
     SVLook = TRUE ;
@@ -548,7 +524,6 @@ TabPage PAGE_DBWIZARD_ADO
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
-
 };
 
 
@@ -581,8 +556,6 @@ TabPage PAGE_DBWIZARD_USERDEFINED
     AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
 };
 
-
-
 TabPage PAGE_DBWIZARD_JDBC
 {
     SVLook = TRUE ;
@@ -622,12 +595,10 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Default: 1521" ;
     };
 
-
     String STR_ORACLE_DRIVERCLASSTEXT{
         Text [ en-US ] = "Oracle JDBC ~driver class";
     };
 
-
     String STR_ORACLE_HELPTEXT{
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
@@ -648,12 +619,10 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "Set up a connection to spreadsheets";
     };
 
-
     String STR_SPREADSHEET_HELPTEXT{
         Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
@@ -669,5 +638,3 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "~Password required" ;
     };
 };
-
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 044ae6f4a..47c72d114 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -119,7 +119,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "one_left.bmp" ;
+                File = "one_left.png" ;
             };
             MaskColor = Color
             {
@@ -138,7 +138,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "all_left.bmp" ;
+                File = "all_left.png" ;
             };
             MaskColor = Color
             {
@@ -157,7 +157,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "one_right.bmp" ;
+                File = "one_right.png" ;
             };
             MaskColor = Color
             {
@@ -176,7 +176,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "all_right.bmp" ;
+                File = "all_right.png" ;
             };
             MaskColor = Color
             {
@@ -186,5 +186,4 @@ ModalDialog DLG_DBASE_INDEXES
             };
         };
     };
-
 };
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index 1fa897b80..f81201c41 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -131,4 +131,3 @@ String STR_DIRECTSQL_CONNECTIONLOST
 {
     Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed.";
 };
-
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index 6c793ac52..a1f689bcb 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,6 +36,7 @@
 #ifndef DBAUI_SBATTRDLG_HRC
 #include "dlgattr.hrc"
 #endif
+
  //================================================
  // Der Attributdialog:
 TabDialog DLG_ATTR
@@ -89,34 +90,3 @@ TabDialog DLG_ATTR
         Text [ en-US ] = "Table Format" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index a6c036ec2..20688a784 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -138,4 +138,3 @@ ModalDialog DLG_SAVE_AS
         Text [ en-US ] = "Insert as";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index b690e7e50..507b96f7e 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -156,34 +156,3 @@ ModalDialog DLG_COLWIDTH
     };
     Text [ en-US ] = "Column Width" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 4539754e8..8c59a26d1 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
         HScroll = TRUE ;
         Sort = TRUE ;
     };
-    
+
     OKButton PB_OK
     {
         Pos = MAP_APPFONT ( 166 , 6 ) ;
@@ -103,5 +103,3 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text [ en-US ] = "Choose a database";
     };
 };
-
-
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 2d832238a..0d8aa0884 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,6 @@ ModalDialog DLG_INDEXDESIGN
     ToolBox TLB_ACTIONS
     {
         Pos = MAP_APPFONT ( 6 , 6 ) ;
-        //	Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ;
         ButtonType = BUTTON_SYMBOL;
         Align = BOXALIGN_TOP;
         HelpId = HID_INDEX_DIALOG_ACTION_TB;
@@ -171,14 +170,17 @@ String STR_TAB_INDEX_SORTORDER
 {
     Text [ en-US ] = "Sort order" ;
 };
+
 String STR_TAB_INDEX_FIELD
 {
     Text [ en-US ] = "Index field" ;
 };
+
 String STR_ORDER_ASCENDING
 {
     Text [ en-US ] = "Ascending" ;
 };
+
 String STR_ORDER_DESCENDING
 {
     Text [ en-US ] = "Descending" ;
@@ -196,7 +198,7 @@ String STR_LOGICAL_INDEX_NAME
 
 Image IMG_PKEYICON
 {
-    ImageBitmap = Bitmap { File = "pkey.bmp"; };
+    ImageBitmap = Bitmap { File = "pkey.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
@@ -228,4 +230,3 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
 {
     Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice.";
 };
-
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index c35e395c6..10affc622 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,6 @@ ModalDialog DLG_PARAMETERS
     Moveable = TRUE ;
     Closeable = TRUE ;
 
-
     FixedLine FL_PARAMS
     {
         Pos = MAP_APPFONT ( 4 , 3 ) ;
@@ -97,4 +96,3 @@ ModalDialog DLG_PARAMETERS
         Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\"column";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index d91610079..600193208 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,11 +75,10 @@ ModalDialog DLG_FILTERCRIT
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
-//		STRLST_AND_OR
         StringList [ en-US ] =
         {
-            < "AND" ; Default ; > ; 
-            < "OR" ; Default ; > ; 
+            < "AND" ; Default ; > ;
+            < "OR" ; Default ; > ;
         };
     };
     ListBox LB_WHEREFIELD2
@@ -115,11 +114,10 @@ ModalDialog DLG_FILTERCRIT
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
-//		STRLST_AND_OR
         StringList [ en-US ] =
         {
-            < "AND" ; Default ; > ; 
-            < "OR" ; Default ; > ; 
+            < "AND" ; Default ; > ;
+            < "OR" ; Default ; > ;
         };
     };
     ListBox LB_WHEREFIELD3
@@ -210,4 +208,3 @@ ModalDialog DLG_FILTERCRIT
         Text [ en-US ] = "=;<>;<;<=;>;>=;like;not like;null;not null";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 2927be9d8..fe7504225 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -173,39 +173,3 @@ ModalDialog DLG_ORDERCRIT
         Text [ en-US ] = "<none>" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index a0b44684e..979fdd370 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,19 +38,19 @@
 //-------------------------------------------------------------------------
 Image BMP_EXCEPTION_ERROR
 {
-    ImageBitmap = Bitmap { File = "exerror.bmp"; };
+    ImageBitmap = Bitmap { File = "exerror.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
 Image BMP_EXCEPTION_WARNING
 {
-    ImageBitmap = Bitmap { File = "exwarning.bmp"; };
+    ImageBitmap = Bitmap { File = "exwarning.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
 Image BMP_EXCEPTION_INFO
 {
-    ImageBitmap = Bitmap { File = "exinfo.bmp"; };
+    ImageBitmap = Bitmap { File = "exinfo.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src
index f285199c5..cca76e7f6 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.src
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index 9c5d4d78a..8f993554f 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -68,16 +68,19 @@ Image IMG_FORMFOLDER_TREE_L
     ImageBitmap = Bitmap { File = "forms_32"; };
     MASKCOLOR;
 };
+
 Image IMG_REPORTFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "reports_32"; };
     MASKCOLOR;
 };
+
 Image IMG_QUERYFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "queries_32"; };
     MASKCOLOR;
 };
+
 Image IMG_TABLEFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "tables_32"; };
@@ -92,7 +95,7 @@ Image IMG_TABLEFOLDER_TREE_L
 
 Image DATABASE_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "db.bmp"; };
+    ImageBitmap = Bitmap { File = "db.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
@@ -125,13 +128,13 @@ Image VIEW_TREE_ICON
 
 Image QUERY_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03202.bmp"; };
+    ImageBitmap = Bitmap { File = "sx03202.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
 Image QUERYFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03201.bmp"; };
+    ImageBitmap = Bitmap { File = "sx03201.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
@@ -164,4 +167,3 @@ Image REPORTFOLDER_TREE_ICON
     ImageBitmap = Bitmap { File = "reports_16"; };
     MASKCOLOR;
 };
-
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 6709753b0..39e7fbe06 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -70,7 +70,6 @@ ModalDialog WIZ_RTFCOPYTABLE
 
     Text [ en-US ] = "Copy RTF Table" ;
 
-
     OutputSize		= TRUE ;
     SVLook			= TRUE ;
     Moveable		= TRUE ;
@@ -123,11 +122,10 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     FixedLine FL_COLUMN_SELECT
     {
-        Pos					= MAP_APPFONT ( 6 , 3  ) ;
-        Size                = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
-        Text [ en-US ] = "Existing columns" ;
+        Pos             = MAP_APPFONT ( 6 , 3  ) ;
+        Size            = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
+        Text [ en-US ]  = "Existing columns" ;
     };
-
     MultiListBox LB_ORG_COLUMN_NAMES
     {
         Border				= TRUE ;
@@ -149,7 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "one_right.bmp" ;
+                File = "one_right.png" ;
             };
             MaskColor = Color
             {
@@ -169,7 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "all_right.bmp" ;
+                File = "all_right.png" ;
             };
             MaskColor = Color
             {
@@ -188,7 +186,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "one_left.bmp" ;
+                File = "one_left.png1" ;
             };
             MaskColor = Color
             {
@@ -207,7 +205,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "all_left.bmp" ;
+                File = "all_left.png" ;
             };
             MaskColor = Color
             {
@@ -314,6 +312,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
         };
     };
 };
+
 //==================================================================
  // TAB_WIZ_NAME_MATCHING
  //==================================================================
@@ -368,7 +367,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortup.bmp" ;
+                File = "sortup.png" ;
             };
             MaskColor = Color
             {
@@ -387,7 +386,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortdown.bmp" ;
+                File = "sortdown.png" ;
             };
             MaskColor = Color
             {
@@ -407,7 +406,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortup.bmp" ;
+                File = "sortup.png" ;
             };
             MaskColor = Color
             {
@@ -426,7 +425,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortdown.bmp" ;
+                File = "sortdown.png" ;
             };
             MaskColor = Color
             {
@@ -453,6 +452,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text [ en-US ]	= "Non~e" ;
     };
 };
+
 TabPage TAB_WIZ_COPYTABLE
 {
     SVLook	= TRUE ;
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 8deda3fde..ae5979c0a 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,17 +61,16 @@ String STR_MISSING_TABLES_XDROP
 String STR_BUTTON_TEXT_ALL
 {
     Text [ en-US ] = "~All";
-
 };
 
 String STR_UNDO_COLON
 {
-    Text [ en-US ] = "Undo:";								
+    Text [ en-US ] = "Undo:";
 };
 
 String STR_REDO_COLON
 {
-    Text [ en-US ] = "Redo:";								
+    Text [ en-US ] = "Redo:";
 };
 
 String STR_UNKNOWN_TYPE_FOUND
@@ -93,6 +92,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
 {
     Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ;
 };
+
 String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index ea8ff407b..aae5a0754 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -97,19 +97,17 @@ Menu RID_QUERYCOLPOPUPMENU
         };
     };
 };
+
 ImageList IMG_JOINS
 {
     Prefix = "jo";
-    MaskColor   = Color {
-            Red   = 0xffff;
-            Green = 0x0000;
-            Blue  = 0xffff;
-    };
+    MaskColor   = Color { Red   = 0xffff; Green = 0x0000; Blue  = 0xffff; };
     IdList = {
         IMG_PRIMARY_KEY; IMG_FOREIGN_KEY;
     };
     IdCount = { 2; };
 };
+
 String STR_QUERY_UNDO_TABWINSHOW
 {
     Text [ en-US ] = "Add Table Window" ;
@@ -147,6 +145,7 @@ String STR_QUERY_UNDO_TABFIELDCREATE
 {
     Text [ en-US ] = "Add Column" ;
 };
+
 String RID_STR_TABLE_DOESNT_EXIST
 {
     Text [ en-US ] = "Invalid expression, table '$name$' does not exist.";
@@ -156,6 +155,7 @@ String RID_STR_FIELD_DOESNT_EXIST
 {
     Text [ en-US ] = "Invalid expression, field name '$name$' does not exist.";
 };
+
 String RID_STR_TOMUCHTABLES
 {
     Text [ en-US ] = "The query covers #num# tables. The selected database type, however, can only process a maximum of #maxnum# table(s) per statement.";
@@ -170,10 +170,12 @@ String STR_QUERY_UNDO_MODIFY_CELL
 {
     Text [ en-US ] = "Edit Column Description";
 };
+
 String STR_QUERY_UNDO_SIZE_COLUMN
 {
     Text [ en-US ] = "Adjust column width";
 };
+
 String STR_QUERY_SORTTEXT
 {
     Text [ en-US ] = "(not sorted);ascending;descending" ;
@@ -183,14 +185,17 @@ String STR_QUERY_FUNCTIONS
 {
     Text [ en-US ] = "(no function);Group";
 };
+
 String STR_QUERY_NOTABLE
 {
     Text [ en-US ] = "(no table)";
 };
+
 String STR_QRY_ORDERBY_UNRELATED
 {
     Text [ en-US ] = "The database only supports sorting for visible fields.";
 };
+
 Menu RID_QUERYFUNCTION_POPUPMENU
 {
     ItemList =
@@ -229,6 +234,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU
         };
     };
 };
+
 String STR_QUERY_HANDLETEXT
 {
     Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or";
@@ -243,38 +249,47 @@ ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK
 {
     Message [ en-US ] = "A condition cannot be applied to field [*]" ;
 };
+
 String STR_QRY_TOO_LONG_STATEMENT
 {
     Text [ en-US ] = "The SQL statement created is too long.";
 };
+
 String STR_QRY_TOOCOMPLEX
 {
     Text [ en-US ] = "Query is too complex" ;
 };
+
 String STR_QRY_NOSELECT
 {
     Text [ en-US ] = "Nothing has been selected." ;
 };
+
 String STR_QRY_TOOMANYCOND
 {
     Text [ en-US ] = "Too many search criteria" ;
 };
+
 String STR_QRY_SYNTAX
 {
     Text [ en-US ] = "SQL syntax error" ;
 };
+
 ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK
 {
     Message [ en-US ] = "[*] cannot be used as a sort criterion.";
 };
+
 String STR_QUERY_TRUE
 {
     Text [ en-US ] = "TRUE" ;
 };
+
 String STR_QUERY_FALSE
 {
     Text [ en-US ] = "FALSE" ;
 };
+
 String STR_QRY_TOO_MANY_TABLES
 {
     Text [ en-US ] = "There are too many tables.";
@@ -284,10 +299,12 @@ String STR_QRY_NATIVE
 {
     Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ;
 };
+
 ErrorBox ERR_QRY_AMB_FIELD
 {
     Message [ en-US ] = "Field name not found or not unique" ;
 };
+
 String STR_QRY_ILLEGAL_JOIN
 {
     Text [ en-US ] = "Join could not be processed" ;
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 30bc059c4..0da839f7b 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -182,13 +182,13 @@ String STR_QUERY_FULL_JOIN
 {
     Text [ en-US ] = "Contains ALL records from '%1' and from '%2'.";
 };
+
 String STR_QUERY_CROSS_JOIN
 {
     Text [ en-US ] = "Contains the cartesian product of ALL records from '%1' and from '%2'.";
 };
+
 String STR_QUERY_NATURAL_JOIN
 {
     Text [ en-US ] = "Contains only one column for each pair of equally-named columns from '%1' and from '%2'.";
 };
-
-
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index 0a5f3e00f..4420ade06 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,22 +44,27 @@ String STR_QUERY_REL_EDIT_RELATION
 {
     Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ;
 };
+
 String STR_QUERY_REL_EDIT
 {
     Text [ en-US ] = "Edit..." ;
 };
+
 String STR_QUERY_REL_CREATE
 {
     Text [ en-US ] = "Create..." ;
 };
+
 String STR_RELATIONDESIGN
 {
     Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ;
 };
+
 String STR_RELATIONDESIGN_NOT_AVAILABLE
 {
     Text [ en-US ] = "The database does not support relations." ;
 };
+
 QueryBox RELATION_DESIGN_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
@@ -76,55 +81,3 @@ String STR_QUERY_REL_COULD_NOT_CREATE
 {
     Text [ en-US ] = "The database could not create the relation. May be foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 974dd5602..bffb9404d 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,18 +65,22 @@ String STR_VALUE_YES
 {
     Text [ en-US ] = "Yes" ;
 };
+
 String STR_VALUE_NO
 {
     Text [ en-US ] = "No" ;
 };
+
 String STR_VALUE_ASC
 {
     Text [ en-US ] = "Ascending" ;
 };
+
 String STR_VALUE_DESC
 {
     Text [ en-US ] = "Descending" ;
 };
+
 String STR_VALUE_NONE
 {
     // Bemerkung : sollte auch in anderen Sprachen irgendwie zum Wort 'Wert' passen : Wert - keiner ....
@@ -87,46 +91,57 @@ String STR_TAB_FIELD_NAME
 {
     Text [ en-US ] = "Field name" ;
 };
+
 String STR_TAB_FIELD_COLUMN_NAME
 {
     Text [ en-US ] = "Field Name" ;
 };
+
 String STR_TAB_FIELD_DATATYPE
 {
     Text [ en-US ] = "Field ~type" ;
 };
+
 String STR_TAB_FIELD_COLUMN_DATATYPE
 {
     Text [ en-US ] = "Field Type" ;
 };
+
 String STR_TAB_FIELD_LENGTH
 {
     Text [ en-US ] = "Field length" ;
 };
+
 String STR_TAB_HELP_TEXT
 {
     Text [ en-US ] = "Description" ;
 };
+
 String STR_COLUMN_DESCRIPTION
 {
     Text [ en-US ] = "Column Description" ;
 };
+
 String STR_TAB_FIELD_NULLABLE
 {
     Text [ en-US ] = "Input required" ;
 };
+
 String STR_FIELD_AUTOINCREMENT
 {
     Text [ en-US ] = "~AutoValue";
 };
+
 String STR_TAB_PROPERTIES
 {
     Text [ en-US ] = "Field Properties" ;
 };
+
 String STR_TABPAGE_GENERAL
 {
     Text [ en-US ] = "General" ;
 };
+
 String STR_TAB_TABLE_DESCRIPTION
 {
     Text [ en-US ] = "Description:";
@@ -156,61 +171,67 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
 {
     ItemList =
     {
-    MenuItem
-    {
-        ITEM_EDIT_CUT
-    };
-    MenuItem
-    {
-        ITEM_EDIT_COPY
-    };
-    MenuItem
-    {
-        ITEM_EDIT_PASTE
-    };
-    MenuItem
-    {
-        ITEM_EDIT_DELETE
-    };
-    MenuItem
-    {
-        Identifier = SID_TABLEDESIGN_INSERTROWS ;
-        HelpID = SID_TABLEDESIGN_INSERTROWS ;
-        Text [ en-US ] = "Insert Rows" ;
+        MenuItem
+        {
+            ITEM_EDIT_CUT
         };
-    MenuItem
-    {
-        Separator = TRUE ;
-    };
-    MenuItem
-    {
-        Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        Checkable = TRUE ;
-        Text [ en-US ] = "Primary Key" ;
+        MenuItem
+        {
+            ITEM_EDIT_COPY
+        };
+        MenuItem
+        {
+            ITEM_EDIT_PASTE
+        };
+        MenuItem
+        {
+            ITEM_EDIT_DELETE
+        };
+        MenuItem
+        {
+            Identifier = SID_TABLEDESIGN_INSERTROWS ;
+            HelpID = SID_TABLEDESIGN_INSERTROWS ;
+            Text [ en-US ] = "Insert Rows" ;
+        };
+        MenuItem
+        {
+            Separator = TRUE ;
+        };
+        MenuItem
+        {
+            Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            Checkable = TRUE ;
+            Text [ en-US ] = "Primary Key" ;
         };
     };
 };
+
 String STR_TABED_UNDO_CELLMODIFIED
 {
     Text [ en-US ] = "Modify cell" ;
 };
+
 String STR_TABED_UNDO_ROWDELETED
 {
     Text [ en-US ] = "Delete row" ;
 };
+
 String STR_TABED_UNDO_TYPE_CHANGED
 {
     Text [ en-US ] = "Modify field type";
 };
+
 String STR_TABED_UNDO_ROWINSERTED
 {
     Text [ en-US ] = "Insert row" ;
 };
+
 String STR_TABED_UNDO_NEWROWINSERTED
 {
     Text [ en-US ] = "Insert new row" ;
 };
+
 String STR_TABED_UNDO_PRIMKEY
 {
     Text [ en-US ] = "Insert/remove primary key" ;
@@ -220,114 +241,141 @@ String STR_DEFAULT_VALUE
 {
     Text [ en-US ] = "~Default value" ;
 };
+
 String STR_FIELD_REQUIRED
 {
     Text [ en-US ] = "~Entry required" ;
 };
+
 String STR_TEXT_LENGTH
 {
     Text [ en-US ] = "~Length" ;
 };
+
 String STR_NUMERIC_TYPE
 {
     Text [ en-US ] = "~Type" ;
 };
+
 String STR_LENGTH
 {
     Text [ en-US ] = "~Length" ;
 };
+
 String STR_SCALE
 {
     Text [ en-US ] = "Decimal ~places" ;
 };
+
 String STR_FORMAT
 {
     Text [ en-US ] = "Format example";
 };
+
 String STR_HELP_BOOL_DEFAULT
 {
     Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.";
 };
+
 String STR_HELP_DEFAULT_VALUE
 {
     Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ;
 };
+
 String STR_HELP_FIELD_REQUIRED
 {
     Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ;
 };
+
 String STR_HELP_TEXT_LENGTH
 {
     Text [ en-US ] = "Enter the maximum text length permitted." ;
 };
+
 String STR_HELP_NUMERIC_TYPE
 {
     Text [ en-US ] = "Enter the number format." ;
 };
+
 String STR_HELP_LENGTH
 {
     Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ;
 };
+
 String STR_HELP_SCALE
 {
     Text [ en-US ] = "Specify the number of decimal places permitted in this field." ;
 };
+
 String STR_HELP_FORMAT_CODE
 {
     Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).";
 };
+
 String STR_HELP_FORMAT_BUTTON
 {
     Text [ en-US ] = "This is where you determine the output format of the data.";
 };
+
 String STR_HELP_AUTOINCREMENT
 {
     Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ;
 };
+
 PushButton PB_FORMAT
 {
     TabStop = TRUE ;
     Text [ en-US ] = "~...";
 };
+
 String STR_TABLEDESIGN_DUPLICATE_NAME
 {
     Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice.";
 };
+
 String STR_TBL_COLUMN_IS_KEYCOLUMN
 {
     Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?";
 };
+
 String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE
 {
     Text [ en-US ] = "Primary Key Affected";
 };
+
 String STR_COLUMN_NAME
 {
     Text [ en-US ] = "Column";
 };
+
 String STR_QRY_CONTINUE
 {
     Text [ en-US ] = "Continue anyway?" ;
 };
+
 String STR_STAT_WARNING
 {
     Text [ en-US ] = "Warning!" ;
 };
+
 QueryBox TABLE_DESIGN_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "The table has been changed.\nDo you want to save the changes?" ;
 };
+
 QueryBox TABLE_QUERY_CONNECTION_LOST
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\nReconnect?" ;
 };
+
 String STR_TABLEDESIGN_CONNECTION_MISSING
 {
     Text [ en-US ] = "The table could not be saved due to problems connecting to the database.";
 };
+
 String STR_TABLEDESIGN_DATASOURCE_DELETED
 {
     Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted.";
@@ -339,14 +387,18 @@ QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES
 
     Buttons = WB_YES_NO ;
 };
+
 String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD
 {
     Text [ en-US ] = "No primary key" ;
 };
+
 String STR_TABLEDESIGN_NO_PRIM_KEY
 {
     Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ;
 };
+
+
 String STR_TABLEDESIGN_TITLE
 {
     Text [ en-US ] = " - %PRODUCTNAME Base: Table Design";
@@ -382,6 +434,7 @@ String STR_AUTOINCREMENT_VALUE
 {
     Text [ en-US ] = "A~uto-increment statement";
 };
+
 String STR_HELP_AUTOINCREMENT_VALUE
 {
     Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src
index c153b79d1..a0dd16eab 100644
--- a/dbaccess/source/ui/uno/copytablewizard.src
+++ b/dbaccess/source/ui/uno/copytablewizard.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,14 +66,17 @@ String STR_CTW_ERROR_DURING_INITIALIZATION
 {
     Text [ en-US ] = "An error occurred during initialization.";
 };
+
 String STR_CTW_ERROR_UNSUPPORTED_SETTING
 {
     Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$.";
 };
+
 String STR_CTW_ERROR_NO_QUERY
 {
     Text [ en-US ] = "To copy a query, your connection must be able to provide queries.";
 };
+
 String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
 {
     Text [ en-US ] = "The given interaction handler is invalid.";
diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src
index 67f72b20f..3d4c33d8a 100644
--- a/dbaccess/source/ui/uno/dbinteraction.src
+++ b/dbaccess/source/ui/uno/dbinteraction.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite