From 77838615b36cdc7563e64f17d0b2a76bd66723b4 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Fri, 5 Mar 2010 08:36:32 +0000 Subject: [PATCH 1/8] Presentations - close app down correctly, and mode to automatically detect file type --- .../presentations/lib/impresscontroller.py | 13 ++++++-- openlp/plugins/presentations/lib/mediaitem.py | 32 ++++++++++++++++--- .../presentations/lib/messagelistener.py | 11 +++++-- .../presentations/lib/powerpointcontroller.py | 4 ++- .../presentations/lib/pptviewcontroller.py | 2 +- .../lib/presentationcontroller.py | 1 + .../presentations/presentationplugin.py | 14 ++++++++ 7 files changed, 67 insertions(+), 10 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 75108d850..d365747e3 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -25,6 +25,7 @@ # OOo API documentation: # http://api.openoffice.org/docs/common/ref/com/sun/star/presentation/XSlideShowController.html +# http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_interfaces_during_debugging # http://docs.go-oo.org/sd/html/classsd_1_1SlideShow.html # http://www.oooforum.org/forum/viewtopic.phtml?t=5252 # http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Working_with_Presentations @@ -62,7 +63,8 @@ class ImpressController(PresentationController): """ log.debug(u'Initialising') PresentationController.__init__(self, plugin, u'Impress') - self.supports = [u'.odp', u'.ppt', u'.pps', u'.pptx', u'.ppsx'] + self.supports = [u'.odp'] + self.alsosupports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx'] self.process = None self.desktop = None @@ -145,10 +147,17 @@ class ImpressController(PresentationController): doc.close_presentation() if os.name != u'nt': desktop = self.get_uno_desktop() + else: + desktop = self.get_com_desktop() + docs = desktop.getComponents() + if docs.hasElements(): + log.debug(u'OpenOffice not terminated') + else: try: desktop.terminate() + log.debug(u'OpenOffice killed') except: - pass + log.exception(u'Failed to terminate OpenOffice') def add_doc(self, name): log.debug(u'Add Doc OpenOffice') diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 51f234f3d..963babbcd 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -56,7 +56,7 @@ class PresentationMediaItem(MediaManagerItem): # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = PresentationListView MediaManagerItem.__init__(self, parent, icon, title) - self.message_listener = MessageListener(controllers) + self.message_listener = MessageListener(self) def initPluginNameVisible(self): self.PluginNameVisible = self.trUtf8('Presentation') @@ -66,7 +66,8 @@ class PresentationMediaItem(MediaManagerItem): fileType = u'' for controller in self.controllers: if self.controllers[controller].enabled: - for type in self.controllers[controller].supports: + types = self.controllers[controller].supports + self.controllers[controller].alsosupports + for type in types: if fileType.find(type) == -1: fileType += u'*%s ' % type self.OnNewFileMasks = self.trUtf8('Presentations (%s)' % fileType) @@ -106,6 +107,9 @@ class PresentationMediaItem(MediaManagerItem): #load the drop down selection if self.controllers[item].enabled: self.DisplayTypeComboBox.addItem(item) + if self.DisplayTypeComboBox.count > 1: + self.DisplayTypeComboBox.insertItem(0, u'Automatic') + self.DisplayTypeComboBox.setCurrentIndex(0) def loadList(self, list): currlist = self.getFileList() @@ -145,10 +149,16 @@ class PresentationMediaItem(MediaManagerItem): return False service_item.title = unicode(self.DisplayTypeComboBox.currentText()) service_item.shortname = unicode(self.DisplayTypeComboBox.currentText()) - controller = self.controllers[service_item.shortname] + shortname = service_item.shortname + for item in items: bitem = self.ListView.item(item.row()) filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + if shortname==u'Automatic': + service_item.shortname = self.findControllerByType(filename) + if not service_item.shortname: + return False + controller = self.controllers[service_item.shortname] (path, name) = os.path.split(filename) doc = controller.add_doc(filename) if doc.get_slide_preview_file(1) is None: @@ -159,5 +169,19 @@ class PresentationMediaItem(MediaManagerItem): service_item.add_from_command(path, name, img) i = i + 1 img = doc.get_slide_preview_file(i) - controller.remove_doc(doc) + controller.remove_doc(doc) return True + + def findControllerByType(self, filename): + filetype = os.path.splitext(filename)[1] + if not filetype: + return None + for controller in self.controllers: + if self.controllers[controller].enabled: + if filetype in self.controllers[controller].supports: + return controller + for controller in self.controllers: + if self.controllers[controller].enabled: + if filetype in self.controllers[controller].alsosupports: + return controller + return None diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 9065bf796..8f9d129dc 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -156,8 +156,9 @@ class MessageListener(object): log = logging.getLogger(u'MessageListener') log.info(u'Message Listener loaded') - def __init__(self, controllers): - self.controllers = controllers + def __init__(self, mediaitem): + self.controllers = mediaitem.controllers + self.mediaitem = mediaitem self.previewHandler = Controller(False) self.liveHandler = Controller(True) # messages are sent from core.ui.slidecontroller @@ -190,6 +191,12 @@ class MessageListener(object): """ log.debug(u'Startup called with message %s' % message) self.handler, file, isLive = self.decodeMessage(message) + filetype = os.path.splitext(file)[1][1:] + if self.handler==u'Automatic': + self.handler = self.mediaitem.findControllerByType(file) + if not self.handler: + return + if isLive: self.liveHandler.addHandler(self.controllers[self.handler], file) else: diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 64c435ebf..b0c6a689c 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -52,7 +52,7 @@ class PowerpointController(PresentationController): """ log.debug(u'Initialising') PresentationController.__init__(self, plugin, u'Powerpoint') - self.supports = [u'.ppt', u'.pps'] + self.supports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx'] self.process = None def check_available(self): @@ -100,6 +100,8 @@ class PowerpointController(PresentationController): doc.close_presentation() if self.process is None: return + if self.process.Presentations.Count > 0: + return try: self.process.Quit() except: diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index ddfbbd204..72c7cd5c1 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -49,7 +49,7 @@ class PptviewController(PresentationController): log.debug(u'Initialising') self.process = None PresentationController.__init__(self, plugin, u'Powerpoint Viewer') - self.supports = [u'.ppt', u'.pps'] + self.supports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx'] def check_available(self): """ diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index 0818c6b4e..e069fce84 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -93,6 +93,7 @@ class PresentationController(object): Name of the application, to appear in the application """ self.supports = [] + self.alsosupports = [] self.docs = [] self.plugin = plugin self.name = name diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 7103a3a2c..b7fe68153 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -114,3 +114,17 @@ class PresentationPlugin(Plugin): 'programs. The choice of available presentation programs is ' 'available to the user in a drop down box.') return about_text + + def find_controller_by_type(self, filename): + filetype = os.path.splitext(filename)[1][1:] + if not filetype: + return None + for controller in self.controllers: + if self.controllers[controller].enabled: + if filetype in self.controllers[controller].supports: + return controller + for controller in self.controllers: + if self.controllers[controller].enabled: + if filetype in self.controllers[self.handler].alsosupports: + return controller + return None From edad400a737974fd40fe79e19b6819ce1ffd4ce0 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Fri, 5 Mar 2010 19:50:51 +0000 Subject: [PATCH 2/8] Minor fixes --- openlp/plugins/presentations/lib/mediaitem.py | 2 +- openlp/plugins/presentations/presentationplugin.py | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index addfbcc76..7fed27145 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -107,7 +107,7 @@ class PresentationMediaItem(MediaManagerItem): #load the drop down selection if self.controllers[item].enabled: self.DisplayTypeComboBox.addItem(item) - if self.DisplayTypeComboBox.count > 1: + if self.DisplayTypeComboBox.count() > 1: self.DisplayTypeComboBox.insertItem(0, u'Automatic') self.DisplayTypeComboBox.setCurrentIndex(0) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index a7fa3bb6c..061eb737f 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -114,17 +114,3 @@ class PresentationPlugin(Plugin): 'programs. The choice of available presentation programs is ' 'available to the user in a drop down box.') return about_text - - def find_controller_by_type(self, filename): - filetype = os.path.splitext(filename)[1][1:] - if not filetype: - return None - for controller in self.controllers: - if self.controllers[controller].enabled: - if filetype in self.controllers[controller].supports: - return controller - for controller in self.controllers: - if self.controllers[controller].enabled: - if filetype in self.controllers[self.handler].alsosupports: - return controller - return None From 1932ed886e0893b40051ec483422376bea628c14 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 08:00:36 +0000 Subject: [PATCH 3/8] Fix up service notes --- openlp/core/ui/servicemanager.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ad0da357b..0c955f392 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -42,7 +42,6 @@ class ServiceManagerList(QtGui.QTreeWidget): def __init__(self, parent=None, name=None): QtGui.QTreeWidget.__init__(self,parent) self.parent = parent - self.setExpandsOnDoubleClick(False) def keyPressEvent(self, event): if type(event) == QtGui.QKeyEvent: @@ -250,6 +249,7 @@ class ServiceManager(QtGui.QWidget): if self.serviceItemNoteForm.exec_(): self.serviceItems[item][u'service_item'].notes = \ self.serviceItemNoteForm.textEdit.toPlainText() + self.repaintServiceList(item, 0) def nextItem(self): """ @@ -429,15 +429,20 @@ class ServiceManager(QtGui.QWidget): for itemcount, item in enumerate(self.serviceItems): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) - treewidgetitem.setText(0,serviceitem.title) - treewidgetitem.setIcon(0,serviceitem.iconic_representation) + if len(serviceitem.notes) > 0: + title = self.trUtf8(u'(N) - %s' % serviceitem.title) + else: + title = serviceitem.title + treewidgetitem.setText(0, title) + treewidgetitem.setToolTip(0, serviceitem.notes) + treewidgetitem.setIcon(0, serviceitem.iconic_representation) treewidgetitem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(item[u'order'])) treewidgetitem.setExpanded(item[u'expanded']) for count, frame in enumerate(serviceitem.get_frames()): treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) text = frame[u'title'] - treewidgetitem1.setText(0,text[:40]) + treewidgetitem1.setText(0, text[:40]) treewidgetitem1.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(count)) if serviceItem == itemcount and serviceItemCount == count: From d3564b2df7b122bd760caf60cbf42a62b00fb05e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 14:08:51 +0000 Subject: [PATCH 4/8] Fix translation --- openlp/core/ui/servicemanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 0c955f392..4b29fd7e7 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,7 +430,7 @@ class ServiceManager(QtGui.QWidget): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) if len(serviceitem.notes) > 0: - title = self.trUtf8(u'(N) - %s' % serviceitem.title) + title = u'%s - %s' % (self.trUtf8('(N)'), serviceitem.title) else: title = serviceitem.title treewidgetitem.setText(0, title) From 77e671bd78192072d8d1435cfb3adeebcac658ab Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 06:42:22 +0000 Subject: [PATCH 5/8] Remove unneeded version tagging --- openlp/core/utils/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index e85b2d939..256d5a090 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -33,13 +33,12 @@ log = logging.getLogger(__name__) def check_latest_version(config, current_version): version_string = current_version #set to prod in the distribution confif file. - environment = config.get_config(u'run environment', u'dev') last_test = config.get_config(u'last version test', datetime.now().date()) this_test = unicode(datetime.now().date()) config.set_config(u'last version test', this_test) if last_test != this_test: version_string = u'' - req = urllib2.Request(u'http://www.openlp.org/files/%s_version.txt' % environment) + req = urllib2.Request(u'http://www.openlp.org/files/version.txt') req.add_header(u'User-Agent', u'OpenLP/%s' % current_version) try: handle = urllib2.urlopen(req, None) From 5560aac57580502e0388199953422fcda13d5a1b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 19:22:54 +0000 Subject: [PATCH 6/8] Fix expanding service items --- openlp/core/ui/servicemanager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 4b29fd7e7..ba9269244 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -599,12 +599,12 @@ class ServiceManager(QtGui.QWidget): self.serviceItems = [] self.isNew = True for item in tempServiceItems: - self.addServiceItem(item[u'service_item'], True) + self.addServiceItem(item[u'service_item'], False, item[u'expanded']) #Set to False as items may have changed rendering #does not impact the saved song so True may aslo be valid self.parent.serviceChanged(False, self.serviceName) - def addServiceItem(self, item, rebuild=False): + def addServiceItem(self, item, rebuild=False, expand=True): """ Add a Service item to the list @@ -624,12 +624,12 @@ class ServiceManager(QtGui.QWidget): if sitem == -1: self.serviceItems.append({u'service_item': item, u'order': len(self.serviceItems) + 1, - u'expanded':True}) + u'expanded':expand}) self.repaintServiceList(len(self.serviceItems) + 1, 0) else: self.serviceItems.insert(sitem + 1, {u'service_item': item, u'order': len(self.serviceItems)+1, - u'expanded':True}) + u'expanded':expand}) self.repaintServiceList(sitem + 1, 0) #if rebuilding list make sure live is fixed. if rebuild: From 6f87c362d1ff54f42d76acb3c6fe35d65bf3e081 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 20:45:27 +0000 Subject: [PATCH 7/8] Use Icon to show we have Notes --- openlp/core/ui/servicemanager.py | 17 +++++++++++++---- openlp/plugins/images/lib/mediaitem.py | 2 +- resources/images/openlp-2.qrc | 1 + resources/images/service_item_notes.png | Bin 0 -> 876 bytes 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 resources/images/service_item_notes.png diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ba9269244..6765334dc 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,12 +430,21 @@ class ServiceManager(QtGui.QWidget): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) if len(serviceitem.notes) > 0: - title = u'%s - %s' % (self.trUtf8('(N)'), serviceitem.title) + icon = QtGui.QImage(serviceitem.icon) + icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, + QtCore.Qt.SmoothTransformation) + + overlay = QtGui.QImage(':/services/service_item_notes.png') + overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, + QtCore.Qt.SmoothTransformation) + painter = QtGui.QPainter(icon) + painter.drawImage(0, 0, overlay) + painter.end() + treewidgetitem.setIcon(0, build_icon(icon)) else: - title = serviceitem.title - treewidgetitem.setText(0, title) + treewidgetitem.setIcon(0, serviceitem.iconic_representation) + treewidgetitem.setText(0, serviceitem.title) treewidgetitem.setToolTip(0, serviceitem.notes) - treewidgetitem.setIcon(0, serviceitem.iconic_representation) treewidgetitem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(item[u'order'])) treewidgetitem.setExpanded(item[u'expanded']) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 830459843..75f2fd981 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem): def retranslateUi(self): self.OnNewPrompt = self.trUtf8('Select Image(s)') self.OnNewFileMasks = \ - self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp)') + self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)') def requiredIcons(self): MediaManagerItem.requiredIcons(self) diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index b6509b528..28af4c31a 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -78,6 +78,7 @@ service_edit.png service_notes.png + service_item_notes.png service_bottom.png service_down.png service_top.png diff --git a/resources/images/service_item_notes.png b/resources/images/service_item_notes.png new file mode 100644 index 0000000000000000000000000000000000000000..59991dba85e745b69fbec46267c1e6414dc506c8 GIT binary patch literal 876 zcmV-y1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00LnE00LnF!7x?&00007bV*G`2igM% z6A(GBp-}Ju00QhuL_t(I%k7lSYn)XS#((GB_nkL0X3VJ37F&O1hM}?L0kxK6v3}W)Y)E)e@67Y1)`%(wR)=ejFDw3F%b9 zwe(yL&xLz2JMM8ADK#>Uva&o|d^ zA-?j};~$mEgU8ywqODk!+VJ2&xiXaHna3$+2!e@;fEff&3cDn~Lu_6qwpM0p&;I#J zKe3*l=bN(I7#gl_RY&eG57zD^E8H5I8d%&A!j@Rv1iyu(ZD14p6|D6W64p@V_~zLM zkKK~-)YMcqb8>xoxF#bq;1Ed|h9%fb@*pB$(Xg0E!LVSY7*>$%NcE}TH}^BH*X!Zu zMRz8VaJitFqPd_sXx5Ltvyz}C#qD{Pk1F=TO|1a>E%QMzZj zpap25Xzp;iLv#0XbN0}Qn^XZXck1x`kumpZHjp7sFiT*)h}26VbuUH@NSGPc5mE=t z8!4n+i#A=EzW9Ug5r6kf>HW_34!+$X?0RA+l0xcYOeCL3F<~)bsoQXIg5;pNqPgNS zS2(9LJF|y|+#c~?{*k$-A8Wi`R$q>tL<$KDh9&C`D}i9Ww`BX}iYS622qFq-O|%%_ zCtg}wN=GN}n|OGnJ&pm%Fzc0T{iHpaq%M7TIYb=d?ztf42j0|!ll*q!j+4zcA;mz9 zkrX2-L@ey>(*d`hCt@r@qgDCs-2CWU)30@2%*H=GFa5&){JpUsCl6nHLdESXL{t#x z&@3ZTiaxkz+h@&2t91E~mCE<0&hq7@Wxot;0N3mF`i-og`1FP0H_FxGW8d7`@zHIy zI{8|om91_x%ZtA*l`bw^vL)auunIKm^>g-5pU~eVT7kkm>?h0s0000 Date: Tue, 9 Mar 2010 08:07:42 +0200 Subject: [PATCH 8/8] Fixed up some problems and inadvertant bugs from the move to the scripts directory. --- openlp/plugins/alerts/lib/alertsmanager.py | 2 +- resources/i18n/openlp_en.ts | 5488 +++++++++++++++++--- scripts/get-strings.py | 21 +- 3 files changed, 4684 insertions(+), 827 deletions(-) diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py index 6838fefa0..41fc25562 100644 --- a/openlp/plugins/alerts/lib/alertsmanager.py +++ b/openlp/plugins/alerts/lib/alertsmanager.py @@ -76,7 +76,7 @@ class AlertsManager(QtCore.QObject): display text """ log.debug(u'display alert called %s' % text) - self.parent.maindisplay.parent.StatusBar.showMessage(self.trUtf8(u'')) + self.parent.maindisplay.parent.StatusBar.showMessage(u'') self.alertList.append(text) if self.timer_id != 0 or self.parent.maindisplay.mediaLoaded: self.parent.maindisplay.parent.StatusBar.showMessage(\ diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts index d92273c1d..6f9d4a26a 100644 --- a/resources/i18n/openlp_en.ts +++ b/resources/i18n/openlp_en.ts @@ -4,879 +4,2296 @@ BibleMediaItem - + Quick - - AlertsTab - - - Alerts - - - - - Font - - - - - Ui_OpenLPExportDialog - - - Author - - - - - Ui_AmendThemeDialog - - - Vertical - - - - - AlertForm - - - Display - - - - - SplashScreen - - - Starting - - - - - MediaManagerItem - - - New - - - - - EditCustomForm - - - Error - - - - - Ui_AmendThemeDialog - - - Center - - - - - TestMediaManager: - - - Item2 - - - - - AboutForm - - - License - - - - - TestMediaManager: - - - Item1 - - - - - Ui_MainWindow - - - English - - - - - Ui_AmendThemeDialog - - - pt - - - - - Ui_OpenSongImportDialog - - - Close - - - - - Ui_AmendThemeDialog - - - Middle - - - - - Opaque - - - Ui_customEditDialog - - Clear - - - - - Save - - - - - BibleImportForm - - - Information - - - - - Ui_OpenSongExportDialog - - - Lyrics - - - - - Ui_customEditDialog - - - Delete - - - - - Ui_OpenLPImportDialog - - - Close - - - - - ImageTab - - - sec - - - - - Ui_OpenSongExportDialog - - - Close - - - - - BibleMediaItem - - - Clear - - - - - Ui_OpenSongExportDialog - - - Author - - - - - Ui_PluginViewDialog - - - Inactive - - - - - Ui_OpenLPImportDialog - - - Import - - - - - Ui_MainWindow - - - F9 - - - - - F8 - - - - - Ui_SongMaintenanceDialog - - - Topics - - - - - Ui_AmendThemeDialog - - - Left - - - - - SongMaintenanceForm - - - Error - - - - - Ui_AmendThemeDialog - - - Top - - - - - Ui_MainWindow - - - F7 - - - - - Ui_AmendThemeDialog - - - Alignment - - - - - MediaManagerItem - - - Add - - - - - BibleMediaItem - - - Search - - - - - Ui_SongMaintenanceDialog - - - Edit - - - - - Ui_EditSongDialog - - - Theme - - - - - SongsPlugin - - - OpenSong - - - - - MediaManagerItem - - - Edit - - - - - Load - - - - - Ui_AmendThemeDialog - - - Bottom - - - - - Ui_BibleImportDialog - - - NIV - - - - - Ui_AmendThemeDialog - - - Image - - - - - GeneralTab - - - Screen - - - - - ThemeManager - - - Error - - - - - Ui_AmendThemeDialog - - - Normal - - - - - AlertsTab - - - s - - - - - Ui_OpenLPExportDialog - - - Close - - - - - Ui_OpenLPImportDialog - - - Author + + Delete selected slide BiblesTab - - Bibles + + ( and ) - Ui_AuditDetailDialog + RemoteTab - - Summary + + Remotes - Ui_BibleImportDialog + ServiceManager - - Import - - - - - SongBookForm - - - Error - - - - - Ui_OpenLPImportDialog - - - Title - - - - - Ui_PluginViewDialog - - - TextLabel - - - - - AboutForm - - - Contribute - - - - - GeneralTab - - - Monitors + + Save Service Ui_AmendThemeDialog - - Bold - - - - - TopicsForm - - - Error - - - - - SlideController - - - Preview - - - - - Ui_OpenLPExportDialog - - - Export - - - - - BibleMediaItem - - - Keep - - - - - Ui_AmendThemeDialog - - - Right - - - - - Ui_EditSongDialog - - - Comments - - - - - AboutForm - - - Credits - - - - - AlertForm - - - Cancel - - - - - AuthorsForm - - - Error + + Shadow Size: Ui_OpenSongExportDialog - - Export - - - - - MediaManagerItem - - - Preview - - - - - Ui_SettingsDialog - - - Settings - - - - - BibleMediaItem - - - Information - - - - - Ui_OpenLPExportDialog - - - Lyrics - - - - - ImageTab - - - Images - - - - - Ui_AmendThemeDialog - - - Horizontal - - - - - Circular - - - - - Ui_EditSongDialog - - - Topic - - - - - BibleMediaItem - - - Advanced - - - - - MediaTab - - - Media - - - - - AboutForm - - + Close - Ui_EditSongDialog + ThemeManager - - Edit - - - - - Ui_OpenLPImportDialog - - - Lyrics + + Import Theme Ui_AmendThemeDialog - - px + + Slide Transition - Ui_EditSongDialog + ImportWizardForm - - Delete - - - - - Ui_OpenSongExportDialog - - - Title + + Bible Exists ThemesTab - - Themes + + Theme level - Ui_EditSongDialog + BibleMediaItem - - Authors + + Bible - Ui_BibleImportDialog + ServiceManager - - KJV + + Save Changes to Service? - Ui_SongMaintenanceDialog + SongUsagePlugin - - Authors - - - - - Ui_AuditDetailDialog - - - Detailed - - - - - Ui_SongMaintenanceDialog - - - Delete - - - - - SlideController - - - s - - - - - SongMediaItem - - - Titles - - - - - Clear - - - - - Ui_BibleImportDialog - - - Crosswalk - - - - - Ui_customEditDialog - - - Edit - - - - - PresentationTab - - - available - - - - - ThemeManager - - - default - - - - - EditSongForm - - - Error - - - - - Ui_SongMaintenanceDialog - - - Add - - - - - Ui_BibleImportDialog - - - Cancel + + &Delete recorded data Ui_OpenLPExportDialog - - Title + + Song Title - GeneralTab + Ui_customEditDialog - - General - - - - - primary + + Edit selected slide - Ui_AmendThemeDialog + SongMediaItem - - Preview + + CCLI Licence: + + + + + Ui_SongUsageDeleteDialog + + + Audit Delete + + + + + BibleMediaItem + + + Clear + + + + + Ui_BibleImportWizard + + + Bible Import Wizard + + + + + Ui_customEditDialog + + + Edit All + + + + + Ui_ServiceNoteEdit + + + Service Item Notes + + + + + SongMaintenanceForm + + + Couldn't save your author! + + + + + Ui_customEditDialog + + + Clear + + + + + ThemesTab + + + Global theme + + + + + SongUsagePlugin + + + Start/Stop live song usage recording + + + + + MainWindow + + + The Main Display has been blanked out + + + + + Ui_OpenSongExportDialog + + + Lyrics + + + + + Ui_AlertDialog + + + Display + + + + + Ui_customEditDialog + + + Delete + + + + + SongMaintenanceForm + + + This author can't be deleted, they are currently assigned to at least one song! + + + + + ThemeManager + + + Create a new theme + + + + + Ui_MainWindow + + + Open an existing service SlideController - - Live + + Move to previous + + + + + Edit and re-preview Song + + + + + Ui_PluginViewDialog + + + Plugin Details AlertsTab - - Preview + + pt + + + + + Edit History: + + + + + SlideController + + + Delay between slides in seconds + + + + + SongMaintenanceForm + + + Couldn't add your book! BiblesTab - - continuous + + verse per line + + + + + Ui_customEditDialog + + + Theme: + + + + + SongMaintenanceForm + + + Error + + + + + Ui_BibleImportWizard + + + Bible: + + + + + ImportWizardForm + + + You need to specify a file with books of the Bible to use in the import! + + + + + ThemeManager + + + Delete Theme + + + + + SplashScreen + + + Splash Screen + + + + + SongMediaItem + + + Song + + + + + SongUsageDeleteForm + + + Delete Selected Audit Events? + + + + + Ui_OpenSongExportDialog + + + Song Title + + + + + BibleMediaItem + + + Search + + + + + Ui_MainWindow + + + List the Plugins + + + + + SongMaintenanceForm + + + No author selected! + + + + + SongUsagePlugin + + + <b>SongUsage Plugin</b><br>This plugin records the use of songs and when they have been used during a live service + + + + + Ui_customEditDialog + + + Move slide Up 1 + + + + + SongsPlugin + + + OpenSong + + + + + AlertsManager + + + Alert message created and delayed + + + + + Ui_EditSongDialog + + + Alternative Title: + + + + + ServiceManager + + + Open Service + + + + + BiblesTab + + + Display Style: Ui_AmendThemeDialog - + + Image + + + + + EditSongForm + + + You need to enter a song title. + + + + + ThemeManager + + + Error + + + + + ImportWizardForm + + + Invalid Bible Location + + + + + ThemesTab + + + Global level + + + + + ThemeManager + + + Make Global + + + + + Ui_MainWindow + + + &Service Manager + + + + + Ui_OpenLPImportDialog + + + Author + + + + + Ui_AmendThemeDialog + + + Height: + + + + + Ui_BibleImportWizard + + + Books Location: + + + + + ThemeManager + + + Delete a theme + + + + + Ui_BibleImportWizard + + + Crosswalk + + + + + SongBookForm + + + Error + + + + + Ui_AuthorsDialog + + + Last name: + + + + + Ui_customEditDialog + + + Title: + + + + + ImportWizardForm + + + You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such. + + + + + SongMediaItem + + + Maintain the lists of authors, topics and books + + + + + Ui_AlertEditDialog + + + Save + + + + + EditCustomForm + + + You have unsaved data + + + + + BibleMediaItem + + + To: + + + + + Ui_AmendThemeDialog + + + Outline + + + + + BibleMediaItem + + + Text Search + + + + + Ui_OpenLPExportDialog + + + openlp.org Song Exporter + + + + + SongUsagePlugin + + + Delete song usage to specified date + + + + + Ui_SongUsageDetailDialog + + + Report Location + + + + + Ui_BibleImportWizard + + + OpenSong + + + + + Ui_MainWindow + + + Open Service + + + + + SongMediaItem + + + Titles + + + + + ImageMediaItem + + + Select Image(s) + + + + + BibleMediaItem + + + Search Type: + + + + + Ui_MainWindow + + + Media Manager + + + + + ImageMediaItem + + + Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*) + + + + + Ui_MainWindow + + + Alt+F4 + + + + + MediaManagerItem + + + &Preview + + + + + GeneralTab + + + CCLI Details + + + + + SongSelect Password: + + + + + Ui_MainWindow + + + Toggle the visibility of the Preview Panel + + + + + SongMaintenanceForm + + + Are you sure you want to delete the selected book? + + + + + Ui_MainWindow + + + &User Guide + + + + + SongUsageDeleteForm + + + Are you sure you want to delete selected Audit Data? + + + + + Ui_MainWindow + + + Set the interface language to English + + + + + Ui_AmendThemeDialog + + + Main Font + + + + + ImportWizardForm + + + Empty Copyright + + + + + CustomPlugin + + + <b>Custom Plugin</b><br>This plugin allows slides to be displayed on the screen in the same way songs are. This plugin provides greater freedom over the songs plugin.<br> + + + + + AuthorsForm + + + You need to type in the first name of the author. + + + + + SongsTab + + + Display Verses on Live Tool bar: + + + + + ServiceManager + + + Move to top + + + + + ImageMediaItem + + + Override background + + + + + Ui_SongMaintenanceDialog + + + Edit + + + + + Ui_OpenSongExportDialog + + + Select All + + + + + ThemesTab + + + Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. + + + + + PresentationMediaItem + + + Presentation + + + + + Ui_AmendThemeDialog + + + Solid Color + + + + + CustomTab + + + Custom + + + + + Ui_OpenLPImportDialog + + + Ready to import + + + + + MainWindow + + + OpenLP version %s has been updated to version %s + +You can obtain the latest version from http://openlp.org + + + + + Ui_BibleImportWizard + + + File Location: + + + + + SlideController + + + Go to Verse + + + + + Ui_MainWindow + + + &Import + + + + + Quit OpenLP + + + + + Ui_BibleImportWizard + + + This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from. + + + + + Ui_OpenLPExportDialog + + + Title + + + + + ImportWizardForm + + + Empty Version Name + + + + + Ui_MainWindow + + + &Preview Panel + + + + + SlideController + + + Start continuous loop + + + + + Ui_AboutDialog + + + License + + + + + GeneralTab + + + primary + + + + + Ui_EditSongDialog + + + Add a Theme + + + + + Ui_MainWindow + + + &New + + + + + Ui_customEditDialog + + + Credits: + + + + + SlideController + + + Live + + + + + ImportWizardForm + + + You need to specify a file of Bible verses to import! + + + + + BiblesTab + + + continuous + + + + + Ui_EditVerseDialog + + + Number + + + + + GeneralTab + + + Application Startup + + + + + Ui_AmendThemeDialog + + + Use Default Location: + + + + + Ui_OpenSongImportDialog + + + Import + + + + + Ui_MainWindow + + + Ctrl+N + + + + + Ui_EditSongDialog + + + Verse Order: + + + + + Ui_SongUsageDetailDialog + + + ASelect Date Range + + + + + Ui_MainWindow + + + Default Theme: + + + + + Toggle Preview Panel + + + + + SongMediaItem + + + Lyrics + + + + + Ui_OpenLPImportDialog + + + Progress: + + + + + Ui_AmendThemeDialog + + + Shadow + + + + + GeneralTab + + + Select monitor for output display: + + + + + Ui_AmendThemeDialog + + + Italics + + + + + ServiceManager + + + Create a new service + + + + + Ui_AmendThemeDialog + + + Background: + + + + + Ui_OpenLPImportDialog + + + openlp.org Song Importer + + + + + Ui_BibleImportWizard + + + Copyright: + + + + + ThemesTab + + + Service level + + + + + BiblesTab + + + [ and ] + + + + + Ui_customEditDialog + + + Save + + + + + MediaManagerItem + + + You must select one or more items + + + + + GeneralTab + + + Application Settings + + + + + ServiceManager + + + Save this service + + + + + ImportWizardForm + + + Open Books CSV file + + + + + GeneralTab + + + SongSelect Username: + + + + + Ui_AmendThemeDialog + + + X Position: + + + + + BibleMediaItem + + + No matching book could be found in this Bible. + + + + + Ui_BibleImportWizard + + + Server: + + + + + Download Options + + + + + ImportWizardForm + + + Invalid OpenSong Bible + + + + + GeneralTab + + + CCLI Number: + + + + + Ui_AmendThemeDialog + + + Center + + + + + ServiceManager + + + Theme: + + + + + Ui_MainWindow + + + &Live + + + + + SongMaintenanceForm + + + Delete Topic + + + + + Ui_MainWindow + + + English + + + + + ImageMediaItem + + + You must select one or more items + + + + + Ui_AuthorsDialog + + + First name: + + + + + Ui_BibleImportWizard + + + Permission: + + + + + Ui_OpenSongImportDialog + + + Close + + + + + Ui_AmendThemeDialog + + + Opaque + + + + + SongMaintenanceForm + + + This book can't be deleted, it is currently assigned to at least one song! + + + + + ImportWizardForm + + + Your Bible import failed. + + + + + SlideController + + + Start playing media + + + + + SongMediaItem + + + Type: + + + + + Ui_AboutDialog + + + Close + + + + + TopicsForm + + + You need to type in a topic name! + + + + + Ui_OpenSongExportDialog + + + Song Export List + + + + + BibleMediaItem + + + Dual: + + + + + ImageTab + + + sec + + + + + ServiceManager + + + Delete From Service + + + + + GeneralTab + + + Automatically open the last service + + + + + Ui_OpenLPImportDialog + + + Song Import List + + + + + Ui_OpenSongExportDialog + + + Author + + + + + Ui_AmendThemeDialog + + + Outline Color: + + + + + Ui_BibleImportWizard + + + Select Import Source + + + + + Ui_MainWindow + + + F9 + + + + + F8 + + + + + ServiceManager + + + &Change Item Theme + + + + + Ui_SongMaintenanceDialog + + + Topics + + + + + Ui_OpenLPImportDialog + + + Import File Song List + + + + + Ui_customEditDialog + + + Edit Custom Slides + + + + + Ui_EditSongDialog + + + &Remove + + + + + Ui_BibleImportWizard + + + Set up the Bible's license details. + + + + + Ui_AmendThemeDialog + + + Alignment + + + + + SongMaintenanceForm + + + Delete Book + + + + + ThemeManager + + + Edit a theme + + + + + Ui_BibleImportWizard + + + BibleGateway + + + + + GeneralTab + + + Preview Next Song from Service Manager + + + + + Ui_EditSongDialog + + + Title && Lyrics + + + + + SongMaintenanceForm + + + No book selected! + + + + + SlideController + + + Move to live + + + + + Ui_EditVerseDialog + + + Other + + + + + Ui_EditSongDialog + + + Theme + + + + + Ui_EditVerseDialog + + + Verse + + + + + Ui_MainWindow + + + Save the current service to disk + + + + + BibleMediaItem + + + Chapter: + + + + + Ui_AmendThemeDialog + + + Bottom + + + + + PresentationTab + + + Available Controllers + + + + + ImportWizardForm + + + Open Verses CSV file + + + + + TopicsForm + + + Error + + + + + RemoteTab + + + Remotes Receiver Port + + + + + Ui_MainWindow + + + &View + + + + + Ui_AmendThemeDialog + + + Normal + + + + + Ui_OpenLPExportDialog + + + Close + + + + + Ui_BibleImportWizard + + + Username: + + + + + ThemeManager + + + Edit Theme + + + + + ServiceManager + + + &Preview Verse + + + + + Ui_AlertDialog + + + Alert Message + + + + + ImportWizardForm + + + Finished import. + + + + + GeneralTab + + + Show blank screen warning + + + + + AlertsTab + + + Location: + + + + + Ui_EditSongDialog + + + Authors, Topics && Book + + + + + EditSongForm + + + You need to enter some verses. + + + + + BibleMediaItem + + + Bible not fully loaded + + + + + CustomTab + + + Display Footer: + + + + + BiblePlugin + + + <strong>Bible Plugin</strong><br />This plugin allows bible verses from different sources to be displayed on the screen during the service. + + + + + Ui_EditSongDialog + + + Copyright Information + + + + + Ui_MainWindow + + + &Export + + + + + Ui_AmendThemeDialog + + + Bold + + + + + SongsPlugin + + + Export songs in OpenLP 2.0 format + + + + + MediaManagerItem + + + Load a new + + + + + AlertEditForm + + + Missing data + + + + + SongsPlugin + + + <b>Song Plugin</b> <br>This plugin allows Songs to be managed and displayed.<br> + + + + + Ui_AmendThemeDialog + + + Footer Font + + + + + EditSongForm + + + Invalid verse entry - vX + + + + + BibleMediaItem + + + No Book Found + + + + + Ui_OpenLPExportDialog + + + Export + + + + + Ui_BibleImportWizard + + + Location: + + + + + BibleMediaItem + + + Keep + + + + + SongUsagePlugin + + + Generate report on Song Usage + + + + + Ui_EditSongDialog + + + Topic + + + + + Ui_MainWindow + + + &Open + + + + + PresentationMediaItem + + + Present using: + + + + + ServiceManager + + + &Live Verse + + + + + Ui_EditVerseDialog + + + Pre-Chorus + + + + + Ui_EditSongDialog + + + Lyrics: + + + + + Ui_AboutDialog + + + Project Lead + Raoul "superfly" Snyman + +Developers + Tim "TRB143" Bentley + Jonathan "gushie" Corwin + Michael "cocooncrash" Gorven + Scott "sguerrieri" Guerrieri + Raoul "superfly" Snyman + Maikel Stuivenberg + Martin "mijiti" Thompson + Jon "Meths" Tibble + Carsten "catini" Tingaard + +Testers + Wesley "wrst" Stout + + + + + Ui_OpenLPExportDialog + + + Lyrics + + + + + AuthorsForm + + + You haven't set a display name for the author, would you like me to combine the first and last names for you? + + + + + SongMediaItem + + + Clear + + + + + AmendThemeForm + + + Slide Height is %s rows + + + + + Ui_OpenSongImportDialog + + + Progress: + + + + + Ui_MainWindow + + + Toggle Theme Manager + + + + + Ui_AlertDialog + + + Alert Text: + + + + + Ui_EditSongDialog + + + Edit + + + + + AlertsTab + + + Font Color: + + + + + Ui_AmendThemeDialog + + + Theme Maintenance + + + + + CustomTab + + + Custom Display + + + + + Ui_OpenSongExportDialog + + + Title + + + + + Ui_AmendThemeDialog + + + <Color1> + + + + + Ui_EditSongDialog + + + Authors + + + + + ThemeManager + + + Export Theme + + + + + ImageMediaItem + + + No items selected... + + + + + Ui_SongBookDialog + + + Name: + + + + + Ui_AuthorsDialog + + + Author Maintenance + + + + + Ui_AmendThemeDialog + + + Font Footer + + + + + Ui_MainWindow + + + &Settings + + + + + &Options + + + + + BibleMediaItem + + + Results: + + + + + Ui_OpenLPExportDialog + + + Full Song List + + + + + Ui_OpenSongImportDialog + + + OpenSong Folder: + + + + + SlideController + + + Move to last + + + + + Ui_OpenLPExportDialog + + + Progress: + + + + + Ui_SongMaintenanceDialog + + + Add + + + + + SongMaintenanceForm + + + Are you sure you want to delete the selected author? + + + + + SongUsagePlugin + + + Song Usage Status + + + + + BibleMediaItem + + + Verse Search + + + + + Ui_SongBookDialog + + + Edit Book + + + + + EditSongForm + + + Save && Preview + + + + + Ui_SongBookDialog + + + Publisher: + + + + + Ui_AmendThemeDialog + + + Font Weight: + + + + + Ui_BibleImportWizard + + + Bible Filename: + + + + + Ui_AmendThemeDialog + + Transparent @@ -884,84 +2301,63 @@ SongMediaItem - + Search - Ui_OpenSongImportDialog + Ui_BibleImportWizard - - Import + + Format: Ui_AmendThemeDialog - + Background - Ui_EditSongDialog + Ui_BibleImportWizard - - Add + + Importing + + + + + Ui_customEditDialog + + + Edit all slides + + + + + MediaMediaItem + + + Select Media + + + + + PresentationMediaItem + + + Select Presentation(s) SongMediaItem - - Lyrics - - - - - MediaManagerItem - - - Delete - - - - - Ui_MainWindow - - - F11 - - - - - F10 - - - - - Ui_AuditDetailDialog - - - to - - - - - Ui_MainWindow - - - F12 - - - - - SongMediaItem - - + Authors @@ -969,23 +2365,2479 @@ Ui_PluginViewDialog - + Active + + Ui_MainWindow + + + Save the current service under a new name + + + + + Ctrl+O + + + Ui_AmendThemeDialog - - Italics + + Other Options + + + + + SongMaintenanceForm + + + Couldn't add your author! + + + + + Ui_AlertEditDialog + + + Edit + + + + + Ui_EditSongDialog + + + Song Editor + + + + + AlertsTab + + + Font + + + + + SongsPlugin + + + &Song + + + + + Ui_MainWindow + + + &File + + + + + MediaManagerItem + + + &Edit + + + + + Ui_AmendThemeDialog + + + Vertical - + + Width: + + + + + ThemeManager + + + You are unable to delete the default theme! + + + + + ThemesTab + + + Use the global theme, overriding any themes associated with either the service or the songs. + + + + + BibleMediaItem + + + Version: + + + + + Ui_AboutDialog + + + OpenLP <version> build <revision> - Open Source Lyrics Projection + +OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if OpenOffice.org, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector. + +Find out more about OpenLP: http://openlp.org/ + +OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below. + + + + + SongsPlugin + + + OpenLP 2.0 + + + + + ServiceManager + + + New Service + + + + + Ui_TopicsDialog + + + Topic name: + + + + + ThemeManager + + + File is not a valid theme! + + + + + Ui_BibleImportWizard + + + License Details + + + + + ServiceManager + + + Move down + + + + + Ui_EditSongDialog + + + R&emove + + + + + Ui_AmendThemeDialog + + + Middle + + + + + Ui_BibleImportWizard + + + Verse Location: + + + + + AlertEditForm + + + Item selected to Edit + + + + + BibleMediaItem + + + From: + + + + + Ui_AmendThemeDialog + + + Shadow Color: + + + + + ServiceManager + + + &Notes + + + + + Ui_MainWindow + + + E&xit + + + + + Ui_OpenLPImportDialog + + + Close + + + + + MainWindow + + + OpenLP Version Updated + + + + + Ui_customEditDialog + + + Replace edited slide + + + + + Add new slide at bottom + + + + + EditCustomForm + + + You need to enter a title + + + + + ThemeManager + + + Theme Exists + + + + + Ui_MainWindow + + + &Help + + + + + Ui_OpenSongExportDialog + + + OpenSong Song Exporter + + + + + Ui_AmendThemeDialog + + + Vertical Align: + + + + + TestMediaManager + + + Item2 + + + + + Item1 + + + + + Ui_AmendThemeDialog + + + Top + + + + + BiblesTab + + + Display Dual Bible Verses + + + + + Ui_MainWindow + + + Toggle Service Manager + + + + + MediaManagerItem + + + &Add to Service + + + + + AmendThemeForm + + + First Color: + + + + + ThemesTab + + + Song level + + + + + alertsPlugin + + + Show an alert message + + + + + Ui_MainWindow + + + Ctrl+F1 + + + + + SongMaintenanceForm + + + Couldn't save your topic! + + + + + Ui_OpenLPExportDialog + + + Remove Selected + + + + + ThemeManager + + + Delete theme + + + + + ImageTab + + + Image Settings + + + + + Ui_OpenSongImportDialog + + + OpenSong Song Importer + + + + + BiblesTab + + + Bibles + + + + + SongUsagePlugin + + + &Extract recorded data + + + + + AlertsTab + + + Font Name: + + + + + Ui_MainWindow + + + &Web Site + + + + + MediaManagerItem + + + Send the selected item live + + + + + Ui_MainWindow + + + M&ode + + + + + Translate the interface to your language + + + + + Service Manager + + + + + CustomMediaItem + + + Custom + + + + + Ui_BibleImportWizard + + + OSIS + + + + + SongsPlugin + + + openlp.org 1.0 + + + + + Ui_MainWindow + + + &Theme + + + + + Ui_EditVerseDialog + + + Edit Verse + + + + + Ui_MainWindow + + + &Language + + + + + SlideController + + + Verse + + + + + ImportWizardForm + + + You need to specify an OpenSong Bible file to import! + + + + + ServiceManager + + + Your service is unsaved, do you want to save those changes before creating a new one ? + + + + + Ui_OpenSongExportDialog + + + Remove Selected + + + + + SongMediaItem + + + Search: + + + + + MainWindow + + + Save Changes to Service? + + + + + Your service has changed, do you want to save those changes? + + + + + EditSongForm + + + Invalid verse entry - values must be Numeric, I,B,C,T,P,E,O + + + + + Ui_EditSongDialog + + + &Add to Song + + + + + Ui_MainWindow + + + &About + + + + + BiblesTab + + + Only show new chapter numbers + + + + + ImportWizardForm + + + You need to specify a version name for your Bible! + + + + + Ui_AlertEditDialog + + + Delete + + + + + EditCustomForm + + + Error + + + + + RemotesPlugin + + + <b>Remote Plugin</b><br>This plugin provides the ability to send messages to a running version of openlp on a different computer.<br>The Primary use for this would be to send alerts from a creche + + + + + SongMaintenanceForm + + + This topic can't be deleted, it is currently assigned to at least one song! + + + + + BibleMediaItem + + + Find: + + + + + AlertEditForm + + + Item selected to Add + + + + + Ui_AmendThemeDialog + + + Right + + + + + ThemeManager + + + Save Theme - (%s) + + + + + ImageMediaItem + + + Allow background of live slide to be overridden + + + + + MediaManagerItem + + + Add the selected item(s) to the service + + + + + AuthorsForm + + + Error + + + + + BibleMediaItem + + + Book: + + + + + Ui_AmendThemeDialog + + + Font Color: + + + + + Ui_OpenLPExportDialog + + + Select openlp.org export filename: + + + + + Ui_SettingsDialog + + + Settings + + + + + BiblesTab + + + Verse Display + + + + + MediaManagerItem + + + Edit the selected + + + + + SlideController + + + Move to next + + + + + Ui_MainWindow + + + &Plugin List + + + + + BiblePlugin + + + &Bible + + + + + Ui_BibleImportWizard + + + Web Download + + + + + Ui_AmendThemeDialog + + + Horizontal + + + + + ImportWizardForm + + + Open OSIS file + + + + + SongMaintenanceForm + + + Couldn't save your book! + + + + + Couldn't add your topic! + + + + + Ui_AmendThemeDialog + + + pt + + + + + Ui_MainWindow + + + &Add Tool... + + + + + Ui_AmendThemeDialog + + + <Color2> + + + + + ServiceManager + + + Move up + + + + + Ui_OpenLPImportDialog + + + Lyrics + + + + + BiblesTab + + + No brackets + + + + + Ui_AlertEditDialog + + + Maintain Alerts + + + + + Ui_AmendThemeDialog + + + px + + + + + ServiceManager + + + Select a theme for the service + + + + + ThemesTab + + + Themes + + + + + ServiceManager + + + Move to bottom + + + + + Ui_PluginViewDialog + + + Status: + + + + + Ui_EditSongDialog + + + CCLI Number: + + + + + ImportWizardForm + + + This Bible already exists! Please import a different Bible or first delete the existing one. + + + + + Ui_MainWindow + + + &Translate + + + + + AlertEditForm + + + Please Save or Clear seletced item + + + + + Ui_MainWindow + + + Save Service As + + + + + Ui_SongMaintenanceDialog + + + Authors + + + + + SongUsageDetailForm + + + Output File Location + + + + + BiblesTab + + + { and } + + + + + GeneralTab + + + Prompt to save Service before starting New + + + + + ImportWizardForm + + + Starting import... + + + + + BiblesTab + + + Note: +Changes don't affect verses already in the service + + + + + Ui_EditVerseDialog + + + Intro + + + + + ServiceManager + + + Move up order + + + + + PresentationTab + + + available + + + + + ThemeManager + + + default + + + + + SongMaintenanceForm + + + Delete Author + + + + + Ui_AmendThemeDialog + + + Display Location + + + + + Ui_PluginViewDialog + + + Version: + + + + + Ui_AlertEditDialog + + + Add + + + + + GeneralTab + + + General + + + + + Ui_AmendThemeDialog + + + Y Position: + + + + + ServiceManager + + + Move down order + + + + + BiblesTab + + + verse per slide + + + + + Ui_BibleImportWizard + + + Welcome to the Bible Import Wizard + + + + + Ui_AmendThemeDialog + + + Show Shadow: + + + + + AlertsTab + + + Preview + + + + + alertsPlugin + + + <b>Alerts Plugin</b><br>This plugin controls the displaying of alerts on the presentations screen + + + + + GeneralTab + + + Show the splash screen + + + + + Ui_MainWindow + + + New Service + + + + + SlideController + + + Move to first + + + + + Ui_MainWindow + + + &Online Help + + + + + SlideController + + + Blank Screen + + + + + Ui_MainWindow + + + Save Service + + + + + Save &As... + + + + + Toggle the visibility of the Media Manager + + + + + MediaManagerItem + + + Delete the selected item + + + + + Ui_EditSongDialog + + + Add + + + + + alertsPlugin + + + &Alert + + + + + BibleMediaItem + + + Advanced + + + + + ImageMediaItem + + + Image(s) + + + + + Ui_MainWindow + + + F11 + + + + + F10 + + + + + F12 + + + + + Ui_BibleImportWizard + + + Select the import format, and where to import from. + + + + + Ui_MainWindow + + + Alt+F7 + + + + + Add an application to the list of tools + + + + + MediaPlugin + + + <b>Media Plugin</b><br>This plugin allows the playing of audio and video media + + + + + BiblesTab + + + Bible Theme: + + + + + SongsPlugin + + + Export songs in openlp.org 1.0 format + + + + + Ui_MainWindow + + + Theme Manager + + + + + AlertsTab + + + Alerts + + + + + Ui_customEditDialog + + + Move slide down 1 + + + + + Ui_AmendThemeDialog + + + Font: + + + + + ServiceManager + + + Load an existing service + + + + + Ui_MainWindow + + + Toggle the visibility of the Theme Manager + + + + + PresentationTab + + + Presentations + + + + + SplashScreen + + + Starting + + + + + ImageTab + + + Slide Loop Delay: + + + + + ServiceManager + + + Move to end + + + + + AlertsTab + + + Alert timeout: + + + + + Ui_MainWindow + + + &Preview Pane + + + + + MediaManagerItem + + + Add a new + + + + + ThemeManager + + + Select Theme Import File + + + + + New Theme + + + + + MediaMediaItem + + + Media + + + + + Ui_BibleImportWizard + + + Password: + + + + + Ui_AmendThemeDialog + + + Outline Size: + + + + + Ui_OpenSongExportDialog + + + Progress: + + + + + AmendThemeForm + + + Second Color: + + + + + Ui_EditSongDialog + + + Theme, Copyright Info && Comments + + + + + Ui_MainWindow + + + &Theme Manager + + + + + Ui_OpenLPImportDialog + + + Select openlp.org songfile to import: + + + + + Ui_EditSongDialog + + + Song Book + + + + + alertsPlugin + + + F7 + + + + + Ui_OpenLPExportDialog + + + Author + + + + + Ui_AmendThemeDialog + + + Wrap Indentation + + + + + ThemeManager + + + Import a theme + + + + + PresentationPlugin + + + <b>Presentation Plugin</b> <br> Delivers the ability to show presentations using a number of different programs. The choice of available presentation programs is available to the user in a drop down box. + + + + + ImageMediaItem + + + Image + + + + + SongsTab + + + Enable search as you type: + + + + + Ui_AlertDialog + + + Cancel + + + + + Ui_OpenLPImportDialog + + + Import + + + + + Ui_EditVerseDialog + + + Chorus + + + + + Ui_EditSongDialog + + + Edit All + + + + + AuthorsForm + + + You need to type in the last name of the author. + + + + + SongsTab + + + Songs Mode + + + + + Ui_AmendThemeDialog + + + Left + + + + + ThemesTab + + + Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. + + + + + ImageTab + + + Images + + + + + BibleMediaItem + + + Verse: + + + + + Ui_BibleImportWizard + + + CSV + + + + + Ui_OpenLPExportDialog + + + Song Export List + + + + + ThemeManager + + + Export theme + + + + + Ui_SongMaintenanceDialog + + + Delete + + + + + Ui_AmendThemeDialog + + + Theme Name: + + + + + Ui_AboutDialog + + + About OpenLP + + + + + Ui_MainWindow + + + Toggle the visibility of the Service Manager + + + + + PresentationMediaItem + + + A presentation with that filename already exists. + + + + + AlertsTab + + + openlp.org + + + + + ImportWizardForm + + + Invalid Books File + + + + + Ui_OpenLPImportDialog + + + Song Title + + + + + MediaManagerItem + + + &Show Live + + + + + AlertsTab + + + Keep History: + + + + + Ui_AmendThemeDialog + + + Image: + + + + + Ui_customEditDialog + + + Set Theme for Slides + + + + + Ui_MainWindow + + + More information about OpenLP + + + + + AlertsTab + + + Background Color: + + + + + SongMaintenanceForm + + + No topic selected! + + + + + Ui_MainWindow + + + &Media Manager + + + + + &Tools + + + + + AmendThemeForm + + + Background Color: + + + + + Ui_EditSongDialog + + + A&dd to Song + + + + + Title: + + + + + GeneralTab + + + Screen + + + + + AlertsTab + + + s + + + + + ImagePlugin + + + <b>Image Plugin</b><br>Allows images of all types to be displayed. If a number of images are selected together and presented on the live controller it is possible to turn them into a timed loop.<br<br>From the plugin if the <i>Override background</i> is chosen and an image is selected any somgs which are rendered will use the selected image from the background instead of the one provied by the theme.<br> + + + + + Ui_AlertEditDialog + + + Clear + + + + + Ui_BibleImportWizard + + + Please wait while your Bible is imported. + + + + + MediaManagerItem + + + No items selected... + + + + + Ui_OpenLPImportDialog + + + Select All + + + + + Ui_AmendThemeDialog + + + Font Main + + + + + Ui_OpenLPImportDialog + + + Title + + + + + Ui_OpenSongExportDialog + + + Select OpenSong song folder: + + + + + Ui_MainWindow + + + Toggle Media Manager + + + + + SongUsagePlugin + + + &Song Usage + + + + + GeneralTab + + + Monitors + + + + + EditCustomForm + + + You need to enter a slide + + + + + ImportWizardForm + + + You need to specify a file to import your Bible from! + + + + + Ui_EditVerseDialog + + + Verse Type + + + + + ThemeManager + + + You have not selected a theme! + + + + + Ui_EditSongDialog + + + Comments + + + + + AlertsTab + + + Bottom + + + + + Ui_MainWindow + + + Create a new Service + + + + + AlertsTab + + + Top + + + + + SlideController + + + Preview + + + + + Ui_PluginViewDialog + + + TextLabel + + + + + About: + + + + + Inactive + + + + + Ui_OpenSongExportDialog + + + Ready to export + + + + + Export + + + + + Ui_PluginViewDialog + + + Plugin List + + + + + Ui_AmendThemeDialog + + + Transition Active: + + + + + Ui_BibleImportWizard + + + Proxy Server (Optional) + + + + + Ui_EditSongDialog + + + &Manage Authors, Topics, Books + + + + + Ui_SongUsageDetailDialog + + + Audit Detail Extraction + + + + + Ui_OpenLPExportDialog + + + Ready to export + + + + + EditCustomForm + + + Save && Preview + + + + + Ui_OpenLPExportDialog + + + Select All + + + + + Ui_SongUsageDetailDialog + + + to + + + + + Ui_AmendThemeDialog + + + Size: + + + + + MainWindow + + + OpenLP Main Display Blanked + + + + + Ui_OpenLPImportDialog + + + Remove Selected + + + + + OpenSongBible + + + Importing + + + + + Ui_EditSongDialog + + + Delete + + + + + Ui_MainWindow + + + Ctrl+S + + + + + PresentationMediaItem + + + File exists + + + + + Ui_OpenSongImportDialog + + + Ready to import + + + + + SlideController + + + Stop continuous loop + + + + + s + + + + + SongMediaItem + + + Song Maintenance + + + + + Ui_customEditDialog + + + Edit + + + + + Ui_AmendThemeDialog + + + Gradient : + + + + + BiblesTab + + + Layout Style: + + + + + ImportWizardForm + + + Invalid Verse File + + + + + EditSongForm + + + Error + + + + + Ui_customEditDialog + + + Add New + + + + + Ui_AuthorsDialog + + + Display name: + + + + + SongMaintenanceForm + + + Are you sure you want to delete the selected topic? + + + + + Ui_AmendThemeDialog + + + Bold/Italics + + + + + Ui_SongMaintenanceDialog + + + Song Maintenance + + + + + Ui_EditVerseDialog + + + Bridge + + + + + SongsTab + + + Songs + + + + + Ui_AmendThemeDialog + + + Preview + + + + + Ui_AboutDialog + + + Credits + + + + + MediaManagerItem + + + Preview the selected item + + + + + Ui_BibleImportWizard + + + Version Name: + + + + + Ui_AboutDialog + + + About + + + + + Ui_EditVerseDialog + + + Ending + + + + + Ui_AmendThemeDialog + + + Horizontal Align: + + + + + ServiceManager + + + &Edit Item + + + + + Ui_AmendThemeDialog + + + Background Type: + + + + + Ui_MainWindow + + + &Save + + + + + OpenLP 2.0 + + + + + ThemeManager + + + A theme with this name already exists, would you like to overwrite it? + + + + + Export a theme + + + + + AmendThemeForm + + + Open file + + + + + Ui_TopicsDialog + + + Topic Maintenance + + + + + Ui_customEditDialog + + + Clear edit area + + + + + Ui_AmendThemeDialog + + + Show Outline: + + + + + SongBookForm + + + You need to type in a book name! + + + + + ImportWizardForm + + + Open OpenSong Bible + + + + + Ui_MainWindow + + + Look && &Feel + + + + + Ui_BibleImportWizard + + + Ready. + + + + + Ui_SongMaintenanceDialog + + + Books/Hymnals + + + + + Ui_AboutDialog + + + Contribute + + + + + Ui_AmendThemeDialog + + Gradient + + AlertsTab + + + Font Size: + + + + + Ui_OpenSongExportDialog + + + Full Song List + + + + + Ui_AmendThemeDialog + + + Circular + + + diff --git a/scripts/get-strings.py b/scripts/get-strings.py index 8d9dad174..ed3cdcb41 100755 --- a/scripts/get-strings.py +++ b/scripts/get-strings.py @@ -24,6 +24,7 @@ ############################################################################### import os +from cgi import escape from ast import parse, NodeVisitor, Str ts_file = u""" @@ -45,7 +46,8 @@ ts_message = u""" class StringExtractor(NodeVisitor): - def __init__(self, strings, filename): + def __init__(self, strings, filename, base_path): + self.base_path = base_path self.filename = filename self.strings = strings self.classname = 'unknown' @@ -58,10 +60,10 @@ class StringExtractor(NodeVisitor): if hasattr(node.func, 'attr') and node.func.attr == 'trUtf8' and isinstance(node.args[0], Str): string = node.args[0].s key = '%s-%s' % (self.classname, string) - self.strings[key] = [self.classname, self.filename, node.lineno, string] + self.strings[key] = [self.classname, self.filename[len(self.base_path) + 1:], node.lineno, escape(string)] self.generic_visit(node) -def parse_file(filename, strings): +def parse_file(base_path, filename, strings): file = open(filename, u'r') try: ast = parse(file.read()) @@ -70,7 +72,7 @@ def parse_file(filename, strings): return file.close() - StringExtractor(strings, filename).visit(ast) + StringExtractor(strings, filename, base_path).visit(ast) def write_file(filename, strings): translation_file = u'' @@ -94,15 +96,18 @@ def write_file(filename, strings): def main(): strings = {} - start_dir = os.path.abspath(u'.') + start_dir = os.path.abspath(u'..') for root, dirs, files in os.walk(start_dir): for file in files: if file.endswith(u'.py'): print u'Parsing "%s"' % file - parse_file(os.path.join(root, file), strings) + parse_file(start_dir, os.path.join(root, file), strings) print u'Generating TS file...', - write_file(os.path.join(start_dir, u'i18n', u'openlp_en.ts'), strings) + write_file(os.path.join(start_dir, u'resources', u'i18n', u'openlp_en.ts'), strings) print u'done.' if __name__ == u'__main__': - main() \ No newline at end of file + if os.path.split(os.path.abspath(u'.'))[1] != u'scripts': + print u'You need to run this script from the scripts directory.' + else: + main()