openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #00670
[Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/i18n into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Fixed up some i18n issues.
--
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/13925
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2009-10-24 16:40:36 +0000
+++ openlp/core/ui/amendthemeform.py 2009-10-25 21:45:25 +0000
@@ -674,10 +674,10 @@
self.theme.font_main_italics)# italic
mainFont.setPixelSize(int(self.theme.font_main_proportion))
metrics = QtGui.QFontMetrics(mainFont)
- page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2 ) - 1
- log.debug(u'Page Length area height %s , metrics %s , lines %s' %
- (int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length ))
- self.FontMainLinesPageLabel.setText(
- self.trUtf8((u'Slide Height is %s rows') % page_length))
+ page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2) - 1
+ log.debug(u'Page Length area height %s, metrics %s, lines %s' %
+ (int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length))
+ page_length_text = unicode(self.trUtf8(u'Slide Height is %s rows'))
+ self.FontMainLinesPageLabel.setText(page_length_text % page_length)
frame = self.thememanager.generateImage(theme)
self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2009-10-24 16:40:36 +0000
+++ openlp/core/ui/mainwindow.py 2009-10-25 21:45:25 +0000
@@ -528,10 +528,11 @@
applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595')
version = check_latest_version(self.generalConfig, applicationVersion)
if applicationVersion != version:
+ version_text = unicode(self.trUtf8(u'OpenLP version %s has been updated '
+ u'to version %s'))
QtGui.QMessageBox.question(None,
- self.trUtf8(u'OpenLP version Updated'),
- self.trUtf8(u'OpenLP version %s has been updated to version %s')
- % (applicationVersion, version),
+ self.trUtf8(u'OpenLP Version Updated'),
+ version_text % (applicationVersion, version),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
self.generalConfig.set_config(u'Application version', version)
Follow ups