From dd001e15ab461933310c7418780f044d88729333 Mon Sep 17 00:00:00 2001 From: Erik Lundin Date: Sat, 8 Sep 2012 00:17:53 +0200 Subject: [PATCH 01/10] Corrected width of the default main output area (was wider than the screen). --- openlp/core/lib/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 8dc03c33e..f16568f06 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -365,7 +365,7 @@ class Renderer(object): The theme information """ if not theme_data.font_main_override: - return QtCore.QRect(10, 0, self.width, self.footer_start) + return QtCore.QRect(10, 0, self.width - 20, self.footer_start) else: return QtCore.QRect(theme_data.font_main_x, theme_data.font_main_y, theme_data.font_main_width - 1, theme_data.font_main_height - 1) From ad39fa11e531cdf94d75d685b39afe7681647a63 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 8 Sep 2012 19:15:08 +0200 Subject: [PATCH 02/10] Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) --- openlp/core/ui/media/vlcplayer.py | 53 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index bf1e7a920..6203ca696 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -63,37 +63,32 @@ if VLC_AVAILABLE: VLC_AVAILABLE = False log.debug(u'VLC could not be loaded: %s' % version) -AUDIO_EXT = [ - u'*.mp3' - , u'*.wav' - , u'*.wma' - , u'*.ogg' - ] +AUDIO_EXT = [u'*.mp3', u'*.wav', u'*.wma', u'*.ogg'] VIDEO_EXT = [ - u'*.3gp' - , u'*.asf', u'*.wmv' - , u'*.au' - , u'*.avi' - , u'*.flv' - , u'*.mov' - , u'*.mp4' - , u'*.ogm' - , u'*.mkv', u'*.mka' - , u'*.ts', u'*.mpg' - , u'*.mpg', u'*.mp2' - , u'*.nsc' - , u'*.nsv' - , u'*.nut' - , u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv' - , u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid' - , u'*.tta', u'*.tac' - , u'*.ty' - , u'*.dts' - , u'*.xa' - , u'*.iso' - , u'*.vob' - ] + u'*.3gp', + u'*.asf', u'*.wmv', + u'*.au', + u'*.avi', + u'*.flv', + u'*.mov', + u'*.mp4', + u'*.ogm', u'*.ogv', + u'*.mkv', u'*.mka', + u'*.ts', u'*.mpg', + u'*.mpg', u'*.mp2', + u'*.nsc', + u'*.nsv', + u'*.nut', + u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv', + u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid', + u'*.tta', u'*.tac', + u'*.ty', + u'*.dts', + u'*.xa', + u'*.iso', + u'*.vob' +] class VlcPlayer(MediaPlayer): From 35207135959c6102e5f0786744b46834712f3a00 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 10 Sep 2012 22:11:48 +0100 Subject: [PATCH 03/10] updates --- resources/i18n/af.ts | 24 +- resources/i18n/da.ts | 623 +++++++++++++++++++++++-------------------- resources/i18n/de.ts | 27 +- resources/i18n/es.ts | 14 +- resources/i18n/fi.ts | 243 +++++++++-------- resources/i18n/it.ts | 556 +++++++++++++++++++++----------------- resources/i18n/nl.ts | 26 +- resources/i18n/sv.ts | 2 +- 8 files changed, 815 insertions(+), 700 deletions(-) diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index d801e9877..00a30995c 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -1368,7 +1368,9 @@ vraag afgelaai word en dus is 'n internet konneksie nodig. Are you sure you want to completely delete "%s" Bible from OpenLP? You will need to re-import this Bible to use it again. - + Wis Bybel "%s" geheel en al vanaf OpenLP? + +Hierdie Bybel sal weer ingevoer moet word voordat dit gebruik geneem kan word. @@ -1700,7 +1702,7 @@ word en dus is 'n Internet verbinding nodig. Edit Slide - + Redigeer Skyfie @@ -5042,12 +5044,12 @@ Die inhoud enkodering is nie UTF-8 nie. Preview and Save - + Skou en Stoor Preview the theme and save it. - + Skou die tema en stoor dit. @@ -6901,17 +6903,17 @@ Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling. SundayPlus Song Files - + SundayPlus Lied Leêrs This importer has been disabled. - + Hierdie invoerder is onaktief gestel. MediaShout Database - + MediaShout Databasis @@ -6921,17 +6923,17 @@ Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling. SongPro Text Files - + SongPro Teks Leêrs SongPro (Export File) - + SongPro (Voer Leêr uit) In SongPro, export your songs using the File -> Export menu - + In SongPro, voer liedere uit deur middel van die Leêr -> Uitvoer spyskaart @@ -7016,7 +7018,7 @@ Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling. Unable to open the MediaShout database. - + Die MediaShout databasis kan nie oopgemaak word nie. diff --git a/resources/i18n/da.ts b/resources/i18n/da.ts index b180b2d4f..81ed7f25a 100644 --- a/resources/i18n/da.ts +++ b/resources/i18n/da.ts @@ -75,7 +75,7 @@ You haven't specified any text for your alert. Please type in some text before clicking New. - Du har ikke angivet nogen tekst til din meddelelse. Skriv noget tekst og tryk så på Ny. + Du har ikke angivet nogen tekst i din meddelelse. Skriv noget tekst og tryk så på Ny. @@ -181,7 +181,7 @@ Vil du fortsætte alligevel? No matching book could be found in this Bible. Check that you have spelled the name of the book correctly. - Ingen matchende bog kunne findes i denne bibel. Check om du har stavet bogens navn rigtigt. + Ingen matchende bog kunne findes i denne bibel. Tjek om du har stavet bogens navn rigtigt. @@ -211,7 +211,7 @@ Vil du fortsætte alligevel? Send the selected Bible live. - Send den valgte bibel live. + Fremvis den valgte bibel. @@ -221,7 +221,7 @@ Vil du fortsætte alligevel? <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display Bible verses from different sources during the service. - <strong>Bibeludvidelse</strong><br />Bibeludvidelsen gør det muligt at vise bibelvers fra forskellige kilder i løbet af gudstjenesten. + <strong>Bibel-udvidelsesmodul</strong><br />Bibeludvidelsen gør det muligt at vise bibelvers fra forskellige kilder i løbet af gudstjenesten. @@ -236,428 +236,429 @@ Vil du fortsætte alligevel? Genesis - + 1. Mosebog Exodus - + 2. Mosebog Leviticus - + 3. Mosebog Numbers - + 4. Mosebog Deuteronomy - + 5. Mosebog Joshua - + Josvabogen Judges - + Dommerbogen Ruth - + Ruths Bog 1 Samuel - + 1. Samuelsbog 2 Samuel - + 2. Samuelsbog 1 Kings - + 1. Kongebog 2 Kings - + 2. Kongebog 1 Chronicles - + 1. Krønikebog 2 Chronicles - + 2. Krønikebog Ezra - + Ezras Bog Nehemiah - + Nehemias' Bog Esther - + Esters Bog Job - + Jobs Bog Psalms - + Salmernes Bog Proverbs - + Ordsprogenes Bog Ecclesiastes - + Prædikerens Bog Song of Solomon - + Højsangen Isaiah - + Esajas' Bog Jeremiah - + Jeremias' Bog Lamentations - + Klagesangene Ezekiel - + Ezekiels Bog Daniel - + Daniels Bog Hosea - + Hoseas' Bog Joel - + Joels Bog Amos - + Amos' Bog Obadiah - + Obadias' Bog Jonah - + Jonas' Bog Micah - + Mikas Bog Nahum - + Nahums Bog Habakkuk - + Habakkuks Bog Zephaniah - + Sefanias' Bog Haggai - + Haggajs Bog Zechariah - + Zakarias' Bog Malachi - + Malakias' Bog Matthew - + Matthæusevangeliet Mark - + Markusevangeliet Luke - + Lukasevangeliet John - + Johannesevangeliet Acts - + Apostlenes Gerninger Romans - + Romerbrevet 1 Corinthians - + 1. Korintherbrev 2 Corinthians - + 2. Korintherbrev Galatians - + Galaterbrevet Ephesians - + Efeserbrevet Philippians - + Filipperbrevet Colossians - + Kolossenserbrevet 1 Thessalonians - + 1. Thessalonikerbrev 2 Thessalonians - + 2. Thessalonikerbrev 1 Timothy - + 1. Timotheusbrev 2 Timothy - + 2. Timotheusbrev Titus - + Titusbrevet Philemon - + Filemonbrevet Hebrews - + Hebræerbrevet James - + Jakobsbrevet 1 Peter - + 1. Petersbrev 2 Peter - + 2. Petersbrev 1 John - + 1. Johannesbrev 2 John - + 2. Johannesbrev 3 John - + 3. Johannesbrev Jude - + Judasbrevet Revelation - + Johannes' Åbenbaring Judith - + Judits Bog Wisdom - + Visdommens Bog Tobit - + Tobits Bog Sirach - + Siraks Bog Baruch - + Baruks Bog 1 Maccabees - + 1. Makkabæerbog 2 Maccabees - + 2. Makkabæerbog 3 Maccabees - + 3. Makkabæerbog 4 Maccabees - + 4. Makkabæerbog Rest of Daniel - + Tilføjelser til Daniels Bog Rest of Esther - + Tilføjelser til Esters Bog + Prayer of Manasses - + Manasses Bøn Letter of Jeremiah - + Jeremias' Brev Prayer of Azariah - + Azarias bøn Susanna - + Susannah Bel - + Bel og Dragen 1 Esdras - + 3. Esdras 2 Esdras - + 4. Esdras :|v|V|verse|verses;;-|to;;,|and;;end Double-semicolon delimited separators for parsing references. Consult the developers for further information. - + .|v|V|vers;;-|til;;,|og;;slut @@ -665,44 +666,46 @@ Vil du fortsætte alligevel? You need to specify a version name for your Bible. - + Du skal angive et navn til denne udgave af Bibelen. You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - + Du skal angive din bibels ophavsret. Bibler i Public Domain skal markeres som sådan. Bible Exists - + Bibel eksisterer This Bible already exists. Please import a different Bible or first delete the existing one. - + Denne bibel eksisterer allerede. Importér en anden bibel for at slette den eksisterende. You need to specify a book name for "%s". - + Du skal angive et bognavn for "%s". The book name "%s" is not correct. Numbers can only be used at the beginning and must be followed by one or more non-numeric characters. - + Bognavnet "%s" er ikke korrekt. +Tal kan kun bruges i begyndelsen og skal følges af et +eller flere ikke-numeriske tegn. Duplicate Book Name - + Duplikeret bognavn The Book Name "%s" has been entered more than once. - + Bognavnet "%s" er blevet brugt mere end én gang. @@ -750,7 +753,14 @@ Book Chapter%(verse)sVerse%(range)sVerse%(list)sVerse%(range)sVerse Book Chapter%(verse)sVerse%(range)sVerse%(list)sChapter%(verse)sVerse%(range)sVerse Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse Please pay attention to the appended "s" of the wildcards and refrain from translating the words inside the names in the brackets. - + Din skriftstedshenvisning er enten ikke understøttet af OpenLP, eller også er den ugyldig. Se efter om din henvisning er i overensstemmelse med et af de følgende mønstre, eller konsultér manualen. + +Bog Kapitel +Bog Kapitel%(range)sKapitel +Bog Kapitel%(verse)sVers%(range)sVers +Bog Kapitel%(verse)sVers%(range)sVers%(list)sVers%(range)sVers +Bog Kapitel%(verse)sVers%(range)sVers%(list)sKapitel%(verse)sVers%(range)sVers +Bog Kapitel%(verse)sVers%(range)sKapitel%(verse)sVers @@ -778,17 +788,17 @@ Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse ( And ) - ( og ) + ( Og ) { And } - { og } + { Og } [ And ] - [ og ] + [ Og ] @@ -805,81 +815,90 @@ Changes do not affect verses already in the service. Custom Scripture References - + Brugerdefinerede skriftstedshenvisninger Verse Separator: - + Vers-separator: Range Separator: - + Rækkevidde-separator: List Separator: - + Liste-separator: End Mark: - + Slutmærke: Multiple alternative verse separators may be defined. They have to be separated by a vertical bar "|". Please clear this edit line to use the default value. - + Flere forskellige vers-separatorere kan angives. +De skal adskilles af en lodret bjælke "|". +Ryd denne linje for at benytte standardværdien. Multiple alternative range separators may be defined. They have to be separated by a vertical bar "|". Please clear this edit line to use the default value. - + Flere forskellige rækkevidde-separatorere kan angives. +De skal adskilles af en lodret bjælke "|". +Ryd denne linje for at benytte standardværdien. Multiple alternative list separators may be defined. They have to be separated by a vertical bar "|". Please clear this edit line to use the default value. - + Flere forskellige liste-separatorere kan angives. +De skal adskilles af en lodret bjælke "|". +Ryd denne linje for at benytte standardværdien. Multiple alternative end marks may be defined. They have to be separated by a vertical bar "|". Please clear this edit line to use the default value. - + Flere forskellige slutmærker kan angives. +De skal adskilles af en lodret bjælke "|". +Ryd denne linje for at benytte standardværdien. English - + Engelsk Default Bible Language - + Standard bibelsprog Book name language in search field, search results and on display: - + Sproget for bognavne i søgefelt, +søgeresultater og på skærmen: Bible Language - + Bibelsprog Application Language - + Programsprog @@ -957,32 +976,32 @@ search results and on display: Bible Editor - + Bibelredigering License Details - + Licensdetaljer Version name: - + Navn på udgave: Copyright: - + Ophavsret: Permissions: - + Tilladelser: Default Bible Language - + Standardsprog for bibler @@ -992,28 +1011,29 @@ search results and on display: Global Settings - + Globale indstillinger Bible Language - + Bibelsprog Application Language - + Programsprog English - + Engelsk This is a Web Download Bible. It is not possible to customize the Book Names. - + Dette er en bibel som er hentet fra nettet. +Det er ikke muligt at tilpasse bognavnene. @@ -1336,19 +1356,21 @@ forespørgsel og en internetforbindelse er derfor påkrævet. Search Scripture Reference... - + Søg skriftstedshenvisning... Search Text... - + Søgetekst... Are you sure you want to completely delete "%s" Bible from OpenLP? You will need to re-import this Bible to use it again. - + Er du sikker på at du vil slette bibelen "%s" fra OpenLP? + +Du bliver nødt til at genimportere denne bibel for at bruge den igen. @@ -1407,7 +1429,7 @@ You will need to re-import this Bible to use it again. Please select a backup directory for your Bibles - + Vælg en mappe til sikkerhedskopiering af dine bibler @@ -1508,7 +1530,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Upgrading Bible(s): %s successful%s - + Opgradering af bibler: %s fuldført%s @@ -1678,7 +1700,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Edit Slide - + Redigér dias @@ -1686,7 +1708,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Are you sure you want to delete the %n selected custom slide(s)? - + Er du sikker på at du vil slette det %n valgte dias?Er du sikker på at du vil slette de %n valgte dias? @@ -1773,7 +1795,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I You must select an image to replace the background with. - + Du skal vælge et billede til at erstatte baggrunden. @@ -1795,7 +1817,7 @@ Vil du tilføje de andre billede alligevel? There was a problem replacing your background, the image file "%s" no longer exists. - + Der opstod et problem med at erstatte din baggrund; billedfilen "%s" eksisterer ikke længere. @@ -1874,7 +1896,7 @@ Vil du tilføje de andre billede alligevel? Send the selected media live. - + Fremvis det valgte medie. @@ -1960,7 +1982,7 @@ Vil du tilføje de andre billede alligevel? Allow media player to be overridden - + Tillad at medieafspilleren bliver tilsidesat @@ -2151,13 +2173,20 @@ 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 sangtekstfremviser + +OpenLP er et gratis program til fremvisning af sangtekster, som kan bruges til at vise dias med sange, bibelvers, videoer, billeder og endda diasshows (hvis Impress, PowerPoint, eller PowerPoint Viewer er installeret) i forbindelse med gudstjenester ved hjælp af en computer og en projektor. + +Lær mere om OpenLP på: http://openlp.org/ + +OpenLP er lavet- og vedligeholdt af frivillige. Hvis du kunne tænke dig at der blev lavet flere gratis kristne programmer, så bedes du overveje at bidrage ved at trykke på knappen herunder. Copyright © 2004-2012 %s Portions copyright © 2004-2012 %s - + Ophavsret © 2004-2012 %s +Delvis ophavsret © 2004-2012 %s @@ -2170,17 +2199,17 @@ Portions copyright © 2004-2012 %s Number of recent files to display: - + Antal af seneste filer der skal vises: Remember active media manager tab on startup - + Husk den aktive mediehåndteringsfane ved opstart Double-click to send items straight to live - + Dobbeltklik for at fremvise emner direkte @@ -2252,12 +2281,12 @@ Portions copyright © 2004-2012 %s Service %Y-%m-%d %H-%M This may not contain any of the following characters: /\?*|<>[]":+ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information. - + Program %d-%m-%Y %H-%M Default Service Name - + Standard programnavn @@ -2267,47 +2296,47 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Date and Time: - + Dato og tid: Monday - + Mandag Tuesday - + Tirsdag Wednesday - + Onsdag Thurdsday - + Torsdag Friday - + Fredag Saturday - + Lørdag Sunday - + Søndag Now - + Nu @@ -2317,7 +2346,7 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Name: - + Navn: @@ -2332,17 +2361,17 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Example: - + Eksempel: X11 - + X11 Bypass X11 Window Manager - + Omgå X11 vindueshåndtering @@ -2357,12 +2386,12 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Current path: - + Nuværende sti: Custom path: - + Brugerdefineret sti: @@ -2377,7 +2406,7 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Cancel - + Annullér @@ -2387,12 +2416,12 @@ See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for Copy data to new location. - + Kopiér data til ny placering. Copy the OpenLP data files to the new location. - + Kopiér OpenLP datafilerne til en ny placering. @@ -2710,7 +2739,7 @@ Version: %s This wizard will help you to configure OpenLP for initial use. Click the next button below to start. - + Denne guide vil hjælpe dig med at konfigurere OpenLP til brug for første gang. Tryk på næste-knappen herunder for at begynde. @@ -2720,7 +2749,7 @@ Version: %s Please wait while OpenLP is set up and your data is downloaded. - + Vent venligst på at OpenLP indstilles og dine data hentes. @@ -2936,7 +2965,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Select monitor for output display: - + Vælg skærm til visning af output: @@ -2951,17 +2980,17 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Show blank screen warning - + Vis advarsel ved blank skærm Automatically open the last service - + Åbn automatisk det seneste program Show the splash screen - + Vis logo @@ -3056,7 +3085,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Repeat track list - + Gentag sætliste @@ -3155,7 +3184,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Service Manager - + Programhåndtering @@ -3175,7 +3204,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Open an existing service. - + Åben et eksisterende program. @@ -3185,7 +3214,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Save the current service to disk. - + Gem det nuværende program på disk. @@ -3230,12 +3259,12 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Toggle Media Manager - + Slå mediehåndteringen til Toggle the visibility of the media manager. - Skift synligheden af mediehåndteringen. + Angiv om mediehåndteringen skal være synlig. @@ -3245,27 +3274,27 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Toggle Theme Manager - + Slå temahåndteringen til Toggle the visibility of the theme manager. - Skift synligheden af temahåndteringen. + Angiv om temahåndteringen skal være synlig. &Service Manager - + &Programhåndtering Toggle Service Manager - + Slå programhåndteringen til Toggle the visibility of the service manager. - + Angiv om programhåndteringen skal være synlig. @@ -3275,12 +3304,12 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Toggle Preview Panel - + Alå forhåndsvisningspanelet til Toggle the visibility of the preview panel. - Skift synligheden af forhåndsvisningspanelet. + Angiv om forhåndsvisningspanelet skal være synlig. @@ -3290,7 +3319,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Toggle Live Panel - + Slå fremvisningspanelet til @@ -3300,17 +3329,17 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can &Plugin List - + Liste over &udvidelsesmoduler List the Plugins - + Vis udvidelsesmodulerne &User Guide - + &Brugerguide @@ -3340,7 +3369,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Set the interface language to %s - + Sæt brugerfladens sprog til %s @@ -3387,7 +3416,9 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can 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/. - + Udgave %s af OpenLP er nu tilgængelig (du bruger nu udgave %s). + +Du kan hente den seneste udgave fra http://openlp.org/. @@ -3433,12 +3464,12 @@ You can download the latest version from http://openlp.org/. Open &Data Folder... - + Åben &datamappe... Open the folder where songs, bibles and other data resides. - + Åben den mappe hvor sange, bibler og andre data er placeret. @@ -3463,7 +3494,7 @@ You can download the latest version from http://openlp.org/. &Recent Files - + &Seneste filer @@ -3473,7 +3504,7 @@ You can download the latest version from http://openlp.org/. Prevent the panels being moved. - + Forhindr panelerne i at flyttes. @@ -3506,12 +3537,12 @@ Re-running this wizard may make changes to your current OpenLP configuration and Clear the list of recent files. - + Ryd liste over seneste filer. Configure &Formatting Tags... - + Konfigurér &formateringsmærker... @@ -3560,17 +3591,17 @@ Importing incorrect settings may cause erratic behaviour or OpenLP to terminate OpenLP will now close. Imported settings will be applied the next time you start OpenLP. - + OpenLP lukker nu ned. Importerede indstillinger vil blive anvendt næste gang du starter OpenLP. Export Settings File - + Eksportér indstillingsfil OpenLP Export Settings File (*.conf) - + OpenLP eksportér indstillingsfil (*.conf) @@ -3627,7 +3658,7 @@ Database: %s You must select one or more items. - + Du skal vælge et, eller flere elementer. @@ -3637,7 +3668,7 @@ Database: %s Invalid Service Item - + Ugyldigt programelement @@ -3682,12 +3713,12 @@ Endelsen er ikke understøttet <lyrics> tag is missing. - + <lyrics> mærke mangler. <verse> tag is missing. - + <verse> mærke mangler. @@ -3786,7 +3817,7 @@ Endelsen er ikke understøttet Include slide text if available - + Inkludér diastekst hvis tilgængelig @@ -3806,7 +3837,7 @@ Endelsen er ikke understøttet Service Sheet - + Program @@ -4015,12 +4046,12 @@ Indholdet er ikke UTF-8. Go Live - + Fremvis Send the selected item to Live. - + Fremvis det valgte element. @@ -4105,7 +4136,7 @@ Indholdet er ikke UTF-8. Service File Missing - + Programfil mangler @@ -4130,12 +4161,12 @@ Indholdet er ikke UTF-8. Error Saving File - + Fejl ved lagring af fil There was an error saving your file. - + Der opstod en fejl ved gemning af din fil. @@ -4169,7 +4200,7 @@ Indholdet er ikke UTF-8. Duplicate Shortcut - + Duplikér genvej @@ -4179,12 +4210,12 @@ Indholdet er ikke UTF-8. Alternate - + Alternativ Select an action and click one of the buttons below to start capturing a new primary or alternate shortcut, respectively. - + Vælg en handling og tryk på en af knapperne herunder for at opfange en ny primær- eller alternativ genvej. @@ -4252,12 +4283,12 @@ Indholdet er ikke UTF-8. Previous Service - + Forrige program Next Service - + Næste Program @@ -4292,7 +4323,7 @@ Indholdet er ikke UTF-8. Add to Service. - + Tilføj til program. @@ -4352,7 +4383,7 @@ Indholdet er ikke UTF-8. Go to "Intro" - + Gå til "intro" @@ -4367,12 +4398,12 @@ Indholdet er ikke UTF-8. Previous Slide - + Forrige dias Next Slide - + Næste dias @@ -4392,7 +4423,7 @@ Indholdet er ikke UTF-8. Tracks - + Spor @@ -4405,7 +4436,7 @@ Indholdet er ikke UTF-8. Formatting Tags - + Formatteringsmærker @@ -4705,7 +4736,7 @@ Indholdet er ikke UTF-8. Theme Already Exists - + Tema eksisterer allerede @@ -4968,17 +4999,17 @@ Indholdet er ikke UTF-8. Transparent - + Gennemsigtig Preview and Save - + Forhåndsvis og gem Preview the theme and save it. - + Forhåndsvis temaet og gem det. @@ -4991,12 +5022,12 @@ Indholdet er ikke UTF-8. Theme Level - Tema niveau + Temaniveau S&ong Level - S&ang niveau + S&angniveau @@ -5006,7 +5037,7 @@ Indholdet er ikke UTF-8. &Service Level - + &Programniveau @@ -5021,7 +5052,7 @@ Indholdet er ikke UTF-8. Use the global theme, overriding any themes associated with either the service or the songs. - + Benyt det globale tema, hvormed alle temaer tilknyttet til enten programmet eller sangene tilsidesættes. @@ -5125,7 +5156,7 @@ Indholdet er ikke UTF-8. Live Background Error - + Fejl med fremvisningsbaggrund @@ -5317,7 +5348,7 @@ Indholdet er ikke 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. - + Openlp.org 1.x importeringen er slået fra på grund af at der mangler et Python-modul. Hvis du vil benytte denne importering, er du nødt til at installere modulet "python-sqlite" først. @@ -5343,7 +5374,7 @@ Indholdet er ikke UTF-8. You need to specify at least one %s file to import from. A file type e.g. OpenSong - + Du skal angive mindst én %s-fil at importere fra. @@ -5393,7 +5424,7 @@ Indholdet er ikke UTF-8. Song Maintenance - + Sanghåndtering @@ -5451,7 +5482,7 @@ Indholdet er ikke UTF-8. Live Toolbar - + Værktøjslinje for fremvisning @@ -5532,7 +5563,7 @@ Indholdet er ikke UTF-8. Split a slide into two only if it does not fit on the screen as one slide. - + Del kun et dias op i to, hvis det ikke kan passe ind på skærmen som ét dias. @@ -5567,13 +5598,13 @@ Indholdet er ikke UTF-8. Next Track - + Næste spor Search Themes... Search bar place holder text - + Søg efter temaer... @@ -5584,42 +5615,42 @@ Indholdet er ikke UTF-8. Invalid Folder Selected Singular - + Ugyldig mappe valgt Invalid File Selected Singular - + Ugyldigt fil valgt Invalid Files Selected Plural - + Ugyldige filer valgt No Folder Selected Singular - + Ingen mappe valgt Open %s Folder - + Åben %s mappe You need to specify one %s file to import from. A file type e.g. OpenSong - + Du skal vælge en %s-fil at importere fra. You need to specify one %s folder to import from. A song format e.g. PowerSong - + Du skal vælge en %s-mappe at importere fra. @@ -5628,25 +5659,25 @@ Indholdet er ikke UTF-8. %1 and %2 Locale list separator: 2 items - + %1 og %2 %1, and %2 Locale list separator: end - + %1, og %2 %1, %2 Locale list separator: middle - + %1, %2 %1, %2 Locale list separator: start - + %1, %2 @@ -5692,12 +5723,12 @@ Indholdet er ikke UTF-8. Send the selected presentation live. - + Fremvis den valgte præsentation. Add the selected presentation to the service. - + Tilføj den valgte præsentation til programmet. @@ -5768,7 +5799,7 @@ Indholdet er ikke UTF-8. Allow presentation application to be overridden - + Tillad at præsentationsprogrammet tilsidesættes @@ -5812,7 +5843,7 @@ Indholdet er ikke UTF-8. Service Manager - + Programhåndtering @@ -5867,7 +5898,7 @@ Indholdet er ikke UTF-8. Go Live - + Fremvis @@ -5887,17 +5918,17 @@ Indholdet er ikke UTF-8. Home - + Hjem Theme - + Tema Desktop - + Skrivebord @@ -5940,12 +5971,12 @@ Indholdet er ikke UTF-8. Android App - + Android App Scan the QR code or click <a href="https://market.android.com/details?id=org.openlp.android">download</a> to install the Android app from the Market. - + Skan QR-koden eller tryk <a href="https://market.android.com/details?id=org.openlp.android">download</a> for at installere Android Appen fra Google Play. @@ -6290,7 +6321,7 @@ The encoding is responsible for the correct character representation. Send the selected song live. - + Fremvis den valgte sang. @@ -6303,7 +6334,7 @@ The encoding is responsible for the correct character representation. Author Maintenance - + Vedligeholdelse af forfattere @@ -6356,7 +6387,9 @@ The encoding is responsible for the correct character representation. [above are Song Tags with notes imported from EasyWorship] - + +[ovenstående er Song Tags med noter importeret fra + EasyWorship] @@ -6364,12 +6397,12 @@ The encoding is responsible for the correct character representation. Meta Data - + Metadata Custom Book Names - + Brugerdefinerede bognavne @@ -6377,7 +6410,7 @@ The encoding is responsible for the correct character representation. Song Editor - + Sangredigering @@ -6572,12 +6605,12 @@ The encoding is responsible for the correct character representation. <strong>Warning:</strong> Not all of the verses are in use. - + <strong>Advarsel:</strong> Ikke alle versene er i brug. The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s. - + Denne rækkefølge af vers er ikke gyldig. Der er ikke nogen vers der svarer til %s. Gyldige elementer er %s. @@ -6608,7 +6641,7 @@ The encoding is responsible for the correct character representation. Song Export Wizard - + Guide til eksportering af sange @@ -6658,7 +6691,7 @@ The encoding is responsible for the correct character representation. No Save Location specified - + Ingen placering angivet til at gemme @@ -6696,7 +6729,7 @@ The encoding is responsible for the correct character representation. Song Import Wizard - Sangimport guide + Guide til import af sange @@ -6706,7 +6739,7 @@ The encoding is responsible for the correct character representation. Generic Document/Presentation - + Almindeligt dokument/præsentation @@ -6776,7 +6809,7 @@ The encoding is responsible for the correct character representation. The generic document/presentation importer has been disabled because OpenLP cannot access OpenOffice or LibreOffice. - + Importeringen af dokumenter/præsentationer er blevet slået fra, da OpenLP ikke kan tilgå OpenOffice eller LibreOffice. @@ -6791,72 +6824,72 @@ The encoding is responsible for the correct character representation. CCLI SongSelect Files - + CCLI SongSelect-filer EasySlides XML File - + EasySlides XML-fil EasyWorship Song Database - + EasyWorship sangdatabase DreamBeam Song Files - + DreamBeam sangfiler You need to specify a valid PowerSong 1.0 database folder. - + Du skal angive en gyldig PowerSong 1.0-database-mappe. ZionWorx (CSV) - + ZionWorx (CSV) First convert your ZionWorx database to a CSV text file, as explained in the <a href="http://manual.openlp.org/songs.html#importing-from-zionworx">User Manual</a>. - + Konvertér først din ZionWorx-database til en CSV-tekstfil, som forklaret i<a href="http://manual.openlp.org/songs.html#importing-from-zionworx">Brugerguidenl</a>. SundayPlus Song Files - + SundayPlus sangfiler This importer has been disabled. - + Denne importør er slået fra. MediaShout Database - + MediaShout-database The MediaShout importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module. - + Importeringen fra MediaShout er kun understøttet på Windows. Det er deaktiveret på grund af et manglende Python-modul. Hvis du ønsker at bruge denne importør, skal du installere "pyodbc"-modulet. SongPro Text Files - + SongPro-tekstfiler SongPro (Export File) - + SongPro (Eksportfil) In SongPro, export your songs using the File -> Export menu - + I SongPro eksporterer du dine sange ved at benytte eksportmenuen i File -> Export menu @@ -6892,12 +6925,12 @@ The encoding is responsible for the correct character representation. Entire Song - + Hele sang Are you sure you want to delete the %n selected song(s)? - Er du sikker på at du vil slette de %n valgte sange? + Er du sikker på at du vil slette den %n valgte sang?Er du sikker på at du vil slette de %n valgte sange? @@ -6908,32 +6941,32 @@ The encoding is responsible for the correct character representation. copy For song cloning - + kopi Search Titles... - + Søg blandt titler... Search Entire Song... - + Søg hele sang... Search Lyrics... - + Søg sangtekster... Search Authors... - + Søg forfattere... Search Song Books... - + Søg sangbøger... @@ -6941,7 +6974,7 @@ The encoding is responsible for the correct character representation. Unable to open the MediaShout database. - + Kunne ikke åbne MediaShout databasen. @@ -6973,12 +7006,12 @@ The encoding is responsible for the correct character representation. No songs to import. - + Ingen sange der kan importeres. Verses not found. Missing "PART" header. - + Versene kunne ikke findes. Manglende "PART" header. @@ -7242,12 +7275,12 @@ The encoding is responsible for the correct character representation. Error reading CSV file. - + Fejl ved læsning af CSV-fil. File not valid ZionWorx CSV format. - + Filen er ikke i et gyldigt ZionWorx CSV-format. \ No newline at end of file diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index d84b1d943..5e1f14a7f 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -1370,7 +1370,8 @@ werden. Daher ist eine Internetverbindung erforderlich. Are you sure you want to completely delete "%s" Bible from OpenLP? You will need to re-import this Bible to use it again. - + Sind Sie sicher, das Sie die "%s" Bibel komplett löschen wollen? +Um sie wieder zu benutzen, muss sie erneut importier werden. @@ -1378,7 +1379,7 @@ You will need to re-import this Bible to use it again. Incorrect Bible file type supplied. OpenSong Bibles may be compressed. You must decompress them before import. - + Falscher Dateityp. OpenSong Bibeln sind möglicherweise komprimiert und müssen entpackt werden, bevor sie importiert werden. @@ -1701,7 +1702,7 @@ Bitte beachten Sie, dass Bibeltexte von Onlinebibeln bei Bedarf heruntergeladen Edit Slide - + Folie bearbeiten @@ -5050,12 +5051,12 @@ Der Inhalt ist nicht in UTF-8 kodiert. Preview and Save - + Vorschau und Speichern Preview the theme and save it. - + Vorschau des Designs zeigen und speichern. @@ -6909,37 +6910,37 @@ Easy Worship] SundayPlus Song Files - + SundayPlus Lied Dateien This importer has been disabled. - + Dieser Import Typ wurde deaktiviert. MediaShout Database - + Media Shout Datenbestand The MediaShout importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module. - + Der Import von MediaShout Datensätzen wird nur unter Windows unterstützt. Er wurde aufgrund fehlender Python Module deaktiviert. Wenn Sie diese Dateien importieren wollen, müssen sie das "pyodbc" Modul installieren. SongPro Text Files - + SongPro Text Dateien SongPro (Export File) - + SongPro (Export Datei) In SongPro, export your songs using the File -> Export menu - + Um in SongPro Dateien zu exportieren, nutzen Sie dort das Menü "Datei -> Export" @@ -7024,7 +7025,7 @@ Easy Worship] Unable to open the MediaShout database. - + Der MediaShout Datensatz kann nicht geöffnet werden. diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 3a72057c5..fc85b9fa2 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -1377,7 +1377,7 @@ Deberá reimportar esta Biblia para utilizarla de nuevo. Incorrect Bible file type supplied. OpenSong Bibles may be compressed. You must decompress them before import. - + Tipo de archivo incorrecto. Las Biblias OpenSong pueden estar comprimidas y es necesario extraerlas antes de la importación. @@ -6913,27 +6913,27 @@ La codificación se encarga de la correcta representación de caracteres. MediaShout Database - + Base de datos MediaShout The MediaShout importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module. - + El importador MediaShout se puede usar en windows únicamente. Se ha deshabilitado porque falta un módulo Python. Debe instalar el módulo "pyodbc" para usar este importador. SongPro Text Files - + Archivos de texto SongPro SongPro (Export File) - + SongPro (Archivo Exportado) In SongPro, export your songs using the File -> Export menu - + En SongPro, puede exportar canciones en el menú Archivo -> Exportar @@ -7018,7 +7018,7 @@ La codificación se encarga de la correcta representación de caracteres. Unable to open the MediaShout database. - + No se logró abrir la base de datos MediaShout diff --git a/resources/i18n/fi.ts b/resources/i18n/fi.ts index c0a1c11ef..918c311fd 100644 --- a/resources/i18n/fi.ts +++ b/resources/i18n/fi.ts @@ -112,7 +112,7 @@ Tahdotko jatkaa siitä huolimatta? Alert message created and displayed. - Hälytysviesti on luota ja näytetty. + Hälytysviesti on luotu ja näytetty. @@ -216,7 +216,7 @@ Tahdotko jatkaa siitä huolimatta? Add the selected Bible to the service. - Lisää valittu Raamatun teksti tilaisuuden ajolistalle. + Lisää valittu Raamatun teksti ajolistalle. @@ -1590,12 +1590,12 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot Send the selected custom slide live. - + Lähetä valittu mukautettu dia esitykseen. Add the selected custom slide to the service. - + Lisää valittu mukautettu dia ajolistalle. @@ -1603,12 +1603,12 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot Custom Display - + Mukautettu näyttö Display footer - + Näytä lopputunniste @@ -1616,7 +1616,7 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot Edit Custom Slides - + Muokkaa mukautettuja dioja @@ -1695,60 +1695,60 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot <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>Kuvankatselu laajennos</strong><br />Kuvankatselu toteuttaa helpon kuvien näyttämisen.<br />Laajennos mahdollistaa kokonaisen kuvajoukon näyttämisen yhdessä ajolistalla, mikä tekee useiden kuvien näyttämisestä hallitumpaa. Kuvia voi myös ajaa slideshowna OpenLP:n ajastusta hyödyntäen. Lisäksi kuvia voi käyttää jumalanpalvelukselle valitun taustakuvan sijaan, mikä mahdollistaa kuvien käyttämisen taustakuvana teksteille teeman sijaan. Image name singular - + Kuva Images name plural - + Kuvat Images container title - + Kuvat Load a new image. - + Lataa uusi kuva. Add a new image. - + Lisää uusi kuva. Edit the selected image. - + Muokkaa valittua kuvaa. Delete the selected image. - + Poista valittu kuva. Preview the selected image. - + Esikatsele valittua kuvaa. Send the selected image live. - + Lähetä valittu kuva esitykseen. Add the selected image to the service. - + Lisää valittu kuva ajolistalle. @@ -1756,7 +1756,7 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot Select Attachment - + Valitse liite @@ -1764,43 +1764,44 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot Select Image(s) - + Valitse kuva(t) You must select an image to delete. - + Sinun pitää valita kuva, jonka poistat. You must select an image to replace the background with. - + Sinun pitää valita kuva, jolla korvaa taustan. Missing Image(s) - + Puuttuvat kuva(t) The following image(s) no longer exist: %s - + Seuraavaa kuvaa (kuvia) ei enää ole olemassa: %s The following image(s) no longer exist: %s Do you want to add the other images anyway? - + Seuraavaa kuvaa (kuvia) ei ole enää olemassa: %s +Haluatko lisätä toisia kuvia siitä huolimatta? There was a problem replacing your background, the image file "%s" no longer exists. - + Taustakuvan korvaaminen ei onnistunut. Kuvatiedosto "%s" ei ole enää olemassa. There was no display item to amend. - + Muutettavaa näyttöotsaketta ei ole. @@ -1808,12 +1809,12 @@ Do you want to add the other images anyway? Background Color - + Taustaväri Default Color: - + Oletusväri: @@ -1826,60 +1827,60 @@ Do you want to add the other images anyway? <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + <strong>Medialaajennos</strong><br /> Medialaajennos mahdollistaa audio ja video lähteiden toistamisen. Media name singular - + Media Media name plural - + Media Media container title - + Media Load new media. - + Lataa uusi media. Add new media. - + Lisää uusi media. Edit the selected media. - + Muokkaa valittua mediaa. Delete the selected media. - + Poista valittu media. Preview the selected media. - + Esikatsele valittua mediaa. Send the selected media live. - + Lähetä valittu media esitykseen. Add the selected media to the service. - + Lisää valittu media ajolistalle. @@ -1887,57 +1888,57 @@ Do you want to add the other images anyway? Select Media - + Valitse media You must select a media file to delete. - + Sinun täytyy valita mediatiedosto poistettavaksi. You must select a media file to replace the background with. - + Sinun täytyy valita mediatiedosto, jolla taustakuva korvataan. There was a problem replacing your background, the media file "%s" no longer exists. - + Taustakuvan korvaamisessa on ongelmia, mediatiedosto '%s" ei ole enää saatavilla. Missing Media File - + Puuttuva mediatiedosto The file %s no longer exists. - + Tiedosto %s ei ole enää olemassa. Videos (%s);;Audio (%s);;%s (*) - + Videoita (%s);;Audio (%s);;%s (*) There was no display item to amend. - + Ei ollut muutettavaa näyttöelementtiä. Unsupported File - + Tiedostotyyppiä ei tueta. Automatic - + Automaattinen Use Player: - + Käytä soitinta: @@ -1945,17 +1946,17 @@ Do you want to add the other images anyway? Available Media Players - + Saatavilla olevat mediasoittimet %s (unavailable) - + %s (ei ole saatavilla) Player Order - + Soittimien järjestys @@ -1968,19 +1969,21 @@ Do you want to add the other images anyway? Image Files - + Kuvatiedostot Information - + Tiedot Bible format has changed. You have to upgrade your existing Bibles. Should OpenLP upgrade now? - + Raamatun tiedostomuoto on muuttunut. +Sinun tarvitsee päivittää aiemmin asennetut Raamatut. +Pitäisikö OpenLP:n päivittää ne nyt? @@ -1988,32 +1991,32 @@ Should OpenLP upgrade now? Credits - + Kiitokset License - + Lisenssi Contribute - + Avustus build %s - + build %s This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + Tämä ohjelma on vapaa, voit jakaa ja / tai muuttaa sitä ehtojen mukaisesti GNU General Public Licensen julkaissut Free Software Foundation, version 2 lisenssillä. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below for more details. - + Tätä ohjelmaa levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. @@ -2078,7 +2081,7 @@ Final Credit on the cross, setting us free from sin. We bring this software to you for free because He has set us free. - + Projektin johto ⏎%s ⏎ ⏎ Kehittäjät ⏎%s ⏎ ⏎ Osallistujat ⏎%s ⏎ ⏎ Testaajat ⏎%s ⏎ ⏎ Paketoijat ⏎%s ⏎ ⏎ Kääntäjät ⏎ afrikaans (af) ⏎%s ⏎ saksa (de) ⏎%s ⏎ brittienglanti (en_GB) ⏎%s ⏎ englanti, Etelä-Afrikka (en_ZA) ⏎%s ⏎ viro (et) ⏎%s ⏎ ranska (fr) ⏎%s ⏎ unkari (hu) ⏎%s ⏎ japani (ja) ⏎ %s ⏎ norja bokmål (nb) ⏎%s ⏎ hollanti (nl) ⏎%s ⏎ portugali, brasilia (pt_BR) ⏎%s ⏎ venäjä (ru) ⏎%s ⏎ ⏎ Dokumentaatio ⏎%s ⏎ ⏎ rakennettu ⏎ Python: http://www.python.org/~~V ⏎ Qt4: http://qt.nokia.com/ ⏎ PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro ⏎ Oxygen kuvakkeet: http://oxygen-icons.org/ ⏎ ⏎ Muut kiitokset ⏎ "Sillä niin on Jumala maailmaa rakastanut, että Hän antoi ⏎ ainokaisen Poikansa, niin että kuka tahansa ⏎ uskoo Häneen ei hukkuisi, vaan perii ⏎ iankaikkisen elämän." - Joh. 3:16 ⏎ ⏎ Ja viimeisenä, mutta ei vähäisimpänä, kaikkein suurin ansio ⏎ Jumala, Isämme, joka lähetti Poikansa kuolemaan ⏎ ristillä, jossa hän vapautti meidät synnistä. Me ⏎ annamme tämän ohjelmiston sinulle maksutta koska ⏎ Hän vapautti meidät maksutta. @@ -2089,7 +2092,7 @@ 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 on vapaa esitysohjelmisto seurakuntakontekstiin, jolla voi näyttää laulujen sanoja, dioja, Raamatun jakeita, videoita, kuvia, ja jopa esitysgrafiikkaa (jos käytössä on joko Impress, PowerPoint tai PowerPoint Viewer) käyttäen tietokonetta ja dataprojektoria. ⏎ ⏎ lisätietoja OpenLP: http://openlp.org/ ⏎ ⏎ OpenLP on toteutettu ja sitä ylläpidetään vapaaehtoisvoimin. Jos haluat nähdä yhä enemmän vapaita kristillisiä ohjelmistoja on tuottettavan, harkitse edistää työtä painammalla alla olevaa painiketta. @@ -2103,87 +2106,87 @@ Portions copyright © 2004-2012 %s UI Settings - + Käyttöliittymän asetukset Number of recent files to display: - + Kuinka monta viimeisintä tiedostoa näytetään Remember active media manager tab on startup - + Muista aktivoida median hallinnan välilehti käynnistyksessä Double-click to send items straight to live - + Tuplaklikkaa lähettääksesi otsakkeet suoraan esitykseen Expand new service items on creation - + Näytä uudet ajolistan otsakkeet avoimina luodessa Enable application exit confirmation - + Varmista sovelluksen sulkeminen ennen poistumista Mouse Cursor - + Hiiren osoitin Hide mouse cursor when over display window - + Piilota hiiren osoitin, kun se on näyttöikkunan päällä Default Image - + Oletuskuva Background color: - + Taustaväri: Image file: - + Kuvatiedosto: Open File - + Avaa tiedosto Advanced - + Edistyneet Preview items when clicked in Media Manager - + Esikatsele otsaketta, kun sitä klikataan median hallinnassa Click to select a color. - + Valitse väri klikkaamalla. Browse for an image file to display. - + Selaa näytettäviä kuvia. Revert to the default OpenLP logo. - + Palauta oletusarvoinen OpenLP logo. @@ -2375,38 +2378,39 @@ This location will be used after OpenLP is closed. Error Occurred - + Tapahtui virhe 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. - + Uups. OpenLP päätyi virheeseen, josta ei voi jatkaa. Tekstikentässä on tietoa virheestä, joka saattaa helpottaa ohjelmakehittäjien työtä, joten ole hyvä ja lähetä se sähköpostilla osoitteeseen bugs@openlp.org. Lisää myös kuvaus siitä, mitä olit tekemässä, kun virhe tapahtui. Send E-Mail - + Lähetä sähköposti Save to File - + Tallenna tiedostoon Please enter a description of what you were doing to cause this error (Minimum 20 characters) - + Ole hyvä ja kerro lyhyesti, mitä olit tekemässä, kun virhe tapahtui. +(Vähintään 20 kirjainta) Attach File - + Liitä tiedosto Description characters to enter : %s - + Kuvauksessa on merkkejä: %s @@ -2415,17 +2419,18 @@ This location will be used after OpenLP is closed. Platform: %s - + Järjestelmä: %s + Save Crash Report - + Tallenna virheraportti Text files (*.txt *.log *.text) - + Teksti tiedostot (*.txt *.log *.text) @@ -2443,7 +2448,8 @@ Version: %s --- Library Versions --- %s - + **OpenLP virheraportti**⏎ Versio: %s⏎ ⏎ --- Poikkeuksen tiedot. ---⏎ ⏎ %s⏎ ⏎ --- Poikkeuksen traceback ---⏎ %s⏎ --- Järjestelmätiedot ---⏎ %s⏎ --- Kirjastoversiot ---⏎ %s⏎ + @@ -2462,7 +2468,8 @@ Version: %s %s Please add the information that bug reports are favoured written in English. - + **OpenLP virheraportti**⏎ Versio: %s⏎ ⏎ --- Poikkeuksen tiedot. ---⏎ ⏎ %s⏎ ⏎ --- Poikkeuksen traceback ---⏎ %s⏎ --- Järjestelmätiedot ---⏎ %s⏎ --- Kirjastoversiot ---⏎ %s⏎ + @@ -2470,17 +2477,17 @@ Version: %s File Rename - + Tiedoston uudelleennimeäminen New File Name: - + Uusi tiedostonimi: File Copy - + Tiedoston kopiointi @@ -2488,17 +2495,17 @@ Version: %s Select Translation - + Valitse käännös Choose the translation you'd like to use in OpenLP. - + Valitse käännös, jota haluat käyttää OpenLP:ssä Translation: - + Käännös: @@ -2506,67 +2513,67 @@ Version: %s Songs - + Laulut First Time Wizard - + Ensikäynnistyksen avustaja Welcome to the First Time Wizard - + Tervetuloa ensikäynnistyksen avustajaan Activate required Plugins - + Aktivoi vaaditut laajennokset Select the Plugins you wish to use. - + Valitse laajeennokset, joita haluat käyttää. Bible - + Raamattu Images - + Kuvat Presentations - + Esitykset Media (Audio and Video) - + Media (audio ja video) Allow remote access - + Salli etäkäyttö Monitor Song Usage - + Tilastoi laulujen käyttöä Allow Alerts - + Salli hälytykset Default Settings - + Oletusasetukset @@ -5592,19 +5599,19 @@ The content encoding is not UTF-8. Presentation name singular - + Esitys Presentations name plural - + Esitykset Presentations container title - + Esitykset @@ -5754,7 +5761,7 @@ The content encoding is not UTF-8. Alerts - + Hälytykset @@ -5794,7 +5801,7 @@ The content encoding is not UTF-8. Show Alert - + Näytä hälytys diff --git a/resources/i18n/it.ts b/resources/i18n/it.ts index a0ac7f643..2ded09027 100644 --- a/resources/i18n/it.ts +++ b/resources/i18n/it.ts @@ -236,62 +236,62 @@ Vuoi continuare comunque? Genesis - + Genesi Exodus - + Esodo Leviticus - + Levitico Numbers - + Numeri Deuteronomy - + Deuteronomio Joshua - + Giosuè Judges - + Giudici Ruth - + Ruth 1 Samuel - + 1 Samuele 2 Samuel - + 2 Samuele 1 Kings - + 1 Re 2 Kings - + 2 Re @@ -356,212 +356,212 @@ Vuoi continuare comunque? Lamentations - + Lamentazioni Ezekiel - + Ezechiele Daniel - + Daniele Hosea - + Osea Joel - + Gioele Amos - + Amos Obadiah - + Abdia Jonah - + Giona Micah - + Michea Nahum - + Nahum Habakkuk - + Habacuc Zephaniah - + Sofonia Haggai - + Aggeo Zechariah - + Zaccaria Malachi - + Malachia Matthew - + Matteo Mark - + Marco Luke - + Luca John - + Giovanni Acts - + Atti degli Apostoli Romans - + Romani 1 Corinthians - + 1 Corinzi 2 Corinthians - + 2 Corinzi Galatians - + Galati Ephesians - + Efesini Philippians - + Filippesi Colossians - + Colossesi 1 Thessalonians - + 1 Tessalonicesi 2 Thessalonians - + 2 Tessalonicesi 1 Timothy - + 1 Timoteo 2 Timothy - + 2 Timoteo Titus - + Tito Philemon - + Filemone Hebrews - + Ebrei James - + Giacomo 1 Peter - + 1 Pietro 2 Peter - + 2 Pietro 1 John - + 1 Giovanni 2 John - + 2 Giovanni 3 John - + 3 Giovanni Jude - + Giuda Revelation - + Apocalisse @@ -1160,73 +1160,73 @@ It is not possible to customize the Book Names. You need to specify a version name for your Bible. - + Devi inserire un nome per la tua Bibbia You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. - + Devi inserire un copyright per la tua Bibbia. Bibbie di pubblico dominio devono essere contrassegnate come tali. Bible Exists - + La Bibbia esiste. This Bible already exists. Please import a different Bible or first delete the existing one. - + La bibbia esiste già. Importa una Bibbia differente o cancella quella inserita. Your Bible import failed. - + Importazione della Bibbia fallita CSV File - + File CSV Bibleserver - + bibleserver Permissions: - + Permessi Bible file: - + File della Bibbia Books file: - + File dei libri Verses file: - + File dei versi openlp.org 1.x Bible Files - + file openlp.org 1.x Registering Bible... - + Aggigungendo la Bibbia Registered Bible. Please note, that verses will be downloaded on demand and thus an internet connection is required. - + Bibbia registrata. Attenzione, i versi saranno scaricati on demand è quindi richiesta una connessione internet @@ -1234,17 +1234,17 @@ demand and thus an internet connection is required. Select Language - + seleziona una lingua OpenLP is unable to determine the language of this translation of the Bible. Please select the language from the list below. - + OpenLP non è riuscito a determinare la lingua della Bibbia. Selezionala dalla lista sotto Language: - + Lingua: @@ -1252,7 +1252,7 @@ demand and thus an internet connection is required. You need to choose a language. - + Devi scegliere una lingua. @@ -1260,52 +1260,52 @@ demand and thus an internet connection is required. Quick - + Veloce Find: - + Cerca: Book: - + Libro: Chapter: - + Capitolo Verse: - + Verso From: - + Da: To: - + A: Text Search - + Ricerca testo Second: - + Seconda Scripture Reference - + Riferimento Biblico @@ -1320,17 +1320,17 @@ demand and thus an internet connection is required. Bible not fully loaded. - + Bibbia caricata parzialmente Information - + Informazioni The second Bible does not contain all the verses that are in the main Bible. Only verses found in both Bibles will be shown. %d verses have not been included in the results. - + La seconda Bibbia non contiene tutti i versi che sono nella Bibbia principale. Saranno mostrati solo i versi trovati in entrambe le Bibbie. %d versi non sono stati inclusi nei risultati @@ -1364,7 +1364,7 @@ You will need to re-import this Bible to use it again. Importing %s %s... Importing <book name> <chapter>... - + Importando %s %s... @@ -1378,7 +1378,7 @@ You will need to re-import this Bible to use it again. Importing %s %s... Importing <book name> <chapter>... - + Importando %s %s... @@ -1386,7 +1386,7 @@ You will need to re-import this Bible to use it again. Select a Backup Directory - + Seleziona una cartella per il backup @@ -1401,17 +1401,17 @@ You will need to re-import this Bible to use it again. Select Backup Directory - + Seleziona la cartella di backup Please select a backup directory for your Bibles - + Seleziona la cartella di backup per le tue Bibbie Previous releases of OpenLP 2.0 are unable to use upgraded Bibles. This will create a backup of your current Bibles so that you can simply copy the files back to your OpenLP data directory if you need to revert to a previous release of OpenLP. Instructions on how to restore the files can be found in our <a href="http://wiki.openlp.org/faq">Frequently Asked Questions</a>. - + Le precedenti versioni di OpenLP 2.0 non sono in grado di aggiornare le Bibbie. Verrà creata una copia di backup delle Bibbie attuali in modo che basterà copiare i files di backup nella cartella dei dati di OpenLp se c'è bisogno di ritornare a una vecchia versione di OpenLP. Le istruzioni su come ripristinare i files possono essere trovati nelle nostre <a href="http://wiki.openlp.org/faq">Frequently Asked Questions</a>. @@ -1421,108 +1421,113 @@ You will need to re-import this Bible to use it again. Backup Directory: - + Cartella di backup: There is no need to backup my Bibles - + Non eseguire il backup delle Bibbie Select Bibles - + Seleziona le Bibbie Please select the Bibles to upgrade - + Seleziona le Bibbie da aggiornare Upgrading - + Aggiornamento Please wait while your Bibles are upgraded. - + Attendi mentre la Bibbia viene aggiornata The backup was not successful. To backup your Bibles you need permission to write to the given directory. - + Backup non riuscito. Necessari i permessi in scrittura per la cartella data. Upgrading Bible %s of %s: "%s" Failed - + Aggiornamento della Bibbia %s di %s: "%s" +Fallito Upgrading Bible %s of %s: "%s" Upgrading ... - + Aggiornamento della Bibbia %s di %s: "%s" +Aggiornamento Download Error - + Download Error To upgrade your Web Bibles an Internet connection is required. - + Per aggiornare le Bibbie è richiesta una connessione internet Upgrading Bible %s of %s: "%s" Upgrading %s ... - + Aggiornamento della Bibbia %s di %s: "%s" +Aggiornamento %s Upgrading Bible %s of %s: "%s" Complete - + Aggiornamento della Bibbia %s di %s: "%s" +Completato , %s failed - + , %s fallito Upgrading Bible(s): %s successful%s Please note that verses from Web Bibles will be downloaded on demand and so an Internet connection is required. - + Aggiornamento della\e Bibbia\e: %s riuscito %s +Attenzione i versi delle Bibbie Online saranno scaricati on demand è quindi richiesta una connessione a internet. Upgrading Bible(s): %s successful%s - + Aggiornamento Bibbia\e: %s completato %s Upgrade failed. - + Aggiornamento fallito. You need to specify a backup directory for your Bibles. - + Devi specificare una cartella per il backup delle Bibbie Starting upgrade... - + Avvio aggiornamento... There are no Bibles that need to be upgraded. - + Non ci sono Bibbie che devono essere aggiornate. @@ -1536,59 +1541,59 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Custom Slide name singular - + Presentazione personalizzata Custom Slides name plural - + Presentazioni personalizzate Custom Slides container title - + Presentazioni Personalizzate Load a new custom slide. - + Carica una nuova presentazione Import a custom slide. - + Importa una presentazione Add a new custom slide. - + Aggiungi una nuova presentazione Edit the selected custom slide. - + Modifica la presentazione selezionata Delete the selected custom slide. - + Cancella la presentazione selezionata Preview the selected custom slide. - + Anteprima della presentazione selezionata Send the selected custom slide live. - + Manda live la presentazione selezionata Add the selected custom slide to the service. - + Aggiungi la presentazione selezionata al servizio @@ -1601,7 +1606,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Display footer - + Mostra footer @@ -1609,62 +1614,62 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Edit Custom Slides - + Modifica la presentazione &Title: - + &Title: Add a new slide at bottom. - + aggiungi una nuova diapositiva sotto Edit the selected slide. - + modifica la diapositiva selezionata Edit all the slides at once. - + Modifica tutte le diapositive Split a slide into two by inserting a slide splitter. - + Dividi la diapositiva in due inserendo un divisore The&me: - + The&me: &Credits: - + &Credits: You need to type in a title. - + Inserisci il titolo You need to add at least one slide - + Inserisci almeno una diapositiva Ed&it All - + Ed&it Tutto Insert Slide - + Inserisci diapositiva @@ -1694,54 +1699,54 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Image name singular - + immagine Images name plural - + Immagini Images container title - + Immagini Load a new image. - + Carica una nuova immagine Add a new image. - + Aggiungi una nuova immagine Edit the selected image. - + Modifica l'immagine selezionata Delete the selected image. - + Cancella l'immagine selezionata Preview the selected image. - + Anteprima dell'immagine selezionata Send the selected image live. - + Invia l'immagine live Add the selected image to the service. - + Aggiungi l'immagine selezionata al servizio @@ -1749,7 +1754,7 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Select Attachment - + Seleziona allegati @@ -1757,43 +1762,44 @@ Please note that verses from Web Bibles will be downloaded on demand and so an I Select Image(s) - + Seleziona immagine(i) You must select an image to delete. - + Seleziona almeno 1 immagine da eliminare You must select an image to replace the background with. - + Devi selezionare almeno 1 immagine con cui sostituire lo sfondo Missing Image(s) - + Immagini mancanti The following image(s) no longer exist: %s - + Impossibile trovare le seguenti immagini: %s The following image(s) no longer exist: %s Do you want to add the other images anyway? - + Impossibile trovare le seguenti immagini: %s +Vuoi comunque caricare le altre immagini? There was a problem replacing your background, the image file "%s" no longer exists. - + E' stato riscontrato un errore nel sostituire lo sfondo, impossibile trovare il file "%s". There was no display item to amend. - + Nessun elemento visualizzato da modificare @@ -1801,12 +1807,12 @@ Do you want to add the other images anyway? Background Color - + Colore di sfondo Default Color: - + Colore di default: @@ -1819,60 +1825,60 @@ Do you want to add the other images anyway? <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + <strong>Media Plugin</strong><br />Il plug in multimediale fornisce supporto per l'audio e il video Media name singular - + Media Media name plural - + Media Media container title - + Media Load new media. - + Carica un nuovo media Add new media. - + Aggiungi un nuovo media Edit the selected media. - + modifica il media selezionato Delete the selected media. - + cancella il media selezionato Preview the selected media. - + Anteprima del media selezionato Send the selected media live. - + Manda live il media selezionato Add the selected media to the service. - + Aggiungi il media selezionato al servizio @@ -1880,57 +1886,57 @@ Do you want to add the other images anyway? Select Media - + Seleziona media You must select a media file to delete. - + Devi prima selezionare un media da cancellare You must select a media file to replace the background with. - + Devi prima selezionare un file multimediale con cui sostituire lo sfondo There was a problem replacing your background, the media file "%s" no longer exists. - + E' stato riscontrato un errore nel sostituire lo sfondo, impossibile trovare il file "%s". Missing Media File - + impossibile trovare il file multimediale The file %s no longer exists. - + Impossibile trovare il file %s Videos (%s);;Audio (%s);;%s (*) - + Video (%s);;Audio (%s);;%s (*) There was no display item to amend. - + Nessun elemento visualizzato da modificare Unsupported File - + File non supportato Automatic - + Automatico Use Player: - + Usa player: @@ -1938,17 +1944,17 @@ Do you want to add the other images anyway? Available Media Players - + Media player disponibili %s (unavailable) - + %s (non disponibile) Player Order - + Ordine di riproduzione @@ -1961,19 +1967,21 @@ Do you want to add the other images anyway? Image Files - + File immagine Information - + Informazione Bible format has changed. You have to upgrade your existing Bibles. Should OpenLP upgrade now? - + Il formato della Bibbia è stato modificato. +Aggiorna le Bibbie esistenti. +OpenLP deve aggiornarle ora? @@ -1981,22 +1989,22 @@ Should OpenLP upgrade now? Credits - + Crediti License - + Licensa Contribute - + Contributi build %s - + build %s @@ -2071,7 +2079,67 @@ Final Credit on the cross, setting us free from sin. We bring this software to you for free because He has set us free. - + Project Lead + %s + +Developers + %s + +Contributors + %s + +Testers + %s + +Packagers + %s + +Translators + Afrikaans (af) + %s + German (de) + %s + English, United Kingdom (en_GB) + %s + English, South Africa (en_ZA) + %s + Estonian (et) + %s + French (fr) + %s + Hungarian (hu) + %s + Japanese (ja) + %s + Norwegian Bokmål (nb) + %s + Dutch (nl) + %s + Portuguese, Brazil (pt_BR) + %s + Russian (ru) + %s + +Documentation + %s + +Built With + Python: http://www.python.org/ + Qt4: http://qt.nokia.com/ + PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro + Oxygen Icons: http://oxygen-icons.org/ + +Final Credit + "For God so loved the world that He gave + His one and only Son, so that whoever + believes in Him will not perish but inherit + eternal life." -- John 3:16 + + And last but not least, final credit goes to + God our Father, for sending His Son to die + on the cross, setting us free from sin. We + bring this software to you for free because + He has set us free. @@ -2101,7 +2169,7 @@ Portions copyright © 2004-2012 %s Number of recent files to display: - + Numero di files recenti da visualizzare @@ -2111,72 +2179,72 @@ Portions copyright © 2004-2012 %s Double-click to send items straight to live - + Doppio click, invia direttamente al live Expand new service items on creation - + Espandi i nuovi elementi del servizio alla creazione Enable application exit confirmation - + Chiedi prima di uscire Mouse Cursor - + Cursore del mouse Hide mouse cursor when over display window - + Nascondi il cursore del mouse sopra la finestra di visualizzazione Default Image - + Immagine di default Background color: - + Colore di sfondo: Image file: - + File immagine: Open File - + Apri file Advanced - + Avanzate Preview items when clicked in Media Manager - + Anteprima degli elementi clikkati in media manager Click to select a color. - + Click per scegliere un colore Browse for an image file to display. - + Scegli un'immagine da visualizzare Revert to the default OpenLP logo. - + Ritorna al logo di openLP di default @@ -2368,7 +2436,7 @@ This location will be used after OpenLP is closed. Error Occurred - + Errore @@ -2378,28 +2446,29 @@ This location will be used after OpenLP is closed. Send E-Mail - + Invia una E-Mail Save to File - + Save to File Please enter a description of what you were doing to cause this error (Minimum 20 characters) - + Inserisci una descrizione di quello che stavi facendo quando si è verificato l'errore +(minimo 20 caratteri) Attach File - + Allega file Description characters to enter : %s - + Descrizione dei caratteri da inserire: %s @@ -2408,17 +2477,18 @@ This location will be used after OpenLP is closed. Platform: %s - + Platform: %s + Save Crash Report - + Salva il report dei crash Text files (*.txt *.log *.text) - + File di testo (*.txt *.log *.text) @@ -2463,17 +2533,17 @@ Version: %s File Rename - + Rinomina file New File Name: - + Nuovo nome file File Copy - + copia file @@ -2481,17 +2551,17 @@ Version: %s Select Translation - + Seleziona Traduzione Choose the translation you'd like to use in OpenLP. - + Seleziona la traduzione che vuoi usare in OpenLP Translation: - + Traduzione: @@ -2499,7 +2569,7 @@ Version: %s Songs - + Canti @@ -2514,37 +2584,37 @@ Version: %s Activate required Plugins - + Attiva i plug in richiesti Select the Plugins you wish to use. - + Seleziona i plugin che vuoi usare Bible - + Bibbia Images - + Immagini Presentations - + Presentazioni Media (Audio and Video) - + Media (audio e video) Allow remote access - + Permetti accesso remoto @@ -2554,82 +2624,82 @@ Version: %s Allow Alerts - + Permetti avvertimenti Default Settings - + Impostazioni di default Downloading %s... - + Downloading %s... Download complete. Click the finish button to start OpenLP. - + Download completato. Click il pulsante fine per avviare OpenLP Enabling selected plugins... - + Abilito i plugin selezionati... No Internet Connection - + Nessuna connessione a internet Unable to detect an Internet connection. - + Impossibile rilevare una connessione internet Sample Songs - + Canti di esempio Select and download public domain songs. - + Seleziona e scarica canti di pubblico dominio Sample Bibles - + Bibbie campione Select and download free Bibles. - + Seleziona e scarica Bibbie free Sample Themes - + Themi campione Select and download sample themes. - + Seleziona e scarica i temi campione Set up default settings to be used by OpenLP. - + Impostazioni di default per OpenLP Default output display: - + Schermo di output predefinito Select default theme: - + Seleziona il tema di default diff --git a/resources/i18n/nl.ts b/resources/i18n/nl.ts index a0715e135..a46e2b4cd 100644 --- a/resources/i18n/nl.ts +++ b/resources/i18n/nl.ts @@ -1367,7 +1367,9 @@ indien nodig en een internetverbinding is dus noodzakelijk. Are you sure you want to completely delete "%s" Bible from OpenLP? You will need to re-import this Bible to use it again. - + Weet u zeker dat u de bijbel "%s" uit OpenLP wilt verwijderen? + +Opnieuw importeren om alsnog te gebruiken. @@ -1375,7 +1377,7 @@ You will need to re-import this Bible to use it again. Incorrect Bible file type supplied. OpenSong Bibles may be compressed. You must decompress them before import. - + Incorrect bijbelbestand. OpenSong bijbels mogen gecomprimeerd zijn. Decomprimeren voordat u ze importeert. @@ -1698,7 +1700,7 @@ Let op, de bijbelverzen worden gedownload indien nodig en een internetverbinding Edit Slide - + Bewerk dia @@ -2194,7 +2196,7 @@ Portions copyright © 2004-2012 %s UI Settings - Werkomgeving instellingen + UI instellingen @@ -3103,7 +3105,7 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can Start background audio paused - Start achtergrond geluid gepausseerd + Start achtergrond geluid gepauseerd @@ -6908,32 +6910,32 @@ De tekstcodering is verantwoordelijk voor een correcte weergave van lettertekens This importer has been disabled. - + importeren is uitgeschakeld MediaShout Database - + MediaShout Database The MediaShout importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module. - + MediaShout importeren wordt alleen ondersteund onder Windows. Het is uitgeschakeld omdat een bepaalde Python module ontbreekt. Om te kunnen importeren, moet u de "pyodbc" module installeren. SongPro Text Files - + SongPro Tekst bestanden SongPro (Export File) - + SongPro (Exporteer bestand) In SongPro, export your songs using the File -> Export menu - + Exporteer de liederen in SongPro via het menu File -> Export @@ -7018,7 +7020,7 @@ De tekstcodering is verantwoordelijk voor een correcte weergave van lettertekens Unable to open the MediaShout database. - + Kan de MediaShout database niet openen. diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index e88cff246..4b6fafb86 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -6953,7 +6953,7 @@ Teckenkodningen ansvarar för rätt teckenrepresentation. Titles - Titlel + Titel From c0a165d8184c37aadf7375b14553648df711d0b8 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Wed, 12 Sep 2012 23:06:26 +0200 Subject: [PATCH 04/10] Fixed bug #1049036 where on osx openlp exited incorrectly with modified service. --- openlp/core/ui/maindisplay.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index c71752944..cc3cc2d23 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -138,11 +138,16 @@ class MainDisplay(Display): if Settings().value(u'advanced/x11 bypass wm', QtCore.QVariant(True)).toBool(): windowFlags |= QtCore.Qt.X11BypassWindowManagerHint - # FIXME: QtCore.Qt.SplashScreen is workaround to make display screen - # stay always on top on Mac OS X. For details see bug 906926. - # It needs more investigation to fix it properly. + # TODO: The following combination of windowFlags works correctly + # on Mac OS X. For next OpenLP version we should test it on other + # platforms. For OpenLP 2.0 keep it only for OS X to not cause any + # regressions on other platforms. if sys.platform == 'darwin': - windowFlags |= QtCore.Qt.SplashScreen + windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Window + # For primary screen ensure it stays above the OS X dock + # and menu bar + if self.screens.current[u'primary']: + windowFlags |= QtCore.Qt.WindowStaysOnTopHint self.setWindowFlags(windowFlags) self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setTransparency(False) From 7089e6980aa9c1887705d47f8576ea9e9c95de8e Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Wed, 12 Sep 2012 23:43:31 +0200 Subject: [PATCH 05/10] Fixed bug #1049036 in singlescreen mode set full screen mode instead of StaysOnTopHint. --- openlp/core/ui/maindisplay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index cc3cc2d23..306bb7511 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -147,7 +147,7 @@ class MainDisplay(Display): # For primary screen ensure it stays above the OS X dock # and menu bar if self.screens.current[u'primary']: - windowFlags |= QtCore.Qt.WindowStaysOnTopHint + self.setWindowState(QtCore.Qt.WindowFullScreen) self.setWindowFlags(windowFlags) self.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.setTransparency(False) From 19845ebfb4e877d4a0236fa41b85cd32db56ec8b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 13 Sep 2012 21:49:31 +0200 Subject: [PATCH 06/10] Fixed bug #1049977 where some Bibles from Bible Gateway still use the old HTML format. Fixes: https://launchpad.net/bugs/1049977 --- openlp/plugins/bibles/lib/http.py | 50 ++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index a223465da..7689d21d0 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -124,6 +124,8 @@ class BGExtract(object): self._remove_elements(tag, 'div', 'footnotes') self._remove_elements(tag, 'div', 'crossrefs') self._remove_elements(tag, 'h3') + self._remove_elements(tag, 'h4') + self._remove_elements(tag, 'h5') def _extract_verses(self, tags): """ @@ -161,6 +163,46 @@ class BGExtract(object): verse_list[verse] = text return verse_list + def _extract_verses_old(self, div): + """ + Use the old style of parsing for those Bibles on BG who mysteriously + have not been migrated to the new (still broken) HTML. + + ``div`` + The parent div. + """ + verse_list = {} + # Cater for inconsistent mark up in the first verse of a chapter. + first_verse = div.find(u'versenum') + if first_verse and first_verse.contents: + verse_list[1] = unicode(first_verse.contents[0]) + for verse in div(u'sup', u'versenum'): + raw_verse_num = verse.next + clean_verse_num = 0 + # Not all verses exist in all translations and may or may not be + # represented by a verse number. If they are not fine, if they are + # it will probably be in a format that breaks int(). We will then + # have no idea what garbage may be sucked in to the verse text so + # if we do not get a clean int() then ignore the verse completely. + try: + clean_verse_num = int(str(raw_verse_num)) + except ValueError: + log.warn(u'Illegal verse number: %s', unicode(raw_verse_num)) + if clean_verse_num: + verse_text = raw_verse_num.next + part = raw_verse_num.next.next + while not (isinstance(part, Tag) and + part.get(u'class') == u'versenum'): + # While we are still in the same verse grab all the text. + if isinstance(part, NavigableString): + verse_text += part + if isinstance(part.next, Tag) and part.next.name == u'div': + # Run out of verses so stop. + break + part = part.next + verse_list[clean_verse_num] = unicode(verse_text) + return verse_list + def get_bible_chapter(self, version, book_name, chapter): """ Access and decode Bibles via the BibleGateway website. @@ -189,7 +231,13 @@ class BGExtract(object): Receiver.send_message(u'openlp_process_events') div = soup.find('div', 'result-text-style-normal') self._clean_soup(div) - verse_list = self._extract_verses(div.findAll('span', 'text')) + span_list = div.findAll('span', 'text') + log.debug('Span list: %s', span_list) + if not span_list: + # If we don't get any spans then we must have the old HTML format + verse_list = self._extract_verses_old(div) + else: + verse_list = self._extract_verses(span_list) if not verse_list: log.debug(u'No content found in the BibleGateway response.') send_error_message(u'parse') From b1701f251ebebd3640b9c5136097c32e05c83796 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 14 Sep 2012 18:21:48 +0100 Subject: [PATCH 07/10] translations --- resources/i18n/af.ts | 4 ++-- resources/i18n/fi.ts | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index 00a30995c..acfe9eadb 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -1378,7 +1378,7 @@ Hierdie Bybel sal weer ingevoer moet word voordat dit gebruik geneem kan word. Incorrect Bible file type supplied. OpenSong Bibles may be compressed. You must decompress them before import. - + Ongeldige Bybel lêer @@ -6918,7 +6918,7 @@ Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling. The MediaShout importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module. - + Die MediaShout invoerder word slegs ondersteun op Windows. Dit is vanweë 'n vermiste Python module, gedeaktiveer. As jy hierdie invoerder wil gebruik, sal jy die "pyodbc" module moet installeer. diff --git a/resources/i18n/fi.ts b/resources/i18n/fi.ts index 918c311fd..69f11b083 100644 --- a/resources/i18n/fi.ts +++ b/resources/i18n/fi.ts @@ -32,7 +32,7 @@ <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen. - <strong>Hälytykset liitännäinen</strong><br />Hälytykset liitännäinen huolehtii lastenhoidon viestien näyttämisestä esityksen aikana. + <strong>Hälytykset lisäosa</strong><br />Hälytykset lisäosa huolehtii lastenhoidon viestien näyttämisestä esityksen aikana. @@ -221,7 +221,7 @@ Tahdotko jatkaa siitä huolimatta? <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display Bible verses from different sources during the service. - <strong>Raamattu-liitännäinen</strong><br />Raamattu-liitännäisellä voi näyttää Raamatun jakeita suoraan Raamatusta tilaisuuden aikana. + <strong>Raamattu-lisäosa</strong><br />Raamattu-lisäosalla voi näyttää Raamatun jakeita suoraan Raamatusta tilaisuuden aikana. @@ -1695,7 +1695,7 @@ Ole hyvä ja huomaa, että jakeet nettiraamatuista ladataan käytettäessä, jot <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>Kuvankatselu laajennos</strong><br />Kuvankatselu toteuttaa helpon kuvien näyttämisen.<br />Laajennos mahdollistaa kokonaisen kuvajoukon näyttämisen yhdessä ajolistalla, mikä tekee useiden kuvien näyttämisestä hallitumpaa. Kuvia voi myös ajaa slideshowna OpenLP:n ajastusta hyödyntäen. Lisäksi kuvia voi käyttää jumalanpalvelukselle valitun taustakuvan sijaan, mikä mahdollistaa kuvien käyttämisen taustakuvana teksteille teeman sijaan. + <strong>Kuvankatselu lisäosa</strong><br />Kuvankatselu toteuttaa helpon kuvien näyttämisen.<br />Lisäosa mahdollistaa kokonaisen kuvajoukon näyttämisen yhdessä ajolistalla, mikä tekee useiden kuvien näyttämisestä hallitumpaa. Kuvia voi myös ajaa slideshowna OpenLP:n ajastusta hyödyntäen. Lisäksi kuvia voi käyttää jumalanpalvelukselle valitun taustakuvan sijaan, mikä mahdollistaa kuvien käyttämisen taustakuvana teksteille teeman sijaan. @@ -1827,7 +1827,7 @@ Haluatko lisätä toisia kuvia siitä huolimatta? <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - <strong>Medialaajennos</strong><br /> Medialaajennos mahdollistaa audio ja video lähteiden toistamisen. + <strong>Media-lisäosa</strong><br /> Media-lisäosa mahdollistaa audio ja video lähteiden toistamisen. @@ -2528,12 +2528,12 @@ Version: %s Activate required Plugins - Aktivoi vaaditut laajennokset + Aktivoi vaaditut lisäosat Select the Plugins you wish to use. - Valitse laajeennokset, joita haluat käyttää. + Valitse lisäosat, joita haluat käyttää. @@ -2578,42 +2578,42 @@ Version: %s Downloading %s... - + Ladataan %s... Download complete. Click the finish button to start OpenLP. - + Lataus valmis. Paina lopetuspainiketta käynnistääksesi OpenLP:n. Enabling selected plugins... - + Otetaan käyttöön valittuja lisäosia... No Internet Connection - + Ei internetyhteyttä Unable to detect an Internet connection. - + Toimivaa internetyhteyttä ei saatavilla. Sample Songs - + Esimerkkejä lauluista Select and download public domain songs. - + Valitse ja lataa tekijäinoikeusvapaita lauluja. Sample Bibles - + Esimerkkejä Raamatuista @@ -3243,12 +3243,12 @@ To cancel the First Time Wizard completely (and not start OpenLP), click the Can &Plugin List - + &Luettelo lisäosista List the Plugins - + Lisäosien luettelo @@ -3635,12 +3635,12 @@ Suffix not supported Plugin List - + Luettelo lisäosista Plugin Details - + Lisäosan tiedot From bb14134233008fa301ec2c54495c99f38a1d99db Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 14 Sep 2012 21:53:55 +0200 Subject: [PATCH 08/10] Fix bug #1051051 where "4-5" style verses would fail. Now they are imported as "4" Fixes: https://launchpad.net/bugs/1051051 --- openlp/plugins/bibles/lib/http.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index a223465da..329acb5ba 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -155,7 +155,14 @@ class BGExtract(object): text = text.replace(old, new) text = u' '.join(text.split()) if verse and text: - verses.append((int(verse.strip()), text)) + verse = verse.strip() + try: + verse = int(verse) + except (TypeError, ValueError): + verse_parts = verse.split(u'-') + if len(verse_parts) > 1: + verse = int(verse_parts[0]) + verses.append((verse, text)) verse_list = {} for verse, text in verses[::-1]: verse_list[verse] = text From a33936f24729f9cbb701d28442f957450f0bbfd1 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Sat, 15 Sep 2012 01:55:55 +0200 Subject: [PATCH 09/10] Fixed #1046587 - individual placeholders are passed to time.strftime(). --- openlp/core/ui/advancedtab.py | 4 ++-- openlp/core/ui/servicemanager.py | 5 +++-- openlp/core/utils/__init__.py | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 2d6b534c4..0276fcebc 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -38,7 +38,7 @@ import sys from openlp.core.lib import SettingsTab, translate, build_icon, Receiver from openlp.core.lib.settings import Settings from openlp.core.lib.ui import UiStrings -from openlp.core.utils import get_images_filter, AppLocation +from openlp.core.utils import get_images_filter, AppLocation, format_time from openlp.core.lib import SlideLimits log = logging.getLogger(__name__) @@ -622,7 +622,7 @@ class AdvancedTab(SettingsTab): time = time.replace(hour = self.serviceNameTime.time().hour(), minute = self.serviceNameTime.time().minute()) try: - service_name_example = time.strftime(unicode( + service_name_example = format_time(unicode( self.serviceNameEdit.text())) except ValueError: preset_is_valid = False diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index d49c988c6..0dc4ef864 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -47,7 +47,8 @@ from openlp.core.lib.ui import UiStrings, critical_error_message_box, \ create_widget_action, find_and_set_in_combo_box from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm from openlp.core.ui.printserviceform import PrintServiceForm -from openlp.core.utils import AppLocation, delete_file, split_filename +from openlp.core.utils import AppLocation, delete_file, split_filename, \ + format_time from openlp.core.utils.actions import ActionList, CategoryOrder class ServiceManagerList(QtGui.QTreeWidget): @@ -621,7 +622,7 @@ class ServiceManager(QtGui.QWidget): '/\\?*|<>\[\]":+\nSee http://docs.python.org/library/' 'datetime.html#strftime-strptime-behavior for more ' 'information.')).toString()) - default_filename = time.strftime(default_pattern) + default_filename = format_time(default_pattern) else: default_filename = u'' directory = unicode(SettingsManager.get_last_dir( diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 224ab4344..393916408 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -35,6 +35,7 @@ import os import re from subprocess import Popen, PIPE import sys +import time import urllib2 from openlp.core.lib.settings import Settings @@ -469,10 +470,24 @@ def get_uno_instance(resolver): return resolver.resolve(u'uno:socket,host=localhost,port=2002;' \ + u'urp;StarOffice.ComponentContext') + +def format_time(text): + """ + Workaround for Python built-in time formatting fuction time.strftime(). + + time.strftime() accepts only ascii characters. This function accepts + unicode string and passes individual % placeholders to time.strftime(). + This ensures only ascii characters are passed to time.strftime(). + """ + def match_formatting(match): + return time.strftime(match.group()) + return re.sub('\%[a-zA-Z]', match_formatting, text) + + from languagemanager import LanguageManager from actions import ActionList __all__ = [u'AppLocation', u'get_application_version', u'check_latest_version', u'add_actions', u'get_filesystem_encoding', u'LanguageManager', u'ActionList', u'get_web_page', u'get_uno_command', u'get_uno_instance', - u'delete_file', u'clean_filename'] + u'delete_file', u'clean_filename', u'format_time'] From 23a28d21523eeae787c9d4fbf98268500ed3ad78 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 15 Sep 2012 12:48:08 +0100 Subject: [PATCH 10/10] Release 1.9.12 bzr-revno: 2063 --- openlp/.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/.version b/openlp/.version index 5e9287b86..1fe2d3795 100644 --- a/openlp/.version +++ b/openlp/.version @@ -1 +1 @@ -1.9.11 +1.9.12