4 files changed, 35 insertions, 11 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 0ca9f9e74362..7e4004bca1d4 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -169,12 +169,12 @@ Image RID_IMG_WARNING_HC
 
 Image RID_IMG_LOCKED
 {
-    ImageBitmap = Bitmap { File = "lock_16.png"; };
+    ImageBitmap = Bitmap { File = "shared_16.png"; };
 };
 
 Image RID_IMG_LOCKED_HC
 {
-    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
+    ImageBitmap = Bitmap { File = "shared_16_h.png"; };
 };
 
 Image RID_IMG_EXTENSION
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 319d953b1430..49d3c1c0cf8e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -236,7 +236,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "No descriptions available for this extension.";
     };
     String RID_DLG_UPDATE_NOINSTALL {
-        Text[en-US] = "The extension cannot be installed because:";
+        Text[en-US] = "The extension cannot be updated because:";
     };
     String RID_DLG_UPDATE_NODEPENDENCY {
         Text[en-US] = "Required OpenOffice.org version doesn't match:";
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index afd44f83cff6..05e514305415 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -660,10 +660,15 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions to install a shared extension!");
+        else
+            message = OUSTR("You need write permissions to install this extension!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
-
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
         xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) );
@@ -893,9 +898,15 @@ void PackageManagerImpl::removePackage(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions in order to remove a shared extension!");
+        else
+            message = OUSTR("You need write permissions in order to remove this extension!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
 
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
@@ -1117,9 +1128,15 @@ void PackageManagerImpl::reinstallDeployedPackages(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions in order to install shared extensions!");
+        else
+            message = OUSTR("You need write permissions in order to install extensions!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
 
     if (office_is_running())
         throw RuntimeException(
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index a3b2bac56cc5..bb5be7e8bbd6 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
@@ -81,5 +81,12 @@ String RID_STR_UNOPKG_ACCEPT_LIC_N
 
 String RID_STR_CONCURRENTINSTANCE
 {
-    Text [ en-US ] = "You need to close the already opened Extension Manager to continue.";
+    Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as already running. "
+        "If this does not apply, delete the lock file at:";
 };
+
+String RID_STR_UNOPKG_ERROR
+{
+    Text [ en-US ] = "ERROR: ";
+};
+