From d1172e14c1d888c19c22d0587a7079c80b9a5619 Mon Sep 17 00:00:00 2001 From: rimach Date: Wed, 22 Sep 2010 20:03:10 +0200 Subject: [PATCH 1/2] fix click/unclick 'Auto detect', fix saving of language setting --- openlp/core/ui/mainwindow.py | 2 +- openlp/core/utils/languagemanager.py | 23 +- openlp/plugins/songs/lib/test/test3.opensong | 0 resources/i18n/af.ts | 1071 +++++++++--------- resources/i18n/de.ts | 25 +- resources/i18n/en.ts | 55 +- resources/i18n/en_GB.ts | 25 +- resources/i18n/en_ZA.ts | 15 +- resources/i18n/es.ts | 133 +-- resources/i18n/hu.ts | 25 +- resources/i18n/ko.ts | 133 +-- resources/i18n/nb.ts | 251 ++-- resources/i18n/pt_BR.ts | 25 +- resources/i18n/sv.ts | 133 +-- resources/openlp.desktop | 18 +- scripts/translation_utils.py | 23 +- 16 files changed, 975 insertions(+), 982 deletions(-) mode change 100755 => 100644 openlp/plugins/songs/lib/test/test3.opensong diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 0d158d042..10f1ee92e 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -343,7 +343,7 @@ class Ui_MainWindow(object): Set up the translation system """ MainWindow.mainTitle = translate('OpenLP.MainWindow', 'OpenLP 2.0') - MainWindow.language = translate('OpenLP.MainWindow', 'English') +# MainWindow.language = translate('OpenLP.MainWindow', 'English') MainWindow.setWindowTitle(MainWindow.mainTitle) self.FileMenu.setTitle(translate('OpenLP.MainWindow', '&File')) self.FileImportMenu.setTitle(translate('OpenLP.MainWindow', '&Import')) diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index f118c64b0..142629c0d 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -82,7 +82,8 @@ class LanguageManager(object): """ translator = QtCore.QTranslator() translator.load(qm_file) - return translator.translate('OpenLP.MainWindow', 'English') + return translator.translate('OpenLP.MainWindow', 'English', + 'Please add here the name of your Language') @staticmethod def get_language(): @@ -107,15 +108,13 @@ class LanguageManager(object): ``action`` The language menu option """ - if action is None: - action_name = u'en' - else: + language = u'en' + if action: action_name = u'%s' % action.objectName() - qm_list = LanguageManager.get_qm_list() - if LanguageManager.auto_language: - language = u'[%s]' % qm_list[action_name] - else: + qm_list = LanguageManager.get_qm_list() language = u'%s' % qm_list[action_name] + if LanguageManager.auto_language: + language = u'[%s]' % language QtCore.QSettings().setValue( u'general/language', QtCore.QVariant(language)) log.info(u'Language file: \'%s\' written to conf file' % language) @@ -132,9 +131,11 @@ class LanguageManager(object): LanguageManager.__qm_list__ = {} qm_files = LanguageManager.find_qm_files() for counter, qmf in enumerate(qm_files): - name = unicode(qmf).split(u'.')[0] - LanguageManager.__qm_list__[u'%#2i %s' % (counter + 1, - LanguageManager.language_name(qmf))] = name + reg_ex = QtCore.QRegExp("^.*i18n/(.*).qm") + if reg_ex.exactMatch(qmf): + name = u'%s' % reg_ex.cap(1) + LanguageManager.__qm_list__[u'%#2i %s' % (counter + 1, + LanguageManager.language_name(qmf))] = name @staticmethod def get_qm_list(): diff --git a/openlp/plugins/songs/lib/test/test3.opensong b/openlp/plugins/songs/lib/test/test3.opensong old mode 100755 new mode 100644 diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index 1b919c851..a3f1e5343 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -5,17 +5,17 @@ &Alert - W&aarskuwing + W&aarskuwing Show an alert message. - Vertoon 'n waarskuwing boodskap. + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - <strong>Waarskuwing Mini-program</strong><br/>Die waarskuwing mini-program beheer die vertoning van moederskamer inligting op die vertoon skerm + @@ -23,57 +23,57 @@ Alert Message - Waarskuwing Boodskap + Waarskuwing Boodskap Alert &text: - Waarskuwing &teks: + &Parameter(s): - &Parameter(s): + &New - &Nuwe + &Nuwe &Save - &Stoor + &Stoor &Delete - Wis uit + Displ&ay - V&ertoon + Display && Cl&ose - Vert&oon && Maak toe + &Close - Maak toe + New Alert - Nuwe Waarskuwing + You haven't specified any text for your alert. Please type in some text before clicking New. - Daar is geen teks vir die waarskuwing gespesifiseer nie. Tik asseblief teks in voordat 'n nuwe een bygevoeg word. + @@ -81,7 +81,7 @@ Alert message created and displayed. - Waarskuwing boodskap geskep en vertoon. + @@ -89,77 +89,77 @@ Alerts - Waarskuwings + Waarskuwings Font - Skrif + Skrif Font name: - Skrif naam: + Font color: - Skrif kleur: + Background color: - Agtergrond kleur: + Font size: - Skrif grootte: + pt - pt + pt Alert timeout: - Waarskuwing verstreke-tyd: + Waarskuwing tydgrens: s - s + s Location: - Ligging: + Ligging: Preview - Voorskou + Voorskou OpenLP 2.0 - OpenLP 2.0 + OpenLP 2.0 Top - Bo + Middle - Middel + Middel Bottom - Onder + Onder @@ -167,12 +167,12 @@ &Bible - &Bybel + &Bybel <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - <strong>Bybel Mini-program</strong><br/>Die Bybel mini-program verskaf die taak om Bybel verse vanaf verskillende bronne tydens die diens te vertoon. + @@ -180,12 +180,12 @@ Book not found - Boek nie gevind nie + The book you requested could not be found in this bible. Please check your spelling and that this is a complete bible not just one testament. - Die aangevraagde boek kon nie in hierdie Bybel gevind word nie. Gaan asseblief spelling na en sien dat hierdie 'n volledige Bybel is instede van een testament. + @@ -193,7 +193,7 @@ Scripture Reference Error - Skrif Verwysing Fout + @@ -214,79 +214,78 @@ Book Chapter:Verse-Chapter:Verse Bibles - Bybels + Bybels Verse Display - Vers Vertoning + Vers Vertoning Only show new chapter numbers - Vertoon net nuwe hoofstuk nommers + Vertoon net nuwe hoofstuk nommers Layout style: - Uitleg styl: + Display style: - Vertoon styl: + Bible theme: - Bybel tema: + Verse Per Slide - Verse Per Skyfie + Verse Per Line - Verse Per Lyn + Continuous - Aaneen-lopend + No Brackets - Geen Hakkies + ( And ) - ( En ) + { And } - { En } + [ And ] - [ En ] + Note: Changes do not affect verses already in the service. - Nota: -Veranderinge affekteer nie verse wat reeds in die diens is nie. + Display dual Bible verses - Vertoon dubbel Bybel verse + @@ -294,375 +293,375 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Bible Import Wizard - Bybel Invoer Gids + Bybel Invoer Gids Welcome to the Bible Import Wizard - Welkom by die Bybel Invoer Gids + Welkom by die Bybel Invoer Gids 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. - Hierdie gids sal u help om Bybels van 'n verskeidenheid formate in te voer. Kliek die volgende knoppie hieronder om die proses te begin deur 'n formaat te kies om in te voer. + Hierdie gids sal u help om Bybels van 'n verskeidenheid vormate in te voer. Kliek die volgende knoppie hieronder om die proses te begin en 'n formaat te kies om in te voer. Select Import Source - Selekteer Invoer Bron + Selekteer Invoer Bron Select the import format, and where to import from. - Selekteer die invoer formaat en van waar af om in te voer. + Selekteer die invoer formaat en van waar af om in te voer. Format: - Formaat: + Formaat: OSIS - OSIS + OSIS CSV - KGW (CSV) + KGW OpenSong - OpenSong + OpenSong Web Download - Web Aflaai + Web Aflaai File location: - Lêer ligging: + Books location: - Boeke ligging: + Verse location: - Vers ligging: + Bible filename: - Bybel lêernaam: + Location: - Ligging: + Ligging: Crosswalk - Crosswalk + Cosswalk BibleGateway - BibleGateway + BibleGateway Bible: - Bybel: + Bybel: Download Options - Aflaai Opsies + Aflaai Opsies Server: - Bediener: + Bediener: Username: - Gebruikersnaam: + Gebruikersnaam: Password: - Wagwoord: + Wagwoord: Proxy Server (Optional) - Tussenganger Bediener (Opsioneel) + Tussenganger Bediener (Opsioneel) License Details - Lisensie Besonderhede + Lisensie Besonderhede Set up the Bible's license details. - Stel hierdie Bybel se lisensie besonderhede op. + Stel hierdie Bybel se lisensie besonderhede op. Version name: - Weergawe naam: + Copyright: - Kopiereg: + Kopiereg: Permission: - Toestemming: + Toestemming: Importing - Invoer + Invoer Please wait while your Bible is imported. - Wag asseblief terwyl u Bybel ingevoer word. + Wag asseblief terwyl u Bybel ingevoer word. Ready. - Gereed. + Gereed. Invalid Bible Location - Ongeldige Bybel Ligging + Ongeldige Bybel Ligging You need to specify a file to import your Bible from. - 'n Lêer van waar die Byber ingevoer word moet gespesifiseer word. + Invalid Books File - Ongeldige Boeke Lêer + Ongeldige Boeke Lêer You need to specify a file with books of the Bible to use in the import. - 'n Lêer met boeke van die Bybel moet gespesifiseer word vir gebruik tydens die invoer. + Invalid Verse File - Ongeldige Vers Lêer + Ongeldige Vers Lêer You need to specify a file of Bible verses to import. - 'n Lêer met Bybel verse moet gespesifiseer word om in te voer. + Invalid OpenSong Bible - Ongeldige OpenSong Bybel + Ongeldige OpenSong Bybel You need to specify an OpenSong Bible file to import. - 'n OpenSong Bybel moet gespesifiseer word om in te voer. + Empty Version Name - Weergawe Naam is leeg + Weergawe Naam is Leeg You need to specify a version name for your Bible. - 'n Weergawe naam moet vir die Bybel gespesifiseer word. + Empty Copyright - Kopiereg is leeg. - - - - Bible Exists - Bybel Bestaan reeds - - - - Open OSIS File - Maak OSIS Lêer oop - - - - Open Books CSV File - Maak Boeke CSV (KGW) Lêer oop - - - - Open Verses CSV File - Maak Verse CSV Lêer oop - - - - Open OpenSong Bible - Maak OpenSong Bybel Oop - - - - Starting import... - Invoer begin... - - - - Finished import. - Invoer voltooi. - - - - Your Bible import failed. - Die Bybel invoer het misluk. + Leë Kopiereg You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + + + Bible Exists + Bybel Bestaan + This Bible already exists. Please import a different Bible or first delete the existing one. + + + Open OSIS File + + + + + Open Books CSV File + + + + + Open Verses CSV File + + + + + Open OpenSong Bible + Maak OpenSong Bybel Oop + + + + Starting import... + Invoer begin... + + + + Finished import. + Invoer voltooi. + + + + Your Bible import failed. + U Bybel invoer het misluk. + BiblesPlugin.MediaItem Bible - Bybel + Bybel Quick - Vinnig + Vinnig Advanced - Gevorderd + Gevorderd Version: - Weergawe: + Weergawe: Dual: - Dubbel: + Dubbel: Search type: - Tipe soek: + Find: - Vind: + Vind: Search - Soek + Soek Results: - Resultate: + &Resultate: Book: - Boek: + Boek: Chapter: - Hoofstuk: + Hoofstuk: Verse: - Vers: + Vers: From: - Vanaf: + Vanaf: To: - Tot: + Aan: Verse Search - Soek Vers + Soek Vers Text Search - Teks Soektog + Teks Soektog Clear - Maak Skoon + Keep - Behou + Behou No Book Found - Geen Boek Gevind nie + Geeb Boek Gevind nie No matching book could be found in this Bible. - Geen bypassende boek kon in dié Bybel gevind word nie. + Geen bypassende boek kon in dié Bybel gevind word nie. etc - ens + Bible not fully loaded. - Bybel nie ten volle gelaai nie. + @@ -670,7 +669,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Importing - Invoer + Invoer @@ -678,7 +677,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin. - <strong>Aanpas Mini-program</strong><br/>Die aanpas mini-program verskaf die vermoë om aangepasde teks skyfies op te stel wat in dieselfde manier gebruik word as die liedere mini-program. Dié mini-program verskaf grooter vryheid as die liedere mini-program. + @@ -686,17 +685,17 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Custom - Aanpas + Custom Display - Aangepasde Vertoning + Aangepasde Vertoning Display footer - Vertoon voetspasie + @@ -704,127 +703,127 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Edit Custom Slides - Redigeer Aangepaste Skyfies + Redigeer Aangepaste Skyfies Move slide up one position. - Skuif skyfie een posisie op. + Move slide down one position. - Skuif skyfie een posisie af. + &Title: - &Titel: + Add New - Voeg Nuwe By + Voeg Nuwe By Add a new slide at bottom. - Voeg nuwe skyfie by aan die onderkant. + Edit - Redigeer + Redigeer Edit the selected slide. - Redigeer die geselekteerde skyfie. + Edit All - Redigeer Alles + Redigeer Alles Edit all the slides at once. - Redigeer al die skyfies tegelyk. + Save - Stoor + Stoor Save the slide currently being edited. - Stoor die skyfie wat tans geredigeer word. + Delete - Wis uit + Delete the selected slide. - Wis die geselekteerde skyfie uit. + Clear - Maak skoon + Clear edit area - Maak die redigeer area skoon + Maak skoon die redigeer area Split Slide - Verdeel Skyfie + Split a slide into two by inserting a slide splitter. - Verdeel 'n skyfie deur 'n skyfie-verdeler te gebruik. + The&me: - Te&ma: + &Credits: - Krediete: + Save && Preview - Stoor && Voorskou + Stoor && Voorskou Error - Fout + Fout You need to type in a title. - 'n Titel word benodig. + You need to add at least one slide - Ten minste een skyfie moet bygevoeg word + You have one or more unsaved slides, please either save your slide(s) or clear your changes. - Daar is een of meer ongestoorde skyfies, stoor asseblief die skyfie(s) of maak die veranderinge skoon. + @@ -832,17 +831,17 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Custom - Aanpas + You haven't selected an item to edit. - Daar is nie 'n item geselekteer om te redigeer nie + You haven't selected an item to delete. - Daar is nie 'n item geselekteer om uit te wis nie. + @@ -850,7 +849,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme. - <strong>Beeld Mini-program</strong><br/>Die beeld mini-program verskaf vertoning van beelde.<br/>Een van die onderskeidende kenmerke van hierdie mini-program is die vermoë om beelde te groepeer in die diensbestuurder wat dit maklik maak om verskeie beelde te vertoon. Die mini-program kan ook van OpenLP se "tydgebonde herhaling"-funksie gebruik maak om 'n automatiese skyfe-vertoning te verkry. Verder kan beelde van hierdie mini-program gebruik word om die huidige tema se agtergrond te vervang hoewel 'n tema sy eie agtergrond het. + @@ -858,52 +857,52 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Image - Beeld + Beeld Select Image(s) - Selekteer beeld(e) + Selekteer beeld(e) All Files - Alle Lêers + Replace Live Background - Vervang Regstreekse Agtergrond + Replace Background - Vervang Agtergrond + Reset Live Background - Herstel Regstreekse Agtergrond + You must select an image to delete. - 'n Beeld om uit te wis moet geselekteer word. + Image(s) - Beeld(e) + Beeld(e) You must select an image to replace the background with. - 'n Beeld wat die agtergrond vervang moet gekies word. + You must select a media file to replace the background with. - 'n Media lêer wat die agtergrond vervang moet gekies word. + @@ -911,7 +910,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - <strong>Media Mini-program</strong><br/>Die media mini-program verskaf speel funksies van audio en video. + @@ -919,27 +918,27 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Media - Media + Media Select Media - Selekteer Media + Selekteer Media Replace Live Background - Vervang Regstreekse Agtergrond + Replace Background - Vervang Agtergrond + You must select a media file to delete. - 'n Media lêer om uit te wis moet geselekteer word. + @@ -947,7 +946,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. Image Files - Beeld Lêers + @@ -955,7 +954,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie. About OpenLP - Aangaande OpenLP + Aangaande OpenLP @@ -966,18 +965,12 @@ OpenLP is free church presentation software, or lyrics projection software, used 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. - OpenLP <version><revision> - Open Source Lyrics Projection - -OpenLP is gratis kerk aanbieding sagteware of lirieke projeksie sagteware wat gebruik word vir die vertoning van liedere, Bybel verse, video's, beelde tot ook aanbiedings (as OpenOffice.org, PowerPoint of PowerPoint Viewer geïnstalleer is) vir kerklike aanbidding deur middel van 'n rekenaar en 'n data projektor. - -Vind meer uit oor OpenLP: http://openlp.org/ - -OpenLP is geskryf en word onderhou deur vrywilligers. As u graag wil sien dat meer Christelike sagteware geskryf word, oorweeg dit asseblief om by te dra deur die knoppie hieronder te gebruik. + About - Aangaande + Aangaande @@ -1019,49 +1012,12 @@ Built With PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro Oxygen Icons: http://oxygen-icons.org/ - Projek Leier -Raoul "superfly" Snyman - -Ontwikkelaars -Tim "TRB143" Bentley -Jonathan "gushie" Corwin -Michael "cocooncrash" Gorven -Scott "sguerrieri" Guerrieri -Raoul "superfly" Snyman -Martin "mijiti" Thompson -Jon "Meths" Tibble - -Bydraers -Meinert "m2j" Jordan -Andreas "googol" Preikschat -Christian "crichter" Richter -Philip "Phill" Ridout -Maikel Stuivenberg -Carsten "catini" Tingaard -Frode "frodus" Woldsund - -Toetsers -Philip "Phill" Ridout -Wesley "wrst" Stout (lead) - -Verpakkers -Thomas "tabthorpe" Abthorpe (FreeBSD) -Tim "TRB143" Bentley (Fedora) -Michael "cocooncrash" Gorven (Ubuntu) -Matthias "matthub" Hub (Mac OS X) -Raoul "superfly" Snyman (Windows, Ubuntu) - -Gebou Met -Python: http://www.python.org/ -Qt4: http://qt.nokia.com/ -PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro -Oxygen Ikone: http://oxygen-icons.org/ - + Credits - Krediete + Krediete @@ -1201,22 +1157,22 @@ This General Public License does not permit incorporating your program into prop License - Lisensie + Lisensie Contribute - Dra By + Dra By Close - Maak toe + Maak toe build %s - bou %s + @@ -1224,27 +1180,27 @@ This General Public License does not permit incorporating your program into prop Advanced - Gevorderd + Gevorderd UI Settings - GK (UI) Verstellings + Number of recent files to display: - Hoeveelheid onlangse lêers om te vertoon: + Remember active media manager tab on startup - Onthou die laaste media bestuurder oortjie wanneer die program begin + Double-click to send items straight to live (requires restart) - Dubbel-kliek items direk na regstreekse vertoning te stuur (benodig herlaai) + @@ -1252,451 +1208,451 @@ This General Public License does not permit incorporating your program into prop Theme Maintenance - Tema Onderhoud + Tema Onderhoud Theme &name: - Tema &naam + Type: - Tipe: + Tipe: Solid Color - Soliede Kleur + Soliede Kleur Gradient - Gradiënt + Gradiënt Image - Beeld + Beeld Image: - Beeld: + Beeld: Gradient: - Gradiënt: + Horizontal - Horisontaal + Horisontaal Vertical - Vertikaal + Vertikaal Circular - Sirkelvormig + Sirkelvormig &Background - Agtergrond + Main Font - Hoof Skrif + Hoof Skrif Font: - Skrif: + Skrif: Color: - Kleur: + Size: - Grootte: + Grootte: pt - pt + pt Adjust line spacing: - Verstel lyn spasiëring: + Normal - Normaal + Normaal Bold - Vetgedruk + Vetgedruk Italics - Kursief + Kursief Bold/Italics - Vetgedruk/Kursief + Bold/Italics Style: - Styl: + Display Location - Vertoon Ligging + Vertoon Ligging Use default location - Gebruik verstek ligging + X position: - X posisie: + Y position: - Y posisie: + Width: - Wydte: + Wydte: Height: - Hoogte: + Hoogte: px - px + px &Main Font - Hoof Skrif + Footer Font - Voetnota Skriftipe + Voetnota Skriftipe &Footer Font - Voetnota Skri&ftipe + Outline - Buitelyn + Buitelyn Outline size: - Buitelyn grootte: + Outline color: - Buitelyn kleur: + Show outline: - Vertoon buitelyn: + Shadow - Skaduwee + Skaduwee Shadow size: - Skaduwee grootte: + Shadow color: - Skaduwee kleur: + Show shadow: - Vertoon skaduwee: + Alignment - Belyning + Belyning Horizontal align: - Horisontale belyning: + Left - Links + Links Right - Regs + Regs Center - Middel + Middel Vertical align: - Vertikale belyning: + Top - Bo + Middle - Middel + Middel Bottom - Onder + Onder Slide Transition - Skyfie Verandering + Skyfie Verandering Transition active - Verandering aktief + &Other Options - Ander &Opsies + Preview - Voorskou + Voorskou All Files - Alle Lêers + Select Image - Selekteer beeld + First color: - Eerste kleur: + Second color: - Tweede kleur: + Slide height is %s rows. - Skyfie hoogte is %s rye. + OpenLP.ExceptionDialog - - - Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. - Oeps! OpenLP het 'n probleem ondervind en kon nie daarvanaf herstel nie. Die teks in die boks hieronder bevat inligting wat van hulp kan wees aan die OpenLP ontwikkelaars, so stuur dit asseblief per e-pos na bugs@openlp.org saam met 'n gedetaileerde beskrywing van wat gedoen was toe die probleem plaasgevind het. - Error Occurred + + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + OpenLP.GeneralTab General - Algemeen + Algemeen Monitors - Monitors + Monitors Select monitor for output display: - Selekteer monitor vir uitgaande vertoning: + Selekteer monitor vir uitgaande vertoning: Display if a single screen - Vertoon as dit 'n enkel skerm is + Application Startup - Applikasie Aanskakel + Program Aanskakel Show blank screen warning - Vertoon leë skerm waarskuwing + Vertoon leë skerm waarskuwing Automatically open the last service - Maak vanself die laaste diens oop + Maak vanself die laaste diens oop Show the splash screen - Wys die spatsel skerm + Wys die spatsel skerm Application Settings - Program Verstellings + Program Verstellings Prompt to save before starting a new service - Vra om te stoor voordat 'n nuwe diens begin word + Automatically preview next item in service - Wys voorskou van volgende item in diens automaties + Slide loop delay: - Skyfie herhaal vertraging: + sec - sek + CCLI Details - CCLI Inligting + CCLI Inligting CCLI number: - CCLI nommer: + SongSelect username: - SongSelect gebruikersnaam: + SongSelect password: - SongSelect wagwoord: + Display Position - Vertoon Posisie + X - X + Y - Y + Height - Hoogte + Width - Wydte + Override display position - Oorskryf vertoon posisie + Screen - Skerm + Skerm primary - primêre + primêre OpenLP.LanguageManager - + Language - Taal + - + Please restart OpenLP to use your new language setting. - Herlaai asseblief OpenLP om die nuwe taal instelling te gebruik. + @@ -1704,416 +1660,415 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 - OpenLP 2.0 - - - - English - Engels + OpenLP 2.0 &File - &Lêer + &Lêer &Import - &Invoer + &Invoer &Export - Uitvo&er + &Uitvoer &View - &Bekyk + &Bekyk M&ode - M&odus + M&odus &Tools - &Gereedskap + &Gereedskap &Settings - Ver&stellings + Ver&stellings &Language - Taa&l + Taa&l &Help - &Hulp + &Hulp Media Manager - Media Bestuurder + Media Bestuurder Service Manager - Diens Bestuurder + Diens Bestuurder Theme Manager - Tema Bestuurder + Tema Bestuurder &New - &Nuwe + &Nuwe New Service - Nuwe Diens + Nuwe Diens Create a new service. - Skep 'n nuwe diens. + Ctrl+N - Ctrl+N + Ctrl+N &Open - Maak &Oop + Maak &Oop Open Service - Maak Diens Oop + Maak Diens Oop Open an existing service. - Maak 'n bestaande diens oop. + Ctrl+O - Ctrl+O + Ctrl+O &Save - &Stoor + &Stoor Save Service - Stoor Diens + Stoor Diens Save the current service to disk. - Stoor die huidige diens na skyf. + Ctrl+S - Ctrl+S + Ctrl+S Save &As... - Stoor &As... + Stoor &As... Save Service As - Stoor Diens As + Stoor Diens As Save the current service under a new name. - Stoor die huidige diens onder 'n nuwe naam. + Ctrl+Shift+S - Ctrl+Shift+S + E&xit - &Uitgang + &Uitgang Quit OpenLP - Sluit OpenLP Af + Sluit OpenLP Af Alt+F4 - Alt+F4 + Alt+F4 &Theme - &Tema + &Tema &Configure OpenLP... - &Konfigureer OpenLP... + &Media Manager - &Media Bestuurder + &Media Bestuurder Toggle Media Manager - Wissel Media Bestuurder + Wissel Media Bestuurder Toggle the visibility of the media manager. - Wissel sigbaarheid van die media bestuurder. + F8 - F8 + F8 &Theme Manager - &Tema Bestuurder + &Tema Bestuurder Toggle Theme Manager - Wissel Tema Bestuurder + Wissel Tema Bestuurder Toggle the visibility of the theme manager. - Wissel sigbaarheid van die tema bestuurder. + F10 - F10 + F10 &Service Manager - &Diens Bestuurder + &Diens Bestuurder Toggle Service Manager - Wissel Diens Bestuurder + Wissel Diens Bestuurder Toggle the visibility of the service manager. - Wissel sigbaarheid van die diens bestuurder. + F9 - F9 + F9 &Preview Panel - Voorskou &Paneel + &Voorskou Paneel Toggle Preview Panel - Wissel Voorskou Paneel + Wissel Voorskou Paneel Toggle the visibility of the preview panel. - Wissel sigbaarheid van die voorskou paneel. + F11 - F11 + F11 &Live Panel - Regstreekse Panee&l + Toggle Live Panel - Wissel Regstreekse Paneel + Toggle the visibility of the live panel. - Wissel sigbaarheid van die regstreekse paneel. + F12 - F12 + F12 &Plugin List - Mini-&program Lys + In&prop Lys List the Plugins - Lys die Mini-programme + Lys die Inproppe Alt+F7 - Alt+F7 + Alt+F7 &User Guide - Gebr&uikers Gids + &Gebruikers Gids &About - &Aangaande + &Aangaande More information about OpenLP - Meer inligting aangaande OpenLP + Meer inligting aangaande OpenLP Ctrl+F1 - Ctrl+F1 + Ctrl+F1 &Online Help - &Aanlyn Hulp + &Aanlyn Hulp &Web Site - &Web Tuiste + &Web Tuiste &Auto Detect - Verklik Outom&aties + Use the system language, if available. - Gebruik die sisteem se taal as dit beskikbaar is. + Set the interface language to %s - Verstel die koppelvlak taal na %s + Add &Tool... - Voeg Gereedskaps&tuk by... + Add an application to the list of tools. - Voeg 'n applikasie by die lys van gereedskapstukke. + &Default - &Verstek + Set the view mode back to the default. - Verstel skou modus terug na verstek modus. + &Setup - Op&stel + Set the view mode to Setup. - Verstel die skou modus na Opstel modus. + &Live - &Regstreeks + &Regstreeks Set the view mode to Live. - Verstel die skou modus na Regstreeks. + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. - Weergawe %s van OpenLP is nou beskikbaar vir aflaai (tans word weergawe %s gebruik). - -Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. + OpenLP Version Updated - OpenLP Weergawe is Opdateer + OpenLP Weergawe is Opdateer OpenLP Main Display Blanked - OpenLP Hoof Vertoning Blanko + OpenLP Hoof Vertoning Blanko The Main Display has been blanked out - Die Hoof Skerm is afgeskakel + Die Hoof Skerm is blanko Save Changes to Service? - Stoor Veranderinge aan Diens? + Your service has changed. Do you want to save those changes? - Die diens het verander. Stoor veranderinge? + Default Theme: %s - Verstek Tema: %s + + + + + English + Please add here the name of your Language + Engels @@ -2121,157 +2076,157 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. No Items Selected - Geen item geselekteer nie + Import %s - Voer %s in + Import a %s - Voer 'n %s in + Load %s - Laai %s + Load a new %s - Laai 'n nuwe %s + New %s - Nuwe %s + Add a new %s - Voeg 'n nuwe %s by + Edit %s - Redigeer %s + Edit the selected %s - Redigeer die geselekteerde %s + Delete %s - Wis %s uit + Delete the selected item - Wis geselekteerde item uit + Wis geselekteerde item uit Preview %s - Voorskou %s + Preview the selected item - Voorskou die geselekteerde item + Voorskou die geselekteerde item Send the selected item live - Stuur die geselekteerde item na regstreekse vertoning + Stuur die geselekteerde item na regstreekse vertoning Add %s to Service - Voeg %s by die Diens + Add the selected item(s) to the service - Voeg die geselekteerde item(s) by die diens + Voeg die geselekteerde item(s) by die diens &Edit %s - R&edigeer %s + &Delete %s - Wis %s uit + &Preview %s - Voorskou %s + &Show Live - Vertoon Regstreek&s + &Vertoon Regstreeks &Add to Service - Voeg by Diens + &Voeg by Diens &Add to selected Service Item - Voeg by die geselekteerde Diens item + You must select one or more items to preview. - Kies een of meer items vir die voorskou. + You must select one or more items to send live. - Kies een of meer items vir regstreekse uitsending. + You must select one or more items. - Kies een of meer items. + No items selected - Geen items geselekteer nie + You must select one or more items - Kies een of meer items + No Service Item Selected - Geen Diens Item Geselekteer nie + You must select an existing service item to add to. - 'n Bestaande diens item moet geselekteer word om by by te voeg. + Invalid Service Item - Ongeldige Diens Item + You must select a %s service item. - Kies 'n %s diens item. + @@ -2279,52 +2234,52 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. Plugin List - Mini-program Lys + Inprop Lys Plugin Details - Mini-program Besonderhede + Inprop Besonderhede Version: - Weergawe: + Weergawe: About: - Aangaande: + Aangaande: Status: - Status: + Status: Active - Aktief + Aktief Inactive - Onaktief + Onaktief %s (Inactive) - %s (Onaktief) + %s (Active) - %s (Aktief) + %s (Disabled) - %s (Onaktief) + @@ -2332,22 +2287,22 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. Reorder Service Item - Hergroepeer Diens Item + Up - Op + Delete - Wis uit + Down - Af + @@ -2355,97 +2310,97 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. New Service - Nuwe Diens + Nuwe Diens Create a new service - Skep 'n nuwe diens + Skep 'n nuwe diens Open Service - Maak Diens Oop + Maak Diens Oop Load an existing service - Laai 'n bestaande diens + Laai 'n bestaande diens Save Service - Stoor Diens + Stoor Diens Save this service - Stoor hierdie diens + Stoor hierdie diens Theme: - Tema: + Tema: Select a theme for the service - Selekteer 'n tema vir die diens + Selekteer 'n tema vir die diens Move to &top - Skuif boon&toe + Move item to the top of the service. - Skuif item tot heel bo in die diens. + Move &up - Sk&uif op + Move item up one position in the service. - Skuif item een posisie boontoe in die diens. + Move &down - Skuif af + Move item down one position in the service. - Skuif item een posisie af in die diens. + Move to &bottom - Skuif tot heel onder + Move item to the end of the service. - Skuif item tot aan die einde van die diens. + &Delete From Service - Wis uit vanaf die Diens + Delete the selected item from the service. - Wis geselekteerde item van die diens af. + &Add New Item - Voeg Nuwe Item By + @@ -2485,7 +2440,7 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. Save Changes to Service? - Stoor Veranderinge aan Diens? + @@ -2582,6 +2537,11 @@ The content encoding is not UTF-8. Move to live Verskuif na regstreekse skerm + + + Edit and reload song preview + + Start continuous loop @@ -2612,11 +2572,6 @@ The content encoding is not UTF-8. Go To - - - Edit and reload song preview - - OpenLP.SpellTextEdit @@ -2738,6 +2693,16 @@ The content encoding is not UTF-8. You are unable to delete the default theme. + + + Theme %s is used in the %s plugin. + + + + + Theme %s is used by the service manager. + + You have not selected a theme. @@ -2799,16 +2764,6 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - - - Theme %s is used in the %s plugin. - - - - - Theme %s is used by the service manager. - - OpenLP.ThemesTab @@ -3128,7 +3083,7 @@ The content encoding is not UTF-8. &Title: - &Titel: + @@ -3163,7 +3118,7 @@ The content encoding is not UTF-8. &Delete - Wis uit + @@ -3248,7 +3203,7 @@ The content encoding is not UTF-8. CCLI number: - CCLI nommer: + @@ -3451,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3486,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3561,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3576,6 +3551,11 @@ The content encoding is not UTF-8. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + Add Files... @@ -3626,31 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem @@ -3824,7 +3779,7 @@ The content encoding is not UTF-8. &Delete - Wis uit + @@ -3866,6 +3821,11 @@ The content encoding is not UTF-8. Could not save your changes. + + + Could not save your modified author, because the author already exists. + + Could not save your modified topic, because it already exists. @@ -3931,11 +3891,6 @@ The content encoding is not UTF-8. No book selected! Geen boek geselekteer nie! - - - Could not save your modified author, because the author already exists. - - SongsPlugin.SongsTab diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index 842d62112..c5ba47e8e 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -1646,12 +1646,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1663,11 +1663,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - Deutsch - &File @@ -2070,6 +2065,12 @@ This General Public License does not permit incorporating your program into prop You can download the latest version from http://openlp.org/. + + + English + Please add here the name of your Language + Deutsch + OpenLP.MediaManagerItem @@ -3581,11 +3582,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - No EasyWorship Song Database Selected @@ -3606,6 +3602,11 @@ The content encoding is not UTF-8. EasyWorship + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + SongsPlugin.MediaItem diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index 7c9716564..52e3e9357 100644 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -1645,12 +1645,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1662,11 +1662,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 - - - English - - &File @@ -2069,6 +2064,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Please add here the name of your Language + + OpenLP.MediaManagerItem @@ -3405,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3440,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3515,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3585,26 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index b2c3ef3ec..65154a827 100644 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -1819,12 +1819,12 @@ This General Public Licence does not permit incorporating your program into prop OpenLP.LanguageManager - + Language Language - + Please restart OpenLP to use your new language setting. Please restart OpenLP to use your new language setting. @@ -1836,11 +1836,6 @@ This General Public Licence does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - English - &File @@ -2244,6 +2239,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s Default Theme: %s + + + English + Please add here the name of your Language + English + OpenLP.MediaManagerItem @@ -3757,11 +3758,6 @@ The content encoding is not UTF-8. Importing %s... Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - No EasyWorship Song Database Selected @@ -3782,6 +3778,11 @@ The content encoding is not UTF-8. EasyWorship + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + SongsPlugin.MediaItem diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index ad4a345db..fc8880b7f 100644 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -1819,12 +1819,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language Language - + Please restart OpenLP to use your new language setting. Please restart OpenLP to use your new language setting. @@ -1836,11 +1836,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - English (South Africa) - &File @@ -2245,6 +2240,12 @@ You can download the latest version from http://openlp.org/. You can download the latest version from http://openlp.org/. + + + English + Please add here the name of your Language + English (South Africa) + OpenLP.MediaManagerItem diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 52bdd6461..3962a9981 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -500,11 +500,21 @@ Changes do not affect verses already in the service. Empty Copyright Derechos de autor en blanco + + + You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + + Bible Exists Ya existe la Biblia + + + This Bible already exists. Please import a different Bible or first delete the existing one. + + Open OSIS File @@ -540,16 +550,6 @@ Changes do not affect verses already in the service. Your Bible import failed. La importación de su Biblia falló. - - - You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - - - - - This Bible already exists. Please import a different Bible or first delete the existing one. - - BiblesPlugin.MediaItem @@ -1504,13 +1504,13 @@ This General Public License does not permit incorporating your program into prop OpenLP.ExceptionDialog - - Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + Error Occurred - - Error Occurred + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. @@ -1645,12 +1645,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1662,11 +1662,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - Ingles - &File @@ -2069,6 +2064,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Please add here the name of your Language + Ingles + OpenLP.MediaManagerItem @@ -2536,6 +2537,11 @@ The content encoding is not UTF-8. Move to live Proyectar en vivo + + + Edit and reload song preview + + Start continuous loop @@ -2566,11 +2572,6 @@ The content encoding is not UTF-8. Go To - - - Edit and reload song preview - - OpenLP.SpellTextEdit @@ -2692,6 +2693,16 @@ The content encoding is not UTF-8. You are unable to delete the default theme. + + + Theme %s is used in the %s plugin. + + + + + Theme %s is used by the service manager. + + You have not selected a theme. @@ -2753,16 +2764,6 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - - - Theme %s is used in the %s plugin. - - - - - Theme %s is used by the service manager. - - OpenLP.ThemesTab @@ -3405,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3440,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3515,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3530,6 +3551,11 @@ The content encoding is not UTF-8. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + Add Files... @@ -3580,31 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem @@ -3820,6 +3821,11 @@ The content encoding is not UTF-8. Could not save your changes. + + + Could not save your modified author, because the author already exists. + + Could not save your modified topic, because it already exists. @@ -3885,11 +3891,6 @@ The content encoding is not UTF-8. No book selected! ¡Ningún libro seleccionado! - - - Could not save your modified author, because the author already exists. - - SongsPlugin.SongsTab diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 2359a8ea0..e28cfa7fa 100644 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -1816,12 +1816,12 @@ A GNU General Public License nem engedi meg, hogy a program része legyen szelle OpenLP.LanguageManager - + Language Nyelv - + Please restart OpenLP to use your new language setting. A nyelvi beállítások az OpenLP újraindítása után lépnek érvénybe. @@ -1833,11 +1833,6 @@ A GNU General Public License nem engedi meg, hogy a program része legyen szelle OpenLP 2.0 - - - English - Magyar - &File @@ -2242,6 +2237,12 @@ A legfrissebb verzió a http://openlp.org oldalról szerezhető be.Default Theme: %s Alapértelmezett téma: %s + + + English + Please add here the name of your Language + Magyar + OpenLP.MediaManagerItem @@ -3755,11 +3756,6 @@ A tartalom kódolása nem UTF-8. Importing %s... Importálás %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - No EasyWorship Song Database Selected @@ -3780,6 +3776,11 @@ A tartalom kódolása nem UTF-8. EasyWorship + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + SongsPlugin.MediaItem diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 1cebe68b8..07133c7bf 100644 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -500,11 +500,21 @@ Changes do not affect verses already in the service. Empty Copyright + + + You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + + Bible Exists + + + This Bible already exists. Please import a different Bible or first delete the existing one. + + Open OSIS File @@ -540,16 +550,6 @@ Changes do not affect verses already in the service. Your Bible import failed. - - - You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - - - - - This Bible already exists. Please import a different Bible or first delete the existing one. - - BiblesPlugin.MediaItem @@ -1504,13 +1504,13 @@ This General Public License does not permit incorporating your program into prop OpenLP.ExceptionDialog - - Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + Error Occurred - - Error Occurred + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. @@ -1645,12 +1645,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1662,11 +1662,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 - - - English - - &File @@ -2069,6 +2064,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Please add here the name of your Language + + OpenLP.MediaManagerItem @@ -2536,6 +2537,11 @@ The content encoding is not UTF-8. Move to live + + + Edit and reload song preview + + Start continuous loop @@ -2566,11 +2572,6 @@ The content encoding is not UTF-8. Go To - - - Edit and reload song preview - - OpenLP.SpellTextEdit @@ -2692,6 +2693,16 @@ The content encoding is not UTF-8. You are unable to delete the default theme. + + + Theme %s is used in the %s plugin. + + + + + Theme %s is used by the service manager. + + You have not selected a theme. @@ -2753,16 +2764,6 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - - - Theme %s is used in the %s plugin. - - - - - Theme %s is used by the service manager. - - OpenLP.ThemesTab @@ -3405,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3440,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3515,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3530,6 +3551,11 @@ The content encoding is not UTF-8. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + Add Files... @@ -3580,31 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem @@ -3820,6 +3821,11 @@ The content encoding is not UTF-8. Could not save your changes. + + + Could not save your modified author, because the author already exists. + + Could not save your modified topic, because it already exists. @@ -3885,11 +3891,6 @@ The content encoding is not UTF-8. No book selected! - - - Could not save your modified author, because the author already exists. - - SongsPlugin.SongsTab diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index 1ea301558..1c09ebae1 100644 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -5,12 +5,12 @@ &Alert - &Varsel + Show an alert message. - Vis en varselmelding. + @@ -28,27 +28,27 @@ Alert &text: - Varsel &tekst: + &Parameter(s): - %Parameter(e): + &New - &Ny + &Ny &Save - &Lagre + &Lagre &Delete - &Slett + @@ -63,12 +63,12 @@ &Close - %Lukk + New Alert - Nytt Varsel + @@ -89,12 +89,12 @@ Alerts - Varsel + Font - Skrifttype + Skrifttype @@ -104,7 +104,7 @@ Font color: - Skrift farge + @@ -114,7 +114,7 @@ Font size: - Skrift størrelse + @@ -134,22 +134,22 @@ Location: - Plassering: + Preview - Forhåndsvisning + OpenLP 2.0 - OpenLP 2.0 + OpenLP 2.0 Top - Topp + Topp @@ -159,7 +159,7 @@ Bottom - Bunn + @@ -167,7 +167,7 @@ &Bible - &Bibel + @@ -180,7 +180,7 @@ Book not found - Fant ikke boken + @@ -214,7 +214,7 @@ Book Chapter:Verse-Chapter:Verse Bibles - Bibler + Bibler @@ -249,7 +249,7 @@ Book Chapter:Verse-Chapter:Verse Verse Per Line - Vers pr linje + @@ -264,17 +264,17 @@ Book Chapter:Verse-Chapter:Verse ( And ) - ( og ) + { And } - { og } + [ And ] - [ og ] + @@ -293,47 +293,47 @@ Changes do not affect verses already in the service. Bible Import Wizard - Bibelimporteringsverktøy + Bibelimporteringsverktøy Welcome to the Bible Import Wizard - Velkommen til bibelimporterings-veilederen + 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. - Denne veiviseren vil hjelpe deg å importere Bibler fra en rekke ulike formater. Klikk på neste-knappen under for å starte prosessen ved å velge et format å importere fra. + Denne veiviseren vil hjelpe deg å importere Bibler fra en rekke ulike formater. Klikk på neste-knappen under for å starte prosessen ved å velge et format å importere fra. Select Import Source - Velg importeringskilde + Velg importeringskilde Select the import format, and where to import from. - Velg importeringsformat og hvor du vil importere dem + Format: - Format: + Format: OSIS - OSIS + CSV - CSV + OpenSong - OpenSong + OpenSong @@ -343,27 +343,27 @@ Changes do not affect verses already in the service. File location: - Fil plassering: + Books location: - Bok plassering: + Verse location: - Vers plassering: + Bible filename: - Bibel filnavn: + Location: - Plassering: + @@ -378,12 +378,12 @@ Changes do not affect verses already in the service. Bible: - Bibel: + Bibel: Download Options - Nedlastingsalternativer + Nedlastingsalternativer @@ -393,12 +393,12 @@ Changes do not affect verses already in the service. Username: - Brukernavn: + Brukernavn: Password: - Passord: + @@ -408,17 +408,17 @@ Changes do not affect verses already in the service. License Details - Lisensdetaljer + Lisensdetaljer Set up the Bible's license details. - Skriv inn Bibelens lisensdetaljer. + Skriv inn Bibelens lisensdetaljer. Version name: - Versons navn: + @@ -428,7 +428,7 @@ Changes do not affect verses already in the service. Permission: - Tillatelse: + Tillatelse: @@ -438,17 +438,17 @@ Changes do not affect verses already in the service. Please wait while your Bible is imported. - Vennligst vent mens bibelen blir importert + Ready. - Klar. + Klar. Invalid Bible Location - Ugyldig Bibelplassering + Ugyldig Bibelplassering @@ -463,7 +463,7 @@ Changes do not affect verses already in the service. You need to specify a file with books of the Bible to use in the import. - Du må angi en fil som inneholder bøkene i Bibelen du vil importere. + Du må angi en fil som inneholder bøkene i Bibelen. @@ -473,12 +473,12 @@ Changes do not affect verses already in the service. You need to specify a file of Bible verses to import. - Du må angi en fil med bibelvers som skal importeres. + Du må angi en fil med bibelvers som skal importeres. Invalid OpenSong Bible - Ugyldig OpenSong Bibel + Ugyldig OpenSong Bibel @@ -500,11 +500,21 @@ Changes do not affect verses already in the service. Empty Copyright Tom copyright + + + You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + + Bible Exists Bibelen eksisterer + + + This Bible already exists. Please import a different Bible or first delete the existing one. + + Open OSIS File @@ -540,16 +550,6 @@ Changes do not affect verses already in the service. Your Bible import failed. Bibelimporteringen mislyktes. - - - You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - - - - - This Bible already exists. Please import a different Bible or first delete the existing one. - - BiblesPlugin.MediaItem @@ -1453,7 +1453,7 @@ This General Public License does not permit incorporating your program into prop Bottom - Bunn + @@ -1473,7 +1473,7 @@ This General Public License does not permit incorporating your program into prop Preview - Forhåndsvisning + @@ -1504,13 +1504,13 @@ This General Public License does not permit incorporating your program into prop OpenLP.ExceptionDialog - - Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + Error Occurred - - Error Occurred + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. @@ -1645,12 +1645,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1662,11 +1662,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - Norsk - &File @@ -2069,6 +2064,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Please add here the name of your Language + Norsk + OpenLP.MediaManagerItem @@ -2514,7 +2515,7 @@ The content encoding is not UTF-8. Preview - Forhåndsvisning + @@ -2536,6 +2537,11 @@ The content encoding is not UTF-8. Move to live + + + Edit and reload song preview + + Start continuous loop @@ -2566,11 +2572,6 @@ The content encoding is not UTF-8. Go To - - - Edit and reload song preview - - OpenLP.SpellTextEdit @@ -2692,6 +2693,16 @@ The content encoding is not UTF-8. You are unable to delete the default theme. Du kan ikke slette det globale temaet + + + Theme %s is used in the %s plugin. + + + + + Theme %s is used by the service manager. + + You have not selected a theme. @@ -2753,16 +2764,6 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - - - Theme %s is used in the %s plugin. - - - - - Theme %s is used by the service manager. - - OpenLP.ThemesTab @@ -3117,7 +3118,7 @@ The content encoding is not UTF-8. &Delete - &Slett + @@ -3405,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3440,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3468,7 +3484,7 @@ The content encoding is not UTF-8. Select the import format, and where to import from. - Velg importeringsformat og hvor du vil importere dem + @@ -3515,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3530,6 +3551,11 @@ The content encoding is not UTF-8. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + Add Files... @@ -3580,31 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem @@ -3778,7 +3779,7 @@ The content encoding is not UTF-8. &Delete - &Slett + @@ -3820,6 +3821,11 @@ The content encoding is not UTF-8. Could not save your changes. + + + Could not save your modified author, because the author already exists. + + Could not save your modified topic, because it already exists. @@ -3885,11 +3891,6 @@ The content encoding is not UTF-8. No book selected! Ingen bok er valgt! - - - Could not save your modified author, because the author already exists. - - SongsPlugin.SongsTab diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index 0bf398ae1..8fe5f056d 100644 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -1682,12 +1682,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language Idioma - + Please restart OpenLP to use your new language setting. Por favor reinicie o OpenLP para usar a nova configuração de idioma. @@ -1699,11 +1699,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - Inglês - &File @@ -2106,6 +2101,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s Tema padrão: %s + + + English + Please add here the name of your Language + Inglês + OpenLP.MediaManagerItem @@ -3618,11 +3619,6 @@ A codificação do conteúdo não é UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - No EasyWorship Song Database Selected @@ -3643,6 +3639,11 @@ A codificação do conteúdo não é UTF-8. EasyWorship + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + SongsPlugin.MediaItem diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index 900fbfa20..928500f65 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -500,11 +500,21 @@ Changes do not affect verses already in the service. Empty Copyright Tom copyright-information + + + You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + + Bible Exists Bibel existerar + + + This Bible already exists. Please import a different Bible or first delete the existing one. + + Open OSIS File @@ -540,16 +550,6 @@ Changes do not affect verses already in the service. Your Bible import failed. Din Bibelimport misslyckades. - - - You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - - - - - This Bible already exists. Please import a different Bible or first delete the existing one. - - BiblesPlugin.MediaItem @@ -1504,13 +1504,13 @@ This General Public License does not permit incorporating your program into prop OpenLP.ExceptionDialog - - Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + Error Occurred - - Error Occurred + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. @@ -1645,12 +1645,12 @@ This General Public License does not permit incorporating your program into prop OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1662,11 +1662,6 @@ This General Public License does not permit incorporating your program into prop OpenLP 2.0 OpenLP 2.0 - - - English - Engelska - &File @@ -2069,6 +2064,12 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Please add here the name of your Language + Engelska + OpenLP.MediaManagerItem @@ -2536,6 +2537,11 @@ The content encoding is not UTF-8. Move to live Flytta till live + + + Edit and reload song preview + + Start continuous loop @@ -2566,11 +2572,6 @@ The content encoding is not UTF-8. Go To - - - Edit and reload song preview - - OpenLP.SpellTextEdit @@ -2692,6 +2693,16 @@ The content encoding is not UTF-8. You are unable to delete the default theme. Du kan inte ta bort standardtemat. + + + Theme %s is used in the %s plugin. + + + + + Theme %s is used by the service manager. + + You have not selected a theme. @@ -2753,16 +2764,6 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - - - Theme %s is used in the %s plugin. - - - - - Theme %s is used by the service manager. - - OpenLP.ThemesTab @@ -3405,6 +3406,16 @@ The content encoding is not UTF-8. You need to add at least one document or presentation file to import from. + + + No EasyWorship Song Database Selected + + + + + You need to select an EasyWorship song database file to import from. + + Select OpenLP 2.0 Database File @@ -3440,6 +3451,11 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + Select EasyWorship Database File + + Starting import... @@ -3515,6 +3531,11 @@ The content encoding is not UTF-8. Generic Document/Presentation + + + EasyWorship + + Filename: @@ -3530,6 +3551,11 @@ The content encoding is not UTF-8. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + Add Files... @@ -3580,31 +3606,6 @@ The content encoding is not UTF-8. Importing %s... - - - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - - - - - No EasyWorship Song Database Selected - - - - - You need to select an EasyWorship song database file to import from. - - - - - Select EasyWorship Database File - - - - - EasyWorship - - SongsPlugin.MediaItem @@ -3820,6 +3821,11 @@ The content encoding is not UTF-8. Could not save your changes. + + + Could not save your modified author, because the author already exists. + + Could not save your modified topic, because it already exists. @@ -3885,11 +3891,6 @@ The content encoding is not UTF-8. No book selected! Ingen bok vald! - - - Could not save your modified author, because the author already exists. - - SongsPlugin.SongsTab diff --git a/resources/openlp.desktop b/resources/openlp.desktop index d84f69297..684119773 100755 --- a/resources/openlp.desktop +++ b/resources/openlp.desktop @@ -1,11 +1,21 @@ -#!/usr/bin/env xdg-open [Desktop Entry] +Categories=AudioVideo; +Comment[de]= +Comment= Encoding=UTF-8 -Name=OpenLP -GenericName=Church lyrics projection Exec=openlp +GenericName[de]=Church lyrics projection +GenericName=Church lyrics projection Icon=openlp +MimeType= +Name[de]=OpenLP +Name=OpenLP +Path= StartupNotify=true Terminal=false +TerminalOptions= Type=Application -Categories=AudioVideo; +X-DBUS-ServiceName= +X-DBUS-StartupType= +X-KDE-SubstituteUID=false +X-KDE-Username= diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index 0949f48b7..3133b70d2 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -140,6 +140,21 @@ def run(command): print_verbose(u'Output:\n%s' % process.readAllStandardOutput()) print u' Done.' +def update_export_at_pootle(source_filename): + """ + This is needed because of database and exported *.ts file can be out of sync + + ``source_filename`` + The file to sync. + + """ + language = source_filename[:-3] + REVIEW_URL = u'http://pootle.projecthq.biz/%s/openlp/review.html' % language + print_verbose(u'Accessing: %s' % (REVIEW_URL)) + page = urllib.urlopen(REVIEW_URL) + page.close() + + def download_file(source_filename, dest_filename): """ Download a file and save it to disk. @@ -166,11 +181,13 @@ def download_translations(): page = urllib.urlopen(SERVER_URL) soup = BeautifulSoup(page) languages = soup.findAll(text=re.compile(r'.*\.ts')) - for language in languages: + for language_file in languages: + update_export_at_pootle(language_file) + for language_file in languages: filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n', - language) + language_file) print_verbose(u'Get Translation File: %s' % filename) - download_file(language, filename) + download_file(language_file, filename) print u' Done.' def prepare_project(): From 7a7a4795f4a50b5627098d900be6fa788a1b48a3 Mon Sep 17 00:00:00 2001 From: rimach Date: Thu, 23 Sep 2010 19:13:57 +0200 Subject: [PATCH 2/2] correct english sentense --- openlp/core/utils/languagemanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index 142629c0d..000328d50 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -83,7 +83,7 @@ class LanguageManager(object): translator = QtCore.QTranslator() translator.load(qm_file) return translator.translate('OpenLP.MainWindow', 'English', - 'Please add here the name of your Language') + 'Please add the name of your language here') @staticmethod def get_language():