diff --git a/components/onlinepackagemanager/languages/opkman_const.de.po b/components/onlinepackagemanager/languages/opkman_const.de.po
index c9908fd06b..9dfc587738 100644
--- a/components/onlinepackagemanager/languages/opkman_const.de.po
+++ b/components/onlinepackagemanager/languages/opkman_const.de.po
@@ -182,11 +182,15 @@ msgid "Lazarus compatibility:"
 msgstr "Lazarus-Kompatibilität"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
+#, fuzzy
+#| msgid "Select package directory:"
+msgid "Package directory:"
 msgstr "Package-Verzeichnis auswählen:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
+#, fuzzy
+#| msgid "Supported widgetset:"
+msgid "Supported widgetsets:"
 msgstr "Unterstütztes Widgetset:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
@@ -201,7 +205,9 @@ msgid "Please select a category for package:"
 msgstr "Bitte wählen Sie eine Kategorie für Package:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
+#, fuzzy
+#| msgid "Please enter supported lazarus versions for package:"
+msgid "Please enter supported Lazarus versions for package:"
 msgstr "Bitte geben Sie die unterstützten Lazarus-Versionen ein für Package:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
@@ -273,10 +279,6 @@ msgstr "Package-Liste filtern nach:"
 msgid "Type filter text"
 msgstr "Filtertext eingeben"
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr "Ein Package mit der selben Zip-Datei existiert bereits!"
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr "Gefiltert nach:"
@@ -307,11 +309,15 @@ msgid "Reset rating"
 msgstr "Bewertung zurücksetzen"
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
+#, fuzzy
+#| msgid "The following repository packages already exists in the target folder. Continue?"
+msgid "The following repository packages already exist in the target folder. Continue?"
 msgstr "Die folgenden Repository-Packages existieren bereits im Zielverzeichnis. Fortfahren?"
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
+#, fuzzy
+#| msgid "The following packages are alrady installed. Continue with install?"
+msgid "The following packages are already installed. Continue anyway?"
 msgstr "Die folgenden Packages sind bereits installiert. Mit der Installation fortfahren?"
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
@@ -323,7 +329,9 @@ msgid "The following repository packages are not installed or don't have a valid
 msgstr "Die folgenden Repository-Packages sind nicht installiert oder haben keinen gültigen Download-Link. Die Packages werden übersprungen. Fortfahren?"
 
 #: opkman_const.rsmainfrm_packageupdate1
-msgid "None of the checked repository packages are installed or has a valid external download link."
+#, fuzzy
+#| msgid "None of the checked repository packages are installed or has a valid external download link."
+msgid "None of the checked repository packages is installed or has a valid external download link."
 msgstr "Keines der ausgewählten Repository-Packages ist installiert oder hat einen gültigen Download-Link."
 
 #: opkman_const.rsmainfrm_packageupdatewarning
@@ -355,13 +363,11 @@ msgid "No packages to show."
 msgstr "Keine Packages zum Anzeigen."
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr ""
 
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
-msgstr "Wollen Sie es jetzt konfigurieren?"
-
 #: opkman_const.rsmainfrm_rsmessageparsingjson
 msgid "Parsing JSON. Please wait..."
 msgstr "Analysiere JSON. Bitte warten..."
@@ -371,20 +377,16 @@ msgid "Please check one or more packages!"
 msgstr "Bitte prüfen Sie ein oder mehrere Packages!"
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
+#, fuzzy,badformat
+#| msgid "depends on package:"
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
 msgstr "hängt ab von Package:"
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr "Abhängigkeit auflösen?"
-
-#: opkman_const.rsmainfrm_rspackagedependency2
+#, fuzzy
+#| msgid "Resolve dependency?"
 msgid "Not resolving dependencies might lead to install failure!"
-msgstr "Nicht aufgelöste Abhängigkeiten können die Installation scheitern lassen!"
-
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr "Abhängigkeitenliste. Sie zu deaktivieren kann zu Fehlern bei der Installation führen. Wollen Sie fortfahren?"
+msgstr "Abhängigkeit auflösen?"
 
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
@@ -759,7 +761,9 @@ msgid "Repository filesize"
 msgstr "Repository-Dateigröße"
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+#, fuzzy
+#| msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr "Unterstützte Widgetsets"
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -772,14 +776,6 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr "Version"
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
 msgstr ""
@@ -913,6 +909,16 @@ msgstr "Niemals"
 msgid "Check for package updates"
 msgstr "Nach Package-Updates suchen"
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
diff --git a/components/onlinepackagemanager/languages/opkman_const.es.po b/components/onlinepackagemanager/languages/opkman_const.es.po
index c98420704c..eec2fbc4e1 100644
--- a/components/onlinepackagemanager/languages/opkman_const.es.po
+++ b/components/onlinepackagemanager/languages/opkman_const.es.po
@@ -187,11 +187,15 @@ msgid "Lazarus compatibility:"
 msgstr "Compatibilidad con Lazarus:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
+#, fuzzy
+#| msgid "Select package directory:"
+msgid "Package directory:"
 msgstr "Seleccionar directorio de paquete:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
+#, fuzzy
+#| msgid "Supported widgetset:"
+msgid "Supported widgetsets:"
 msgstr "Widgetset soportado:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
@@ -206,7 +210,9 @@ msgid "Please select a category for package:"
 msgstr "Por favor selecciona una categoría para el paquete:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
+#, fuzzy
+#| msgid "Please enter supported lazarus versions for package:"
+msgid "Please enter supported Lazarus versions for package:"
 msgstr "Por favor ingrese las versiones de Lazarus soportadas por el paquete:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
@@ -278,10 +284,6 @@ msgstr "Filtrar lista de paquetes por:"
 msgid "Type filter text"
 msgstr "Texto de filtro de tipo"
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr "¡Un paquete con el mismo archivo zip ya existe!"
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr "Filtrar por:"
@@ -312,11 +314,15 @@ msgid "Reset rating"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
+#, fuzzy
+#| msgid "The following repository packages already exists in the target folder. Continue?"
+msgid "The following repository packages already exist in the target folder. Continue?"
 msgstr "Los siguientes paquetes del repositorio ya existen en la carpeta de destino ¿Continuar?"
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
+#, fuzzy
+#| msgid "The following packages are alrady installed. Continue with install?"
+msgid "The following packages are already installed. Continue anyway?"
 msgstr "Los siguientes paquetes ya están instalados ¿Continuar con la instalación?"
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
@@ -331,8 +337,8 @@ msgstr "Los siguientes paquetes del repositorio no tienen un enlace externo de d
 
 #: opkman_const.rsmainfrm_packageupdate1
 #, fuzzy
-#| msgid "None of the checked repository package(s) has a valid external download link."
-msgid "None of the checked repository packages are installed or has a valid external download link."
+#| msgid "None of the checked repository packages are installed or has a valid external download link."
+msgid "None of the checked repository packages is installed or has a valid external download link."
 msgstr "Ninguno de los repositorios marcados tiene un link externo de descarga válido."
 
 #: opkman_const.rsmainfrm_packageupdatewarning
@@ -364,13 +370,13 @@ msgid "No packages to show."
 msgstr "No hay paquetes para mostrar."
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
+#, fuzzy
+#| msgid "Remote package repository not configured."
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr "Repositorio externo de paquetes sin configurar."
 
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
-msgstr "¿Quieres configurarlo ahora?"
-
 #: opkman_const.rsmainfrm_rsmessageparsingjson
 msgid "Parsing JSON. Please wait..."
 msgstr "Analizando JSON. Por favor espera..."
@@ -380,20 +386,16 @@ msgid "Please check one or more packages!"
 msgstr "¡Por favor marca uno o mas paquetes!"
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
+#, fuzzy,badformat
+#| msgid "depends on package:"
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
 msgstr "depende del paquete:"
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr "¿Resolver dependencia?"
-
-#: opkman_const.rsmainfrm_rspackagedependency2
+#, fuzzy
+#| msgid "Resolve dependency?"
 msgid "Not resolving dependencies might lead to install failure!"
-msgstr "¡No resolver las dependencias puede llevar a un error de la instalación!"
-
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr "lista de dependencias. Desmarcarlo puede llevar a un error de la instalación. ¿Deseas continuar?"
+msgstr "¿Resolver dependencia?"
 
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
@@ -776,7 +778,9 @@ msgid "Repository filesize"
 msgstr "Tamaño del repositorio"
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+#, fuzzy
+#| msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr "Widgetset soportados"
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -789,14 +793,6 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr "Versión"
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
 msgstr ""
@@ -930,6 +926,16 @@ msgstr ""
 msgid "Check for package updates"
 msgstr ""
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
diff --git a/components/onlinepackagemanager/languages/opkman_const.fi.po b/components/onlinepackagemanager/languages/opkman_const.fi.po
index 84d1995324..2bfddde11d 100644
--- a/components/onlinepackagemanager/languages/opkman_const.fi.po
+++ b/components/onlinepackagemanager/languages/opkman_const.fi.po
@@ -169,11 +169,15 @@ msgid "Lazarus compatibility:"
 msgstr "Lazarus yhteensopivuus:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
+#, fuzzy
+#| msgid "Select package directory:"
+msgid "Package directory:"
 msgstr "Valitse pakettikansio:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
+#, fuzzy
+#| msgid "Supported widgetset:"
+msgid "Supported widgetsets:"
 msgstr "Tuetut käyttöliittymäkirjastot"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
@@ -186,7 +190,9 @@ msgid "Please select a category for package:"
 msgstr "Valitse pakkauksen luokka:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
+#, fuzzy
+#| msgid "Please enter supported lazarus versions for package:"
+msgid "Please enter supported Lazarus versions for package:"
 msgstr "Anna pakkauksen tukemat Lazarus versiot:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
@@ -258,10 +264,6 @@ msgstr "Suodata pakkauslettelo :"
 msgid "Type filter text"
 msgstr ""
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr "Samanniminen paketti zip-tiedostona on jo olemassa!"
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr ""
@@ -292,11 +294,13 @@ msgid "Reset rating"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
+msgid "The following repository packages already exist in the target folder. Continue?"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
+#, fuzzy
+#| msgid "The following packages are alrady installed. Continue with install?"
+msgid "The following packages are already installed. Continue anyway?"
 msgstr "Seuraavat paketit on jo asennettu. Jatketaanko asentamista?"
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
@@ -308,7 +312,7 @@ msgid "The following repository packages are not installed or don't have a valid
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdate1
-msgid "None of the checked repository packages are installed or has a valid external download link."
+msgid "None of the checked repository packages is installed or has a valid external download link."
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdatewarning
@@ -338,13 +342,11 @@ msgid "No packages to show."
 msgstr "Ei paketteja näytettäväksi"
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr ""
 
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
-msgstr "Haluatko asettaa sen nyt?"
-
 #: opkman_const.rsmainfrm_rsmessageparsingjson
 msgid "Parsing JSON. Please wait..."
 msgstr "JSON:in jäsennys. Odota ..."
@@ -354,20 +356,16 @@ msgid "Please check one or more packages!"
 msgstr "Tarkista yhdestä tai useammasta paketista!"
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
+#, fuzzy,badformat
+#| msgid "depends on package:"
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
 msgstr "riippuvuus pakkauksesta:"
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr "Ratkaise riippuvuus?"
-
-#: opkman_const.rsmainfrm_rspackagedependency2
+#, fuzzy
+#| msgid "Resolve dependency?"
 msgid "Not resolving dependencies might lead to install failure!"
-msgstr ""
-
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr "riippuvuusluettelo. Sen poistaminen saattaisi johtaa asentamisen epäonnistumiseen. Haluatko jatkaa?"
+msgstr "Ratkaise riippuvuus?"
 
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
@@ -750,7 +748,9 @@ msgid "Repository filesize"
 msgstr ""
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+#, fuzzy
+#| msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr "Tuetut käyttöliittymäkirjastot"
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -763,14 +763,6 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr "Versio"
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
 msgstr ""
@@ -904,6 +896,16 @@ msgstr ""
 msgid "Check for package updates"
 msgstr ""
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
diff --git a/components/onlinepackagemanager/languages/opkman_const.hu.po b/components/onlinepackagemanager/languages/opkman_const.hu.po
index a3ecfd397c..ced89b2db8 100644
--- a/components/onlinepackagemanager/languages/opkman_const.hu.po
+++ b/components/onlinepackagemanager/languages/opkman_const.hu.po
@@ -187,11 +187,13 @@ msgid "Lazarus compatibility:"
 msgstr "Lazarus kompatibilitás:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
+msgid "Package directory:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
+#, fuzzy
+#| msgid "Supported widgetset:"
+msgid "Supported widgetsets:"
 msgstr "Támogatott vezérlőkészletek:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
@@ -206,7 +208,7 @@ msgid "Please select a category for package:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
+msgid "Please enter supported Lazarus versions for package:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
@@ -278,10 +280,6 @@ msgstr "Csomaglista szűrése:"
 msgid "Type filter text"
 msgstr "Szűrőszöveg bevitele"
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr "Egy csomag már létezik ugyanezzel a zip fájllal!"
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr "Szűrés:"
@@ -312,11 +310,13 @@ msgid "Reset rating"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
+msgid "The following repository packages already exist in the target folder. Continue?"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
+#, fuzzy
+#| msgid "The following packages are alrady installed. Continue with install?"
+msgid "The following packages are already installed. Continue anyway?"
 msgstr "A következő csomagok már telepítve vannak. Folytatás telepítéssel?"
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
@@ -328,7 +328,7 @@ msgid "The following repository packages are not installed or don't have a valid
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdate1
-msgid "None of the checked repository packages are installed or has a valid external download link."
+msgid "None of the checked repository packages is installed or has a valid external download link."
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdatewarning
@@ -358,13 +358,13 @@ msgid "No packages to show."
 msgstr "Nincs megjelenítendő csomag."
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
+#, fuzzy
+#| msgid "Remote package repository not configured."
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr "A távoli csomagtároló nincs beállítva."
 
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
-msgstr "Szeretné most beállítani?"
-
 #: opkman_const.rsmainfrm_rsmessageparsingjson
 msgid "Parsing JSON. Please wait..."
 msgstr ""
@@ -374,20 +374,16 @@ msgid "Please check one or more packages!"
 msgstr "Egy vagy több csomagot ki kell jelölni!"
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
+#, fuzzy,badformat
+#| msgid "depends on package:"
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
 msgstr "függ a következő csomagtól:"
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr "Függőség feloldása?"
-
-#: opkman_const.rsmainfrm_rspackagedependency2
+#, fuzzy
+#| msgid "Resolve dependency?"
 msgid "Not resolving dependencies might lead to install failure!"
-msgstr "A feloldatlan függőségek a telepítés sikertelenségét okozhatják!"
-
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr ""
+msgstr "Függőség feloldása?"
 
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
@@ -772,7 +768,9 @@ msgid "Repository filesize"
 msgstr "Fájlméret (a tárolóban)"
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+#, fuzzy
+#| msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr "Támogatott vezérlőkészletek"
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -785,14 +783,6 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr "Változat"
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
 msgstr ""
@@ -926,6 +916,16 @@ msgstr ""
 msgid "Check for package updates"
 msgstr ""
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
diff --git a/components/onlinepackagemanager/languages/opkman_const.po b/components/onlinepackagemanager/languages/opkman_const.po
index 7c038a173f..d3b700cfcb 100644
--- a/components/onlinepackagemanager/languages/opkman_const.po
+++ b/components/onlinepackagemanager/languages/opkman_const.po
@@ -159,11 +159,11 @@ msgid "Lazarus compatibility:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
+msgid "Package directory:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
+msgid "Supported widgetsets:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
@@ -176,7 +176,7 @@ msgid "Please select a category for package:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
+msgid "Please enter supported Lazarus versions for package:"
 msgstr ""
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
@@ -248,10 +248,6 @@ msgstr ""
 msgid "Type filter text"
 msgstr ""
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr ""
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr ""
@@ -282,11 +278,11 @@ msgid "Reset rating"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
+msgid "The following repository packages already exist in the target folder. Continue?"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
+msgid "The following packages are already installed. Continue anyway?"
 msgstr ""
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
@@ -298,7 +294,7 @@ msgid "The following repository packages are not installed or don't have a valid
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdate1
-msgid "None of the checked repository packages are installed or has a valid external download link."
+msgid "None of the checked repository packages is installed or has a valid external download link."
 msgstr ""
 
 #: opkman_const.rsmainfrm_packageupdatewarning
@@ -328,11 +324,9 @@ msgid "No packages to show."
 msgstr ""
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
-msgstr ""
-
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr ""
 
 #: opkman_const.rsmainfrm_rsmessageparsingjson
@@ -344,21 +338,13 @@ msgid "Please check one or more packages!"
 msgstr ""
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
 msgstr ""
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr ""
-
-#: opkman_const.rsmainfrm_rspackagedependency2
 msgid "Not resolving dependencies might lead to install failure!"
 msgstr ""
 
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr ""
-
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
 msgstr ""
@@ -730,7 +716,7 @@ msgid "Repository filesize"
 msgstr ""
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr ""
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -743,14 +729,6 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr ""
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
 msgstr ""
@@ -884,6 +862,16 @@ msgstr ""
 msgid "Check for package updates"
 msgstr ""
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr ""
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
diff --git a/components/onlinepackagemanager/languages/opkman_const.ru.po b/components/onlinepackagemanager/languages/opkman_const.ru.po
index 2c351baa3f..158518c67d 100644
--- a/components/onlinepackagemanager/languages/opkman_const.ru.po
+++ b/components/onlinepackagemanager/languages/opkman_const.ru.po
@@ -125,7 +125,7 @@ msgstr "Параметры"
 #: opkman_const.rscreaterepositorypackagefrm_caption
 msgctxt "opkman_const.rscreaterepositorypackagefrm_caption"
 msgid "Create repository package"
-msgstr "Создать пакет в репозитории"
+msgstr "Создать пакет для репозитория"
 
 #: opkman_const.rscreaterepositorypackagefrm_cbopen_caption
 msgctxt "opkman_const.rscreaterepositorypackagefrm_cbopen_caption"
@@ -134,15 +134,15 @@ msgstr "Открыть целевой каталог после создания
 
 #: opkman_const.rscreaterepositorypackagefrm_error0
 msgid "Error reading package"
-msgstr ""
+msgstr "Ошибка чтения пакета"
 
 #: opkman_const.rscreaterepositorypackagefrm_error1
 msgid "Cannot create zip file:"
-msgstr ""
+msgstr "Невозможно создать файл ZIP:"
 
 #: opkman_const.rscreaterepositorypackagefrm_error2
 msgid "Cannot create JSON file:"
-msgstr ""
+msgstr "Невозможно создать файл JSON:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbcategory_caption
 msgid "Category:"
@@ -169,12 +169,12 @@ msgid "Lazarus compatibility:"
 msgstr "Совместимость с Lazarus:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbpackagedir_caption
-msgid "Select package directory:"
-msgstr ""
+msgid "Package directory:"
+msgstr "Каталог пакета:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsupportedwidgetset_caption
-msgid "Supported widgetset:"
-msgstr ""
+msgid "Supported widgetsets:"
+msgstr "Поддерживаемые библиотеки виджетов:"
 
 #: opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption
 msgctxt "opkman_const.rscreaterepositorypackagefrm_lbsvnurl_caption"
@@ -183,48 +183,48 @@ msgstr "SVN:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message0
 msgid "Please select a category for package:"
-msgstr ""
+msgstr "Выберите категорию пакета:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message1
-msgid "Please enter supported lazarus versions for package:"
-msgstr ""
+msgid "Please enter supported Lazarus versions for package:"
+msgstr "Введите поддерживаемые пакетом версии Lazarus:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message2
 msgid "Please enter supported FPC versions for package:"
-msgstr ""
+msgstr "Введите поддерживаемые пакетом версии FPC:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message3
 msgid "Please enter supported widgetsets for package:"
-msgstr ""
+msgstr "Введите поддерживаемые пакетом библиотеки виджетов:"
 
 #: opkman_const.rscreaterepositorypackagefrm_message4
 msgid "Compressing package. Please wait..."
-msgstr ""
+msgstr "Идёт сжатие пакета. Подождите..."
 
 #: opkman_const.rscreaterepositorypackagefrm_message5
 msgid "Creating JSON. Please wait..."
-msgstr ""
+msgstr "Идёт создание JSON. Подождите..."
 
 #: opkman_const.rscreaterepositorypackagefrm_message6
 msgid "Repository package successfully created."
-msgstr ""
+msgstr "Пакет для репозитория успешно создан."
 
 #: opkman_const.rscreaterepositorypackagefrm_nopackage
 msgid "No packages found!"
-msgstr ""
+msgstr "Не найдено ни одного пакета!"
 
 #: opkman_const.rscreaterepositorypackagefrm_pncaption_caption0
 msgid "Available packages"
-msgstr ""
+msgstr "Доступные пакеты"
 
 #: opkman_const.rscreaterepositorypackagefrm_pncaption_caption1
 msgctxt "opkman_const.rscreaterepositorypackagefrm_pncaption_caption1"
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: opkman_const.rscreaterepositorypackagefrm_pncaption_caption2
 msgid "Data"
-msgstr ""
+msgstr "Данные"
 
 #: opkman_const.rscreaterepositorypackagefrm_pnmessage_caption
 msgid "Please wait..."
@@ -232,11 +232,11 @@ msgstr "Подождите..."
 
 #: opkman_const.rscreaterepositorypackagefrm_sddtitledst
 msgid "Save repository package to..."
-msgstr ""
+msgstr "Сохранить пакет для репозитория в..."
 
 #: opkman_const.rscreaterepositorypackagefrm_sddtitlesrc
 msgid "Select package directory"
-msgstr ""
+msgstr "Выберите каталог пакета"
 
 #: opkman_const.rslazaruspackagemanager
 msgid "Online Package Manager"
@@ -258,10 +258,6 @@ msgstr "Фильтровать список пакетов по:"
 msgid "Type filter text"
 msgstr "Введите текст фильтра"
 
-#: opkman_const.rsmainfrm_filenamealreadyexists
-msgid "A package with the same zip file already exists!"
-msgstr ""
-
 #: opkman_const.rsmainfrm_lbfilter_caption
 msgid "Filter by:"
 msgstr "Фильтрация:"
@@ -272,12 +268,12 @@ msgstr "Копировать в буфер обмена"
 
 #: opkman_const.rsmainfrm_micreatejsonforupdates
 msgid "Create JSON for updates"
-msgstr ""
+msgstr "Создать JSON для обновлений"
 
 #: opkman_const.rsmainfrm_micreaterepositorypackage
 msgctxt "opkman_const.rsmainfrm_micreaterepositorypackage"
 msgid "Create repository package"
-msgstr "Создать пакет в репозитории"
+msgstr "Создать пакет для репозитория"
 
 #: opkman_const.rsmainfrm_mijsonhide
 msgid "Hide JSON"
@@ -292,58 +288,60 @@ msgid "Reset rating"
 msgstr "Сбросить рейтинг"
 
 #: opkman_const.rsmainfrm_packagealreadydownloaded
-msgid "The following repository packages already exists in the target folder. Continue?"
-msgstr ""
+msgid "The following repository packages already exist in the target folder. Continue?"
+msgstr "Следующие пакеты из репозитория уже существуют в целевом каталоге. Продолжить?"
 
 #: opkman_const.rsmainfrm_packagealreadyinstalled
-msgid "The following packages are alrady installed. Continue with install?"
-msgstr ""
+msgid "The following packages are already installed. Continue anyway?"
+msgstr "Следующие пакеты уже установлены. Продолжить всё равно?"
 
 #: opkman_const.rsmainfrm_packagenamealreadyexists
 msgid "A package with the same name already exists!"
-msgstr ""
+msgstr "Пакет с таким же именем уже имеется!"
 
 #: opkman_const.rsmainfrm_packageupdate0
 msgid "The following repository packages are not installed or don't have a valid external download link. The packages will be skipped. Continue?"
-msgstr ""
+msgstr "Следующие пакеты из репозитория не установлены либо не имеют корректной ссылки для загрузки. Они будут пропущены. Продолжить?"
 
 #: opkman_const.rsmainfrm_packageupdate1
-msgid "None of the checked repository packages are installed or has a valid external download link."
-msgstr ""
+msgid "None of the checked repository packages is installed or has a valid external download link."
+msgstr "Ни один из отмеченных пакетов из репозитория не установлен и не имеет корректной ссылки для загрузки."
 
 #: opkman_const.rsmainfrm_packageupdatewarning
 msgid ""
 "Updating packages from external link is not without a risk!\n"
 "Only update if you trust the package maintainer. Continue?\n"
 msgstr ""
+"Обновление пакетов из внешнего источника рискованно!\n"
+"Проводите обновление только при доверии сопровождающему пакета. Продолжить?\n"
 
 #: opkman_const.rsmainfrm_rsmessagedownload
 msgid "Downloading package list. Please wait..."
-msgstr ""
+msgstr "Идёт загрузка списка пакетов. Подождите..."
 
 #: opkman_const.rsmainfrm_rsmessageerror0
 msgid "Cannot download package list. Error message:"
-msgstr ""
+msgstr "Невозможно загрузить список пакетов. Сообщение об ошибке:"
 
 #: opkman_const.rsmainfrm_rsmessageerror1
 msgid "Invalid JSON file."
-msgstr ""
+msgstr "Файл JSON некорректен."
 
 #: opkman_const.rsmainfrm_rsmessageerror2
 msgid "Remote server unreachable."
-msgstr ""
+msgstr "Удалённый сервер недоступен."
 
 #: opkman_const.rsmainfrm_rsmessagenopackage
 msgid "No packages to show."
-msgstr ""
+msgstr "Пакеты для отображения отсутствуют."
 
 #: opkman_const.rsmainfrm_rsmessagenorepository0
-msgid "Remote package repository not configured."
-msgstr ""
-
-#: opkman_const.rsmainfrm_rsmessagenorepository1
-msgid "Do you wish to configure it now?"
+msgid ""
+"Remote package repository not configured.\n"
+"Do you wish to configure it now?\n"
 msgstr ""
+"Удалённый репозиторий не настроен.\n"
+"Хотите сделать это сейчас?\n"
 
 #: opkman_const.rsmainfrm_rsmessageparsingjson
 msgid "Parsing JSON. Please wait..."
@@ -351,27 +349,19 @@ msgstr "Идёт чтение JSON. Подождите..."
 
 #: opkman_const.rsmainfrm_rsnopackagetodownload
 msgid "Please check one or more packages!"
-msgstr ""
+msgstr "Отметьте один или более пакетов!"
 
 #: opkman_const.rsmainfrm_rspackagedependency0
-msgid "depends on package:"
-msgstr ""
+msgid "Package \"%s\" depends on package \"%s\". Resolve dependency?"
+msgstr "Пакет \"%s\" зависит от пакета \"%s\". Провести разрешение зависимости?"
 
 #: opkman_const.rsmainfrm_rspackagedependency1
-msgid "Resolve dependency?"
-msgstr ""
-
-#: opkman_const.rsmainfrm_rspackagedependency2
 msgid "Not resolving dependencies might lead to install failure!"
-msgstr ""
-
-#: opkman_const.rsmainfrm_rspackagedependency4
-msgid "dependency list. Unchecking it might lead to installing failure. Do you wish to continue?"
-msgstr ""
+msgstr "Неразрешённые зависимости могут привести к сбою установки!"
 
 #: opkman_const.rsmainfrm_rspackagerating
 msgid "Your vote for package \"%s\" is: %s. Thank you for voting!"
-msgstr ""
+msgstr "Ваш голос за пакет \"%s\": %s. Спасибо за участие!"
 
 #: opkman_const.rsmainfrm_rsrepositorycleanup0
 msgid "This will delete all non-installed packages from local repository. Continue?"
@@ -740,7 +730,7 @@ msgid "Repository filesize"
 msgstr "Размер файла в репозитории"
 
 #: opkman_const.rsmainfrm_vsttext_supportedwidgetsets
-msgid "Supported widget sets"
+msgid "Supported widgetsets"
 msgstr "Поддерживаемые библиотеки виджетов"
 
 #: opkman_const.rsmainfrm_vsttext_svnurl
@@ -753,50 +743,42 @@ msgctxt "opkman_const.rsmainfrm_vsttext_version"
 msgid "Version"
 msgstr "Версия"
 
-#: opkman_const.rsopitons_lbexcludefiles_hint
-msgid "This files will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
-#: opkman_const.rsopitons_lbexcludefolders_hint
-msgid "This folders will be excluded from repository packages (see: \"Create repository package\")"
-msgstr ""
-
 #: opkman_const.rsoptions_badd_caption
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #: opkman_const.rsoptions_bdelete_caption
 msgid "Delete"
-msgstr ""
+msgstr "Удалить"
 
 #: opkman_const.rsoptions_bedit_caption
 msgid "Edit"
-msgstr ""
+msgstr "Правка"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item0
 msgid "Every few minutes"
-msgstr ""
+msgstr "Каждые несколько минут"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item1
 msgid "Every hour"
-msgstr ""
+msgstr "Каждый час"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item2
 msgid "Once per day"
-msgstr ""
+msgstr "Каждый день"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item3
 msgid "Weekly"
-msgstr ""
+msgstr "Каждую неделю"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item4
 msgid "Montly"
-msgstr ""
+msgstr "Каждый месяц"
 
 #: opkman_const.rsoptions_cbcheckforupdates_item5
 msgctxt "opkman_const.rsoptions_cbcheckforupdates_item5"
 msgid "Never"
-msgstr ""
+msgstr "Никогда"
 
 #: opkman_const.rsoptions_cbdelete_caption
 msgid "Delete downloaded zip files after installation/update"
@@ -888,12 +870,22 @@ msgstr ""
 #: opkman_const.rsoptions_lastupdate_never
 msgctxt "opkman_const.rsoptions_lastupdate_never"
 msgid "Never"
-msgstr ""
+msgstr "Не проводилось"
 
 #: opkman_const.rsoptions_lbcheckforupdates_caption
 msgid "Check for package updates"
 msgstr ""
 
+#: opkman_const.rsoptions_lbexcludefiles_hint
+msgctxt "opkman_const.rsoptions_lbexcludefiles_hint"
+msgid "These files will be excluded from repository packages (see: \"Create repository package\")"
+msgstr "Эти файлы будут исключены из состава пакета (см. \"Создать пакет для репозитория\")"
+
+#: opkman_const.rsoptions_lbexcludefolders_hint
+msgctxt "opkman_const.rsoptions_lbexcludefolders_hint"
+msgid "These folders will be excluded from repository packages (see: \"Create repository package\")"
+msgstr "Эти каталоги будут исключены из состава пакета (см. \"Создать пакет для репозитория\")"
+
 #: opkman_const.rsoptions_lbfilterdirs_caption
 msgid "Excluded folders (packages)"
 msgstr ""
@@ -904,7 +896,7 @@ msgstr ""
 
 #: opkman_const.rsoptions_lblastupdate_caption
 msgid "Last update: "
-msgstr ""
+msgstr "Последнее обновление: "
 
 #: opkman_const.rsoptions_lblocalrepositoryarchive_caption
 msgid "Archive directory"
diff --git a/components/onlinepackagemanager/opkman_const.pas b/components/onlinepackagemanager/opkman_const.pas
index 141f4542e9..f65e094476 100644
--- a/components/onlinepackagemanager/opkman_const.pas
+++ b/components/onlinepackagemanager/opkman_const.pas
@@ -75,7 +75,7 @@ resourcestring
   rsMainFrm_VSTText_Author = 'Author';
   rsMainFrm_VSTText_LazCompatibility = 'Lazarus compatibility';
   rsMainFrm_VSTText_FPCCompatibility = 'FPC compatibility';
-  rsMainFrm_VSTText_SupportedWidgetsets = 'Supported widget sets';
+  rsMainFrm_VSTText_SupportedWidgetsets = 'Supported widgetsets';
   rsMainFrm_VSTText_Packagetype = 'Package type';
   rsMainFrm_VSTText_Dependecies = 'Dependencies';
   rsMainFrm_VSTText_License = 'License';
@@ -162,27 +162,24 @@ resourcestring
   rsMainFrm_miCopyToClpBrd = 'Copy to clipboard';
   rsMainFrm_miResetRating = 'Reset rating';
   rsMainFrm_PackagenameAlreadyExists = 'A package with the same name already exists!';
-  rsMainFrm_FilenameAlreadyExists = 'A package with the same zip file already exists!';
-  rsMainFrm_PackageAlreadyInstalled = 'The following packages are alrady installed. Continue with install?';
-  rsMainFrm_PackageAlreadyDownloaded = 'The following repository packages already exists in the target folder. Continue?';
+  rsMainFrm_PackageAlreadyInstalled = 'The following packages are already installed. Continue anyway?';
+  rsMainFrm_PackageAlreadyDownloaded = 'The following repository packages already exist in the target folder. Continue?';
   rsMainFrm_PackageUpdateWarning = 'Updating packages from external link is not without a risk!' + sLineBreak + 'Only update if you trust the package maintainer. Continue?';
   rsMainFrm_PackageUpdate0 = 'The following repository packages are not installed or don''t have a valid external download link. The packages will be skipped. Continue?';
-  rsMainFrm_PackageUpdate1 = 'None of the checked repository packages are installed or has a valid external download link.';
+  rsMainFrm_PackageUpdate1 = 'None of the checked repository packages is installed or has a valid external download link.';
   rsMainFrm_rsMessageNoPackage = 'No packages to show.';
   rsMainFrm_rsMessageParsingJSON = 'Parsing JSON. Please wait...';
   rsMainFrm_rsMessageDownload = 'Downloading package list. Please wait...';
-  rsMainFrm_rsMessageNoRepository0 = 'Remote package repository not configured.';
-  rsMainFrm_rsMessageNoRepository1 = 'Do you wish to configure it now?';
+  rsMainFrm_rsMessageNoRepository0 = 'Remote package repository not configured.' + sLineBreak + 'Do you wish to configure it now?';
   rsMainFrm_rsMessageError0 = 'Cannot download package list. Error message:';
   rsMainFrm_rsMessageError1 = 'Invalid JSON file.';
   rsMainFrm_rsMessageError2 = 'Remote server unreachable.';
   rsMainFrm_rsNoPackageToDownload = 'Please check one or more packages!';
   rsMainFrm_rsRepositoryCleanup0 = 'This will delete all non-installed packages from local repository. Continue?';
   rsMainFrm_rsRepositoryCleanup1 = '%s packages deleted!';
-  rsMainFrm_rsPackageDependency0 = 'depends on package:';
-  rsMainFrm_rsPackageDependency1 = 'Resolve dependency?';
-  rsMainFrm_rsPackageDependency2 = 'Not resolving dependencies might lead to install failure!';
-  rsMainFrm_rsPackageDependency4 = 'dependency list. Unchecking it might lead to installing failure. Do you wish to continue?';
+  rsMainFrm_rsPackageDependency0 = 'Package "%s" depends on package "%s". '
+    +'Resolve dependency?';
+  rsMainFrm_rsPackageDependency1 = 'Not resolving dependencies might lead to install failure!';
   rsMainFrm_rsPackageRating = 'Your vote for package "%s" is: %s. Thank you for voting!';
 
   //progress form
@@ -268,8 +265,8 @@ resourcestring
   rsOptions_bAdd_Caption = 'Add';
   rsOptions_bEdit_Caption = 'Edit';
   rsOptions_bDelete_Caption = 'Delete';
-  rsOpitons_lbExcludeFiles_Hint = 'This files will be excluded from repository packages (see: "Create repository package")';
-  rsOpitons_lbExcludeFolders_Hint = 'This folders will be excluded from repository packages (see: "Create repository package")';
+  rsOptions_lbExcludeFiles_Hint = 'These files will be excluded from repository packages (see: "Create repository package")';
+  rsOptions_lbExcludeFolders_Hint = 'These folders will be excluded from repository packages (see: "Create repository package")';
   rsOptions_InputBox_Caption = 'Add new exclusion';
   rsOptions_InputBox_Text0 = 'Type the extension name:';
   rsOptions_InputBox_Text1 = 'Type the folder name:';
@@ -291,7 +288,7 @@ resourcestring
   rsCreateRepositoryPackageFrm_Caption = 'Create repository package';
   rsCreateRepositoryPackageFrm_pnMessage_Caption = 'Please wait...';
   rsCreateRepositoryPackageFrm_cbOpen_Caption = 'Open containing folder after creation';
-  rsCreateRepositoryPackageFrm_lbPackageDir_Caption = 'Select package directory:';
+  rsCreateRepositoryPackageFrm_lbPackageDir_Caption = 'Package directory:';
   rsCreateRepositoryPackageFrm_pnCaption_Caption0 = 'Available packages';
   rsCreateRepositoryPackageFrm_pnCaption_Caption1 = 'Description';
   rsCreateRepositoryPackageFrm_pnCaption_Caption2 = 'Data';
@@ -300,7 +297,7 @@ resourcestring
   rsCreateRepositoryPackageFrm_lbDisplayName_Caption = 'Display name:';
   rsCreateRepositoryPackageFrm_lbLazCompatibility_Caption = 'Lazarus compatibility:';
   rsCreateRepositoryPackageFrm_lbFPCCompatibility_Caption = 'FPC compatibility:';
-  rsCreateRepositoryPackageFrm_lbSupportedWidgetset_Caption = 'Supported widgetset:';
+  rsCreateRepositoryPackageFrm_lbSupportedWidgetset_Caption = 'Supported widgetsets:';
   rsCreateRepositoryPackageFrm_lbHomePageURL_Caption = 'Home page:';
   rsCreateRepositoryPackageFrm_lbDownloadURL_Caption = 'Update link (JSON):';
   rsCreateRepositoryPackageFrm_lbSVNURL_Caption = 'SVN:';
@@ -310,7 +307,7 @@ resourcestring
   rsCreateRepositoryPackageFrm_Error1 = 'Cannot create zip file:';
   rsCreateRepositoryPackageFrm_Error2 = 'Cannot create JSON file:';
   rsCreateRepositoryPackageFrm_Message0 = 'Please select a category for package:';
-  rsCreateRepositoryPackageFrm_Message1 = 'Please enter supported lazarus versions for package:';
+  rsCreateRepositoryPackageFrm_Message1 = 'Please enter supported Lazarus versions for package:';
   rsCreateRepositoryPackageFrm_Message2 = 'Please enter supported FPC versions for package:';
   rsCreateRepositoryPackageFrm_Message3 = 'Please enter supported widgetsets for package:';
   rsCreateRepositoryPackageFrm_Message4 = 'Compressing package. Please wait...';
diff --git a/components/onlinepackagemanager/opkman_downloader.pas b/components/onlinepackagemanager/opkman_downloader.pas
index 517a637894..12b96b13c2 100644
--- a/components/onlinepackagemanager/opkman_downloader.pas
+++ b/components/onlinepackagemanager/opkman_downloader.pas
@@ -331,7 +331,7 @@ begin
     else
     begin
       FErrTyp := etConfig;
-      FErrMsg := rsMainFrm_rsMessageNoRepository0 + sLineBreak + rsMainFrm_rsMessageNoRepository1;
+      FErrMsg := rsMainFrm_rsMessageNoRepository0;
     end;
     if FTimer.Enabled then
       FTimer.StopTimer;
diff --git a/components/onlinepackagemanager/opkman_optionsfrm.pas b/components/onlinepackagemanager/opkman_optionsfrm.pas
index 0750c7c1cb..07dd7a3a2e 100644
--- a/components/onlinepackagemanager/opkman_optionsfrm.pas
+++ b/components/onlinepackagemanager/opkman_optionsfrm.pas
@@ -403,11 +403,11 @@ begin
   bFoldersAdd.Caption := rsOptions_bAdd_Caption;
   bFoldersEdit.Caption := rsOptions_bEdit_Caption;
   bFoldersDelete.Caption := rsOptions_bDelete_Caption;
-  lbExcludeFiles.Hint := rsOpitons_lbExcludeFiles_Hint;
+  lbExcludeFiles.Hint := rsOptions_lbExcludeFiles_Hint;
   lbExcludeFiles.Items.Delimiter := ',';
   lbExcludeFiles.Items.StrictDelimiter := True;
   lbExcludeFiles.Items.DelimitedText := Options.ExcludedFiles;
-  lbExcludeFolders.Hint := rsOpitons_lbExcludeFolders_Hint;
+  lbExcludeFolders.Hint := rsOptions_lbExcludeFolders_Hint;
   lbExcludeFolders.Items.Delimiter := ',';
   lbExcludeFolders.Items.StrictDelimiter := True;
   lbExcludeFolders.Items.DelimitedText := Options.ExcludedFolders;
diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas
index 52a0de5d1a..ef98759211 100644
--- a/components/onlinepackagemanager/opkman_visualtree.pas
+++ b/components/onlinepackagemanager/opkman_visualtree.pas
@@ -1264,10 +1264,10 @@ begin
                   begin
                     if (Result = mrNone) or (Result = mrYes) then
                     begin
-                      Msg := rsProgressFrm_lbPackage_Caption + ' "' + Data^.PackageFileName + '" ' + rsMainFrm_rsPackageDependency0 + ' "' + DataSearch^.PackageFileName + '". ' + rsMainFrm_rsPackageDependency1;
+                      Msg := Format(rsMainFrm_rsPackageDependency0, [Data^.PackageFileName, DataSearch^.PackageFileName]);
                       Result := MessageDlgEx(Msg, mtConfirmation, [mbYes, mbYesToAll, mbNo, mbNoToAll, mbCancel], TForm(FVST.Parent.Parent));
                       if Result in [mrNo, mrNoToAll] then
-                        MessageDlgEx(rsMainFrm_rsPackageDependency2, mtInformation, [mbOk], TForm(FVST.Parent.Parent));
+                        MessageDlgEx(rsMainFrm_rsPackageDependency1, mtInformation, [mbOk], TForm(FVST.Parent.Parent));
                       if (Result = mrNoToAll) or (Result = mrCancel) then
                         Exit;
                     end;