From 6d7c5c337d6731a0c6c27f066a3c67a4116e8cb2 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 31 Aug 2010 08:51:07 +0200 Subject: [PATCH 01/10] Update translation files. --- resources/i18n/openlp_af.ts | 684 ++++++++------- resources/i18n/openlp_de.ts | 672 ++++++++------- resources/i18n/openlp_en.ts | 684 ++++++++------- resources/i18n/openlp_en_GB.ts | 684 ++++++++------- resources/i18n/openlp_en_ZA.ts | 1422 ++++++++++++++++---------------- resources/i18n/openlp_es.ts | 684 ++++++++------- resources/i18n/openlp_et.ts | 672 ++++++++------- resources/i18n/openlp_hu.ts | 684 ++++++++------- resources/i18n/openlp_ko.ts | 684 ++++++++------- resources/i18n/openlp_nb.ts | 686 ++++++++------- resources/i18n/openlp_pt_BR.ts | 688 ++++++++------- resources/i18n/openlp_sv.ts | 684 ++++++++------- 12 files changed, 4391 insertions(+), 4537 deletions(-) diff --git a/resources/i18n/openlp_af.ts b/resources/i18n/openlp_af.ts index 47853ca2e..bdcb68f09 100644 --- a/resources/i18n/openlp_af.ts +++ b/resources/i18n/openlp_af.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. Geen bypassende boek kon in dié Bybel gevind word nie. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Redigeer Aangepaste Skyfies - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Voeg Nuwe By - + Add a new slide at bottom. - + Edit Redigeer - + Edit the selected slide. - + Edit All Redigeer Alles - + Edit all the slides at once. - + Save Stoor - + Save the slide currently being edited. - + Delete - + Delete the selected slide. - + Clear - + Clear edit area Maak skoon die redigeer area - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Beeld(e) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Tema Onderhoud - + Theme &name: - - &Visibility: - - - - - Opaque - Deursigtigheid - - - - Transparent - Deursigtig - - - + Type: Tipe: - + Solid Color Soliede Kleur - + Gradient Gradiënt - + Image Beeld - + Image: Beeld: - + Gradient: - + Horizontal Horisontaal - + Vertical Vertikaal - + Circular Sirkelvormig - + &Background - + Main Font Hoof Skrif - + Font: Skrif: - + Color: - + Size: Grootte: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normaal - + Bold Vetgedruk - + Italics Kursief - + Bold/Italics Bold/Italics - + Style: - + Display Location Vertoon Ligging - + Use default location - + X position: - + Y position: - + Width: Wydte: - + Height: Hoogte: - + px px - + &Main Font - + Footer Font Voetnota Skriftipe - + &Footer Font - + Outline Buitelyn - + Outline size: - + Outline color: - + Show outline: - + Shadow Skaduwee - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Belyning - + Horizontal align: - + Left Links - + Right Regs - + Center Middel - + Vertical align: - + Top - + Middle Middel - + Bottom Onder - + Slide Transition Skyfie Verandering - + Transition active - + &Other Options - + Preview Voorskou - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop Engels - + &File &Lêer - + &Import &Invoer - + &Export &Uitvoer - + &View &Bekyk - + M&ode M&odus - + &Tools &Gereedskap - + &Settings Ver&stellings - + &Language Taa&l - + &Help &Hulp - + Media Manager Media Bestuurder - + Service Manager Diens Bestuurder - + Theme Manager Tema Bestuurder - + &New &Nuwe - + New Service Nuwe Diens - + Create a new service. - + Ctrl+N Ctrl+N - + &Open Maak &Oop - + Open Service Maak Diens Oop - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Stoor - + Save Service Stoor Diens - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Stoor &As... - + Save Service As Stoor Diens As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Uitgang - + Quit OpenLP Sluit OpenLP Af - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager &Media Bestuurder - + Toggle Media Manager Wissel Media Bestuurder - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Tema Bestuurder - + Toggle Theme Manager Wissel Tema Bestuurder - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Diens Bestuurder - + Toggle Service Manager Wissel Diens Bestuurder - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Voorskou Paneel - + Toggle Preview Panel Wissel Voorskou Paneel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List In&prop Lys - + List the Plugins Lys die Inproppe - + Alt+F7 Alt+F7 - + &User Guide &Gebruikers Gids - + &About &Aangaande - + More information about OpenLP Meer inligting aangaande OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Aanlyn Hulp - + &Web Site &Web Tuiste - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Regstreeks - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP Weergawe is Opdateer - + OpenLP Main Display Blanked OpenLP Hoof Vertoning Blanko - + The Main Display has been blanked out Die Hoof Skerm is blanko - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Inprop Lys - + Plugin Details Inprop Besonderhede - + Version: Weergawe: - - TextLabel - TeksEtiket - - - + About: Aangaande: - + Status: Status: - + Active Aktief - + Inactive Onaktief @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Skep 'n nuwe diens - + Open Service Maak Diens Oop @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Laai 'n bestaande diens - + Save Service Stoor Diens @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Verander Item Tema - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Fout - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Regstreeks - + Preview Voorskou - - Move to first - Verskuif na eerste - - - + Move to previous Beweeg na vorige - + Move to next Verskuif na volgende - - Move to last - Verskuif na laaste posisie - - - + Hide - + Move to live Verskuif na regstreekse skerm - + Edit and re-preview Song Redigeer en sien weer 'n voorskou van die Lied - + Start continuous loop Begin aaneenlopende lus - + Stop continuous loop Stop deurlopende lus - + s s - + Delay between slides in seconds Vertraging in sekondes tussen skyfies - + Start playing media Begin media speel @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Gaan na Vers + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Nuwe Tema @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error Fout @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists Tema Bestaan - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Lied Redigeerder - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit R&edigeer - + Ed&it All - + &Delete - + Title && Lyrics Titel && Lirieke - + Authors Skrywers - + &Add to Song &Voeg by Lied - + &Remove &Verwyder - + &Manage Authors, Topics, Song Books - + Topic Onderwerp - + A&dd to Song Voeg by Lie&d - + R&emove V&erwyder - + Song Book Lied Boek - - - Authors, Topics && Song Book - - - - - Theme - Tema - - New &Theme + Song No.: - Copyright Information - Kopiereg Informasie - - - - © + Authors, Topics && Song Book + Theme + Tema + + + + New &Theme + + + + + Copyright Information + Kopiereg Informasie + + + + © + + + + CCLI number: - + Comments Kommentaar - + Theme, Copyright Info && Comments Tema, Kopiereg Informasie && Kommentaar - + Save && Preview Stoor && Voorskou - + Add Author - + This author does not exist, do you want to add them? - + Error Fout - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Redigeer Vers - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. Invoer begin... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Selekteer Invoer Bron - + Select the import format, and where to import from. Selekteer die invoer formaat en van waar af om in te voer. - + Format: Formaat: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing Invoer - + Please wait while your songs are imported. - + Ready. Gereed. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error Fout - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author Wis Skrywer Uit - + Are you sure you want to delete the selected author? Is u seker u wil die geselekteerde skrywer uitwis? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! Geen skrywer geselekteer nie! - + Delete Topic Wis Onderwerp Uit - + Are you sure you want to delete the selected topic? Is u seker u wil die geselekteerde onderwerp uitwis? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! Geen onderwerp geselekteer nie! - + Delete Book Wis Boek Uit - + Are you sure you want to delete the selected book? Is jy seker jy wil die geselekteerde boek uitwis? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! Geen boek geselekteer nie! diff --git a/resources/i18n/openlp_de.ts b/resources/i18n/openlp_de.ts index d805db01c..e2222d6db 100644 --- a/resources/i18n/openlp_de.ts +++ b/resources/i18n/openlp_de.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -649,7 +649,7 @@ Changes do not affect verses already in the service. Das Buch wurde in dieser Bibelausgabe nicht gefunden. - + etc @@ -659,7 +659,7 @@ Changes do not affect verses already in the service. - + Bible not fully loaded. @@ -701,62 +701,62 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Sonderfolien bearbeiten - + &Title: - + Add New Neues anfügen - + Edit Bearbeiten - + Edit All - + Save Speichern - + Delete Löschen - + Clear - + Clear edit area Aufräumen des Bearbeiten Bereiches - + Split Slide - + The&me: - + &Credits: @@ -771,37 +771,37 @@ Changes do not affect verses already in the service. Fehler - + Move slide down one position. - + Add a new slide at bottom. - + Edit the selected slide. - + Edit all the slides at once. - + Save the slide currently being edited. - + Delete the selected slide. - + Split a slide into two by inserting a slide splitter. @@ -821,7 +821,7 @@ Changes do not affect verses already in the service. - + Move slide up one position. @@ -875,7 +875,7 @@ Changes do not affect verses already in the service. - + Image(s) Bild(er) @@ -885,20 +885,25 @@ Changes do not affect verses already in the service. - + You must select an image to delete. - + You must select an image to replace the background with. - + You must select a media file to replace the background with. + + + Reset Live Background + + MediaPlugin @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Medien @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Designverwaltung - + Theme &name: - - &Visibility: - - - - - Opaque - Fest - - - - Transparent - Durchsichtig - - - + Type: Art: - + Solid Color Füllfarbe - + Gradient Farbverlauf - + Image Bild - + Image: Bild: - + Gradient: - + Horizontal Horizontal - + Vertical Vertikal - + Circular Radial - + &Background - + Main Font Hauptschriftart - + Font: Schriftart: - + Color: Farbe: - + Size: Größe: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Fett - + Italics Kursiv - + Bold/Italics Fett/Kursiv - + Style: - + Display Location Anzeige Ort - + Use default location - + X position: - + Y position: - + Width: Breite: - + Height: Höhe: - + px px - + &Main Font - + Footer Font Schriftart der Fußzeile - + &Footer Font - + Outline Rand - + Outline size: - + Outline color: - + Show outline: - + Shadow Schatten - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Ausrichtung - + Horizontal align: - + Left Links - + Right Rechts - + Center Mitte - + Vertical align: - + Top Oben - + Middle Mittig - + Bottom Unten - + Slide Transition Folienübergang - + Transition active - + &Other Options - + Preview Vorschau - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,407 +1655,407 @@ This General Public License does not permit incorporating your program into prop Deutsch - + &File &Datei - + &Import &Importieren - + &Export &Exportieren - + &View &Ansicht - + M&ode M&odus - + &Tools &Extras - + &Settings Ein&stellungen - + &Language &Sprache - + &Help &Hilfe - + Media Manager Medienmanager - + Service Manager Ablaufverwaltung - + Theme Manager Designmanager - + &New &Neu - + New Service Neuer Ablauf - + Create a new service. - + Ctrl+N Strg+N - + &Open &Öffnen - + Open Service Öffnen Ablauf - + Open an existing service. - + Ctrl+O Strg+O - + &Save &Speichern - + Save Service Ablauf speichern - + Save the current service to disk. - + Ctrl+S Strg+S - + Save &As... Speichern &als... - + Save Service As Speicher Gottesdienst unter - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Beenden - + Quit OpenLP OpenLP beenden - + Alt+F4 Alt+F4 - + &Theme &Design - + &Configure OpenLP... - + &Media Manager &Medienmanager - + Toggle Media Manager Medienmanager ein/ausblenden - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Designmanager - + Toggle Theme Manager Designverwaltung ein/ausblenden - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager Ablauf&sverwaltung - + Toggle Service Manager Ablaufmanager ein/ausblenden - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Vorschaubereich - + Toggle Preview Panel Vorschaubereich ein/ausblenden - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Plugin-Liste - + List the Plugins Plugins auflisten - + Alt+F7 Alt+F7 - + &User Guide Ben&utzerhandbuch - + &About &Über - + More information about OpenLP Mehr Informationen über OpenLP - + Ctrl+F1 Strg+F1 - + &Online Help &Online Hilfe - + &Web Site &Webseite - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. - - Version %s of OpenLP is now available for download (you are currently running version %s). - -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. - - - - + OpenLP Version Updated OpenLP-Version aktualisiert - + OpenLP Main Display Blanked Hauptbildschirm abgedunkelt - + The Main Display has been blanked out Die Projektion ist momentan nicht aktiv - + Save Changes to Service? Änderungen am Ablauf speichern? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s + + + 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/. + + OpenLP.MediaManagerItem @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Plugin-Liste - + Plugin Details Plugin-Details - + Version: Version: - - TextLabel - Text Beschriftung - - - + About: Über: - + Status: Status: - + Active Aktiv - + Inactive Inaktiv @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Erstelle neuen Ablauf - + Open Service Öffnen Ablauf @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Öffne Ablauf - + Save Service Ablauf speichern @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Design des Elements ändern - + Save Changes to Service? Änderungen am Ablauf speichern? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Fehler - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Live - + Preview Vorschau - - Move to first - Ganz nach vorn verschieben - - - + Move to previous Vorherige Folie anzeigen - + Move to next Verschiebe zum Nächsten - - Move to last - Zur letzten Folie - - - + Hide - + Move to live Verschieben zur Live Ansicht - + Edit and re-preview Song Lied bearbeiten und wieder anzeigen - + Start continuous loop Endlosschleife starten - + Stop continuous loop Endlosschleife beenden - + s s - + Delay between slides in seconds Pause zwischen den Folien in Sekunden - + Start playing media Abspielen @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Springe zu + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Neues Design @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error Fehler @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists Design existiert - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,250 +3057,255 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Lied bearbeiten - + &Title: - + &Lyrics: - + &Add - + &Edit &Bearbeiten - + Ed&it All - + &Delete - + Title && Lyrics Titel && Liedtext - + Authors Autoren - + &Add to Song Zum Lied &hinzufügen - + &Remove Entfe&rnen - + Topic Thema - + A&dd to Song Zum Lied &hinzufügen - + R&emove &Entfernen - + Song Book Liederbuch - + Theme Design - + New &Theme - + Copyright Information Copyright Angaben - + © - + Comments Kommentare - + Theme, Copyright Info && Comments Design, Copyrightinformationen && Kommentare - + Save && Preview Speichern && Vorschau - + Add Author - + This author does not exist, do you want to add them? - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + Add Book - + This song book does not exist, do you want to add it? - + Error Fehler - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Alt&ernate title: - + &Verse order: - + &Manage Authors, Topics, Song Books - + Authors, Topics && Song Book - + CCLI number: - + This author is already in the list. - + This topic is already in the list. + + + Song No.: + + SongsPlugin.EditVerseForm - + Edit Verse Bearbeite Vers - + &Verse type: - + &Insert @@ -3360,82 +3348,82 @@ The content encoding is not UTF-8. Starte import ... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Importquelle auswählen - + Select the import format, and where to import from. Wähle das Import Format und woher der Import erfolgen soll. - + Format: Format: - + OpenLyrics - + OpenSong OpenSong - + Add Files... - + Remove File(s) - + Filename: - + Browse... - + Importing - + Please wait while your songs are imported. - + Ready. Fertig. - + %p% @@ -3525,32 +3513,32 @@ The content encoding is not UTF-8. - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3725,52 +3713,52 @@ The content encoding is not UTF-8. - + Error Fehler - + Delete Author Lösche Autor - + Are you sure you want to delete the selected author? Sind Sie sicher, dass Sie den ausgewählten Autor löschen wollen? - + No author selected! Sie haben keinen Autor ausgewählt! - + Delete Topic Lösche Thema - + Are you sure you want to delete the selected topic? Soll der gewählte Eintrag wirklich gelöscht werden? - + No topic selected! Kein Thema ausgewählt! - + Delete Book Buch löschen - + Are you sure you want to delete the selected book? Sind Sie sicher, dass das markierte Buch wirklich gelöscht werden soll? - + No book selected! Kein Buch ausgewählt! @@ -3780,62 +3768,62 @@ The content encoding is not UTF-8. - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + This author cannot be deleted, they are currently assigned to at least one song. - + This topic cannot be deleted, it is currently assigned to at least one song. - + This book cannot be deleted, it is currently assigned to at least one song. diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts index 3d538ab1b..76e7b89dd 100644 --- a/resources/i18n/openlp_en.ts +++ b/resources/i18n/openlp_en.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New - + Add a new slide at bottom. - + Edit - + Edit the selected slide. - + Edit All - + Edit all the slides at once. - + Save - + Save the slide currently being edited. - + Delete - + Delete the selected slide. - + Clear - + Clear edit area - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance - + Theme &name: - - &Visibility: - - - - - Opaque - - - - - Transparent - - - - + Type: - + Solid Color - + Gradient - + Image - + Image: - + Gradient: - + Horizontal - + Vertical - + Circular - + &Background - + Main Font - + Font: - + Color: - + Size: - + pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal - + Bold - + Italics - + Bold/Italics - + Style: - + Display Location - + Use default location - + X position: - + Y position: - + Width: - + Height: - + px - + &Main Font - + Footer Font - + &Footer Font - + Outline - + Outline size: - + Outline color: - + Show outline: - + Shadow - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment - + Horizontal align: - + Left - + Right - + Center - + Vertical align: - + Top - + Middle - + Bottom - + Slide Transition - + Transition active - + &Other Options - + Preview - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop - + &File - + &Import - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New - + New Service - + Create a new service. - + Ctrl+N - + &Open - + Open Service - + Open an existing service. - + Ctrl+O - + &Save - + Save Service - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated - + OpenLP Main Display Blanked - + The Main Display has been blanked out - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List - + Plugin Details - + Version: - - TextLabel - - - - + About: - + Status: - + Active - + Inactive @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Open Service @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Service @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live - + Preview - - Move to first - - - - + Move to previous - + Move to next - - Move to last - - - - + Hide - + Move to live - + Edit and re-preview Song - + Start continuous loop - + Stop continuous loop - + s - + Delay between slides in seconds - + Start playing media @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit - + Ed&it All - + &Delete - + Title && Lyrics - + Authors - + &Add to Song - + &Remove - + &Manage Authors, Topics, Song Books - + Topic - + A&dd to Song - + R&emove - + Song Book - - - Authors, Topics && Song Book - - - - - Theme - - - New &Theme + Song No.: - Copyright Information - - - - - © + Authors, Topics && Song Book - CCLI number: + Theme - Comments + New &Theme + Copyright Information + + + + + © + + + + + CCLI number: + + + + + Comments + + + + Theme, Copyright Info && Comments - + Save && Preview - + Add Author - + This author does not exist, do you want to add them? - + Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source - + Select the import format, and where to import from. - + Format: - + OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing - + Please wait while your songs are imported. - + Ready. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author - + Are you sure you want to delete the selected author? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! - + Delete Topic - + Are you sure you want to delete the selected topic? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! - + Delete Book - + Are you sure you want to delete the selected book? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! diff --git a/resources/i18n/openlp_en_GB.ts b/resources/i18n/openlp_en_GB.ts index 3503a2e29..091b8c6c6 100644 --- a/resources/i18n/openlp_en_GB.ts +++ b/resources/i18n/openlp_en_GB.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. No matching book could be found in this Bible. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Edit Custom Slides - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Add New - + Add a new slide at bottom. - + Edit Edit - + Edit the selected slide. - + Edit All Edit All - + Edit all the slides at once. - + Save Save - + Save the slide currently being edited. - + Delete Delete - + Delete the selected slide. - + Clear Clear - + Clear edit area Clear edit area - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Image(s) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Theme Maintenance - + Theme &name: - - &Visibility: - - - - - Opaque - Opaque - - - - Transparent - Transparent - - - + Type: Type: - + Solid Color Solid Color - + Gradient Gradient - + Image Image - + Image: Image: - + Gradient: - + Horizontal Horizontal - + Vertical Vertical - + Circular - + &Background - + Main Font Main Font - + Font: Font: - + Color: - + Size: Size: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Bold - + Italics Italics - + Bold/Italics Bold/Italics - + Style: - + Display Location Display Location - + Use default location - + X position: - + Y position: - + Width: Width: - + Height: Height: - + px px - + &Main Font - + Footer Font Footer Font - + &Footer Font - + Outline Outline - + Outline size: - + Outline color: - + Show outline: - + Shadow Shadow - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Alignment - + Horizontal align: - + Left Left - + Right Right - + Center Center - + Vertical align: - + Top Top - + Middle Middle - + Bottom Bottom - + Slide Transition Slide Transition - + Transition active - + &Other Options - + Preview Preview - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop English - + &File &File - + &Import &Import - + &Export &Export - + &View &View - + M&ode M&ode - + &Tools &Tools - + &Settings &Settings - + &Language &Language - + &Help &Help - + Media Manager Media Manager - + Service Manager Service Manager - + Theme Manager Theme Manager - + &New &New - + New Service New Service - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Open - + Open Service Open Service - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Save - + Save Service Save Service - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Save &As... - + Save Service As Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit E&xit - + Quit OpenLP Quit OpenLP - + Alt+F4 Alt+F4 - + &Theme &Theme - + &Configure OpenLP... - + &Media Manager &Media Manager - + Toggle Media Manager Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Theme Manager - + Toggle Theme Manager Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Service Manager - + Toggle Service Manager Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Preview Panel - + Toggle Preview Panel Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Plugin List - + List the Plugins List the Plugins - + Alt+F7 Alt+F7 - + &User Guide &User Guide - + &About &About - + More information about OpenLP More information about OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Online Help - + &Web Site &Web Site - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP Version Updated - + OpenLP Main Display Blanked OpenLP Main Display Blanked - + The Main Display has been blanked out The Main Display has been blanked out - + Save Changes to Service? Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Plugin List - + Plugin Details Plugin Details - + Version: Version: - - TextLabel - TextLabel - - - + About: About: - + Status: Status: - + Active Active - + Inactive Inactive @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Create a new service - + Open Service Open Service @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Load an existing service - + Save Service Save Service @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Change Item Theme - + Save Changes to Service? Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Live - + Preview Preview - - Move to first - Move to first - - - + Move to previous Move to previous - + Move to next Move to next - - Move to last - Move to last - - - + Hide - + Move to live Move to live - + Edit and re-preview Song Edit and re-preview Song - + Start continuous loop Start continuous loop - + Stop continuous loop Stop continuous loop - + s s - + Delay between slides in seconds Delay between slides in seconds - + Start playing media Start playing media @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Go to Verse + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme New Theme @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error Error @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists Theme Exists - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Song Editor - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit &Edit - + Ed&it All - + &Delete - + Title && Lyrics Title && Lyrics - + Authors Authors - + &Add to Song &Add to Song - + &Remove &Remove - + &Manage Authors, Topics, Song Books - + Topic Topic - + A&dd to Song A&dd to Song - + R&emove R&emove - + Song Book Song Book - - - Authors, Topics && Song Book - - - - - Theme - Theme - - New &Theme + Song No.: - Copyright Information - Copyright Information - - - - © + Authors, Topics && Song Book + Theme + Theme + + + + New &Theme + + + + + Copyright Information + Copyright Information + + + + © + + + + CCLI number: - + Comments Comments - + Theme, Copyright Info && Comments Theme, Copyright Info && Comments - + Save && Preview Save && Preview - + Add Author - + This author does not exist, do you want to add them? - + Error Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Edit Verse - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. Starting import... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Select Import Source - + Select the import format, and where to import from. Select the import format, and where to import from. - + Format: Format: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing Importing - + Please wait while your songs are imported. - + Ready. Ready. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author Delete Author - + Are you sure you want to delete the selected author? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! - + Delete Topic Delete Topic - + Are you sure you want to delete the selected topic? Are you sure you want to delete the selected topic? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! No topic selected! - + Delete Book Delete Book - + Are you sure you want to delete the selected book? Are you sure you want to delete the selected book? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! diff --git a/resources/i18n/openlp_en_ZA.ts b/resources/i18n/openlp_en_ZA.ts index 24faf3bc9..a3c4ba050 100644 --- a/resources/i18n/openlp_en_ZA.ts +++ b/resources/i18n/openlp_en_ZA.ts @@ -13,7 +13,7 @@ Show an alert message. - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -23,7 +23,7 @@ Alert Message - Alert Message + Alert Message @@ -38,7 +38,7 @@ &New - &New + &New @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. Alert message created and displayed. @@ -663,12 +663,12 @@ Changes do not affect verses already in the service. No matching book could be found in this Bible. - + etc etc - + Bible not fully loaded. Bible not fully loaded. @@ -710,97 +710,97 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Edit Custom Slides - + Move slide down one position. Move slide down one position. - + &Title: &Title: - + Add New Add New - + Add a new slide at bottom. Add a new slide at bottom. - + Edit Edit - + Edit the selected slide. Edit the selected slide. - + Edit All Edit All - + Edit all the slides at once. Edit all the slides at once. - + Save Save - + Save the slide currently being edited. Save the slide currently being edited. - + Delete Delete - + Delete the selected slide. Delete the selected slide. - + Clear Clear - + Clear edit area Clear edit area - + Split Slide Split Slide - + Split a slide into two by inserting a slide splitter. Split a slide into two by inserting a slide splitter. - + The&me: The&me: - + &Credits: &Credits: @@ -830,9 +830,9 @@ Changes do not affect verses already in the service. You have one or more unsaved slides, please either save your slide(s) or clear your changes. - + Move slide up one position. - + Move slide up one position. @@ -889,25 +889,30 @@ Changes do not affect verses already in the service. Replace Background - + You must select an image to delete. You must select an image to delete. - + Image(s) Image(s) - + You must select an image to replace the background with. You must select an image to replace the background with. - + You must select a media file to replace the background with. You must select a media file to replace the background with. + + + Reset Live Background + + MediaPlugin @@ -920,7 +925,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Media @@ -940,7 +945,7 @@ Changes do not affect verses already in the service. Replace Background - + You must select a media file to delete. You must select a media file to delete. @@ -948,7 +953,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files Image Files @@ -1383,319 +1388,299 @@ Built With OpenLP.AmendThemeForm - + Theme Maintenance Theme Maintenance - + Theme &name: Theme &name: - - &Visibility: - &Visibility: - - - - Opaque - Opaque - - - - Transparent - Transparent - - - + Type: - Type: + Type: - + Solid Color - Solid Colour + Solid Colour - + Gradient - + Gradient - + Image - Image + Image - + Image: - + Image: - + Gradient: - + Gradient: - + Horizontal - Horizontal + Horizontal - + Vertical - Vertical + Vertical - + Circular - Circular + Circular - + &Background - + &Background - + Main Font - Main Font + Main Font - + Font: - + Font: - + Color: - + Color: - + Size: - + Size: - + pt - pt + pt - - Wrap indentation: - - - - + Adjust line spacing: - + Adjust line spacing: - + Normal - Normal + Normal - + Bold - Bold + Bold - + Italics - Italics + Italics - + Bold/Italics - + Bold/Italics - + Style: - + Style: - + Display Location - + Display Location - + Use default location - + Use default location - + X position: - + X position: - + Y position: - + Y position: - + Width: - Width: - - - - Height: - Height: - - - - px - px - - - - &Main Font - + Width: - Footer Font - Footer Font + Height: + Height: - + + px + px + + + + &Main Font + &Main Font + + + + Footer Font + Footer Font + + + &Footer Font - + &Footer Font + + + + Outline + Outline + + + + Outline size: + Outline size: + + + + Outline color: + Outline color: + + + + Show outline: + Show outline: + + + + Shadow + Shadow + + + + Shadow size: + Shadow size: + + + + Shadow color: + Shadow color: + + + + Show shadow: + Show shadow: + + + + Alignment + Alignment + + + + Horizontal align: + Horizontal align: + + + + Left + Left + + + + Right + Right + + + + Center + Centre - Outline - Outline + Vertical align: + Vertical align: - Outline size: - + Top + Top + + + + Middle + Middle - Outline color: - + Bottom + Bottom - Show outline: - + Slide Transition + Slide Transition - Shadow - Shadow + Transition active + Transition active - Shadow size: - - - - - Shadow color: - - - - - Show shadow: - - - - - Alignment - Alignment - - - - Horizontal align: - - - - - Left - - - - - Right - Right - - - - Center - Centre - - - - Vertical align: - - - - - Top - Top - - - - Middle - Middle - - - - Bottom - Bottom - - - - Slide Transition - Slide Transition - - - - Transition active - - - - &Other Options - + &Other Options - + Preview - Preview + Preview - + All Files - All Files + All Files - + Select Image - + Select Image - + First color: - + First color: - + Second color: - + Second color: - + Slide height is %s rows. - + Slide height is %s rows. @@ -1703,127 +1688,127 @@ Built With General - + General Monitors - + Monitors Select monitor for output display: - Select monitor for output display: + Select monitor for output display: Display if a single screen - + Display if a single screen Application Startup - Application Startup + Application Startup Show blank screen warning - Show blank screen warning + Show blank screen warning Automatically open the last service - Automatically open the last service + Automatically open the last service Show the splash screen - + Show the splash screen Application Settings - Application Settings + Application Settings CCLI Details - CCLI Details + CCLI Details CCLI number: - + CCLI number: SongSelect username: - + SongSelect username: SongSelect password: - + SongSelect password: Display Position - + Display Position X - + X Y - + Y Height - + Height Width - + Width Override display position - + Override display position Screen - + Screen primary - primary + primary Prompt to save before starting a new service - + Prompt to save before starting a new service Automatically preview next item in service - + Automatically preview next item in service Slide loop delay: - + Slide loop delay: sec - + sec @@ -1831,426 +1816,426 @@ Built With Language - + Language Please restart OpenLP to use your new language setting. - + Please restart OpenLP to use your new language setting. OpenLP.MainWindow - + OpenLP 2.0 - OpenLP 2.0 + OpenLP 2.0 English - English - - - - &File - &File - - - - &Import - &Import + English - &Export - &Export + &File + &File - &View - &View + &Import + &Import - M&ode - + &Export + &Export - &Tools - + &View + &View + M&ode + M&ode + + + + &Tools + &Tools + + + &Settings - &Settings - - - - &Language - - - - - &Help - - - - - Media Manager - Media Manager - - - - Service Manager - Service Manager - - - - Theme Manager - - - - - &New - &New - - - - New Service - - - - - Create a new service. - - - - - Ctrl+N - Ctrl+N - - - - &Open - &Open - - - - Open Service - Open Service - - - - Open an existing service. - - - - - Ctrl+O - Ctrl+O - - - - &Save - &Save - - - - Save Service - - - - - Save the current service to disk. - - - - - Ctrl+S - Ctrl+S - - - - Save &As... - - - - - Save Service As - - - - - Save the current service under a new name. - - - - - Ctrl+Shift+S - - - - - E&xit - - - - - Quit OpenLP - Quit OpenLP - - - - Alt+F4 - Alt+F4 - - - - &Theme - + &Settings - &Configure OpenLP... - + &Language + &Language + + + + &Help + &Help + + + + Media Manager + Media Manager + + + + Service Manager + Service Manager + + + + Theme Manager + Theme Manager + + + + &New + &New + + + + New Service + New Service + + + + Create a new service. + Create a new service. + + + + Ctrl+N + Ctrl+N + + + + &Open + &Open + + + + Open Service + Open Service + + + + Open an existing service. + Open an existing service. + + + + Ctrl+O + Ctrl+O + + + + &Save + &Save + + + + Save Service + Save Service + + + + Save the current service to disk. + Save the current service to disk. + + + + Ctrl+S + Ctrl+S + + + + Save &As... + Save &As... + + + + Save Service As + Save Service As + + + + Save the current service under a new name. + Save the current service under a new name. + + + + Ctrl+Shift+S + Ctrl+Shift+S + + + + E&xit + E&xit + + + + Quit OpenLP + Quit OpenLP + + + + Alt+F4 + Alt+F4 + + + + &Theme + &Theme - &Media Manager - + &Configure OpenLP... + &Configure OpenLP... - Toggle Media Manager - + &Media Manager + &Media Manager - Toggle the visibility of the media manager. - + Toggle Media Manager + Toggle Media Manager - F8 - F8 + Toggle the visibility of the media manager. + Toggle the visibility of the media manager. - &Theme Manager - + F8 + F8 - Toggle Theme Manager - Toggle Theme Manager + &Theme Manager + &Theme Manager - Toggle the visibility of the theme manager. - + Toggle Theme Manager + Toggle Theme Manager - F10 - + Toggle the visibility of the theme manager. + Toggle the visibility of the theme manager. - &Service Manager - &Service Manager + F10 + F10 - Toggle Service Manager - Toggle Service Manager. + &Service Manager + &Service Manager - Toggle the visibility of the service manager. - + Toggle Service Manager + Toggle Service Manager. - F9 - F9 + Toggle the visibility of the service manager. + Toggle the visibility of the service manager. - &Preview Panel - &Preview Panel + F9 + F9 - Toggle Preview Panel - Toggle Preview Panel + &Preview Panel + &Preview Panel - Toggle the visibility of the preview panel. - + Toggle Preview Panel + Toggle Preview Panel - F11 - + Toggle the visibility of the preview panel. + Toggle the visibility of the preview panel. - &Live Panel - + F11 + F11 - Toggle Live Panel - + &Live Panel + &Live Panel - Toggle the visibility of the live panel. - + Toggle Live Panel + Toggle Live Panel - F12 - + Toggle the visibility of the live panel. + Toggle the visibility of the live panel. - &Plugin List - + F12 + F12 - List the Plugins - List the plugins + &Plugin List + &Plugin List - Alt+F7 - Alt+F7 + List the Plugins + List the Plugins - &User Guide - &User Guide + Alt+F7 + Alt+F7 - &About - + &User Guide + &User Guide - - More information about OpenLP - + + &About + &About - Ctrl+F1 - Ctrl+F1 + More information about OpenLP + More information about OpenLP - &Online Help - + Ctrl+F1 + Ctrl+F1 - &Web Site - + &Online Help + &Online Help - &Auto Detect - + &Web Site + &Web Site - Use the system language, if available. - + &Auto Detect + &Auto Detect - - Set the interface language to %s - + + Use the system language, if available. + Use the system language, if available. - Add &Tool... - + Set the interface language to %s + Set the interface language to %s - Add an application to the list of tools. - + Add &Tool... + Add &Tool... - - &Default - + + Add an application to the list of tools. + Add an application to the list of tools. + &Default + &Default + + + Set the view mode back to the default. - + Set the view mode back to the default. - + &Setup - + &Setup - + Set the view mode to Setup. - + Set the view mode to Setup. - + &Live - &Live + &Live - + Set the view mode to Live. - + Set the view mode to Live. - + + OpenLP Version Updated + OpenLP Version Updated + + + + OpenLP Main Display Blanked + OpenLP Main Display Blanked + + + + The Main Display has been blanked out + The Main Display has been blanked out + + + + Save Changes to Service? + Save Changes to Service? + + + + Your service has changed. Do you want to save those changes? + Your service has changed. Do you want to save those changes? + + + + Default Theme: %s + Default Theme: %s + + + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. - - - - - OpenLP Version Updated - OpenLP Version Updated - - - - OpenLP Main Display Blanked - - - - - The Main Display has been blanked out - The Main Display has been blanked out - - - - Save Changes to Service? - Save Changes to Service? - - - - Your service has changed. Do you want to save those changes? - - - - - Default Theme: %s +You can download the latest version from http://openlp.org/. @@ -2259,215 +2244,210 @@ You can download the latest version from <a href="http://openlp.org/&quo No Items Selected - + No Items Selected Import %s - + Import %s Import a %s - + Import a %s Load %s - + Load %s Load a new %s - + Load a new %s New %s - + New %s Add a new %s - + Add a new %s Edit %s - + Edit %s Edit the selected %s - + Edit the selected %s Delete %s - + Delete %s Delete the selected item - Delete the selected item + Delete the selected item Preview %s - + Preview %s Preview the selected item - + Preview the selected item Send the selected item live - Send the selected item live. + Send the selected item live. Add %s to Service - + Add %s to Service Add the selected item(s) to the service - Add the selected item(s) to the service. + Add the selected item(s) to the service. &Edit %s - + &Edit %s &Delete %s - + &Delete %s &Preview %s - + &Preview %s &Show Live - + &Show Live &Add to Service - + &Add to Service &Add to selected Service Item - + &Add to selected Service Item You must select one or more items to preview. - + You must select one or more items to preview. You must select one or more items to send live. - + You must select one or more items to send live. You must select one or more items. - + You must select one or more items. No items selected - + No items selected You must select one or more items - You must select one or more items + You must select one or more items No Service Item Selected - + No Service Item Selected You must select an existing service item to add to. - + You must select an existing service item to add to. Invalid Service Item - + Invalid Service Item You must select a %s service item. - + You must select a %s service item. OpenLP.PluginForm - + Plugin List - + Plugin List - + Plugin Details - Plugin Details + Plugin Details - + Version: - Version: + Version: - - TextLabel - - - - + About: - + About: - + Status: - Status: + Status: - + Active - Active + Active - + Inactive - + Inactive %s (Inactive) - + %s (Inactive) %s (Active) - + %s (Active) %s (Disabled) - + %s (Disabled) @@ -2475,22 +2455,22 @@ You can download the latest version from <a href="http://openlp.org/&quo Reorder Service Item - + Reorder Service Item Up - + Up Delete - Delete + Delete Down - + Down @@ -2498,87 +2478,87 @@ You can download the latest version from <a href="http://openlp.org/&quo New Service - + New Service Create a new service - Create a new service + Create a new service - + Open Service - Open Service + Open Service Load an existing service - + Load an existing service - + Save Service - + Save Service Save this service - Save this service + Save this service Theme: - Theme: + Theme: Select a theme for the service - Select a theme for the service. + Select a theme for the service Move to &top - + Move to &top Move item to the top of the service. - + Move item to the top of the service. Move &up - + Move &up Move item up one position in the service. - + Move item up one position in the service. Move &down - + Move &down Move item down one position in the service. - + Move item down one position in the service. Move to &bottom - + Move to &bottom Move item to the end of the service. - + Move item to the end of the service. &Delete From Service - + &Delete From Service @@ -2626,38 +2606,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Change Item Theme - + Save Changes to Service? Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2691,72 +2671,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Live - + Preview Preview - - Move to first - - - - + Move to previous Move to previous - + Move to next Move to next slide. - - Move to last - Move to last - - - + Hide - + Move to live Move to live - + Edit and re-preview Song Edit and re-preview Song. - + Start continuous loop Start continuous loop - + Stop continuous loop - + s s - + Delay between slides in seconds Delay between slides in seconds. - + Start playing media Start playing media @@ -2766,10 +2736,23 @@ The content encoding is not UTF-8. Go to Verse + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme @@ -2839,7 +2822,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2864,7 +2847,7 @@ The content encoding is not UTF-8. - + Error Error @@ -2924,23 +2907,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists Theme Exists - + A theme with this name already exists. Would you like to overwrite it? @@ -3256,250 +3239,255 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Song Editor - + &Title: &Title: - + &Lyrics: - + &Add - + &Edit - + Ed&it All - + &Delete &Delete - + Title && Lyrics Title && Lyrics - + Authors Authors - + &Add to Song - + &Remove &Remove - + &Manage Authors, Topics, Song Books - + Topic Topic - + A&dd to Song - + R&emove - + Song Book - + Authors, Topics && Song Book - + Theme Theme - + New &Theme - + Copyright Information Copyright Information - + © - + Comments - + Theme, Copyright Info && Comments - + Save && Preview Save && Preview - + Add Author - + This author does not exist, do you want to add them? - + Error Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? - + Alt&ernate title: - + &Verse order: - + CCLI number: + CCLI number: + + + + Song No.: SongsPlugin.EditVerseForm - + Edit Verse Edit Verse - + &Verse type: - + &Insert @@ -3542,82 +3530,82 @@ The content encoding is not UTF-8. Starting import... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Select Import Source - + Select the import format, and where to import from. Select the import format, and where to import from. - + Format: Format: - + OpenLyrics - + OpenSong OpenSong - + Add Files... - + Remove File(s) - + Filename: - + Browse... - + Importing Importing - + Please wait while your songs are imported. - + Ready. Ready. - + %p% @@ -3707,32 +3695,32 @@ The content encoding is not UTF-8. - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation @@ -3851,12 +3839,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3912,112 +3900,112 @@ The content encoding is not UTF-8. &Delete - + Error Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author - + Are you sure you want to delete the selected author? Are you sure you want to delete the selected author? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! No author selected! - + Delete Topic Delete Topic - + Are you sure you want to delete the selected topic? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! - + Delete Book Delete Book - + Are you sure you want to delete the selected book? Are you sure you want to delete the selected book? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! No book selected! diff --git a/resources/i18n/openlp_es.ts b/resources/i18n/openlp_es.ts index 93d04b1c4..000c2e18c 100644 --- a/resources/i18n/openlp_es.ts +++ b/resources/i18n/openlp_es.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. No se encuentra un libro que concuerde, en esta Biblia. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Editar Diapositivas Personalizadas - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Agregar Nueva - + Add a new slide at bottom. - + Edit Editar - + Edit the selected slide. - + Edit All Editar Todo - + Edit all the slides at once. - + Save Guardar - + Save the slide currently being edited. - + Delete Eliminar - + Delete the selected slide. - + Clear Limpiar - + Clear edit area Limpiar el área de edición - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Imagen(es) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Medios @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Mantenimiento de Temas - + Theme &name: - - &Visibility: - - - - - Opaque - Opaco - - - - Transparent - Transparente - - - + Type: Tipo: - + Solid Color Color Sólido - + Gradient Gradiente - + Image Imagen - + Image: Imagen: - + Gradient: - + Horizontal Horizontal - + Vertical Vertical - + Circular Circular - + &Background - + Main Font Tipo de Letra Principal - + Font: Fuente: - + Color: - + Size: Tamaño: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Negrita - + Italics Cursiva - + Bold/Italics Negrita/Cursiva - + Style: - + Display Location Ubicación en la pantalla - + Use default location - + X position: - + Y position: - + Width: Ancho: - + Height: Altura: - + px px - + &Main Font - + Footer Font Fuente de Pie de Página - + &Footer Font - + Outline Contorno - + Outline size: - + Outline color: - + Show outline: - + Shadow Sombra - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Alineación - + Horizontal align: - + Left Izquierda - + Right Derecha - + Center Centro - + Vertical align: - + Top - + Middle Medio - + Bottom - + Slide Transition Transición de Diapositiva - + Transition active - + &Other Options - + Preview Vista Previa - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop Ingles - + &File &Archivo - + &Import &Importar - + &Export &Exportar - + &View &Ver - + M&ode M&odo - + &Tools &Herramientas - + &Settings &Preferencias - + &Language &Idioma - + &Help &Ayuda - + Media Manager Gestor de Medios - + Service Manager Gestor de Servicio - + Theme Manager Gestor de Temas - + &New &Nuevo - + New Service Servicio Nuevo - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Abrir - + Open Service Abrir Servicio - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Guardar - + Save Service Guardar Servicio - + Save the current service to disk. - + Ctrl+S Crtl+G - + Save &As... Guardar &Como... - + Save Service As Guardar Servicio Como - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Salir - + Quit OpenLP Salir de OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager Gestor de &Medios - + Toggle Media Manager Alternar Gestor de Medios - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager Gestor de &Temas - + Toggle Theme Manager Alternar Gestor de Temas - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager Gestor de &Servicio - + Toggle Service Manager Alternar Gestor de Servicio - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Panel de Vista Previa - + Toggle Preview Panel Alternar Panel de Vista Previa - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List Lista de &Plugins - + List the Plugins Lista de Plugins - + Alt+F7 Alt+F7 - + &User Guide Guía de &Usuario - + &About &Acerca De - + More information about OpenLP Más información acerca de OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Ayuda En Línea - + &Web Site Sitio &Web - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live En &vivo - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated Versión de OpenLP Actualizada - + OpenLP Main Display Blanked Pantalla Principal de OpenLP en Blanco - + The Main Display has been blanked out La Pantalla Principal esta en negro - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Lista de Plugins - + Plugin Details Detalles de Plugin - + Version: Versión: - - TextLabel - TextLabel - - - + About: Acerca de: - + Status: Estado: - + Active Activo - + Inactive Inactivo @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Crear un servicio nuevo - + Open Service Abrir Servicio @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Abrir un servicio existente - + Save Service Guardar Servicio @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Cambiar Tema de Ítem - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live En vivo - + Preview Vista Previa - - Move to first - Ir al principio - - - + Move to previous Regresar al anterior - + Move to next Ir al siguiente - - Move to last - Mover al final - - - + Hide - + Move to live Proyectar en vivo - + Edit and re-preview Song Editar y re-visualizar Canción - + Start continuous loop Iniciar bucle continuo - + Stop continuous loop Detener el bucle - + s s - + Delay between slides in seconds Espera entre diapositivas en segundos - + Start playing media Iniciar la reproducción de medios @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Ir al Verso + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Tema Nuevo @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error Error @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists Ya existe el Tema - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Editor de Canción - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit &Editar - + Ed&it All - + &Delete - + Title && Lyrics Título && Letra - + Authors Autores - + &Add to Song &Agregar a Canción - + &Remove &Quitar - + &Manage Authors, Topics, Song Books - + Topic Categoría - + A&dd to Song A&gregar a Canción - + R&emove &Quitar - + Song Book Himnario - - - Authors, Topics && Song Book - - - - - Theme - Tema - - New &Theme + Song No.: - Copyright Information - Información de Derechos de Autor - - - - © + Authors, Topics && Song Book + Theme + Tema + + + + New &Theme + + + + + Copyright Information + Información de Derechos de Autor + + + + © + + + + CCLI number: - + Comments Comentarios - + Theme, Copyright Info && Comments Tema, Derechos de Autor && Comentarios - + Save && Preview Guardar && Vista Previa - + Add Author - + This author does not exist, do you want to add them? - + Error Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Editar Verso - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. Iniciando importación... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Seleccione Origen de Importación - + Select the import format, and where to import from. Seleccione el formato y el lugar del cual importar. - + Format: Formato: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing Importando - + Please wait while your songs are imported. - + Ready. Listo. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author Borrar Autor - + Are you sure you want to delete the selected author? ¿Está seguro que desea eliminar el autor seleccionado? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! ¡Ningún autor seleccionado! - + Delete Topic Borrar Categoría - + Are you sure you want to delete the selected topic? ¿Está seguro que desea eliminar la categoría seleccionada? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! ¡No seleccionó la categoría! - + Delete Book Eliminar Libro - + Are you sure you want to delete the selected book? ¿Está seguro de que quiere eliminar el libro seleccionado? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! ¡Ningún libro seleccionado! diff --git a/resources/i18n/openlp_et.ts b/resources/i18n/openlp_et.ts index d37314bdb..fa40aa33d 100644 --- a/resources/i18n/openlp_et.ts +++ b/resources/i18n/openlp_et.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -644,7 +644,7 @@ Changes do not affect verses already in the service. - + etc @@ -659,7 +659,7 @@ Changes do not affect verses already in the service. - + Bible not fully loaded. @@ -701,47 +701,47 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Kohandatud slaidide muutmine - + Add New Uue lisamine - + Edit Muuda - + Edit All Kõigi muutmine - + Save Salvesta - + Delete Kustuta - + Clear Puhasta - + Clear edit area Muutmise ala puhastamine - + Split Slide Tükelda slaid @@ -756,52 +756,52 @@ Changes do not affect verses already in the service. Viga - + Move slide down one position. - + &Title: - + Add a new slide at bottom. - + Edit the selected slide. - + Edit all the slides at once. - + Save the slide currently being edited. - + Delete the selected slide. - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -821,7 +821,7 @@ Changes do not affect verses already in the service. - + Move slide up one position. @@ -875,7 +875,7 @@ Changes do not affect verses already in the service. Ekraani tausta asendamine - + Image(s) Pilt(pildid) @@ -885,20 +885,25 @@ Changes do not affect verses already in the service. - + You must select an image to delete. - + You must select an image to replace the background with. - + You must select a media file to replace the background with. + + + Reset Live Background + + MediaPlugin @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Meedia @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1207,317 +1212,297 @@ Built With OpenLP.AmendThemeForm - + Theme Maintenance Kujunduste haldus - + Theme &name: - - &Visibility: - - - - - Opaque - Läbipaistmatu - - - - Transparent - Läbipaistev - - - + Type: Liik: - + Solid Color Ühtlane värv - + Gradient Üleminek - + Image Pilt - + Image: Pilt: - + Gradient: - + Horizontal Horisontaalne - + Vertical Vertikaalne - + Circular Ümmargune - + &Background - + Main Font Peamine kirjastiil - + Font: Kirjastiil: - + Color: - + Size: Suurus: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Tavaline - + Bold Rasvane - + Italics Kursiiv - + Bold/Italics Rasvane/kaldkiri - + Style: - + Display Location Kuva asukoht - + Use default location - + X position: - + Y position: - + Width: Laius: - + Height: Kõrgus: - + px px - + &Main Font - + Footer Font Jaluse kirjatüüp - + &Footer Font - + Outline Välisjoon - + Outline size: - + Outline color: - + Show outline: - + Shadow Vari - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Joondus - + Horizontal align: - + Left Vasakul - + Right Paremal - + Center Keskel - + Vertical align: - + Top Üleval - + Middle Keskel - + Bottom All - + Slide Transition Slaidide üleminek - + Transition active - + &Other Options - + Preview Eelvaade - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1671,412 +1656,412 @@ Built With Eesti - + OpenLP 2.0 OpenLP 2.0 - + &File &Fail - + &Import &Impordi - + &Export &Ekspordi - + &View &Vaade - + M&ode &Režiim - + &Tools &Tööriistad - + &Settings &Sätted - + &Language &Keel - + &Help A&bi - + Media Manager Meediahaldur - + Service Manager Teenistuse haldur - + Theme Manager Kujunduse haldur - + &New &Uus - + New Service Uus teenistus - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Ava - + Open Service Teenistuse avamine - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Salvesta - + Save Service Salvesta teenistus - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Salvesta &kui... - + Save Service As Salvesta teenistus kui - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Välju - + Quit OpenLP Lahku OpenLPst - + Alt+F4 Alt+F4 - + &Theme &Kujundus - + &Configure OpenLP... - + &Media Manager &Meediahaldur - + Toggle Media Manager Meediahalduri lüliti - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Kujunduse haldur - + Toggle Theme Manager Kujunduse halduri lüliti - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Teenistuse haldur - + Toggle Service Manager Teenistuse halduri lüliti - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Eelvaatluspaneel - + Toggle Preview Panel Eelvaatluspaneeli lüliti - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Pluginate loend - + List the Plugins Pluginate loend - + Alt+F7 Alt+F7 - + &User Guide &Kasutajajuhend - + &About &Lähemalt - + More information about OpenLP Lähem teave OpenLP kohta - + Ctrl+F1 Ctrl+F1 - + &Online Help &Abi veebis - + &Web Site &Veebileht - + &Auto Detect &Isetuvastus - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... Lisa &tööriist... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Otse - + Set the view mode to Live. - - Version %s of OpenLP is now available for download (you are currently running version %s). - -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. - - - - + OpenLP Version Updated OpenLP uuendus - + OpenLP Main Display Blanked OpenLP peakuva on tühi - + The Main Display has been blanked out Peakuva on tühi - + Save Changes to Service? Kas salvestada teenistusse tehtud muudatused? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s + + + 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/. + + OpenLP.MediaManagerItem @@ -2239,42 +2224,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Pluginate loend - + Plugin Details Plugina andmed - + Version: Versioon: - - TextLabel - TekstiPealdis - - - + About: Kirjeldus: - + Status: Olek: - + Active Aktiivne - + Inactive Pole aktiivne @@ -2330,7 +2310,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Uue teenistuse loomine - + Open Service Teenistuse avamine @@ -2340,7 +2320,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Välise teenistuse laadimine - + Save Service Salvesta teenistus @@ -2425,38 +2405,38 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Changes to Service? Kas salvestada teenistusse tehtud muudatused? - + Your service is unsaved, do you want to save those changes before creating a new one? See teenistus pole salvestatud, kas tahad selle uue avamist salvestada? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? See teenistus pole salvestatud, kas tahad enne uue avamist muudatused salvestada? - + Error Viga - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2515,72 +2495,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Ekraan - + Preview Eelvaade - - Move to first - Liikumine esimesele - - - + Move to previous Eelmisele liikumine - + Move to next Liikumine järgmisele - - Move to last - Liikumine viimasele - - - + Hide - + Move to live Tõsta ekraanile - + Edit and re-preview Song Muuda ja kuva laulu eelvaade uuesti - + Start continuous loop Katkematu korduse alustamine - + Stop continuous loop Katkematu korduse lõpetamine - + s s - + Delay between slides in seconds Viivitus slaidide vahel sekundites - + Start playing media Meediaesituse alustamine @@ -2590,10 +2560,23 @@ The content encoding is not UTF-8. Liikumine salmile + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Uus kujundus @@ -2663,7 +2646,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2688,7 +2671,7 @@ The content encoding is not UTF-8. - + Error Viga @@ -2748,23 +2731,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. See fail ei ole sobilik kujundus. - + Theme Exists Kujundus on juba olemas - + A theme with this name already exists. Would you like to overwrite it? @@ -3080,250 +3063,255 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Lauluredaktor - + &Title: - + &Lyrics: - + &Add - + &Edit &Muuda - + Ed&it All - + &Delete &Kustuta - + Title && Lyrics Pealkiri && laulusõnad - + Authors Autorid - + &Add to Song &Lisa laulule - + &Remove &Eemalda - + Topic Teema - + A&dd to Song L&isa laulule - + R&emove &Eemalda - + Song Book Laulik - + Theme Kujundus - + Copyright Information Autoriõiguse andmed - + Comments Kommentaarid - + Theme, Copyright Info && Comments Kujundus, autoriõigus && kommentaarid - + Add Author - + This author does not exist, do you want to add them? - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + Add Book - + This song book does not exist, do you want to add it? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + New &Theme - + © - + Save && Preview - + Error Viga - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + &Manage Authors, Topics, Song Books - + Authors, Topics && Song Book - + This author is already in the list. - + This topic is already in the list. - + Alt&ernate title: - + &Verse order: - + CCLI number: + + + Song No.: + + SongsPlugin.EditVerseForm - + Edit Verse - + &Verse type: - + &Insert @@ -3361,82 +3349,82 @@ The content encoding is not UTF-8. - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source - + Select the import format, and where to import from. - + Format: - + OpenLyrics - + OpenSong - + Add Files... - + Remove File(s) - + Filename: - + Browse... - + Importing - + Please wait while your songs are imported. - + Ready. - + %p% @@ -3531,32 +3519,32 @@ The content encoding is not UTF-8. - + OpenLP 2.0 - + openlp.org 1.x - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation @@ -3675,12 +3663,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3731,47 +3719,47 @@ The content encoding is not UTF-8. &Kustuta - + Delete Author - + Delete Topic - + Delete Book - + Error Viga - + Are you sure you want to delete the selected author? - + No author selected! - + Are you sure you want to delete the selected topic? - + No topic selected! - + Are you sure you want to delete the selected book? @@ -3781,67 +3769,67 @@ The content encoding is not UTF-8. - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + This author cannot be deleted, they are currently assigned to at least one song. - + This topic cannot be deleted, it is currently assigned to at least one song. - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! diff --git a/resources/i18n/openlp_hu.ts b/resources/i18n/openlp_hu.ts index ba662fc28..1c75f31e3 100644 --- a/resources/i18n/openlp_hu.ts +++ b/resources/i18n/openlp_hu.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. Nem található ilyen könyv ebben a Bibliában. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Egyedi diák szerkesztése - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Új hozzáadása - + Add a new slide at bottom. - + Edit Szerkesztés - + Edit the selected slide. - + Edit All Összes szerkesztése - + Edit all the slides at once. - + Save Mentés - + Save the slide currently being edited. - + Delete Törlés - + Delete the selected slide. - + Clear - + Clear edit area Szerkesztő terület törlése - + Split Slide Dia kettéválasztása - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Kép(ek) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Média @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1334,317 +1339,297 @@ A GNU General Public License nem engedi meg, hogy a program része legyen szelle OpenLP.AmendThemeForm - + Theme Maintenance Témák kezelése - + Theme &name: - - &Visibility: - - - - - Opaque - Átlátszatlan - - - - Transparent - Átlátszó - - - + Type: Típus: - + Solid Color Homogén szín - + Gradient Színátmenet - + Image Kép - + Image: Kép: - + Gradient: - + Horizontal Vízszintes - + Vertical Függőleges - + Circular Körkörös - + &Background - + Main Font Alap betűkészlet - + Font: Betűkészlet: - + Color: - + Size: Méret: - + pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normál - + Bold Félkövér - + Italics Dőlt - + Bold/Italics Félkövér dőlt - + Style: - + Display Location Hely megjelenítése - + Use default location - + X position: - + Y position: - + Width: Szélesség: - + Height: Magasság: - + px - + &Main Font - + Footer Font Lábjegyzet betűkészlete - + &Footer Font - + Outline Körvonal - + Outline size: - + Outline color: - + Show outline: - + Shadow Árnyék - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Igazítás - + Horizontal align: - + Left Balra zárt - + Right Jobbra zárt - + Center Középre igazított - + Vertical align: - + Top - + Middle Középre - + Bottom - + Slide Transition Diaátmenet - + Transition active - + &Other Options - + Preview Előnézet - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1793,7 +1778,7 @@ A GNU General Public License nem engedi meg, hogy a program része legyen szelle OpenLP.MainWindow - + OpenLP 2.0 @@ -1803,404 +1788,404 @@ A GNU General Public License nem engedi meg, hogy a program része legyen szelle Magyar - + &File &Fájl - + &Import &Importálás - + &Export &Exportálás - + &View &Nézet - + M&ode &Mód - + &Tools &Eszközök - + &Settings &Beállítások - + &Language &Nyelv - + &Help &Súgó - + Media Manager Médiakezelő - + Service Manager Szolgálatkezelő - + Theme Manager Témakezelő - + &New &Új - + New Service Új szolgálat - + Create a new service. - + Ctrl+N - + &Open &Megnyitás - + Open Service Szolgálat megnyitása - + Open an existing service. - + Ctrl+O - + &Save - + Save Service Szolgálat mentése - + Save the current service to disk. - + Ctrl+S - + Save &As... Mentés má&sként... - + Save Service As Szolgálat mentése másként - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Kilépés - + Quit OpenLP OpenLP bezárása - + Alt+F4 - + &Theme &Téma - + &Configure OpenLP... - + &Media Manager &Médiakezelő - + Toggle Media Manager Médiakezelő átváltása - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager &Témakezelő - + Toggle Theme Manager Témakezelő átváltása - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager &Szolgálatkezelő - + Toggle Service Manager Szolgálatkezelő átváltása - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel &Előnézet panel - + Toggle Preview Panel Előnézet panel átváltása - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List &Bővítménylista - + List the Plugins Bővítmények listája - + Alt+F7 - + &User Guide &Felhasználói kézikönyv - + &About &Névjegy - + More information about OpenLP Több információ az OpenLP-ről - + Ctrl+F1 - + &Online Help &Online súgó - + &Web Site &Weboldal - + &Auto Detect &Automatikus felismerés - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... &Eszköz hozzáadása... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Egyenes adás - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP verziófrissítés - + OpenLP Main Display Blanked Sötét OpenLP fő képernyő - + The Main Display has been blanked out A fő képernyő el lett sötétítve - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2366,42 +2351,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Bővítménylista - + Plugin Details Bővítmény részletei - + Version: Verzió: - - TextLabel - Szövegcímke - - - + About: Névjegy: - + Status: Állapot: - + Active Aktív - + Inactive Inaktív @@ -2457,7 +2437,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Új szolgálat létrehozása - + Open Service Szolgálat megnyitása @@ -2467,7 +2447,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Egy meglévő szolgálat betöltése - + Save Service Szolgálat mentése @@ -2577,38 +2557,38 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? A szolgálat nincs elmentve, szeretné menteni, mielőtt az újat létrehozná? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? A szolgálat nincs elmentve, szeretné menteni, mielőtt az újat megnyitná? - + Error Hiba - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2642,72 +2622,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Egyenes adás - + Preview Előnézet - - Move to first - Mozgatás az elsőre - - - + Move to previous Mozgatás az előzőre - + Move to next Mozgatás a következőre - - Move to last - Mozgatás az utolsóra - - - + Hide - + Move to live Mozgatás az egyenes adásban lévőre - + Edit and re-preview Song Dal szerkesztése, majd újra az előnézet megnyitása - + Start continuous loop Folyamatos vetítés indítása - + Stop continuous loop Folyamatos vetítés leállítása - + s mp - + Delay between slides in seconds Diák közötti késleltetés másodpercben - + Start playing media Médialejátszás indítása @@ -2717,10 +2687,23 @@ The content encoding is not UTF-8. Ugrás versszakra + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Új téma @@ -2790,7 +2773,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2815,7 +2798,7 @@ The content encoding is not UTF-8. - + Error Hiba @@ -2875,23 +2858,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. Nem érvényes témafájl. - + Theme Exists A téma már létezik - + A theme with this name already exists. Would you like to overwrite it? @@ -3207,232 +3190,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Dalszerkesztő - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit &Szerkesztés - + Ed&it All - + &Delete &Törlés - + Title && Lyrics Cím és dalszöveg - + Authors Szerzők - + &Add to Song &Hozzáadás dalhoz - + &Remove &Eltávolítás - + &Manage Authors, Topics, Song Books - + Topic Témakör - + A&dd to Song &Hozzáadás dalhoz - + R&emove &Eltávolítás - + Song Book Daloskönyv - - - Authors, Topics && Song Book - - - - - Theme - Téma - - New &Theme + Song No.: - Copyright Information - Szerzői jogi információ - - - - © + Authors, Topics && Song Book + Theme + Téma + + + + New &Theme + + + + + Copyright Information + Szerzői jogi információ + + + + © + + + + CCLI number: - + Comments Megjegyzések - + Theme, Copyright Info && Comments Téma, szerzői jogi infók és megjegyzések - + Save && Preview Mentés és előnézet - + Add Author - + This author does not exist, do you want to add them? - + Error Hiba - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3440,17 +3428,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Versszak szerkesztése - + &Verse type: - + &Insert @@ -3578,112 +3566,112 @@ The content encoding is not UTF-8. Importálás indítása... - + Song Import Wizard Dalimportáló tündér - + Welcome to the Song Import Wizard Üdvözlet a dalimportáló tündérben - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. A tündérrel különféle formátumú dalokat lehet importálni. Az alább található Tovább gombra való kattintással indítható a folyamat első lépése a formátum kiválasztásával. - + Select Import Source Válassza ki az importálandó forrást - + Select the import format, and where to import from. Válassza ki a importálandó forrást és a helyet, ahonnan importálja. - + Format: Formátum: - + OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: Fájlnév: - + Browse... Tallózás... - + Add Files... Fájlok hozzáadása... - + Remove File(s) Fájlok törlése - + Importing Importálás - + Please wait while your songs are imported. Kérem, várjon, míg a dalok importálás alatt állnak. - + Ready. Kész. - + %p% @@ -3802,12 +3790,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3863,112 +3851,112 @@ The content encoding is not UTF-8. &Törlés - + Error Hiba - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author Szerző törlése - + Are you sure you want to delete the selected author? A kiválasztott szerző biztosan törölhető? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! Nincs kiválasztott szerző! - + Delete Topic Témakör törlése - + Are you sure you want to delete the selected topic? A kiválasztott témakör biztosan törölhető? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! Nincs kiválasztott témakör! - + Delete Book Könyv törlése - + Are you sure you want to delete the selected book? A kiválasztott könyv biztosan törölhető? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! Nincs kiválasztott könyv! diff --git a/resources/i18n/openlp_ko.ts b/resources/i18n/openlp_ko.ts index a74275115..685f0a7a8 100644 --- a/resources/i18n/openlp_ko.ts +++ b/resources/i18n/openlp_ko.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New - + Add a new slide at bottom. - + Edit - + Edit the selected slide. - + Edit All - + Edit all the slides at once. - + Save - + Save the slide currently being edited. - + Delete - + Delete the selected slide. - + Clear - + Clear edit area - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance - + Theme &name: - - &Visibility: - - - - - Opaque - - - - - Transparent - - - - + Type: - + Solid Color - + Gradient - + Image - + Image: - + Gradient: - + Horizontal - + Vertical - + Circular - + &Background - + Main Font - + Font: - + Color: - + Size: - + pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal - + Bold - + Italics - + Bold/Italics - + Style: - + Display Location - + Use default location - + X position: - + Y position: - + Width: - + Height: - + px - + &Main Font - + Footer Font - + &Footer Font - + Outline - + Outline size: - + Outline color: - + Show outline: - + Shadow - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment - + Horizontal align: - + Left - + Right - + Center - + Vertical align: - + Top - + Middle - + Bottom - + Slide Transition - + Transition active - + &Other Options - + Preview - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop - + &File - + &Import - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New - + New Service - + Create a new service. - + Ctrl+N - + &Open - + Open Service - + Open an existing service. - + Ctrl+O - + &Save - + Save Service - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated - + OpenLP Main Display Blanked - + The Main Display has been blanked out - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List - + Plugin Details - + Version: - - TextLabel - - - - + About: - + Status: - + Active - + Inactive @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Open Service @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Service @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live - + Preview - - Move to first - - - - + Move to previous - + Move to next - - Move to last - - - - + Hide - + Move to live - + Edit and re-preview Song - + Start continuous loop - + Stop continuous loop - + s - + Delay between slides in seconds - + Start playing media @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. - + Theme Exists - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit - + Ed&it All - + &Delete - + Title && Lyrics - + Authors - + &Add to Song - + &Remove - + &Manage Authors, Topics, Song Books - + Topic - + A&dd to Song - + R&emove - + Song Book - - - Authors, Topics && Song Book - - - - - Theme - - - New &Theme + Song No.: - Copyright Information - - - - - © + Authors, Topics && Song Book - CCLI number: + Theme - Comments + New &Theme + Copyright Information + + + + + © + + + + + CCLI number: + + + + + Comments + + + + Theme, Copyright Info && Comments - + Save && Preview - + Add Author - + This author does not exist, do you want to add them? - + Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source - + Select the import format, and where to import from. - + Format: - + OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing - + Please wait while your songs are imported. - + Ready. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author - + Are you sure you want to delete the selected author? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! - + Delete Topic - + Are you sure you want to delete the selected topic? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! - + Delete Book - + Are you sure you want to delete the selected book? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! diff --git a/resources/i18n/openlp_nb.ts b/resources/i18n/openlp_nb.ts index 2bb0ae95e..9d94a44c4 100644 --- a/resources/i18n/openlp_nb.ts +++ b/resources/i18n/openlp_nb.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. Finner ingen matchende bøker i denne Bibelen. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Rediger egendefinerte lysbilder - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Legg til Ny - + Add a new slide at bottom. - + Edit - + Edit the selected slide. - + Edit All - + Edit all the slides at once. - + Save Lagre - + Save the slide currently being edited. - + Delete - + Delete the selected slide. - + Clear - + Clear edit area - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Bilde(r) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Vedlikehold av tema - + Theme &name: - - &Visibility: - - - - - Opaque - Gjennomsiktighet - - - - Transparent - Gjennomsiktig - - - + Type: Type: - + Solid Color Ensfarget - + Gradient - + Image - + Image: - + Gradient: - + Horizontal - + Vertical Vertikal - + Circular - + &Background - + Main Font Hovedskrifttype - + Font: - + Color: - + Size: Størrelse: - + pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Fet - + Italics Kursiv - + Bold/Italics - + Style: - + Display Location - + Use default location - + X position: - + Y position: - + Width: Bredde: - + Height: Høyde: - + px - + &Main Font - + Footer Font Skrifttype bunntekst - + &Footer Font - + Outline Omriss - + Outline size: - + Outline color: - + Show outline: - + Shadow Skygge - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Justering - + Horizontal align: - + Left - + Right - + Center Sentrert - + Vertical align: - + Top Topp - + Middle Midtstilt - + Bottom - + Slide Transition Lysbildeovergang - + Transition active - + &Other Options - + Preview - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop Norsk - + &File &Fil - + &Import &Import - + &Export &Eksporter - + &View &Vis - + M&ode - + &Tools - + &Settings &Innstillinger - + &Language &Språk - + &Help &Hjelp - + Media Manager Innholdselementer - + Service Manager - + Theme Manager - + &New &Ny - + New Service - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Åpne - + Open Service Åpne møteplan - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Lagre - + Save Service - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Avslutt - + Quit OpenLP Avslutt OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager - + Toggle Theme Manager Åpne tema-behandler - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager - + Toggle Service Manager Vis møteplanlegger - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Forhåndsvisningspanel - + Toggle Preview Panel Vis forhåndsvisningspanel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Tillegsliste - + List the Plugins Hent liste over tillegg - + Alt+F7 ALT+F7 - + &User Guide &Brukerveiledning - + &About &Om - + More information about OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help - + &Web Site &Internett side - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... Legg til & Verktøy... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Direkte - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP versjonen har blitt oppdatert - + OpenLP Main Display Blanked - + The Main Display has been blanked out - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List - + Plugin Details - + Version: - - TextLabel - - - - + About: Om: - + Status: Status: - + Active Aktiv - + Inactive @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Opprett ny møteplan - + Open Service Åpne møteplan @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo - + Save Service @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Bytt objekttema - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) OpenLP møteplan (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Direkte - + Preview - - Move to first - - - - + Move to previous Flytt til forrige - + Move to next - - Move to last - Flytt til sist - - - + Hide - + Move to live - + Edit and re-preview Song Endre og forhåndsvis sang - + Start continuous loop Start kontinuerlig løkke - + Stop continuous loop - + s - + Delay between slides in seconds Forsinkelse mellom lysbilder i sekund - + Start playing media Start avspilling av media @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Gå til vers + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. Filen er ikke et gyldig tema. - + Theme Exists Temaet eksisterer - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Sangredigeringsverktøy - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit &Rediger - + Ed&it All - + &Delete - + Title && Lyrics Tittel && Sangtekst - + Authors - + &Add to Song - + &Remove &Fjern - + &Manage Authors, Topics, Song Books - + Topic Emne - + A&dd to Song - + R&emove &Fjern - + Song Book - - - Authors, Topics && Song Book - - - - - Theme - Tema - - New &Theme + Song No.: - Copyright Information - Copyright-informasjon - - - - © + Authors, Topics && Song Book - CCLI number: - + Theme + Tema - Comments + New &Theme + Copyright Information + Copyright-informasjon + + + + © + + + + + CCLI number: + + + + + Comments + + + + Theme, Copyright Info && Comments - + Save && Preview - + Add Author - + This author does not exist, do you want to add them? - + Error - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Rediger Vers - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Velg importeringskilde - + Select the import format, and where to import from. - + Format: Format: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing - + Please wait while your songs are imported. - + Ready. Klar. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author - + Are you sure you want to delete the selected author? Er du sikker på at du vil slette den valgte forfatteren? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! Ingen forfatter er valgt! - + Delete Topic Slett emne - + Are you sure you want to delete the selected topic? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! - + Delete Book Slett bok - + Are you sure you want to delete the selected book? Er du sikker på at du vil slette den merkede boken? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! Ingen bok er valgt! diff --git a/resources/i18n/openlp_pt_BR.ts b/resources/i18n/openlp_pt_BR.ts index f0481854f..4d25aa1bc 100644 --- a/resources/i18n/openlp_pt_BR.ts +++ b/resources/i18n/openlp_pt_BR.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. Nenhum livro foi encontrado nesta Bíblia - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Editar Slides Customizados - + Move slide up one position. - + Move slide down one position. Mover slide uma posição para baixo. - + &Title: &Título: - + Add New Adicionar Novo - + Add a new slide at bottom. - + Edit Editar - + Edit the selected slide. Editar o slide selecionado. - + Edit All Editar Todos - + Edit all the slides at once. - + Save Salvar - + Save the slide currently being edited. - + Delete Deletar - + Delete the selected slide. - + Clear Limpar - + Clear edit area Limpar área de edição - + Split Slide - + Split a slide into two by inserting a slide splitter. Dividir um slide em dois, inserindo um divisor de slides. - + The&me: - + &Credits: &Créditos: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. Substituir Plano de Fundo - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Imagem(s) - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Mídia @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. Substituir Plano de Fundo - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1238,317 +1243,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Manutenção do Tema - + Theme &name: &Nome do Tema: - - &Visibility: - - - - - Opaque - Opaco - - - - Transparent - Transparente - - - + Type: Tipo: - + Solid Color Cor Sólida - + Gradient Gradiente - + Image Imagem - + Image: Imagem: - + Gradient: - + Horizontal Horizontal - + Vertical Vertical - + Circular Circular - + &Background - + Main Font Fonte Principal - + Font: Fonte: - + Color: - + Size: Tamanho: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Negrito - + Italics Itálico - + Bold/Italics Negrito/Itálico - + Style: Estilo: - + Display Location Local de Exibição - + Use default location - + X position: - + Y position: - + Width: Largura: - + Height: Altura: - + px px - + &Main Font - + Footer Font Fonte do Rodapé - + &Footer Font Fonte do &Rodapé - + Outline Esboço - + Outline size: - + Outline color: - + Show outline: - + Shadow Sombra - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Alinhamento - + Horizontal align: - + Left Esquerda - + Right Direita - + Center Centralizar - + Vertical align: - + Top Topo - + Middle Meio - + Bottom - + Slide Transition Transição do Slide - + Transition active - + &Other Options &Outras Opções - + Preview - + All Files Todos os Arquivos - + Select Image Selecionar Imagem - + First color: - + Second color: - + Slide height is %s rows. @@ -1697,7 +1682,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1707,406 +1692,404 @@ This General Public License does not permit incorporating your program into prop Inglês - + &File &Arquivo - + &Import &Importar - + &Export &Exportar - + &View &Visualizar - + M&ode M&odo - + &Tools &Ferramentas - + &Settings &Configurações - + &Language &Idioma - + &Help &Ajuda - + Media Manager Gerenciador de Mídia - + Service Manager Gerenciador de Culto - + Theme Manager Gerenciador de Temas - + &New &Novo - + New Service Novo Culto - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Abrir - + Open Service - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Salvar - + Save Service Salvar Culto - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Salvar &Como... - + Save Service As Salvar Culto Como - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit S&air - + Quit OpenLP Fechar o OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... &Configurar o OpenLP... - + &Media Manager &Gerenciador de Mídia - + Toggle Media Manager Alternar Gerenciador de Mídia - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Gerenciador de Temas - + Toggle Theme Manager Alternar para Gerenciamento de Temas - + Toggle the visibility of the theme manager. Alternar a visibilidade do Gerenciador de Temas. - + F10 F10 - + &Service Manager &Gerenciador de Culto - + Toggle Service Manager Alternar para o Gerenciador de Cultos - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Painel de Pré-Visualização - + Toggle Preview Panel Alternar para Painel de Pré-Visualização - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Lista de Plugin - + List the Plugins Listar os Plugins - + Alt+F7 Alt+F7 - + &User Guide &Guia do Usuário - + &About &Sobre - + More information about OpenLP Mais informações sobre o OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Ajuda Online - + &Web Site &Web Site - + &Auto Detect - + Use the system language, if available. Usar o idioma do sistema, caso disponível. - + Set the interface language to %s Definir o idioma da interface como %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Ao Vivo - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. - A versão %s do OpenLP já está disponível para download (você está usando a versão %s). - -Você pode baixar a versão mais recente em <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. + - + OpenLP Version Updated Versão do OpenLP Atualizada - + OpenLP Main Display Blanked Tela Principal do OpenLP em Branco - + The Main Display has been blanked out A Tela Principal foi apagada - + Save Changes to Service? Salvar Mudanças no Culto? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s Tema padrão: %s @@ -2272,42 +2255,37 @@ Você pode baixar a versão mais recente em <a href="http://openlp.org/& OpenLP.PluginForm - + Plugin List Lista de Plugins - + Plugin Details Detalhes do Plugin - + Version: Versão: - - TextLabel - TextLabel - - - + About: Sobre: - + Status: Status: - + Active Ativo - + Inactive Inativo @@ -2363,7 +2341,7 @@ Você pode baixar a versão mais recente em <a href="http://openlp.org/& Criar um novo culto - + Open Service @@ -2373,7 +2351,7 @@ Você pode baixar a versão mais recente em <a href="http://openlp.org/& Carregar um culto existente - + Save Service Salvar Culto @@ -2483,38 +2461,38 @@ Você pode baixar a versão mais recente em <a href="http://openlp.org/& &Alterar Tema do Item - + Save Changes to Service? Salvar Mudanças no Culto? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) Arquivo de Culto do OpenLP (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Erro - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2548,72 +2526,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Ao Vivo - + Preview - - Move to first - Mover para o primeiro - - - + Move to previous Mover para o anterior - + Move to next Mover para o próximo - - Move to last - Mover para o último - - - + Hide - + Move to live Mover para ao vivo - + Edit and re-preview Song Editar e pré-visualizar Música novamente - + Start continuous loop Iniciar repetição contínua - + Stop continuous loop Parar repetição contínua - + s s - + Delay between slides in seconds Intervalo entre slides em segundos - + Start playing media Iniciar a reprodução de mídia @@ -2623,10 +2591,23 @@ The content encoding is not UTF-8. Ir ao Versículo + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Novo Tema @@ -2696,7 +2677,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2721,7 +2702,7 @@ The content encoding is not UTF-8. - + Error Erro @@ -2781,24 +2762,24 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. O arquivo não é um tema válido. A codificação do conteúdo não é UTF-8. - + File is not a valid theme. O arquivo não é um tema válido. - + Theme Exists Tema Existe - + A theme with this name already exists. Would you like to overwrite it? Já existe um tema com este nome. Deseja sobreescrevê-lo? @@ -3114,232 +3095,237 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.EditSongForm - + Song Editor Editor de Músicas - + &Title: &Título: - + Alt&ernate title: Título &Alternativo: - + &Lyrics: - + &Verse order: Ordem das &estrofes: - + &Add %Adicionar - + &Edit &Editar - + Ed&it All - + &Delete &Deletar - + Title && Lyrics Título && Letras - + Authors Autores - + &Add to Song &Adicionar à Música - + &Remove &Remover - + &Manage Authors, Topics, Song Books - + Topic Tópico - + A&dd to Song A&dicionar uma Música - + R&emove R&emover - + Song Book Livro de Músicas - - - Authors, Topics && Song Book - - - - - Theme - Tema - - New &Theme + Song No.: - Copyright Information - Informação de Direitos Autorais - - - - © + Authors, Topics && Song Book + Theme + Tema + + + + New &Theme + + + + + Copyright Information + Informação de Direitos Autorais + + + + © + + + + CCLI number: - + Comments Comentários - + Theme, Copyright Info && Comments Tema, Direitos Autorais && Comentários - + Save && Preview Salvar && Pré-Visualizar - + Add Author Adicionar Autor - + This author does not exist, do you want to add them? Este autor não existe, deseja adicioná-lo? - + Error Erro - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? Este tópico não existe, deseja adicioná-lo? - + This topic is already in the list. Este tópico já está na lista. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. Não há nenhum tópico válido selecionado. Selecione um tópico da lista, ou digite um novo tópico e clique em "Adicionar Tópico à Música" para adicionar o novo tópico. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? Você não adicionou nenhum autor a esta música. Deseja adicionar um agora? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? Este hinário não existe, deseja adicioná-lo? @@ -3347,17 +3333,17 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Editar Versículo - + &Verse type: Tipo de &Versículo: - + &Insert @@ -3485,112 +3471,112 @@ A codificação do conteúdo não é UTF-8. Iniciando importação... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Selecionar Origem da Importação - + Select the import format, and where to import from. Selecione o formato e de onde será a importação - + Format: Formato: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing Importando - + Please wait while your songs are imported. Por favor aguarde enquanto as músicas são importadas. - + Ready. Pronto. - + %p% @@ -3709,12 +3695,12 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3770,112 +3756,112 @@ A codificação do conteúdo não é UTF-8. &Deletar - + Error Erro - + Could not add your author. - + This author already exists. - + Could not add your topic. Não foi possível adicionar o seu tópico. - + This topic already exists. - + Could not add your book. Não foi possível adicionar o livro. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. Não foi possível salvar o seu autor modificado, porque ele já existe. - + Could not save your modified topic, because it already exists. Não foi possível salvar o tópico modificado, porque ele já existe. - + Delete Author Deletar Autor - + Are you sure you want to delete the selected author? Você tem certeza que deseja deletar o autor selecionado? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! Nenhum autor selecionado! - + Delete Topic Deletar Tópico - + Are you sure you want to delete the selected topic? Você tem certeza que deseja deletar o tópico selecionado? - + This topic cannot be deleted, it is currently assigned to at least one song. Este tópico não pode ser removido, pois está associado a pelo menos uma música. - + No topic selected! Nenhum tópico selecionado! - + Delete Book Deletar Livro - + Are you sure you want to delete the selected book? Você tem certeza que deseja deletar o livro selecionado? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! Nenhum livro selecionado! diff --git a/resources/i18n/openlp_sv.ts b/resources/i18n/openlp_sv.ts index 606e6e21a..db15f9534 100644 --- a/resources/i18n/openlp_sv.ts +++ b/resources/i18n/openlp_sv.ts @@ -13,7 +13,7 @@ - + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen @@ -79,7 +79,7 @@ AlertsPlugin.AlertsManager - + Alert message created and displayed. @@ -654,12 +654,12 @@ Changes do not affect verses already in the service. Ingen matchande bok kunde hittas i den här Bibeln. - + etc - + Bible not fully loaded. @@ -701,102 +701,102 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides Redigera anpassad bild - + Move slide up one position. - + Move slide down one position. - + &Title: - + Add New Lägg till ny - + Add a new slide at bottom. - + Edit Redigera - + Edit the selected slide. - + Edit All Redigera alla - + Edit all the slides at once. - + Save Spara - + Save the slide currently being edited. - + Delete Ta bort - + Delete the selected slide. - + Clear - + Clear edit area Töm redigeringsområde - + Split Slide - + Split a slide into two by inserting a slide splitter. - + The&me: - + &Credits: @@ -880,22 +880,27 @@ Changes do not affect verses already in the service. - + + Reset Live Background + + + + You must select an image to delete. - + Image(s) Bilder - + You must select an image to replace the background with. - + You must select a media file to replace the background with. @@ -911,7 +916,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem - + Media Media @@ -931,7 +936,7 @@ Changes do not affect verses already in the service. - + You must select a media file to delete. @@ -939,7 +944,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1201,317 +1206,297 @@ This General Public License does not permit incorporating your program into prop OpenLP.AmendThemeForm - + Theme Maintenance Temaunderhåll - + Theme &name: - - &Visibility: - - - - - Opaque - Ogenomskinlig - - - - Transparent - Genomskinlig - - - + Type: Typ: - + Solid Color Solid Färg - + Gradient Stegvis - + Image Bild - + Image: Bild: - + Gradient: - + Horizontal Horisontellt - + Vertical Vertikal - + Circular Cirkulär - + &Background - + Main Font Huvudfont - + Font: Font: - + Color: - + Size: Storlek: - + pt pt - - Wrap indentation: - - - - + Adjust line spacing: - + Normal Normal - + Bold Fetstil - + Italics Kursiv - + Bold/Italics Fetstil/kursiv - + Style: - + Display Location Visa plats - + Use default location - + X position: - + Y position: - + Width: Bredd: - + Height: Höjd: - + px px - + &Main Font - + Footer Font Sidfot-font - + &Footer Font - + Outline Kontur - + Outline size: - + Outline color: - + Show outline: - + Shadow Skugga - + Shadow size: - + Shadow color: - + Show shadow: - + Alignment Justering - + Horizontal align: - + Left Vänster - + Right Höger - + Center Centrera - + Vertical align: - + Top Topp - + Middle Mitten - + Bottom - + Slide Transition Bildövergång - + Transition active - + &Other Options - + Preview Förhandsgranska - + All Files - + Select Image - + First color: - + Second color: - + Slide height is %s rows. @@ -1660,7 +1645,7 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - + OpenLP 2.0 OpenLP 2.0 @@ -1670,404 +1655,404 @@ This General Public License does not permit incorporating your program into prop Engelska - + &File &Fil - + &Import &Importera - + &Export &Exportera - + &View &Visa - + M&ode &Läge - + &Tools &Verktyg - + &Settings &Inställningar - + &Language &Språk - + &Help &Hjälp - + Media Manager Mediahanterare - + Service Manager Mötesplaneringshanterare - + Theme Manager Temahanterare - + &New &Ny - + New Service - + Create a new service. - + Ctrl+N Ctrl+N - + &Open &Öppna - + Open Service - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Spara - + Save Service - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... S&para som... - + Save Service As Spara mötesplanering som... - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Avsluta - + Quit OpenLP Stäng OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager &Mediahanterare - + Toggle Media Manager Växla mediahanterare - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Temahanterare - + Toggle Theme Manager Växla temahanteraren - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Mötesplaneringshanterare - + Toggle Service Manager Växla mötesplaneringshanterare - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Förhandsgranskning - + Toggle Preview Panel Växla förhandsgranskningspanel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Pluginlista - + List the Plugins Lista Plugin - + Alt+F7 Alt+F7 - + &User Guide &Användarguide - + &About &Om - + More information about OpenLP Mer information om OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Online-hjälp - + &Web Site &Webbsida - + &Auto Detect - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). -You can download the latest version from <a href="http://openlp.org/">http://openlp.org/</a>. +You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP-version uppdaterad - + OpenLP Main Display Blanked OpenLP huvuddisplay tömd - + The Main Display has been blanked out Huvuddisplayen har rensats - + Save Changes to Service? - + Your service has changed. Do you want to save those changes? - + Default Theme: %s @@ -2233,42 +2218,37 @@ You can download the latest version from <a href="http://openlp.org/&quo OpenLP.PluginForm - + Plugin List Pluginlista - + Plugin Details Plugindetaljer - + Version: Version: - - TextLabel - TextLabel - - - + About: Om: - + Status: Status: - + Active Aktiv - + Inactive Inaktiv @@ -2324,7 +2304,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Skapa en ny mötesplanering - + Open Service @@ -2334,7 +2314,7 @@ You can download the latest version from <a href="http://openlp.org/&quo Ladda en planering - + Save Service @@ -2444,38 +2424,38 @@ You can download the latest version from <a href="http://openlp.org/&quo &Byt objektets tema - + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) - + Your current service is unsaved, do you want to save the changes before opening a new one? - + Error Fel - + File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. @@ -2509,72 +2489,62 @@ The content encoding is not UTF-8. OpenLP.SlideController - + Live Live - + Preview Förhandsgranska - - Move to first - Flytta till första - - - + Move to previous Flytta till föregående - + Move to next Flytta till nästa - - Move to last - Flytta till sist - - - + Hide - + Move to live Flytta till live - + Edit and re-preview Song Ändra och åter-förhandsgranska sång - + Start continuous loop Börja oändlig loop - + Stop continuous loop Stoppa upprepad loop - + s s - + Delay between slides in seconds Fördröjning mellan bilder, i sekunder - + Start playing media Börja spela media @@ -2584,10 +2554,23 @@ The content encoding is not UTF-8. Hoppa till vers + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + OpenLP.ThemeManager - + New Theme Nytt Tema @@ -2657,7 +2640,7 @@ The content encoding is not UTF-8. - + %s (default) @@ -2682,7 +2665,7 @@ The content encoding is not UTF-8. - + Error Fel @@ -2742,23 +2725,23 @@ The content encoding is not UTF-8. - + File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. Filen är inte ett giltigt tema. - + Theme Exists Temat finns - + A theme with this name already exists. Would you like to overwrite it? @@ -3074,232 +3057,237 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Sångredigerare - + &Title: - + Alt&ernate title: - + &Lyrics: - + &Verse order: - + &Add - + &Edit &Redigera - + Ed&it All - + &Delete - + Title && Lyrics Titel && Sångtexter - + Authors - + &Add to Song &Lägg till i sång - + &Remove &Ta bort - + &Manage Authors, Topics, Song Books - + Topic Ämne - + A&dd to Song Lägg till i sång - + R&emove Ta &bort - + Song Book Sångbok - - - Authors, Topics && Song Book - - - - - Theme - Tema - - New &Theme + Song No.: - Copyright Information - Copyright-information - - - - © + Authors, Topics && Song Book + Theme + Tema + + + + New &Theme + + + + + Copyright Information + Copyright-information + + + + © + + + + CCLI number: - + Comments Kommentarer - + Theme, Copyright Info && Comments Tema, copyright-info && kommentarer - + Save && Preview Spara && förhandsgranska - + Add Author - + This author does not exist, do you want to add them? - + Error Fel - + This author is already in the list. - + No Author Selected - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + Add Topic - + This topic does not exist, do you want to add it? - + This topic is already in the list. - + No Topic Selected - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You need to type in a song title. - + You need to type in at least one verse. - + Warning - + You have not added any authors for this song. Do you want to add an author now? - + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? - + Add Book - + This song book does not exist, do you want to add it? @@ -3307,17 +3295,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm - + Edit Verse Redigera vers - + &Verse type: - + &Insert @@ -3445,112 +3433,112 @@ The content encoding is not UTF-8. Påbörjar import... - + Song Import Wizard - + Welcome to the Song Import Wizard - + This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from. - + Select Import Source Välj importkälla - + Select the import format, and where to import from. Välj format för import, och plats att importera från. - + Format: Format: - + OpenLP 2.0 OpenLP 2.0 - + openlp.org 1.x - + OpenLyrics - + OpenSong OpenSong - + Words of Worship - + CCLI/SongSelect - + Songs of Fellowship - + Generic Document/Presentation - + Filename: - + Browse... - + Add Files... - + Remove File(s) - + Importing Importerar - + Please wait while your songs are imported. - + Ready. Redo. - + %p% @@ -3669,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3730,112 +3718,112 @@ The content encoding is not UTF-8. - + Error Fel - + Could not add your author. - + This author already exists. - + Could not add your topic. - + This topic already exists. - + Could not add your book. - + This book already exists. - + Could not save your changes. - + Could not save your modified author, because he already exists. - + Could not save your modified topic, because it already exists. - + Delete Author Ta bort låtskrivare - + Are you sure you want to delete the selected author? Är du säker på att du vill ta bort den valda låtskrivaren? - + This author cannot be deleted, they are currently assigned to at least one song. - + No author selected! Ingen författare vald! - + Delete Topic Ta bort ämne - + Are you sure you want to delete the selected topic? Är du säker på att du vill ta bort valt ämne? - + This topic cannot be deleted, it is currently assigned to at least one song. - + No topic selected! Inget ämne valt! - + Delete Book Ta bort bok - + Are you sure you want to delete the selected book? Är du säker på att du vill ta bort vald bok? - + This book cannot be deleted, it is currently assigned to at least one song. - + No book selected! Ingen bok vald! From cafd5fca5424ce087b639c35fa81118f836baaa1 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 31 Aug 2010 15:23:21 +0200 Subject: [PATCH 02/10] Reduce "Go to Verse" to "Go To" --- openlp/core/ui/slidecontroller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 5d688b890..8b14eb43b 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -219,7 +219,7 @@ class SlideController(QtGui.QWidget): self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarButton( u'Edit Song', u':/general/general_edit.png', - translate('OpenLP.SlideController', 'Edit and re-preview Song'), + translate('OpenLP.SlideController', 'Edit and re-preview song'), self.onEditSong) if isLive: self.Toolbar.addToolbarSeparator(u'Loop Separator') @@ -279,11 +279,11 @@ class SlideController(QtGui.QWidget): if isLive: self.SongMenu = QtGui.QToolButton(self.Toolbar) self.SongMenu.setText(translate('OpenLP.SlideController', - 'Go to Verse')) + 'Go To')) self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup) self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu) self.SongMenu.setMenu(QtGui.QMenu( - translate('OpenLP.SlideController', 'Go to Verse'), + translate('OpenLP.SlideController', 'Go To'), self.Toolbar)) self.Toolbar.makeWidgetsInvisible([u'Song Menu']) # Screen preview area From ad57ee09271585132997d16a6ce78446cb2816fb Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 1 Sep 2010 08:19:45 +0200 Subject: [PATCH 03/10] Removed an unnecessary space. --- openlp/core/ui/thememanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 11130293c..3ad6b5c8d 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -576,7 +576,7 @@ class ThemeManager(QtGui.QWidget): translate('OpenLP.ThemeManager', 'Theme Exists'), translate('OpenLP.ThemeManager', 'A theme with this name already ' - 'exists. Would you like to overwrite it?'), + 'exists. Would you like to overwrite it?'), (QtGui.QMessageBox.Yes | QtGui.QMessageBox.No), QtGui.QMessageBox.No) if self.saveThemeName != u'': From 40efcbfb8ed8fb1b59e82a1dd154e85226c65415 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 1 Sep 2010 08:32:59 +0200 Subject: [PATCH 04/10] Update translation files. --- resources/i18n/openlp_af.ts | 20 ++-- resources/i18n/openlp_de.ts | 28 ++--- resources/i18n/openlp_en.ts | 16 +-- resources/i18n/openlp_en_GB.ts | 20 ++-- resources/i18n/openlp_en_ZA.ts | 200 +++++++++++++++++---------------- resources/i18n/openlp_es.ts | 20 ++-- resources/i18n/openlp_et.ts | 26 ++--- resources/i18n/openlp_hu.ts | 20 ++-- resources/i18n/openlp_ko.ts | 16 +-- resources/i18n/openlp_nb.ts | 20 ++-- resources/i18n/openlp_pt_BR.ts | 22 ++-- resources/i18n/openlp_sv.ts | 20 ++-- 12 files changed, 216 insertions(+), 212 deletions(-) diff --git a/resources/i18n/openlp_af.ts b/resources/i18n/openlp_af.ts index bdcb68f09..78a29d279 100644 --- a/resources/i18n/openlp_af.ts +++ b/resources/i18n/openlp_af.ts @@ -2520,8 +2520,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Redigeer en sien weer 'n voorskou van die Lied + Edit and re-preview song + @@ -2550,8 +2550,8 @@ The content encoding is not UTF-8. - Go to Verse - Gaan na Vers + Go To + @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... Invoer begin... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Invoer voltooi. - + Your song import failed. diff --git a/resources/i18n/openlp_de.ts b/resources/i18n/openlp_de.ts index e2222d6db..0ed5de23a 100644 --- a/resources/i18n/openlp_de.ts +++ b/resources/i18n/openlp_de.ts @@ -2518,11 +2518,6 @@ The content encoding is not UTF-8. Move to live Verschieben zur Live Ansicht - - - Edit and re-preview Song - Lied bearbeiten und wieder anzeigen - Start continuous loop @@ -2548,10 +2543,15 @@ The content encoding is not UTF-8. Start playing media Abspielen + + + Edit and re-preview song + + - Go to Verse - Springe zu + Go To + @@ -2742,8 +2742,8 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? - + A theme with this name already exists. Would you like to overwrite it? + @@ -3343,7 +3343,7 @@ The content encoding is not UTF-8. - + Starting import... Starte import ... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Importvorgang abgeschlossen. - + Your song import failed. diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts index 76e7b89dd..c0ab459bc 100644 --- a/resources/i18n/openlp_en.ts +++ b/resources/i18n/openlp_en.ts @@ -2520,7 +2520,7 @@ The content encoding is not UTF-8. - Edit and re-preview Song + Edit and re-preview song @@ -2550,7 +2550,7 @@ The content encoding is not UTF-8. - Go to Verse + Go To @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. - + Your song import failed. diff --git a/resources/i18n/openlp_en_GB.ts b/resources/i18n/openlp_en_GB.ts index 091b8c6c6..11225bda1 100644 --- a/resources/i18n/openlp_en_GB.ts +++ b/resources/i18n/openlp_en_GB.ts @@ -2520,8 +2520,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Edit and re-preview Song + Edit and re-preview song + @@ -2550,8 +2550,8 @@ The content encoding is not UTF-8. - Go to Verse - Go to Verse + Go To + @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... Starting import... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Finished import. - + Your song import failed. diff --git a/resources/i18n/openlp_en_ZA.ts b/resources/i18n/openlp_en_ZA.ts index a3c4ba050..3fcd45621 100644 --- a/resources/i18n/openlp_en_ZA.ts +++ b/resources/i18n/openlp_en_ZA.ts @@ -119,7 +119,7 @@ pt - pt + pt @@ -134,7 +134,7 @@ Location: - Location: + Location: @@ -154,7 +154,7 @@ Middle - Middle + Middle @@ -222,17 +222,17 @@ Book Chapter:Verse-Chapter:Verse Bibles - Bibles + Bibles Verse Display - Verse Display + Verse Display Only show new chapter numbers - Only show new chapter numbers + Only show new chapter numbers @@ -911,7 +911,7 @@ Changes do not affect verses already in the service. Reset Live Background - + Reset Live Background @@ -2236,7 +2236,9 @@ Built With 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/. - + 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/. @@ -2563,93 +2565,94 @@ You can download the latest version from http://openlp.org/. Delete the selected item from the service. - + Delete the selected item from the service. &Add New Item - + &Add New Item &Add to Selected Item - + &Add to Selected Item &Edit Item - + &Edit Item &Reorder Item - + &Reorder Item &Notes - + &Notes &Preview Verse - + &Preview Verse &Live Verse - &Live Verse + &Live Verse &Change Item Theme - &Change Item Theme + &Change Item Theme Save Changes to Service? - Save Changes to Service? + Save Changes to Service? Your service is unsaved, do you want to save those changes before creating a new one? - + Your service is unsaved, do you want to save those changes before creating a new one? OpenLP Service Files (*.osz) - + OpenLP Service Files (*.osz) Your current service is unsaved, do you want to save the changes before opening a new one? - + Your current service is unsaved, do you want to save the changes before opening a new one? Error - Error + Error File is not a valid service. The content encoding is not UTF-8. - + File is not a valid service. +The content encoding is not UTF-8. File is not a valid service. - + File is not a valid service. Missing Display Handler - + Missing Display Handler Your item cannot be displayed as there is no handler to display it - + Your item cannot be displayed as there is no handler to display it @@ -2657,7 +2660,7 @@ The content encoding is not UTF-8. Service Item Notes - Service Item Notes + Service Item Notes @@ -2665,7 +2668,7 @@ The content encoding is not UTF-8. Configure OpenLP - + Configure OpenLP @@ -2673,67 +2676,67 @@ The content encoding is not UTF-8. Live - Live + Live Preview - Preview + Preview Move to previous - Move to previous + Move to previous Move to next - Move to next slide. + Move to next Hide - + Hide Move to live - Move to live - - - - Edit and re-preview Song - Edit and re-preview Song. + Move to live Start continuous loop - Start continuous loop + Start continuous loop Stop continuous loop - + Stop continuous loop s - s + s Delay between slides in seconds - Delay between slides in seconds. + Delay between slides in seconds Start playing media - Start playing media + Start playing media + + + + Edit and re-preview song + - Go to Verse - Go to Verse + Go To + @@ -2741,12 +2744,12 @@ The content encoding is not UTF-8. Spelling Suggestions - + Spelling Suggestions Formatting Tags - + Formatting Tags @@ -2754,177 +2757,178 @@ The content encoding is not UTF-8. New Theme - + New Theme Create a new theme. - + Create a new theme. Edit Theme - Edit Theme + Edit Theme Edit a theme. - + Edit a theme. Delete Theme - Delete Theme + Delete Theme Delete a theme. - + Delete a theme. Import Theme - Import Theme + Import Theme Import a theme. - + Import a theme. Export Theme - Export Theme + Export Theme Export a theme. - + Export a theme. &Edit Theme - + &Edit Theme &Delete Theme - + &Delete Theme Set As &Global Default - + Set As &Global Default E&xport Theme - + E&xport Theme %s (default) - + %s (default) You must select a theme to edit. - + You must select a theme to edit. You must select a theme to delete. - + You must select a theme to delete. Delete Confirmation - + Delete Confirmation Delete theme? - + Delete theme? Error - Error + Error You are unable to delete the default theme. - + You are unable to delete the default theme. Theme %s is use in %s plugin. - + Theme %s is use in %s plugin. Theme %s is use by the service manager. - + Theme %s is use by the service manager. You have not selected a theme. - + You have not selected a theme. Save Theme - (%s) - Save Theme - (%s) + Save Theme - (%s) Theme Exported - + Theme Exported Your theme has been successfully exported. - + Your theme has been successfully exported. Theme Export Failed - + Theme Export Failed Your theme could not be exported due to an error. - + Your theme could not be exported due to an error. Select Theme Import File - + Select Theme Import File Theme (*.*) - + Theme (*.*) File is not a valid theme. The content encoding is not UTF-8. - + File is not a valid theme. +The content encoding is not UTF-8. File is not a valid theme. - + File is not a valid theme. Theme Exists - Theme Exists + Theme Exists - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -2933,47 +2937,47 @@ The content encoding is not UTF-8. Themes - Themes + Themes Global Theme - + Global Theme Theme Level - + Theme Level S&ong Level - + S&ong Level Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. - Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. + Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. &Service Level - + &Service Level Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. - Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. + Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. &Global Level - + &Global Level Use the global theme, overriding any themes associated with either the service or the songs. - Use the global theme, overriding any themes associated with either the service or the songs. + Use the global theme, overriding any themes associated with either the service or the songs. @@ -2981,7 +2985,7 @@ The content encoding is not UTF-8. <strong>Presentation Plugin</strong><br />The presentation plugin provides the ability to show presentations using a number of different programs. The choice of available presentation programs is available to the user in a drop down box. - + <strong>Presentation Plugin</strong><br />The presentation plugin provides the ability to show presentations using a number of different programs. The choice of available presentation programs is available to the user in a drop down box. @@ -3525,7 +3529,7 @@ The content encoding is not UTF-8. - + Starting import... Starting import... @@ -3839,12 +3843,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3852,12 +3856,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Finished import. - + Your song import failed. diff --git a/resources/i18n/openlp_es.ts b/resources/i18n/openlp_es.ts index 000c2e18c..7eed8bc64 100644 --- a/resources/i18n/openlp_es.ts +++ b/resources/i18n/openlp_es.ts @@ -2520,8 +2520,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Editar y re-visualizar Canción + Edit and re-preview song + @@ -2550,8 +2550,8 @@ The content encoding is not UTF-8. - Go to Verse - Ir al Verso + Go To + @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... Iniciando importación... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Importación finalizada. - + Your song import failed. diff --git a/resources/i18n/openlp_et.ts b/resources/i18n/openlp_et.ts index fa40aa33d..bec3ed7a4 100644 --- a/resources/i18n/openlp_et.ts +++ b/resources/i18n/openlp_et.ts @@ -2524,11 +2524,6 @@ The content encoding is not UTF-8. Move to live Tõsta ekraanile - - - Edit and re-preview Song - Muuda ja kuva laulu eelvaade uuesti - Start continuous loop @@ -2554,10 +2549,15 @@ The content encoding is not UTF-8. Start playing media Meediaesituse alustamine + + + Edit and re-preview song + + - Go to Verse - Liikumine salmile + Go To + @@ -2748,7 +2748,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3429,7 +3429,7 @@ The content encoding is not UTF-8. - + Starting import... @@ -3663,12 +3663,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3676,12 +3676,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. - + Your song import failed. diff --git a/resources/i18n/openlp_hu.ts b/resources/i18n/openlp_hu.ts index 1c75f31e3..5fa7ba974 100644 --- a/resources/i18n/openlp_hu.ts +++ b/resources/i18n/openlp_hu.ts @@ -2653,8 +2653,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Dal szerkesztése, majd újra az előnézet megnyitása + Edit and re-preview song + @@ -2683,8 +2683,8 @@ The content encoding is not UTF-8. - Go to Verse - Ugrás versszakra + Go To + @@ -2875,7 +2875,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3561,7 +3561,7 @@ The content encoding is not UTF-8. - + Starting import... Importálás indítása... @@ -3790,12 +3790,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3803,12 +3803,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Az importálás befejeződött. - + Your song import failed. diff --git a/resources/i18n/openlp_ko.ts b/resources/i18n/openlp_ko.ts index 685f0a7a8..4ab79d607 100644 --- a/resources/i18n/openlp_ko.ts +++ b/resources/i18n/openlp_ko.ts @@ -2520,7 +2520,7 @@ The content encoding is not UTF-8. - Edit and re-preview Song + Edit and re-preview song @@ -2550,7 +2550,7 @@ The content encoding is not UTF-8. - Go to Verse + Go To @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. - + Your song import failed. diff --git a/resources/i18n/openlp_nb.ts b/resources/i18n/openlp_nb.ts index 9d94a44c4..f2a7393d4 100644 --- a/resources/i18n/openlp_nb.ts +++ b/resources/i18n/openlp_nb.ts @@ -2520,8 +2520,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Endre og forhåndsvis sang + Edit and re-preview song + @@ -2550,8 +2550,8 @@ The content encoding is not UTF-8. - Go to Verse - Gå til vers + Go To + @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Import fullført. - + Your song import failed. diff --git a/resources/i18n/openlp_pt_BR.ts b/resources/i18n/openlp_pt_BR.ts index 4d25aa1bc..0e6ff05a7 100644 --- a/resources/i18n/openlp_pt_BR.ts +++ b/resources/i18n/openlp_pt_BR.ts @@ -2557,8 +2557,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Editar e pré-visualizar Música novamente + Edit and re-preview song + @@ -2587,8 +2587,8 @@ The content encoding is not UTF-8. - Go to Verse - Ir ao Versículo + Go To + @@ -2780,8 +2780,8 @@ A codificação do conteúdo não é UTF-8. - A theme with this name already exists. Would you like to overwrite it? - Já existe um tema com este nome. Deseja sobreescrevê-lo? + A theme with this name already exists. Would you like to overwrite it? + @@ -3466,7 +3466,7 @@ A codificação do conteúdo não é UTF-8. - + Starting import... Iniciando importação... @@ -3695,12 +3695,12 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3708,12 +3708,12 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.SongImportForm - + Finished import. Importação Finalizada. - + Your song import failed. diff --git a/resources/i18n/openlp_sv.ts b/resources/i18n/openlp_sv.ts index db15f9534..d3322e9f9 100644 --- a/resources/i18n/openlp_sv.ts +++ b/resources/i18n/openlp_sv.ts @@ -2520,8 +2520,8 @@ The content encoding is not UTF-8. - Edit and re-preview Song - Ändra och åter-förhandsgranska sång + Edit and re-preview song + @@ -2550,8 +2550,8 @@ The content encoding is not UTF-8. - Go to Verse - Hoppa till vers + Go To + @@ -2742,7 +2742,7 @@ The content encoding is not UTF-8. - A theme with this name already exists. Would you like to overwrite it? + A theme with this name already exists. Would you like to overwrite it? @@ -3428,7 +3428,7 @@ The content encoding is not UTF-8. - + Starting import... Påbörjar import... @@ -3657,12 +3657,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport - + copyright - + © @@ -3670,12 +3670,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm - + Finished import. Importen är färdig. - + Your song import failed. From d4ce60534ad3a78866e2e7ca6412f2de98ba8a1f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 Sep 2010 10:59:21 +0200 Subject: [PATCH 05/10] Reworked the translation script. Renamed the translation files to just their language codes for easier integration into translation tools. --- resources/i18n/{openlp_af.ts => af.ts} | 0 resources/i18n/{openlp_de.ts => de.ts} | 0 resources/i18n/{openlp_en.ts => en.ts} | 0 resources/i18n/{openlp_en_GB.ts => en_GB.ts} | 0 resources/i18n/{openlp_en_ZA.ts => en_ZA.ts} | 2 +- resources/i18n/{openlp_es.ts => es.ts} | 0 resources/i18n/{openlp_et.ts => et.ts} | 0 resources/i18n/{openlp_hu.ts => hu.ts} | 0 resources/i18n/{openlp_ko.ts => ko.ts} | 0 resources/i18n/{openlp_nb.ts => nb.ts} | 0 resources/i18n/{openlp_pt_BR.ts => pt_BR.ts} | 0 resources/i18n/{openlp_sv.ts => sv.ts} | 0 scripts/translation_utils.py | 444 +++++++++++-------- 13 files changed, 270 insertions(+), 176 deletions(-) rename resources/i18n/{openlp_af.ts => af.ts} (100%) rename resources/i18n/{openlp_de.ts => de.ts} (100%) rename resources/i18n/{openlp_en.ts => en.ts} (100%) rename resources/i18n/{openlp_en_GB.ts => en_GB.ts} (100%) rename resources/i18n/{openlp_en_ZA.ts => en_ZA.ts} (99%) rename resources/i18n/{openlp_es.ts => es.ts} (100%) rename resources/i18n/{openlp_et.ts => et.ts} (100%) rename resources/i18n/{openlp_hu.ts => hu.ts} (100%) rename resources/i18n/{openlp_ko.ts => ko.ts} (100%) rename resources/i18n/{openlp_nb.ts => nb.ts} (100%) rename resources/i18n/{openlp_pt_BR.ts => pt_BR.ts} (100%) rename resources/i18n/{openlp_sv.ts => sv.ts} (100%) diff --git a/resources/i18n/openlp_af.ts b/resources/i18n/af.ts similarity index 100% rename from resources/i18n/openlp_af.ts rename to resources/i18n/af.ts diff --git a/resources/i18n/openlp_de.ts b/resources/i18n/de.ts similarity index 100% rename from resources/i18n/openlp_de.ts rename to resources/i18n/de.ts diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/en.ts similarity index 100% rename from resources/i18n/openlp_en.ts rename to resources/i18n/en.ts diff --git a/resources/i18n/openlp_en_GB.ts b/resources/i18n/en_GB.ts similarity index 100% rename from resources/i18n/openlp_en_GB.ts rename to resources/i18n/en_GB.ts diff --git a/resources/i18n/openlp_en_ZA.ts b/resources/i18n/en_ZA.ts similarity index 99% rename from resources/i18n/openlp_en_ZA.ts rename to resources/i18n/en_ZA.ts index 3fcd45621..ebfc86a2e 100644 --- a/resources/i18n/openlp_en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -2993,7 +2993,7 @@ The content encoding is not UTF-8. Presentation - Presentation + Presentation diff --git a/resources/i18n/openlp_es.ts b/resources/i18n/es.ts similarity index 100% rename from resources/i18n/openlp_es.ts rename to resources/i18n/es.ts diff --git a/resources/i18n/openlp_et.ts b/resources/i18n/et.ts similarity index 100% rename from resources/i18n/openlp_et.ts rename to resources/i18n/et.ts diff --git a/resources/i18n/openlp_hu.ts b/resources/i18n/hu.ts similarity index 100% rename from resources/i18n/openlp_hu.ts rename to resources/i18n/hu.ts diff --git a/resources/i18n/openlp_ko.ts b/resources/i18n/ko.ts similarity index 100% rename from resources/i18n/openlp_ko.ts rename to resources/i18n/ko.ts diff --git a/resources/i18n/openlp_nb.ts b/resources/i18n/nb.ts similarity index 100% rename from resources/i18n/openlp_nb.ts rename to resources/i18n/nb.ts diff --git a/resources/i18n/openlp_pt_BR.ts b/resources/i18n/pt_BR.ts similarity index 100% rename from resources/i18n/openlp_pt_BR.ts rename to resources/i18n/pt_BR.ts diff --git a/resources/i18n/openlp_sv.ts b/resources/i18n/sv.ts similarity index 100% rename from resources/i18n/openlp_sv.ts rename to resources/i18n/sv.ts diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index 340cab11f..f52af4984 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -24,13 +24,31 @@ # with this program; if not, write to the Free Software Foundation, Inc., 59 # # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -# Short description -# Steps for creating languages: -# 1. make sure that the openlp_en.ts file exist -# 2. go to scripts folder and start: -# python translation_utils.py -a -############################################################################### +""" +This script is used to maintain the translation files in OpenLP. It downloads +the latest translation files from the Pootle translation server, updates the +local translation files from both the source code and the files from Pootle, +and can also generate the compiled translation files. + +Create New Language +------------------- + +To create a new language, simply run this script with the ``-a`` command line +option:: + + @:~$ ./translation_utils.py -a + +Update Translation Files +------------------------ + +The best way to update the translations is to download the files from Pootle, +and then update the local files using both the downloaded files and the source. +This is done easily via the ``-d``, ``-p`` and ``-u`` options:: + + @:~$ ./translation_utils.py -dpu + +""" import os import urllib import re @@ -39,201 +57,277 @@ from optparse import OptionParser from PyQt4 import QtCore from BeautifulSoup import BeautifulSoup -class TranslationUtils(object): +SERVER_URL = u'http://pootle.projecthq.biz/export/openlp/' +IGNORED_PATHS = [u'scripts'] +IGNORED_FILES = [u'setup.py'] + +verbose_mode = False + +class Command(object): + """ + Provide an enumeration of commands. + """ + Download = 1 + Create = 2 + Prepare = 3 + Update = 4 + Generate = 5 + +class CommandStack(object): + """ + This class provides an iterable stack. + """ def __init__(self): - self.ignore_paths = [u'./scripts'] - self.ignore_files = [u'setup.py'] - self.server_url = u'http://pootle.projecthq.biz/export/openlp/' - self.cmd_stack = [] - self.stack_count = 0 - self.verbose = False - + self.current_index = 0 + self.data = [] - def process_stack(self): - if len(self.cmd_stack) > 0: - if len(self.cmd_stack) == self.stack_count: - print u'Process %d commands' % self.stack_count - print u'%d. ' % (self.stack_count-len(self.cmd_stack)+1), - command = self.cmd_stack.pop(0) - if len(command) > 1: - command[0](command[1]) - else: - command[0]() + def __len__(self): + return len(self.data) + + def __getitem__(self, index): + if self.data[index].get(u'arguments'): + return self.data[index][u'command'], self.data[index][u'arguments'] else: - print "Finished all commands" + return self.data[index][u'command'] + + def __iter__(self): + return self + + def next(self): + if self.current_index == len(self.data): + raise StopIteration + else: + current_item = self.data[self.current_index][u'command'] + self.current_index += 1 + return current_item + + def append(self, command, **kwargs): + data = {u'command': command} + if u'arguments' in kwargs: + data[u'arguments'] = kwargs[u'arguments'] + self.data.append(data) + + def reset(self): + self.current_index = 0 - def downloadTranslations(self): - print 'Download Translation files from HQ-Server' - page = urllib.urlopen(u'%s' % (self.server_url)) - soup = BeautifulSoup(page) - languages = soup.findAll(text=re.compile(".*\.ts")) - for language in languages: - filename = os.path.join(u'..', u'resources', u'i18n', - u'openlp_%s' % language) - self.printVerbose(u'Get Translation File: %s' % filename) - self.get_and_write_file(language, filename) - print u' done' - self.process_stack() +def print_verbose(text): + """ + This method checks to see if we are in verbose mode, and if so prints + ``text`` out. - def get_and_write_file(self, language, filename): - page = urllib.urlopen(u'%s%s' % (self.server_url, language)) - content = page.read().decode('utf8') - page.close() - file = open(filename, u'w') - file.write(content.encode('utf8')) - file.close() - - def creation(self, language): - print "Create new Translation File" - """ - Use this option to create a new translation file - this function: - * create the new *.ts file - """ - filename = os.path.join(u'..', u'resources', u'i18n', - u'openlp_%s.ts' % language) - self.get_and_write_file(u'en.ts', filename) - self.printVerbose(""" - Please remind: For permanent providing this language: - this language name have to append to the global list - variable "translations" in this file - and this file have to be uploaded to the Pootle Server - Please contact the developers! - """) - print u' done' - self.process_stack() - - - def preparation(self): - print u'Generating the openlp.pro file' - stringlist = [] - start_dir = os.path.join(u'..') - for root, dirs, files in os.walk(start_dir): - for file in files: - path = u'%s' % root - path = path.replace('\\','/') - path = path.replace('..','.') - - if file.startswith(u'hook-') or file.startswith(u'test_'): - continue + ``text`` + The text to print. + """ + global verbose_mode + if verbose_mode: + print u' %s' % text - cond = False - for search in self.ignore_paths: - if path.startswith(search): - cond = True - if cond: - continue - cond = False - for search in self.ignore_files: - if search == file: - cond = True - if cond: - continue - - if file.endswith(u'.py'): +def run(command): + """ + This method runs an external application. + + ``command`` + The command to run. + """ + print_verbose(command) + process = QtCore.QProcess() + process.start(command) + while (process.waitForReadyRead()): + print_verbose(u'ReadyRead: %s' % QtCore.QString(process.readAll())) + print_verbose(u'Error(s):\n%s' % process.readAllStandardError()) + print_verbose(u'Output:\n%s' % process.readAllStandardOutput()) + print u' Done.' + +def download_file(source_filename, dest_filename): + """ + Download a file and save it to disk. + + ``source_filename`` + The file to download. + + ``dest_filename`` + The new local file name. + """ + print_verbose(u'Downloading from: %s' % (SERVER_URL + source_filename)) + page = urllib.urlopen(SERVER_URL + source_filename) + content = page.read().decode('utf8') + page.close() + file = open(dest_filename, u'w') + file.write(content.encode('utf8')) + file.close() + +def download_translations(): + """ + This method downloads the translation files from the Pootle server. + """ + print 'Download translation files from Pootle' + page = urllib.urlopen(SERVER_URL) + soup = BeautifulSoup(page) + languages = soup.findAll(text=re.compile(r'.*\.ts')) + for language in languages: + filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n', + language) + print_verbose(u'Get Translation File: %s' % filename) + download_file(language, filename) + print u' Done.' + +def prepare_project(): + """ + This method creates the project file needed to update the translation files + and compile them into .qm files. + """ + print u'Generating the openlp.pro file' + lines = [] + start_dir = os.path.abspath(u'..') + start_dir = start_dir + os.sep + print_verbose(u'Starting directory: %s' % start_dir) + for root, dirs, files in os.walk(start_dir): + for file in files: + path = root.replace(start_dir, u'').replace(u'\\', u'/') #.replace(u'..', u'.') + if file.startswith(u'hook-') or file.startswith(u'test_'): + continue + ignore = False + for ignored_path in IGNORED_PATHS: + if path.startswith(ignored_path): + ignore = True + break + if ignore: + continue + ignore = False + for ignored_file in IGNORED_FILES: + if file == ignored_file: + ignore = True + break + if ignore: + continue + if file.endswith(u'.py') or file.endswith(u'.pyw'): + if path: line = u'%s/%s' % (path, file) - self.printVerbose(u'Parsing "%s"' % line) - stringlist.append(u'SOURCES += %s' % line) - elif file.endswith(u'.pyw'): - line = u'%s/%s' % (path, file) - self.printVerbose(u'Parsing "%s"' % line) - stringlist.append(u'SOURCES += %s' % line) - elif file.endswith(u'.ts'): - line = u'%s/%s' % (path, file) - self.printVerbose(u'Parsing "%s"' % line) - stringlist.append(u'TRANSLATIONS += %s' % line) - - stringlist.sort() - self.write_file(os.path.join(start_dir, u'openlp.pro'), stringlist) - print u' done' - self.process_stack() + else: + line = file + print_verbose(u'Parsing "%s"' % line) + lines.append(u'SOURCES += %s' % line) + elif file.endswith(u'.ts'): + line = u'%s/%s' % (path, file) + print_verbose(u'Parsing "%s"' % line) + lines.append(u'TRANSLATIONS += %s' % line) + lines.sort() + file = open(os.path.join(start_dir, u'openlp.pro'), u'w') + file.write(u'\n'.join(lines).encode('utf8')) + file.close() + print u' Done.' - def update(self): - print u'Update the translation files' - cmd = u'pylupdate4 -verbose -noobsolete ../openlp.pro' - self.start_cmd(cmd) +def update_translations(): + print u'Update the translation files' + if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')): + print u'You have no generated a project file yet, please run this ' + \ + u'script with the -p option.' + return + else: + os.chdir(os.path.abspath(u'..')) + run(u'pylupdate4 -verbose -noobsolete openlp.pro') - def generate(self): - print u'Generate the related *.qm files' - cmd = u'lrelease ../openlp.pro' - self.start_cmd(cmd) - - def write_file(self, filename, stringlist): - content = u'' - for line in stringlist: - content = u'%s%s\n' % (content, line) - file = open(filename, u'w') - file.write(content.encode('utf8')) - file.close() +def generate_binaries(): + print u'Generate the related *.qm files' + if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')): + print u'You have no generated a project file yet, please run this ' + \ + u'script with the -p option. It is also recommended that you ' + \ + u'this script with the -u option to update the translation ' + \ + u'files as well.' + return + else: + os.chdir(os.path.abspath(u'..')) + run(u'lrelease openlp.pro') - def printVerbose(self, data): - if self.verbose: - print u' %s' % data +def create_translation(language): + """ + This method creates a new translation file. - def start_cmd(self, command): - self.printVerbose(command) - self.process = QtCore.QProcess() - self.process.start(command) - while (self.process.waitForReadyRead()): - self.printVerbose(u'ReadyRead: %s' % QtCore.QString(self.process.readAll())) - self.printVerbose(self.process.readAllStandardError()) - self.printVerbose(self.process.readAllStandardOutput()) - print u' done' - self.process_stack() - + ``language`` + The language file to create. + """ + print "Create new Translation File" + filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n', language) + download_file(u'en.ts', filename) + print u'\n** Please Note **\n' + print u'In order to get this file into OpenLP and onto the Pootle ' + \ + u'translation server you will need to subscribe to the OpenLP' + \ + u'Translators mailing list, and request that your language file ' + \ + u'be added to the project.\n' + print u' Done' + +def process_stack(command_stack): + """ + This method looks at the commands in the command stack, and processes them + in the order they are in the stack. + + ``command_stack`` + The command stack to process. + """ + if command_stack: + print u'Processing %d commands...' % len(command_stack) + for command in command_stack: + print u'%d.' % (command_stack.current_index), + if command == Command.Download: + download_translations() + elif command == Command.Prepare: + prepare_project() + elif command == Command.Update: + update_translations() + elif command == Command.Generate: + generate_binaries() + elif command == Command.Create: + command, arguments = command_stack[command_stack.current_index] + create_translation(*arguments) + print u'Finished processing commands.' + else: + print u'No commands to process.' def main(): - # start Main Class - Util = TranslationUtils() - + global verbose_mode # Set up command line options. - usage = u''' - This script handle the translation files for OpenLP. - Usage: %prog [options] - If no option will be used, options "-d -p -u -g" will be set automatically - ''' + usage = u'%prog [options]\nOptions are parsed in the order they are ' + \ + u'listed below. If no options are given, "-dpug" will be used.\n\n' + \ + u'This script is used to manage OpenLP\'s translation files.' parser = OptionParser(usage=usage) - parser.add_option('-d', '--download-ts', action='store_true', - dest='download', help='Load languages from Pootle Server') - parser.add_option('-c', '--create', metavar='lang', - help='creation of new translation file, Parameter: language (e.g. "en_GB"') - parser.add_option('-p', '--prepare', action='store_true', dest='prepare', - help='preparation (generate pro file)') + parser.add_option('-d', '--download-ts', dest='download', + action='store_true', help='download language files from Pootle') + parser.add_option('-c', '--create', dest=u'create', metavar='LANG', + help='create a new translation file for language LANG, e.g. "en_GB"') + parser.add_option('-p', '--prepare', dest='prepare', action='store_true', + help='generate a project file, used to update the translations') parser.add_option('-u', '--update', action='store_true', dest='update', - help='update translation files') - parser.add_option('-g', '--generate', action='store_true', dest='generate', - help='generate qm files') - parser.add_option('-v', '--verbose', action='store_true', dest='verbose', - help='Give more informations while processing') - + help='update translation files (needs a project file)') + parser.add_option('-g', '--generate', dest='generate', action='store_true', + help='compile .ts files into .qm files') + parser.add_option('-v', '--verbose', dest='verbose', action='store_true', + help='show extra information while processing translations') (options, args) = parser.parse_args() + # Create and populate the command stack + command_stack = CommandStack() if options.download: - Util.cmd_stack.append([Util.downloadTranslations]) + command_stack.append(Command.Download) if options.create: - Util.cmd_stack.append([Util.creation, u'%s' % options.create]) + command_stack.append(Command.Create, arguments=[options.create]) if options.prepare: - Util.cmd_stack.append([Util.preparation]) + command_stack.append(Command.Prepare) if options.update: - Util.cmd_stack.append([Util.update]) + command_stack.append(Command.Update) if options.generate: - Util.cmd_stack.append([Util.generate]) - if options.verbose: - Util.verbose = True + command_stack.append(Command.Generate) + verbose_mode = options.verbose + if not command_stack: + command_stack.append(Command.Download) + command_stack.append(Command.Prepare) + command_stack.append(Command.Update) + command_stack.append(Command.Generate) + # Process the commands + process_stack(command_stack) - if len(Util.cmd_stack) == 0: - Util.cmd_stack.append([Util.downloadTranslations]) - Util.cmd_stack.append([Util.preparation]) - Util.cmd_stack.append([Util.update]) - Util.cmd_stack.append([Util.generate]) - - Util.stack_count = len(Util.cmd_stack) - Util.process_stack() - - - if __name__ == u'__main__': if os.path.split(os.path.abspath(u'.'))[1] != u'scripts': print u'You need to run this script from the scripts directory.' else: main() + From df007a438e26284cb497be12b9b1e9793e6bd17a Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 Sep 2010 12:53:50 +0200 Subject: [PATCH 06/10] Fixed double-spacing --- openlp/plugins/bibles/lib/db.py | 2 +- openlp/plugins/bibles/lib/manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index 51b6bb5fa..49bc82102 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -353,7 +353,7 @@ class BibleDB(QtCore.QObject, Manager): QtGui.QMessageBox.information(self.bible_plugin.mediaItem, translate('BiblesPlugin.BibleDB', 'Book not found'), translate('BiblesPlugin.BibleDB', 'The book you requested ' - 'could not be found in this bible. Please check your ' + 'could not be found in this bible. Please check your ' 'spelling and that this is a complete bible not just ' 'one testament.')) return verse_list diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index a0734aa98..4f35556f1 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -246,7 +246,7 @@ class BibleManager(object): translate('BiblesPlugin.BibleManager', 'Scripture Reference Error'), translate('BiblesPlugin.BibleManager', 'Your scripture ' - 'reference is either not supported by OpenLP or invalid. ' + 'reference is either not supported by OpenLP or invalid. ' 'Please make sure your reference conforms to one of the ' 'following patterns:\n\n' 'Book Chapter\n' From 081c66a1ed113a93ecc43912c4fdd11beaf3816f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 Sep 2010 13:00:08 +0200 Subject: [PATCH 07/10] More extra spaces removed. --- openlp/core/ui/aboutdialog.py | 83 ++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 3965b4ffc..84fc52958 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -199,18 +199,18 @@ class Ui_AboutDialog(object): 'Preamble\n' '\n' 'The licenses for most software are designed to take away your ' - 'freedom to share and change it. By contrast, the GNU General ' + 'freedom to share and change it. By contrast, the GNU General ' 'Public License is intended to guarantee your freedom to share ' 'and change free software--to make sure the software is free for ' - 'all its users. This General Public License applies to most of ' + 'all its users. This General Public License applies to most of ' 'the Free Software Foundation\'s software and to any other ' - 'program whose authors commit to using it. (Some other Free ' + 'program whose authors commit to using it. (Some other Free ' 'Software Foundation software is covered by the GNU Lesser ' - 'General Public License instead.) You can apply it to your ' + 'General Public License instead.) You can apply it to your ' 'programs, too.\n' '\n' 'When we speak of free software, we are referring to freedom, not ' - 'price. Our General Public Licenses are designed to make sure ' + 'price. Our General Public Licenses are designed to make sure ' 'that you have the freedom to distribute copies of free software ' '(and charge for this service if you wish), that you receive ' 'source code or can get it if you want it, that you can change ' @@ -225,8 +225,8 @@ class Ui_AboutDialog(object): '\n' 'For example, if you distribute copies of such a program, whether ' 'gratis or for a fee, you must give the recipients all the rights ' - 'that you have. You must make sure that they, too, receive or ' - 'can get the source code. And you must show them these terms so ' + 'that you have. You must make sure that they, too, receive or ' + 'can get the source code. And you must show them these terms so ' 'they know their rights.\n' '\n' 'We protect your rights with two steps: (1) copyright the ' @@ -235,15 +235,15 @@ class Ui_AboutDialog(object): '\n' 'Also, for each author\'s protection and ours, we want to make ' 'certain that everyone understands that there is no warranty for ' - 'this free software. If the software is modified by someone else ' + 'this free software. If the software is modified by someone else ' 'and passed on, we want its recipients to know that what they ' 'have is not the original, so that any problems introduced by ' 'others will not reflect on the original authors\' reputations.\n' '\n' 'Finally, any free program is threatened constantly by software ' - 'patents. We wish to avoid the danger that redistributors of a ' + 'patents. We wish to avoid the danger that redistributors of a ' 'free program will individually obtain patent licenses, in effect ' - 'making the program proprietary. To prevent this, we have made ' + 'making the program proprietary. To prevent this, we have made ' 'it clear that any patent must be licensed for everyone\'s free ' 'use or not licensed at all.\n' '\n' @@ -262,10 +262,10 @@ class Ui_AboutDialog(object): 'containing the Program or a portion of it, either verbatim or ' 'with modifications and/or translated into another language. ' '(Hereinafter, translation is included without limitation in the ' - 'term "modification".) Each licensee is addressed as "you".\n' + 'term "modification".) Each licensee is addressed as "you".\n' '\n' 'Activities other than copying, distribution and modification are ' - 'not covered by this License; they are outside its scope. The ' + 'not covered by this License; they are outside its scope. The ' 'act of running the Program is not restricted, and the output ' 'from the Program is covered only if its contents constitute a ' 'work based on the Program (independent of having been made by ' @@ -305,7 +305,7 @@ class Ui_AboutDialog(object): 'notice that there is no warranty (or else, saying that you ' 'provide a warranty) and that users may redistribute the program ' 'under these conditions, and telling the user how to view a copy ' - 'of this License. (Exception: if the Program itself is ' + 'of this License. (Exception: if the Program itself is ' 'interactive but does not normally print such an announcement, ' 'your work based on the Program is not required to print an ' 'announcement.)\n' @@ -315,7 +315,7 @@ class Ui_AboutDialog(object): 'Program, and can be reasonably considered independent and ' 'separate works in themselves, then this License, and its terms, ' 'do not apply to those sections when you distribute them as ' - 'separate works. But when you distribute the same sections as ' + 'separate works. But when you distribute the same sections as ' 'part of a whole which is a work based on the Program, the ' 'distribution of the whole must be on the terms of this License, ' 'whose permissions for other licensees extend to the entire ' @@ -350,17 +350,17 @@ class Ui_AboutDialog(object): 'medium customarily used for software interchange; or,\n' '\n' 'c) Accompany it with the information you received as to the ' - 'offer to distribute corresponding source code. (This ' + 'offer to distribute corresponding source code. (This ' 'alternative is allowed only for noncommercial distribution and ' 'only if you received the program in object code or executable ' 'form with such an offer, in accord with Subsection b above.)\n' '\n' 'The source code for a work means the preferred form of the work ' - 'for making modifications to it. For an executable work, ' + 'for making modifications to it. For an executable work, ' 'complete source code means all the source code for all modules ' 'it contains, plus any associated interface definition files, ' 'plus the scripts used to control compilation and installation of ' - 'the executable. However, as a special exception, the source ' + 'the executable. However, as a special exception, the source ' 'code distributed need not include anything that is normally ' 'distributed (in either source or binary form) with the major ' 'components (compiler, kernel, and so on) of the operating system ' @@ -374,7 +374,7 @@ class Ui_AboutDialog(object): 'not compelled to copy the source along with the object code.\n' '\n' '4. You may not copy, modify, sublicense, or distribute the ' - 'Program except as expressly provided under this License. Any ' + 'Program except as expressly provided under this License. Any ' 'attempt otherwise to copy, modify, sublicense or distribute the ' 'Program is void, and will automatically terminate your rights ' 'under this License. However, parties who have received copies, ' @@ -383,10 +383,10 @@ class Ui_AboutDialog(object): 'compliance.\n' '\n' '5. You are not required to accept this License, since you have ' - 'not signed it. However, nothing else grants you permission to ' - 'modify or distribute the Program or its derivative works. These ' + 'not signed it. However, nothing else grants you permission to ' + 'modify or distribute the Program or its derivative works. These ' 'actions are prohibited by law if you do not accept this ' - 'License. Therefore, by modifying or distributing the Program ' + 'License. Therefore, by modifying or distributing the Program ' '(or any work based on the Program), you indicate your acceptance ' 'of this License to do so, and all its terms and conditions for ' 'copying, distributing or modifying the Program or works based on ' @@ -395,7 +395,7 @@ class Ui_AboutDialog(object): '6. Each time you redistribute the Program (or any work based on ' 'the Program), the recipient automatically receives a license ' 'from the original licensor to copy, distribute or modify the ' - 'Program subject to these terms and conditions. You may not ' + 'Program subject to these terms and conditions. You may not ' 'impose any further restrictions on the recipients\' exercise of ' 'the rights granted herein. You are not responsible for enforcing ' 'compliance by third parties to this License.\n' @@ -405,10 +405,10 @@ class Ui_AboutDialog(object): 'patent issues), conditions are imposed on you (whether by court ' 'order, agreement or otherwise) that contradict the conditions of ' 'this License, they do not excuse you from the conditions of this ' - 'License. If you cannot distribute so as to satisfy ' + 'License. If you cannot distribute so as to satisfy ' 'simultaneously your obligations under this License and any other ' 'pertinent obligations, then as a consequence you may not ' - 'distribute the Program at all. For example, if a patent license ' + 'distribute the Program at all. For example, if a patent license ' 'would not permit royalty-free redistribution of the Program by ' 'all those who receive copies directly or indirectly through you, ' 'then the only way you could satisfy both it and this License ' @@ -423,7 +423,7 @@ class Ui_AboutDialog(object): 'any patents or other property right claims or to contest ' 'validity of any such claims; this section has the sole purpose ' 'of protecting the integrity of the free software distribution ' - 'system, which is implemented by public license practices. Many ' + 'system, which is implemented by public license practices. Many ' 'people have made generous contributions to the wide range of ' 'software distributed through that system in reliance on ' 'consistent application of that system; it is up to the ' @@ -439,29 +439,29 @@ class Ui_AboutDialog(object): 'interfaces, the original copyright holder who places the Program ' 'under this License may add an explicit geographical distribution ' 'limitation excluding those countries, so that distribution is ' - 'permitted only in or among countries not thus excluded. In such ' + 'permitted only in or among countries not thus excluded. In such ' 'case, this License incorporates the limitation as if written in ' 'the body of this License.\n' '\n' '9. The Free Software Foundation may publish revised and/or new ' - 'versions of the General Public License from time to time. Such ' + 'versions of the General Public License from time to time. Such ' 'new versions will be similar in spirit to the present version, ' 'but may differ in detail to address new problems or concerns.\n' '\n' - 'Each version is given a distinguishing version number. If the ' + 'Each version is given a distinguishing version number. If the ' 'Program specifies a version number of this License which applies ' - 'to it and \"any later version\', you have the option of ' + 'to it and "any later version", you have the option of ' 'following the terms and conditions either of that version or of ' - 'any later version published by the Free Software Foundation. If ' + 'any later version published by the Free Software Foundation. If ' 'the Program does not specify a version number of this License, ' 'you may choose any version ever published by the Free Software ' 'Foundation.\n' '\n' '10. If you wish to incorporate parts of the Program into other ' 'free programs whose distribution conditions are different, write ' - 'to the author to ask for permission. For software which is ' + 'to the author to ask for permission. For software which is ' 'copyrighted by the Free Software Foundation, write to the Free ' - 'Software Foundation; we sometimes make exceptions for this. Our ' + 'Software Foundation; we sometimes make exceptions for this. Our ' 'decision will be guided by the two goals of preserving the free ' 'status of all derivatives of our free software and of promoting ' 'the sharing and reuse of software generally.\n' @@ -470,12 +470,12 @@ class Ui_AboutDialog(object): '\n' '11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO ' 'WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE ' - 'LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT ' + 'LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT ' 'HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT ' 'WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, ' 'BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY ' - 'AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE ' - 'QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ' + 'AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE ' + 'QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ' 'PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY ' 'SERVICING, REPAIR OR CORRECTION.\n' '\n' @@ -499,7 +499,7 @@ class Ui_AboutDialog(object): 'this is to make it free software which everyone can redistribute ' 'and change under these terms.\n' '\n' - 'To do so, attach the following notices to the program. It is ' + 'To do so, attach the following notices to the program. It is ' 'safest to attach them to the start of each source file to most ' 'effectively convey the exclusion of warranty; and each file ' 'should have at least the "copyright" line and a pointer to where ' @@ -516,7 +516,7 @@ class Ui_AboutDialog(object): '\n' '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 the ' + 'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ' 'GNU General Public License for more details.\n' '\n' 'You should have received a copy of the GNU General Public ' @@ -537,14 +537,14 @@ class Ui_AboutDialog(object): 'under certain conditions; type "show c" for details.\n' '\n' 'The hypothetical commands "show w" and "show c" should show ' - 'the appropriate parts of the General Public License. Of course, ' + 'the appropriate parts of the General Public License. Of course, ' 'the commands you use may be called something other than "show ' 'w" and "show c"; they could even be mouse-clicks or menu items--' 'whatever suits your program.\n' '\n' 'You should also get your employer (if you work as a programmer) ' 'or your school, if any, to sign a "copyright disclaimer" for the ' - 'program, if necessary. Here is a sample; alter the names:\n' + 'program, if necessary. Here is a sample; alter the names:\n' '\n' 'Yoyodyne, Inc., hereby disclaims all copyright interest in the ' 'program "Gnomovision" (which makes passes at compilers) written ' @@ -554,9 +554,9 @@ class Ui_AboutDialog(object): 'Ty Coon, President of Vice\n' '\n' 'This General Public License does not permit incorporating your ' - 'program into proprietary programs. If your program is a ' + 'program into proprietary programs. If your program is a ' 'subroutine library, you may consider it more useful to permit ' - 'linking proprietary applications with the library. If this is ' + 'linking proprietary applications with the library. If this is ' 'what you want to do, use the GNU Lesser General Public License ' 'instead of this License.')) self.aboutNotebook.setTabText( @@ -565,3 +565,4 @@ class Ui_AboutDialog(object): self.contributeButton.setText(translate('OpenLP.AboutForm', 'Contribute')) self.closeButton.setText(translate('OpenLP.AboutForm', 'Close')) + From 952dfca9fca2f6df936c3f1bde3becbc3bbd1adb Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 Sep 2010 13:05:48 +0200 Subject: [PATCH 08/10] Updated translation files, removed some more double-spaces --- openlp/core/ui/aboutdialog.py | 8 +- resources/i18n/af.ts | 56 ++--- resources/i18n/de.ts | 278 +++++++++++------------ resources/i18n/en.ts | 56 ++--- resources/i18n/en_GB.ts | 56 ++--- resources/i18n/en_ZA.ts | 416 ++++++++++++---------------------- resources/i18n/es.ts | 56 ++--- resources/i18n/et.ts | 274 +++++++++++----------- resources/i18n/hu.ts | 185 +++------------ resources/i18n/ko.ts | 56 ++--- resources/i18n/nb.ts | 56 ++--- resources/i18n/pt_BR.ts | 56 ++--- resources/i18n/sv.ts | 56 ++--- 13 files changed, 672 insertions(+), 937 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 84fc52958..3b9190156 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -255,12 +255,12 @@ class Ui_AboutDialog(object): '\n' '0. This License applies to any program or other work which ' 'contains a notice placed by the copyright holder saying it may ' - 'be distributed under the terms of this General Public License. ' + 'be distributed under the terms of this General Public License. ' 'The "Program", below, refers to any such program or work, and a ' '"work based on the Program" means either the Program or any ' 'derivative work under copyright law: that is to say, a work ' 'containing the Program or a portion of it, either verbatim or ' - 'with modifications and/or translated into another language. ' + 'with modifications and/or translated into another language. ' '(Hereinafter, translation is included without limitation in the ' 'term "modification".) Each licensee is addressed as "you".\n' '\n' @@ -310,7 +310,7 @@ class Ui_AboutDialog(object): 'your work based on the Program is not required to print an ' 'announcement.)\n' '\n' - 'These requirements apply to the modified work as a whole. If ' + 'These requirements apply to the modified work as a whole. If ' 'identifiable sections of that work are not derived from the ' 'Program, and can be reasonably considered independent and ' 'separate works in themselves, then this License, and its terms, ' @@ -507,7 +507,7 @@ class Ui_AboutDialog(object): '\n' '\n' - 'Copyright (C) \n' + 'Copyright (C) \n' '\n' 'This program is free software; you can redistribute it and/or ' 'modify it under the terms of the GNU General Public License as ' diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index 78a29d279..3ca75ea47 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index 0ed5de23a..006e3f196 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -184,8 +184,8 @@ - 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. - + 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. + @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -206,7 +206,7 @@ Book Chapter:Verse-Verse,Verse-Verse Book Chapter:Verse-Verse,Chapter:Verse-Verse Book Chapter:Verse-Chapter:Verse - + @@ -1019,141 +1019,6 @@ Built With Credits Credits - - - Copyright © 2004-2010 Raoul Snyman -Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard - -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. - -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. - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -<one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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; either version 2 of the License, or (at your option) any later version. - -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 the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". -This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. - -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. - -<signature of Ty Coon>, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - - License @@ -1174,6 +1039,141 @@ This General Public License does not permit incorporating your program into prop build %s + + + Copyright © 2004-2010 Raoul Snyman +Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard + +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. + +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. + + +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +GNU GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> +Copyright (C) <year> <name of author> + +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; either version 2 of the License, or (at your option) any later version. + +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 the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". +This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. + +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. + +<signature of Ty Coon>, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + OpenLP.AdvancedTab diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index c0ab459bc..97f604a34 100644 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index 11225bda1..280d8f1a5 100644 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index ebfc86a2e..cd62c00b3 100644 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -184,8 +184,8 @@ - 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. - 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. + 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. + @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -206,15 +206,7 @@ Book Chapter:Verse-Verse,Verse-Verse Book Chapter:Verse-Verse,Chapter:Verse-Verse Book Chapter:Verse-Chapter:Verse - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: - -Book Chapter -Book Chapter-Chapter -Book Chapter:Verse-Verse -Book Chapter:Verse-Verse,Verse-Verse -Book Chapter:Verse-Verse,Chapter:Verse-Verse -Book Chapter:Verse-Chapter:Verse - + @@ -992,271 +984,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr Credits Credits - - - Copyright © 2004-2010 Raoul Snyman -Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard - -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. - -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. - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -<one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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; either version 2 of the License, or (at your option) any later version. - -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 the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". -This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. - -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. - -<signature of Ty Coon>, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - Copyright © 2004-2010 Raoul Snyman -Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard - -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. - -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. - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -<one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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; either version 2 of the License, or (at your option) any later version. - -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 the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". -This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. - -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. - -<signature of Ty Coon>, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - License @@ -1356,6 +1083,141 @@ Built With Oxygen Icons: http://oxygen-icons.org/ + + + Copyright © 2004-2010 Raoul Snyman +Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard + +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. + +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. + + +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +GNU GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> +Copyright (C) <year> <name of author> + +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; either version 2 of the License, or (at your option) any later version. + +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 the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". +This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. + +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. + +<signature of Ty Coon>, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + OpenLP.AdvancedTab diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 7eed8bc64..17e2615a8 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts index bec3ed7a4..fce37afcb 100644 --- a/resources/i18n/et.ts +++ b/resources/i18n/et.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -983,141 +983,6 @@ OpenLP on kirjutatud vabatahtlike poolt. Kui sulle meeldiks näha rohkem kristli Credits Autorid - - - Copyright © 2004-2010 Raoul Snyman -Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard - -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. - -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. - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -<one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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; either version 2 of the License, or (at your option) any later version. - -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 the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". -This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. - -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. - -<signature of Ty Coon>, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - - License @@ -1180,6 +1045,141 @@ Built With + + + Copyright © 2004-2010 Raoul Snyman +Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard + +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. + +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. + + +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +GNU GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> +Copyright (C) <year> <name of author> + +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; either version 2 of the License, or (at your option) any later version. + +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 the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". +This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. + +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. + +<signature of Ty Coon>, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + OpenLP.AdvancedTab diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 5fa7ba974..55cec3b93 100644 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1042,28 +1042,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1075,9 +1075,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1089,37 +1089,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1129,14 +1129,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1148,144 +1148,17 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - Copyright © 2004-2010 Raoul Snyman -Részleges copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard - -Ez a program szabad szoftver; terjeszthető illetve módosítható a Free Software Foundation által kiadott GNU General Public License dokumentumában leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi változata szerint. - -Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. További részleteket a GNU General Public License tartalmaz. - - -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Bárki terjesztheti, másolhatja a dokumentumot, de a módosítása nem megengedett. (A fordítás csak tájékoztató jellegű és jogi szempontból csakis az angol eredeti a mérvadó.) - -Előszó - -A legtöbb szoftver licencei azzal a szándékkal készültek, hogy minél kevesebb lehetőséget adjanak a szoftver megváltoztatására és terjesztésére. Ezzel szemben a GNU GPL célja, hogy garantálja a szabad szoftver másolásának és terjesztésének szabadságát, ezáltal biztosítva a szoftver szabad felhasználhatóságát minden felhasználó számára. A GPL szabályai vonatkoznak a Free Software Foundation legtöbb szoftverére, illetve minden olyan programra, melynek szerzője úgy dönt, hogy ezt használja a szerzői jog megjelölésekor. (A Free Software Foundation egyes szoftvereire a GNU LGPL érvényes.) Bárki használhatja a programjaiban a GPL-t a szerzői jogi megjegyzésnél. - -A szabad szoftver megjelölés nem jelenti azt, hogy a szoftvernek nem lehet ára. A GPL licencek célja, hogy garantálja a szabad szoftver másolatainak szabad terjesztését (és e szolgáltatásért akár díj felszámítását), a forráskód elérhetőségét, hogy bárki szabadon módosíthassa a szoftvert, vagy felhasználhassa a részeit új szabad programokban; és hogy mások megismerhessék ezt a lehetőséget. - -A szerző jogainak védelmében korlátozásokat kell hozni, amelyek megtiltják, hogy bárki megtagadhassa ezeket a jogokat másoktól, vagy ezekről való lemondásra kényszerítsen bárki mást. Ezek a megszorítások bizonyos felelősségeket jelentenek azok számára, akik a szoftver másolatait terjesztik vagy módosítják. - -Ha valaki például ilyen program másolatait terjeszti, akár ingyen vagy bizonyos összeg fejében, a szoftverre vonatkozó minden jogot tovább kell adnia a fogadó feleknek. Biztosítani kell továbbá, hogy megkapják vagy legalábbis megkaphassák a forráskódot is. És persze ezeket a licencfeltételeket is el kell juttatni, hogy tisztában legyenek a jogaikkal. - -A jogok védelme két lépésből áll: - -(1) a szoftver szerzői jogainak védelméből és - -(2) a jelen licenc biztosításából, amely jogalapot biztosít a szoftver másolására, terjesztésére és/vagy módosítására. - -Az egyes szerzők és a magunk védelmében biztosítani akarjuk, hogy mindenki megértse: a jelen szabad szoftverre nincs jótállás. Ha a szoftvert módosították és továbbadták, akkor mindenkinek, aki a módosított változatot kapja, tudnia kell, hogy az nem az eredeti, így a mások által okozott hibáknak nem lehet hatása az eredeti szerző hírnevére. - -Végül, a szabad szoftver létét állandóan fenyegetik a szoftverszabadalmak. El szeretnénk kerülni annak veszélyét, hogy a szabad program terjesztői szabadalmat jegyezhessenek be rá, ezáltal saját szellemi tulajdont képezővé tegyék a programot. Ennek megelőzéséhez tisztázni kívánjuk: szabadalom szabad szoftverrel kapcsolatban csak mindenki általi szabad használatra jegyezhető be, vagy egyáltalán nem jegyezhető be. - -A másolásra, terjesztésre, módosításra vonatkozó pontos szabályok és feltételek: -A MÁSOLÁSRA, TERJESZTÉSRE ÉS MÓDOSÍTÁSRA VONATKOZÓ FELTÉTELEK ÉS KIKÖTÉSEK - -0. Ez a licenc minden olyan programra vagy munkára vonatkozik, amelynek a szerzői jogi megjegyzésében a jog tulajdonosa a következő szöveget helyezte el: a GPL-ben foglaltak alapján terjeszthető. Az alábbiakban a Program kifejezés bármely ilyen programra vagy munkára vonatkozik, a Programon alapuló munka pedig magát a programot vagy egy szerzői joggal védett munkát jelenti: vagyis olyan munkát, amely tartalmazza a programot vagy annak egy részletét, módosítottan vagy módosítatlanul és/vagy más nyelvre fordítva. (Az alábbiakban a fordítás minden egyéb megkötés nélkül beletartozik a módosítás fogalmába.) Minden engedélyezés címzettje Ön. - -A jelen licenc a másoláson, terjesztésen és módosításon kívül más tevékenységre nem vonatkozik, azok a hatályán kívül esnek. A Program futtatása nincs korlátozva, illetve a Program kimenetére is csak abban az esetben vonatkozik ez a szabályozás, ha az tartalmazza a Programon alapuló munka egy részletét (függetlenül attól, hogy ez a Program futtatásával jött-e létre). Ez tehát a Program működésétől függ. - -1. A Program forráskódja módosítás nélkül másolható és bármely adathordozón terjeszthető, feltéve, hogy minden egyes példányon pontosan szerepel a megfelelő szerzői jogi megjegyzés, illetve a garanciavállalás elutasítása; érintetlenül kell hagyni minden erre a szabályozásra és a garancia teljes hiányára utaló szöveget és a jelen licencdokumentumot is el kell juttatni mindazokhoz, akik a Programot kapják. - -Felszámítható díj a másolat fizikai továbbítása fejében, illetve ellenszolgáltatás fejében a Programhoz garanciális támogatás is biztosítható. - -2. A Program vagy annak egy része módosítható, így a Programon alapuló munka jön létre. A módosítás ezután az 1. szakaszban adott feltételek szerint tovább terjeszthető, ha az alábbi feltételek is teljesülnek: - -a) A módosított fájlokat el kell látni olyan megjegyzéssel, amely feltünteti a módosítást végző nevét és a módosítások dátumát. - -b) Minden olyan munkát, amely részben vagy egészben tartalmazza a Programot vagy a Programon alapul, olyan szabályokkal kell kiadni vagy terjeszteni, hogy annak használati joga harmadik személy részére licencdíjmentesen hozzáférhető legyen, a jelen dokumentumban található feltételeknek megfelelően. - -c) Ha a módosított Program interaktívan olvassa a parancsokat futás közben, akkor úgy kell elkészíteni, hogy a megszokott módon történő indításkor megjelenítsen egy üzenetet a megfelelő szerzői jogi megjegyzéssel és a garancia hiányára utaló közléssel (vagy éppen azzal az információval, hogy miként juthat valaki garanciához), illetve azzal az információval, hogy bárki terjesztheti a Programot a jelen feltételeknek megfelelően, és arra is utalást kell tenni, hogy a felhasználó miként tekintheti meg a licenc egy példányát. (Kivétel: ha a Program interaktív ugyan, de nem jelenít meg hasonló üzenetet, akkor a Programon alapuló munkának sem kell ezt tennie.) - -Ezek a feltételek a módosított munkára, mint egészre vonatkoznak. Ha a munka azonosítható részei nem a Programon alapulnak és független munkákként elkülönülten azonosíthatók, akkor ez a szabályozás nem vonatkozik ezekre a részekre, ha azok külön munkaként kerülnek terjesztésre. Viszont, ha ugyanez a rész az egész részeként kerül terjesztésre, amely a Programon alapuló munka, akkor az egész terjesztése csak a jelen dokumentum alapján lehetséges, amely ebben az esetben a jogokat minden egyes felhasználó számára kiterjeszti az egészre tekintet nélkül arra, hogy melyik részt ki írta. - -E szövegrésznek tehát nem az a célja, hogy mások jogait elvegye vagy korlátozza a kizárólag saját maga által írt munkákra; a cél az, hogy a jogok gyakorlása szabályozva legyen a Programon alapuló illetve a gyűjteményes munkák terjesztése esetében. - -Ezenkívül más munkáknak, amelyek nem a Programon alapulnak, a Programmal (vagy a Programon alapuló munkával) közös adathordozón vagy adattárolón szerepeltetése nem jelenti a jelen szabályok érvényességét azokra is. - -3. A Program (vagy a Programon alapuló munka a 2. szakasznak megfelelően) másolható és terjeszthető tárgykódú vagy végrehajtható kódú formájában az 1. és 2. szakaszban foglaltak szerint, amennyiben az alábbi feltételek is teljesülnek: - -a) a teljes, gép által értelmezhető forráskód kíséri az anyagot, amelynek terjesztése az 1. és 2. szakaszban foglaltak szerint történik, jellemzően szoftverterjesztésre használt adathordozón; vagy, - -b) legalább három évre szólóan írásban vállalja, hogy bármely külső személynek rendelkezésre áll a teljes gép által értelmezhető forráskód, a fizikai továbbítást fedező összegnél nem nagyobb díjért az 1. és 2. szakaszban foglaltak szerint szoftverterjesztésre használt adathordozón; vagy, - -c) a megfelelő forráskód terjesztésére vonatkozóan megkapott tájékoztatás kíséri az anyagot. (Ez az alternatíva csak nem kereskedelmi terjesztés esetén alkalmazható abban az esetben, ha a terjesztő a Programhoz a tárgykódú vagy forráskódú formájában jutott hozzá az ajánlattal együtt a fenti b. cikkelynek megfelelően.) - -Egy munka forráskódja a munkának azt a formáját jelenti, amelyben a módosításokat elsődlegesen végezni szokás. Egy végrehajtható program esetében a teljes forráskód a tartalmazott összes modul forráskódját jelenti, továbbá a kapcsolódó felületdefiníciós fájlokat és a fordítást vezérlő parancsfájlokat. Egy speciális kivételként a forráskódnak nem kell tartalmaznia normál esetben a végrehajtható kód futtatására szolgáló operációs rendszer főbb részeiként (kernel, fordítóprogram stb.) terjesztett részeit (forrás vagy bináris formában), kivéve, ha a komponens maga a végrehajtható állományt kíséri. - -Ha a végrehajtható program vagy tárgykód terjesztése a forráskód hozzáférését egy megadott helyen biztosító írásban vállalja, akkor ez egyenértékű a forráskód terjesztésével, bár másoknak nem kell a forrást lemásolniuk a tárgykóddal együtt. - -4. A Programot csak a jelen Licencben leírtaknak megfelelően szabad lemásolni, terjeszteni, módosítani és allicencbe adni. Az egyéb módon történő másolás, módosítás, terjesztés és allicencbe adás érvénytelen, és azonnal érvényteleníti a dokumentumban megadott jogosultságokat. Mindazonáltal azok, akik a Licencet megszegőtől kaptak példányokat vagy jogokat, tovább gyakorolhatják a Licenc által meghatározott jogaikat mindaddig, amíg teljesen megfelelnek a Licenc feltételeinek. - -5. Önnek nem kötelező elfogadnia ezt a szabályozást, hiszen nem írta alá. Ezen kívül viszont semmi más nem ad jogokat a Program terjesztésére és módosítására. Ezeket a cselekedeteket a törvény bünteti, ha nem a jelen szerzői jogi szabályozás keretei között történnek. Mindezek miatt a Program (vagy a Programon alapuló munka) terjesztése vagy módosítása a jelen dokumentum szabályainak, és azon belül a Program vagy a munka módosítására, másolására vagy terjesztésére vonatkozó összes feltételének elfogadását jelenti. - -6. Minden alkalommal, amikor a Program (vagy az azon alapuló munka) továbbadása történik, a Programot megkapó személy automatikusan hozzájut az eredeti licenctulajdonostól származó licenchez, amely a jelen szabályok szerint biztosítja a jogot a Program másolására, terjesztésére és módosítására. Nem lehet semmilyen módon tovább korlátozni a fogadó félnek az itt megadott jogait. A Program továbbadója nem felelős harmadik személyekkel betartatni a jelen szabályokat. - -7. Ha bírósági határozat, szabadalomsértés vélelme, vagy egyéb (nem kizárólag szabadalmakkal kapcsolatos) okból olyan feltételeknek kell megfelelnie (akár bírósági határozat, akár megállapodás, akár bármi más eredményeképp), amelyek ellentétesek a jelen feltételekkel, az nem menti fel a terjesztőt a jelen feltételek figyelembevétele alól. Ha a terjesztés nem lehetséges a jelen Licenc és az egyéb feltételek kötelezettségeinek együttes betartásával, akkor tilos a Program terjesztése. Ha például egy szabadalmi szerződés nem engedi meg egy program jogdíj nélküli továbbterjesztését azok számára, akik közvetve vagy közvetlenül megkapják, akkor az egyetlen módja, hogy eleget tegyen valaki mindkét feltételnek az, hogy eláll a Program terjesztésétől. - -Ha ennek a szakasznak bármely része érvénytelen, vagy nem érvényesíthető valamely körülmény folytán, akkor a szakasz maradék részét kell alkalmazni, egyéb esetekben pedig a szakasz egésze alkalmazandó. - -Ennek a szakasznak nem az a célja, hogy a szabadalmak vagy egyéb hasonló jogok megsértésére ösztönözzön bárkit is; mindössze meg szeretné védeni a szabad szoftver terjesztési rendszerének egységét, amelyet a szabad közreadást szabályozó feltételrendszerek teremtenek meg. Sok ember nagymértékben járult hozzá az e rendszer keretében terjesztett, különféle szoftverekhez, és számít a rendszer következetes alkalmazására; azt a szerző/adományozó dönti el, hogy a szoftverét más rendszer szerint is közzé kívánja-e tenni, és a licencet kapók ezt nem befolyásolhatják. - -E szakasz célja, hogy pontosan tisztázza azt, ami elgondolásunk szerint a jelen licenc többi részének a következménye. - -8. Ha a Program terjesztése és/vagy használata egyes országokban nem lehetséges akár szabadalmak, akár szerzői jogokkal védett felületek miatt, akkor a Program szerzői jogainak eredeti tulajdonosa, aki a Programot ezen szabályozás alapján adja közre, egy explicit földrajzi megkötést adhat a terjesztésre, és egyes országokat kizárhat. Ebben az esetben úgy tekintendő, hogy a jelen licenc ezt a megkötést is tartalmazza, ugyanúgy mintha csak a fő szövegében lenne leírva. - -9. A Free Software Foundation időről időre kiadja a General Public License dokumentum felülvizsgált és/vagy újabb változatait. Ezek az újabb dokumentumok az előzőek szellemében készülnek, de részletekben különbözhetnek, hogy új problémákat vagy aggályokat is kezeljenek. - -A dokumentum minden változata egy megkülönböztető verziószámmal ellátva jelenik meg. Ha a Program szerzői jogi megjegyzésében egy bizonyos vagy annál újabb verzió van megjelölve, akkor lehetőség van akár a megjelölt, vagy a Free Software Foundation által kiadott későbbi verzióban leírt feltételek követésére. Ha nincs ilyen megjelölt verzió, akkor lehetőség van a Free Software Foundation által valaha kibocsátott bármelyik dokumentum alkalmazására. - -10. A Programot más szabad szoftverbe, amelynek szerzői jogi szabályozása különbözik, csak akkor építheti be, ha a szerzőtől erre engedélyt szerzett. Abban az esetben, ha a program szerzői jogainak tulajdonosa a Free Software Foundation, akkor a Free Software Foundation címére kell írni; néha kivételt teszünk. A döntés a következő két cél szem előtt tartásával fog történni: megmaradjon a szabad szoftveren alapuló munkák szabad állapota, valamint segítse elő a szoftver újrafelhasználását és megosztását. -GARANCIAVÁLLALÁS HIÁNYA - -11. MIVEL A JELEN PROGRAM HASZNÁLATI JOGA DÍJMENTES, AZ ALKALMAZHATÓ JOGSZABÁLYOK ÁLTAL BIZTOSÍTOTT MAXIMÁLIS MÉRTÉKBEN VISSZAUTASÍTJUK A PROGRAMHOZ A GARANCIA BIZTOSÍTÁSÁT. AMENNYIBEN A SZERZŐI JOGOK TULAJDONOSAI ÍRÁSBAN MÁSKÉNT NEM NYILATKOZNAK, A PROGRAM A "JELEN ÁLLAPOTÁBAN" KERÜL KIADÁSRA, MINDENFÉLE GARANCIAVÁLLALÁS NÉLKÜL, LEGYEN AZ KIFEJEZETT VAGY BELEÉRTETT, BELEÉRTVE, DE NEM KIZÁRÓLAGOSAN A FORGALOMBA HOZHATÓSÁGRA VAGY ALKALMAZHATÓSÁGRA VONATKOZÓ GARANCIÁKAT. A PROGRAM MINŐSÉGÉBŐL ÉS MŰKÖDÉSÉBŐL FAKADÓ ÖSSZES KOCKÁZAT A FELHASZNÁLÓT TERHELI. HA A PROGRAM HIBÁSAN MŰKÖDIK, A FELHASZNÁLÓNAK MAGÁNAK KELL VÁLLALNIA A JAVÍTÁSHOZ SZÜKSÉGES MINDEN KÖLTSÉGET. - -12. AMENNYIBEN A HATÁLYOS JOGSZABÁLYOK VAGY A SZERZŐI JOGOK TULAJDONOSAI ÍRÁSOS MEGÁLLAPODÁSBAN MÁSKÉNT NEM RENDELKEZNEK, SEM A PROGRAM SZERZŐJE, SEM MÁSOK, AKIK MÓDOSÍTOTTÁK ÉS/VAGY TERJESZTETTÉK A PROGRAMOT A FENTIEKNEK MEGFELELŐEN, NEM TEHETŐK FELELŐSSÉ A KÁROKÉRT, BELEÉRTVE MINDEN VÉLETLEN, VAGY KÖVETKEZMÉNYES KÁRT, AMELY A PROGRAM HASZNÁLATÁBÓL VAGY A HASZNÁLAT MEGAKADÁLYOZÁSÁBÓL SZÁRMAZIK (BELEÉRTVE, DE NEM KIZÁRÓLAGOSAN AZ ADATVESZTÉST ÉS A HELYTELEN ADATFELDOLGOZÁST, VALAMINT A MÁS PROGRAMOKKAL VALÓ HIBÁS EGYÜTTMŰKÖDÉST), MÉG AKKOR SEM, HA EZEN FELEK TUDATÁBAN VOLTAK, HOGY ILYEN KÁROK KELETKEZHETNEK. - -FELTÉTELEK ÉS SZABÁLYOK VÉGE -Hogyan alkalmazhatók ezek a szabályok egy új programra? -Ha valaki egy új programot készít és szeretné, hogy az bárki számára a lehető leginkább hasznos legyen, akkor a legjobb módszer, hogy azt szabad szoftverré teszi, megengedve mindenkinek a szabad másolást és módosítást a jelen feltételeknek megfelelően. - -Ehhez a következő megjegyzést kell csatolni a programhoz. A legbiztosabb ezt minden egyes forrásfájl elejére beírni, így közölve leghatásosabban a garancia visszautasítását; ezenkívül minden fájl kell, hogy tartalmazzon egy copyright sort és egy mutatót arra a helyre, ahol a teljes szöveg található. - -Egy sor, amely megadja a program nevét és funkcióját -Copyright (C) év; szerző neve; - -Ez a program szabad szoftver; terjeszthető illetve módosítható a Free Software Foundation által kiadott GNU General Public License dokumentumában leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi változata szerint. - -Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. További részleteket a GNU General Public License tartalmaz. - -A felhasználónak a programmal együtt meg kell kapnia a GNU General Public License egy példányát; ha mégsem kapta meg, akkor ezt a Free Software Foundationnak küldött levélben jelezze (cím: Free Software Foundation Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.) - -A programhoz csatolni kell azt is, hogy miként lehet kapcsolatba lépni a szerzővel, elektronikus vagy hagyományos levél küldésével. - -Ha a program interaktív, a következőhöz hasonló üzenettel lehet ezt megtenni a program indulásakor: - -Gnomovision version 69, Copyright (C) év, a szerző neve. -A Gnomovision programhoz SEMMILYEN GARANCIA NEM JÁR; részletekért írja be a 'show w' parancsot. Ez egy szabad szoftver, bizonyos feltételek mellett terjeszthető, illetve módosítható; részletekért írja be a 'show c' parancsot. - -A show w és show c képzeletbeli parancsok, és a GPL megfelelő részeit kell megjeleníteniük. Természetesen a valódi parancsok a show w és show c parancstól különbözhetnek; lehetnek akár egérkattintások vagy menüpontok is, ami a programnak megfelel. - -Ha szükséges, meg kell szerezni a munkáltatótól (ha a szerző programozóként dolgozik) vagy az iskolától a program szerzői jogairól való lemondás igazolását. Erre itt egy példa; változtassa meg a neveket: - -A Fiktív Bt. ezennel lemond minden szerzői jogi érdekeltségéről a „Gnomovision” programmal (amelyet több fázisban fordítanak le a fordítóprogramok) kapcsolatban, amelyet H. Ekker János írt. - -Aláírás: Tira Mihály, 1989. április 1. Tira Mihály ügyvezető - -A GNU General Public License nem engedi meg, hogy a program része legyen szellemi tulajdont képező programoknak. Ha a program egy szubrutinkönyvtár, akkor megfontolhatja, hogy nem célszerűbb-e megengedni, hogy szellemi tulajdont képező alkalmazásokkal is összefűzhető legyen a programkönyvtár. Ha ezt szeretné, akkor a GPL helyett a GNU LGPL-t kell használni. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 4ab79d607..8eab3b396 100644 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index f2a7393d4..3e1842746 100644 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index 0e6ff05a7..c4cabb41c 100644 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1073,28 +1073,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1106,9 +1106,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1120,37 +1120,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1160,14 +1160,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1179,16 +1179,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index d3322e9f9..786f7a98b 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -184,7 +184,7 @@ - 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. + 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. @@ -197,7 +197,7 @@ - Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: Book Chapter Book Chapter-Chapter @@ -1036,28 +1036,28 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fif Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. @@ -1069,9 +1069,9 @@ a) You must cause the modified files to carry prominent notices stating that you b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1083,37 +1083,37 @@ a) Accompany it with the complete corresponding machine-readable source code, wh b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -1123,14 +1123,14 @@ How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. -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 the GNU General Public License for more details. +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 the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1142,16 +1142,16 @@ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. -The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. From 08e97a67cb62ae5332c221c6a54c19f2d5d8ffdf Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 6 Sep 2010 06:53:48 +0200 Subject: [PATCH 09/10] More string fixes and updates from Pootle. --- openlp/plugins/presentations/lib/mediaitem.py | 2 +- resources/i18n/af.ts | 6 +++--- resources/i18n/de.ts | 6 +++--- resources/i18n/en.ts | 6 +++--- resources/i18n/en_GB.ts | 6 +++--- resources/i18n/en_ZA.ts | 6 +++--- resources/i18n/es.ts | 6 +++--- resources/i18n/et.ts | 6 +++--- resources/i18n/hu.ts | 6 +++--- resources/i18n/ko.ts | 6 +++--- resources/i18n/nb.ts | 6 +++--- resources/i18n/pt_BR.ts | 6 +++--- resources/i18n/sv.ts | 6 +++--- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 001aeac4d..60b455368 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -212,7 +212,7 @@ class PresentationMediaItem(MediaManagerItem): self, translate('PresentationPlugin.MediaItem', 'Unsupported File'), translate('PresentationPlugin.MediaItem', - 'This type of presentation is not supported')) + 'This type of presentation is not supported.')) continue item_name = QtGui.QListWidgetItem(filename) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index 3ca75ea47..6b9e90322 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index 006e3f196..b4c437b75 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -1075,7 +1075,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1091,7 +1091,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1146,7 +1146,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index 97f604a34..e93b5528d 100644 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index 280d8f1a5..1f644c3b4 100644 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index cd62c00b3..e31ea3797 100644 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -1119,7 +1119,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1135,7 +1135,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1190,7 +1190,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 17e2615a8..a89b222f4 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts index fce37afcb..eacc6fe0c 100644 --- a/resources/i18n/et.ts +++ b/resources/i18n/et.ts @@ -1081,7 +1081,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1097,7 +1097,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1152,7 +1152,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 55cec3b93..984599a5b 100644 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -1061,7 +1061,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1077,7 +1077,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1132,7 +1132,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 8eab3b396..04f7b048b 100644 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index 3e1842746..7c4ba2d4b 100644 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index c4cabb41c..04dc0ba7e 100644 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -1092,7 +1092,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1108,7 +1108,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1163,7 +1163,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index 786f7a98b..080a2ea1d 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -1055,7 +1055,7 @@ The precise terms and conditions for copying, distribution and modification foll GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. @@ -1071,7 +1071,7 @@ b) You must cause any work that you distribute or publish, that in whole or in p c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. @@ -1126,7 +1126,7 @@ If you develop a new program, and you want it to be of the greatest possible use To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of author> 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; either version 2 of the License, or (at your option) any later version. From 035bf7577fdb6a70a24fc0570e37e13a535396b9 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 6 Sep 2010 07:54:51 +0200 Subject: [PATCH 10/10] Update some strings, fix up the layout in the edit song dialog. --- openlp/plugins/songs/forms/editsongdialog.py | 15 +- resources/i18n/af.ts | 2 +- resources/i18n/de.ts | 6 +- resources/i18n/en.ts | 2 +- resources/i18n/en_GB.ts | 2 +- resources/i18n/en_ZA.ts | 326 +++++++++++++------ resources/i18n/es.ts | 2 +- resources/i18n/et.ts | 10 +- resources/i18n/hu.ts | 2 +- resources/i18n/ko.ts | 2 +- resources/i18n/nb.ts | 2 +- resources/i18n/pt_BR.ts | 2 +- resources/i18n/sv.ts | 2 +- 13 files changed, 257 insertions(+), 118 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 870a68bca..0d2e65f95 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -258,10 +258,11 @@ class Ui_EditSongDialog(object): self.TopicBookLayout.addWidget(self.TopicGroupBox) self.SongBookGroup = QtGui.QGroupBox(self.TopicBookWidget) self.SongBookGroup.setObjectName(u'SongBookGroup') - self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup) + self.SongbookLayout = QtGui.QFormLayout(self.SongBookGroup) self.SongbookLayout.setMargin(8) self.SongbookLayout.setSpacing(8) self.SongbookLayout.setObjectName(u'SongbookLayout') + self.SongbookNameLabel = QtGui.QLabel(self.SongBookGroup) self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) @@ -272,13 +273,11 @@ class Ui_EditSongDialog(object): self.SongbookCombo.setEditable(True) self.SongbookCombo.setSizePolicy(sizePolicy) self.SongbookCombo.setObjectName(u'SongbookCombo') - self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1) + self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo) self.songBookNumberLabel = QtGui.QLabel(self.SongBookGroup) - self.SongbookLayout.addWidget(self.songBookNumberLabel, 0, 1, 1, 1) self.songBookNumberEdit = QtGui.QLineEdit(self.SongBookGroup) - self.songBookNumberLabel.setBuddy(self.songBookNumberEdit) - self.songBookNumberEdit.setMaximumWidth(35) - self.SongbookLayout.addWidget(self.songBookNumberEdit, 0, 2, 1, 1) + self.SongbookLayout.addRow(self.songBookNumberLabel, + self.songBookNumberEdit) self.TopicBookLayout.addWidget(self.SongBookGroup) self.AuthorsTabLayout.addWidget(self.TopicBookWidget) self.SongTabWidget.addTab(self.AuthorsTab, u'') @@ -446,8 +445,10 @@ class Ui_EditSongDialog(object): translate('SongsPlugin.EditSongForm', 'R&emove')) self.SongBookGroup.setTitle( translate('SongsPlugin.EditSongForm', 'Song Book')) + self.SongbookNameLabel.setText(translate('SongsPlugin.EditSongForm', + 'Book:')) self.songBookNumberLabel.setText(translate('SongsPlugin.EditSongForm', - 'Song No.:')) + 'Number:')) self.SongTabWidget.setTabText( self.SongTabWidget.indexOf(self.AuthorsTab), translate('SongsPlugin.EditSongForm', diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index 6b9e90322..cde35ce80 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index b4c437b75..10b15691f 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -10,7 +10,7 @@ Show an alert message. - + Hinweis anzeigen @@ -2846,8 +2846,8 @@ The content encoding is not UTF-8. - This type of presentation is not supported - + This type of presentation is not supported. + diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index e93b5528d..86411c4e5 100644 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index 1f644c3b4..d08d90416 100644 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index e31ea3797..f56ff3755 100644 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -185,7 +185,7 @@ 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. - + 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. @@ -206,7 +206,15 @@ Book Chapter:Verse-Verse,Verse-Verse Book Chapter:Verse-Verse,Chapter:Verse-Verse Book Chapter:Verse-Chapter:Verse - + Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns: + +Book Chapter +Book Chapter-Chapter +Book Chapter:Verse-Verse +Book Chapter:Verse-Verse,Verse-Verse +Book Chapter:Verse-Verse,Chapter:Verse-Verse +Book Chapter:Verse-Chapter:Verse + @@ -1216,7 +1224,137 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gno Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - + Copyright © 2004-2010 Raoul Snyman +Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard + +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. + +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. + + +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +GNU GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> +Copyright (C) <year> <name of author> + +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; either version 2 of the License, or (at your option) any later version. + +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 the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w". +This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details. + +The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker. + +<signature of Ty Coon>, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. @@ -2593,12 +2731,12 @@ The content encoding is not UTF-8. Edit and re-preview song - + Edit and re-preview song Go To - + Go To @@ -2791,7 +2929,7 @@ The content encoding is not UTF-8. A theme with this name already exists. Would you like to overwrite it? - + A theme with this name already exists. Would you like to overwrite it? @@ -2860,41 +2998,41 @@ The content encoding is not UTF-8. Select Presentation(s) - + Select Presentation(s) Automatic - + Automatic Present using: - Present using: + Present using: File Exists - + File Exists A presentation with that filename already exists. - + A presentation with that filename already exists. Unsupported File - - - - - This type of presentation is not supported - + Unsupported File You must select an item to delete. + You must select an item to delete. + + + + This type of presentation is not supported. @@ -2903,22 +3041,22 @@ The content encoding is not UTF-8. Presentations - + Presentations Available Controllers - Available Controllers + Available Controllers Advanced - Advanced + Advanced Allow presentation application to be overriden - + Allow presentation application to be overriden @@ -2926,7 +3064,7 @@ The content encoding is not UTF-8. <strong>Remote Plugin</strong><br />The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API. - + <strong>Remote Plugin</strong><br />The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API. @@ -2934,22 +3072,22 @@ The content encoding is not UTF-8. Remotes - Remotes + Remotes Serve on IP address: - + Serve on IP address: Port number: - + Port number: Server Settings - + Server Settings @@ -2957,42 +3095,42 @@ The content encoding is not UTF-8. &Song Usage Tracking - + &Song Usage Tracking &Delete Tracking Data - + &Delete Tracking Data Delete song usage data up to a specified date. - + Delete song usage data up to a specified date. &Extract Tracking Data - + &Extract Tracking Data Generate a report on song usage. - + Generate a report on song usage. Toggle Tracking - + Toggle Tracking Toggle the tracking of song usage. - + Toggle the tracking of song usage. <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. @@ -3000,17 +3138,17 @@ The content encoding is not UTF-8. Delete Selected Song Usage Events? - + Delete Selected Song Usage Events? Are you sure you want to delete selected Song Usage data? - + Are you sure you want to delete selected Song Usage data? Delete Song Usage Data - + Delete Song Usage Data @@ -3018,27 +3156,27 @@ The content encoding is not UTF-8. Output File Location - Output File Location + Output File Location Song Usage Extraction - + Song Usage Extraction Select Date Range - + Select Date Range to - + to Report Location - Report Location + Report Location @@ -3051,12 +3189,12 @@ The content encoding is not UTF-8. Import songs using the import wizard. - + Import songs using the import wizard. <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. @@ -3064,42 +3202,42 @@ The content encoding is not UTF-8. Author Maintenance - Author Maintenance + Author Maintenance Display name: - + Display name: First name: - First name: + First name: Last name: - Last name: + Last name: Error - Error + Error You need to type in the first name of the author. - You need to type in the first name of the author. + You need to type in the first name of the author. You need to type in the last name of the author. - + You need to type in the last name of the author. You have not set a display name for the author, would you like me to combine the first and last names for you? - + You have not set a display name for the author, would you like me to combine the first and last names for you? @@ -3107,192 +3245,192 @@ The content encoding is not UTF-8. Song Editor - Song Editor + Song Editor &Title: - &Title: + &Title: &Lyrics: - + &Lyrics: &Add - + &Add &Edit - + &Edit Ed&it All - + Ed&it All &Delete - &Delete + &Delete Title && Lyrics - Title && Lyrics + Title && Lyrics Authors - Authors + Authors &Add to Song - + &Add to Song &Remove - &Remove + &Remove &Manage Authors, Topics, Song Books - + &Manage Authors, Topics, Song Books Topic - Topic + Topic A&dd to Song - + A&dd to Song R&emove - + R&emove Song Book - + Song Book Authors, Topics && Song Book - + Authors, Topics && Song Book Theme - Theme + Theme New &Theme - + New &Theme Copyright Information - Copyright Information + Copyright Information © - + © Comments - + Comments Theme, Copyright Info && Comments - + Theme, Copyright Info && Comments Save && Preview - Save && Preview + Save && Preview Add Author - + Add Author This author does not exist, do you want to add them? - + This author does not exist, do you want to add them? Error - Error + Error This author is already in the list. - + This author is already in the list. No Author Selected - + No Author Selected You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. Add Topic - + Add Topic This topic does not exist, do you want to add it? - + This topic does not exist, do you want to add it? This topic is already in the list. - + This topic is already in the list. No Topic Selected - + No Topic Selected You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. You need to type in a song title. - + You need to type in a song title. You need to type in at least one verse. - + You need to type in at least one verse. Warning - + Warning @@ -3651,7 +3789,7 @@ The content encoding is not UTF-8. You must select an item to delete. - + You must select an item to delete. @@ -3712,7 +3850,7 @@ The content encoding is not UTF-8. © - + © @@ -3753,12 +3891,12 @@ The content encoding is not UTF-8. &Add - + &Add &Edit - + &Edit diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index a89b222f4..ac7be358a 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts index eacc6fe0c..6d7eb1f63 100644 --- a/resources/i18n/et.ts +++ b/resources/i18n/et.ts @@ -2840,11 +2840,6 @@ The content encoding is not UTF-8. You must select an item to delete. - - - This type of presentation is not supported - - File Exists @@ -2855,6 +2850,11 @@ The content encoding is not UTF-8. Unsupported File + + + This type of presentation is not supported. + + PresentationPlugin.PresentationTab diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 984599a5b..ca1dbfb43 100644 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -2847,7 +2847,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 04f7b048b..ca4b1696c 100644 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index 7c4ba2d4b..7e2cdd865 100644 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index 04dc0ba7e..98bb9733e 100644 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -2879,7 +2879,7 @@ A codificação do conteúdo não é UTF-8. - This type of presentation is not supported + This type of presentation is not supported. diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index 080a2ea1d..c38fa6658 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -2841,7 +2841,7 @@ The content encoding is not UTF-8. - This type of presentation is not supported + This type of presentation is not supported.