Skip to content

Commit f026d5a

Browse files
author
borysiasty
committedNov 13, 2008
Plugin Installer: string fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@9635 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 5f9d23c commit f026d5a

File tree

3 files changed

+433
-392
lines changed

3 files changed

+433
-392
lines changed
 

‎i18n/qgis_pl_PL.ts

Lines changed: 418 additions & 375 deletions
Large diffs are not rendered by default.

‎python/plugins/plugin_installer/i18n.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,17 @@ QgsPluginInstallerDialog::foo()
141141
tr("This plugin is installed, but I can't find it in any enabled repository")
142142
tr("This plugin is not installed and is seen for the first time")
143143
tr("This plugin is installed and is newer than its version available in a repository")
144-
tr("This plugin is incompatible with your Quantum GIS version and probably won't work")
145-
tr("The Python module is missing on your system.\nFor more information, please visit its homepage")
146-
tr("This plugin seems to be broken\nIt has been installed, but can't be loaded")
147-
144+
tr("This plugin is incompatible with your Quantum GIS version and probably won't work.")
145+
tr("The required Python module is not installed.\nFor more information, please visit its homepage.")
146+
tr("This plugin seems to be broken.\nIt has been installed but can't be loaded.\nHere is the error message:")
148147
tr("not installed", "singular")
149148
tr("installed", "singular")
150149
tr("upgradeable", "singular")
151150
tr("installed", "singular")
152151
tr("new!", "singular")
153152
tr("installed", "singular")
154153
tr("invalid", "singular")
155-
tr("Note that it's an uninsatallable core plugin")
154+
tr("Note that it's an uninstallable core plugin")
156155
tr("installed version")
157156
tr("available version")
158157
tr("available version")
@@ -186,7 +185,7 @@ QgsPluginInstallerDialog::foo()
186185
tr("Plugin reinstalled successfully")
187186
tr("Python plugin reinstalled.\nYou have to restart Quantum GIS to reload it.")
188187
tr("The plugin is designed for a newer version of Quantum GIS. The minimum required version is:")
189-
tr("The plugin depends on some components missing on your system. Please install the following Python module:")
188+
tr("The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it:")
190189
tr("The plugin is broken. Python said:")
191190
tr("Plugin uninstall failed")
192191

‎python/plugins/plugin_installer/installer_gui.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ def populatePluginTree(self):
389389
"orphan" : self.tr("This plugin is installed, but I can't find it in any enabled repository"),
390390
"new" : self.tr("This plugin is not installed and is seen for the first time"),
391391
"newer" : self.tr("This plugin is installed and is newer than its version available in a repository"),
392-
"incompatible" : self.tr("This plugin is incompatible with your Quantum GIS version and probably won't work"),
393-
"dependent" : self.tr("The Python module is missing on your system.\nFor more information, please visit its homepage"),
394-
"broken" : self.tr("This plugin seems to be broken\nIt has been installed, but can't be loaded")}
392+
"incompatible" : self.tr("This plugin is incompatible with your Quantum GIS version and probably won't work."),
393+
"dependent" : self.tr("The required Python module is not installed.\nFor more information, please visit its homepage."),
394+
"broken" : self.tr("This plugin seems to be broken.\nIt has been installed but can't be loaded.\nHere is the error message:")}
395395
statuses ={"not installed" : self.tr("not installed", "singular"),
396396
"installed" : self.tr("installed", "singular"),
397397
"upgradeable" : self.tr("upgradeable", "singular"),
@@ -405,13 +405,9 @@ def populatePluginTree(self):
405405
orderValid = ["upgradeable","new","not installed","installed","orphan","newer"]
406406
def addItem(p):
407407
if self.filterCheck(p):
408-
statusTip=""
409-
if p["error"]:
410-
statusTip = statusTips[p["error"]]
411-
else:
412-
statusTip = statusTips[p["status"]]
408+
statusTip = statusTips[p["status"]]
413409
if p["read-only"]:
414-
statusTip = statusTip + "\n" + self.tr("Note that it's an uninsatallable core plugin")
410+
statusTip = statusTip + "\n" + self.tr("Note that it's an uninstallable core plugin")
415411
installedVersion = p["version_inst"]
416412
if not installedVersion:
417413
installedVersion = "?"
@@ -438,13 +434,16 @@ def addItem(p):
438434
verTip = ""
439435
if p["error"] == "broken":
440436
desc = self.tr("This plugin is broken")
441-
descTip = statusTips[p["error"]]
437+
descTip = statusTips[p["error"]] + "\n" + p["error_details"]
438+
statusTip = descTip
442439
elif p["error"] == "incompatible":
443440
desc = self.tr("This plugin requires a newer version of Quantum GIS") + " (" + self.tr("at least")+ " " + p["error_details"] + ")"
444441
descTip = statusTips[p["error"]]
442+
statusTip = descTip
445443
elif p["error"] == "dependent":
446444
desc = self.tr("This plugin requires a missing module") + " (" + p["error_details"] + ")"
447445
descTip = statusTips[p["error"]]
446+
statusTip = descTip
448447
else:
449448
desc = p["desc_local"]
450449
descTip = p["desc_repo"]
@@ -579,7 +578,7 @@ def installPlugin(self):
579578
message = self.tr("The plugin is designed for a newer version of Quantum GIS. The minimum required version is:")
580579
message += " <b>" + plugin["error_details"] + "</b>"
581580
elif plugin["error"] == "dependent":
582-
message = self.tr("The plugin depends on some components missing on your system. Please install the following Python module:")
581+
message = self.tr("The plugin depends on some components missing on this system. You need to install the following Python module in order to enable it:")
583582
message += "<b> " + plugin["error_details"] + "</b>"
584583
else:
585584
message = self.tr("The plugin is broken. Python said:")

0 commit comments

Comments
 (0)
Please sign in to comment.