Index: core/xwiki-core/src/main/resources/ApplicationResources.properties
===================================================================
--- core/xwiki-core/src/main/resources/ApplicationResources.properties	(revision 34797)
+++ core/xwiki-core/src/main/resources/ApplicationResources.properties	(working copy)
@@ -1509,7 +1509,7 @@
 rendering.macro.office.parameter.attachment.name=Attachment
 rendering.macro.office.parameter.attachment.description=The office attachment to be viewed. Use an attachment string reference to specify which office file should be viewed: file.ppt, Page@file.doc, Space.Page@file.xls or wiki:Space.Page@file.odt.
 rendering.macro.office.parameter.filterStyles.name=Filter Styles
-rendering.macro.office.parameter.filterStyles.description=Whether to filter in-line CSS styles present in the HTML content produced by the OpenOffice server. Office content is usually better integrated in the host wiki page when styles are filtered.
+rendering.macro.office.parameter.filterStyles.description=Whether to filter in-line CSS styles present in the HTML content produced by the Office Server. Office content is usually better integrated in the host wiki page when styles are filtered.
 rendering.macro.context.name=Context
 rendering.macro.context.description=Executes content in the context of the passed document
 rendering.macro.context.content.description=The content to execute
@@ -1783,8 +1783,8 @@
 admin.general.description=General settings of the wiki.
 admin.programming=Programming
 admin.programming.description=Settings related to programming in XWiki.
-admin.ooserver=OpenOffice Server
-admin.xwiki.officeimporteradmin.description=Configure the Open Office Server.
+admin.ooserver=Office Server
+admin.xwiki.officeimporteradmin.description=Configure the Office Server.
 
 admin.presentation=Presentation
 admin.presentation.description=Modify the header, change the panels display, customize the skin and color themes.
@@ -2212,8 +2212,8 @@
 
 # Office importer application
 xe.officeimporter.notallowed=Guests are not allowed to view the contents of this page.
-xe.officeimporter.error.normaluser=This application requires an active OpenOffice server which we could not locate. Please contact your administrator to resolve this issue.
-xe.officeimporter.error.adminuser=You need to setup an OpenOffice server to make the OfficeImporter application available to your users. Please look at the [OfficeImporter Documentation>http://extensions.xwiki.org/xwiki/bin/Extension/Office%20Importer%20Application] for instructions on how to setup and configure an OpenOffice server.
+xe.officeimporter.error.normaluser=This application requires an active Office Server which we could not locate. Please contact your administrator to resolve this issue.
+xe.officeimporter.error.adminuser=You need to setup an Office Server to make the Office Importer application available to your users. Please look at the [Office Importer Documentation>http://extensions.xwiki.org/xwiki/bin/Extension/Office%20Importer%20Application] for instructions on how to setup and configure an Office Server.
 xe.officeimporter.import.title=Office Importer
 xe.officeimporter.import.document=Document
 xe.officeimporter.import.target=Target
@@ -2262,7 +2262,7 @@
 xe.officeimporter.openoffice.actions.disconnect=Disconnect
 xe.officeimporter.openoffice.actions.restart=Restart server
 xe.officeimporter.openoffice.update=Update
-xe.officeimporter.openoffice.limitedcontrol=The OpenOffice server can only be controlled from the main wiki
+xe.officeimporter.openoffice.limitedcontrol=The Office Server can only be controlled from the main wiki
 
 # Panels application
 xe.panels.classedit.youare=You are editing
Index: web/xwiki-gwt-wysiwyg-client/src/main/resources/org/xwiki/gwt/wysiwyg/client/Strings.properties
===================================================================
--- web/xwiki-gwt-wysiwyg-client/src/main/resources/org/xwiki/gwt/wysiwyg/client/Strings.properties	(revision 34797)
+++ web/xwiki-gwt-wysiwyg-client/src/main/resources/org/xwiki/gwt/wysiwyg/client/Strings.properties	(working copy)
@@ -193,7 +193,7 @@
 importOfficeContentFilterStylesCheckBoxLabel=Filter Styles
 
 importOfficeFileMenuItemCaption=Office Document
-importOfficeFileFeatureNotAvailable=This feature requires an active openoffice server which we could not locate, please contact your administrator to resolve this issue. 
+importOfficeFileFeatureNotAvailable=This feature requires an active Office Server which we could not locate, please contact your administrator to resolve this issue. 
 importOfficeFileWizardStepTitle=Import Office Document
 importOfficeFileHelpLabel=Choose the office document to import. The file will be uploaded and attached to the current wiki document and its content imported in this wiki document.