From 43b7e84106c3e958362d5f24d8846de4d4bf78ab Mon Sep 17 00:00:00 2001 From: rimach Date: Tue, 14 Sep 2010 19:49:21 +0200 Subject: [PATCH] Head --- resources/i18n/af.ts | 671 ++++------ resources/i18n/de.ts | 642 ++++----- resources/i18n/en.ts | 668 ++++------ resources/i18n/en_GB.ts | 671 ++++------ resources/i18n/en_ZA.ts | 918 ++++--------- resources/i18n/es.ts | 671 ++++------ resources/i18n/et.ts | 2723 ++++++++++++++++++--------------------- resources/i18n/hu.ts | 671 ++++------ resources/i18n/ko.ts | 668 ++++------ resources/i18n/nb.ts | 671 ++++------ resources/i18n/pt_BR.ts | 672 ++++------ resources/i18n/sv.ts | 671 ++++------ 12 files changed, 3772 insertions(+), 6545 deletions(-) diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index c27c90037..e0cf10b78 100755 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert W&aarskuwing - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Waarskuwings @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bybel - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bybel - + Bibles Bybels - + Import Invoer - + Import a Bible - + Add Byvoeg - + Add a new Bible - + Edit Redigeer - + Edit the selected Bible - + Delete - + Delete the selected Bible - + Preview Voorskou - + Preview the selected Bible - + Live Regstreeks - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. Geen bypassende boek kon in dié Bybel gevind word nie. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import Invoer - + Import a Custom - + Load - + Load a new Custom - + Add Byvoeg - + Add a new Custom - + Edit Redigeer - + Edit the selected Custom - + Delete - + Delete the selected Custom - + Preview Voorskou - + Preview the selected Custom - + Live Regstreeks - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Beeld - + Images Beelde - + Load - + Load a new Image - + Add Byvoeg - + Add a new Image - + Edit Redigeer - + Edit the selected Image - + Delete - + Delete the selected Image - + Preview Voorskou - + Preview the selected Image - + Live Regstreeks - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Beeld(e) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Media - + Medias - + Load - + Load a new Media - + Add Byvoeg - + Add a new Media - + Edit Redigeer - + Edit the selected Media - + Delete - + Delete the selected Media - + Preview Voorskou - + Preview the selected Media - + Live Regstreeks - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Media - - - ->>>>>>> MERGE-SOURCE Select Media Selekteer Media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,15 +1985,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + Nuwe Diens + + + + Open Service + Maak Diens Oop + + + + Save Service + Stoor Diens + OpenLP 2.0 OpenLP 2.0 - - English - Engels + + AddHereYourLanguageName + @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New &Nuwe - - - New Service - Nuwe Diens - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open Maak &Oop - - - Open Service - Maak Diens Oop - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save &Stoor - - - Save Service - Stoor Diens - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Engels + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live &Vertoon Regstreeks - + &Add to Service &Voeg by Diens - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Inprop Lys -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Inprop Besonderhede -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Weergawe: -<<<<<<< TREE - - TextLabel - TeksEtiket - - -======= ->>>>>>> MERGE-SOURCE - + About: Aangaande: - + Status: Status: - + Active Aktief - + Inactive Onaktief @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Skep 'n nuwe diens -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Maak Diens Oop @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. Laai 'n bestaande diens - + Save Service Stoor Diens @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Verander Item Tema -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Fout -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. Voorskou -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Beweeg na vorige -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Verskuif na volgende -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Blanko Skerm @@ -2898,96 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Verskuif na regstreekse skerm -<<<<<<< TREE - Edit and re-preview Song - Redigeer en sien weer 'n voorskou van die Lied -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Begin aaneenlopende lus -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Stop deurlopende lus -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Vertraging in sekondes tussen skyfies -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Begin media speel -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3167,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3226,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Aanbieding - + Presentations Aanbiedinge - + Load - + Load a new Presentation - + Delete - + Delete the selected Presentation - + Preview Voorskou - + Preview the selected Presentation - + Live Regstreeks - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3324,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3365,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Afstandbehere @@ -3406,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3500,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Lied - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Lied - + Songs Liedere - + Add Byvoeg - + Add a new Song - + Edit Redigeer - + Edit the selected Song - + Delete - + Delete the selected Song - + Preview Voorskou - + Preview the selected Song - + Live Regstreeks - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3631,137 +3483,142 @@ 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 - - Song No.: + + Book: + Boek: + + + + Number: - + Authors, Topics && Song Book - + Theme Tema - + New &Theme - + Copyright Information Kopiereg Informasie - + © - + CCLI number: - + Comments Kommentaar - + Theme, Copyright Info && Comments Tema, Kopiereg Informasie && Kommentaar @@ -3781,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Fout @@ -3830,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3905,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Redigeer Vers -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4055,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Invoer begin... @@ -4174,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4293,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4314,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Invoer voltooi. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index 439766ef3..9fcddc120 100755 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Hinweis - + Show an alert message. Hinweis anzeigen -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Hinweise @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bibel - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bibel - + Bibles Bibeln - + Import - + Import a Bible - + Add - + Add a new Bible - + Edit Bearbeiten - + Edit the selected Bible - + Delete Löschen - + Delete the selected Bible - + Preview Vorschau - + Preview the selected Bible - + Live Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -738,11 +734,7 @@ Changes do not affect verses already in the service. Das Buch wurde in dieser Bibelausgabe nicht gefunden. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc @@ -752,11 +744,7 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,62 +786,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: @@ -868,37 +856,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. @@ -918,7 +906,7 @@ Changes do not affect verses already in the service. - + Move slide up one position. @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom Sonderfolien - + Customs - + Import - + Import a Custom - + Load - + Load a new Custom - + Add - + Add a new Custom - + Edit Bearbeiten - + Edit the selected Custom - + Delete Löschen - + Delete the selected Custom - + Preview Vorschau - + Preview the selected Custom - + Live Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Bild - + Images - + Load - + Load a new Image - + Add - + Add a new Image - + Edit Bearbeiten - + Edit the selected Image - + Delete Löschen - + Delete the selected Image - + Preview Vorschau - + Preview the selected Image - + Live Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1135,11 +1123,7 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Bild(er) @@ -1149,38 +1133,22 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Medien - + Medias - + Load - + Load a new Media - + Add - + Add a new Media - + Edit Bearbeiten - + Edit the selected Media - + Delete Löschen - + Delete the selected Media - + Preview Vorschau - + Preview the selected Media - + Live Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,11 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Media Medien @@ -1300,11 +1264,7 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1312,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2430,6 +2390,11 @@ This General Public License does not permit incorporating your program into prop Default Theme: %s + + + AddHereYourLanguageName + + Version %s of OpenLP is now available for download (you are currently running version %s). @@ -2441,82 +2406,82 @@ You can download the latest version from http://openlp.org/. OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live &Zeige Live - + &Add to Service &Zum Ablauf hinzufügen - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items Sie müssen mindestens ein Element markieren - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2524,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Plugin-Liste -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Plugin-Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Version: -<<<<<<< TREE - - TextLabel - Text Beschriftung - - -======= ->>>>>>> MERGE-SOURCE - + About: Über: - + Status: Status: - + Active Aktiv - + Inactive Inaktiv @@ -2630,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Erstelle neuen Ablauf -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Öffnen Ablauf @@ -2644,7 +2585,7 @@ You can download the latest version from http://openlp.org/. Öffne Ablauf - + Save Service Ablauf speichern @@ -2754,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Design des Elements ändern -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Fehler -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2849,140 +2770,85 @@ The content encoding is not UTF-8. Vorschau -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Vorherige Folie anzeigen -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Verschiebe zum Nächsten -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to live Verschieben zur Live Ansicht - -<<<<<<< TREE - - Edit and re-preview Song - Lied bearbeiten und wieder anzeigen - -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Endlosschleife starten -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Endlosschleife beenden -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Pause zwischen den Folien in Sekunden -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Abspielen -<<<<<<< TREE Blank Screen - Livebild schwarz + Blank to Theme - Livebild Hintergrund + Show Desktop - Livebild Transparent + - - Go to - Gehe zu -======= - + Edit and re-preview song - + Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3162,13 +3028,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3222,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Präsentation - + Presentations Präsentationen - + Load - + Load a new Presentation - + Delete Löschen - + Delete the selected Presentation - + Preview Vorschau - + Preview the selected Presentation - + Live Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3325,15 +3186,9 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported - -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3362,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Fernprojektion @@ -3403,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3497,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Lied - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Lied - + Songs Lieder - + Add - + Add a new Song - + Edit Bearbeiten - + Edit the selected Song - + Delete Löschen - + Delete the selected Song - + Preview Vorschau - + Preview the selected Song - + Live Live - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3628,107 +3483,107 @@ 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 @@ -3778,108 +3633,72 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Fehler -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE 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: @@ -3894,37 +3713,30 @@ The content encoding is not UTF-8. - - Song No.: + + Book: + Buch: + + + + Number: SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Bearbeite Vers -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -3962,11 +3774,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Starte import ... @@ -4171,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4290,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4311,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Importvorgang abgeschlossen. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index 26230bd53..9ba29a478 100755 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible - + Bibles - + Import - + Import a Bible - + Add - + Add a new Bible - + Edit - + Edit the selected Bible - + Delete - + Delete the selected Bible - + Preview - + Preview the selected Bible - + Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import - + Import a Custom - + Load - + Load a new Custom - + Add - + Add a new Custom - + Edit - + Edit the selected Custom - + Delete - + Delete the selected Custom - + Preview - + Preview the selected Custom - + Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image - + Images - + Load - + Load a new Image - + Add - + Add a new Image - + Edit - + Edit the selected Image - + Delete - + Delete the selected Image - + Preview - + Preview the selected Image - + Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media - + Medias - + Load - + Load a new Media - + Add - + Add a new Media - + Edit - + Edit the selected Media - + Delete - + Delete the selected Media - + Preview - + Preview the selected Media - + Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - - - - ->>>>>>> MERGE-SOURCE Select Media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,14 +1985,29 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + + + + + Open Service + + + + + Save Service + + OpenLP 2.0 - - English + + AddHereYourLanguageName @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New - - - New Service - - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open - - - Open Service - - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save - - - Save Service - - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live - + &Add to Service - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: -<<<<<<< TREE - - TextLabel - - - -======= ->>>>>>> MERGE-SOURCE - + About: - + Status: - + Active - + Inactive @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. - + Save Service @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen @@ -2898,95 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live -<<<<<<< TREE - Edit and re-preview Song -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3166,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3225,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation - + Presentations - + Load - + Load a new Presentation - + Delete - + Delete the selected Presentation - + Preview - + Preview the selected Presentation - + Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3323,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3364,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes @@ -3405,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3499,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song - + Songs - + Add - + Add a new Song - + Edit - + Edit the selected Song - + Delete - + Delete the selected Song - + Preview - + Preview the selected Song - + Live - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3630,137 +3483,142 @@ 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 - - Song No.: + + Book: - + + Number: + + + + Authors, Topics && Song Book - + Theme - + New &Theme - + Copyright Information - + © - + CCLI number: - + Comments - + Theme, Copyright Info && Comments @@ -3780,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error @@ -3829,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3904,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4054,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... @@ -4173,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4292,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4313,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index caea1db8e..0088eab91 100755 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Alert - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Alerts @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bible - + Bibles Bibles - + Import Import - + Import a Bible - + Add Add - + Add a new Bible - + Edit Edit - + Edit the selected Bible - + Delete Delete - + Delete the selected Bible - + Preview Preview - + Preview the selected Bible - + Live Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. No matching book could be found in this Bible. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom Custom - + Customs - + Import Import - + Import a Custom - + Load - + Load a new Custom - + Add Add - + Add a new Custom - + Edit Edit - + Edit the selected Custom - + Delete Delete - + Delete the selected Custom - + Preview Preview - + Preview the selected Custom - + Live Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Image - + Images Images - + Load - + Load a new Image - + Add Add - + Add a new Image - + Edit Edit - + Edit the selected Image - + Delete Delete - + Delete the selected Image - + Preview Preview - + Preview the selected Image - + Live Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Image(s) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Media - + Medias - + Load - + Load a new Media - + Add Add - + Add a new Media - + Edit Edit - + Edit the selected Media - + Delete Delete - + Delete the selected Media - + Preview Preview - + Preview the selected Media - + Live Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Media - - - ->>>>>>> MERGE-SOURCE Select Media Select Media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,15 +1985,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + New Service + + + + Open Service + Open Service + + + + Save Service + Save Service + OpenLP 2.0 OpenLP 2.0 - - English - English + + AddHereYourLanguageName + @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New &New - - - New Service - New Service - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open &Open - - - Open Service - Open Service - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save &Save - - - Save Service - Save Service - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + English + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live &Show Live - + &Add to Service &Add to Service - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items You must select one or more items - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Plugin List -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Plugin Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Version: -<<<<<<< TREE - - TextLabel - TextLabel - - -======= ->>>>>>> MERGE-SOURCE - + About: About: - + Status: Status: - + Active Active - + Inactive Inactive @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Create a new service -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Open Service @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. Load an existing service - + Save Service Save Service @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Change Item Theme -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. Preview -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Move to previous -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Move to next -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Blank Screen @@ -2898,96 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Move to live -<<<<<<< TREE - Edit and re-preview Song - Edit and re-preview Song -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Start continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Stop continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Delay between slides in seconds -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Start playing media -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3167,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3226,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Presentation - + Presentations Presentations - + Load - + Load a new Presentation - + Delete Delete - + Delete the selected Presentation - + Preview Preview - + Preview the selected Presentation - + Live Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3324,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3365,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Remotes @@ -3406,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3500,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Song - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Song - + Songs Songs - + Add Add - + Add a new Song - + Edit Edit - + Edit the selected Song - + Delete Delete - + Delete the selected Song - + Preview Preview - + Preview the selected Song - + Live Live - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3631,137 +3483,142 @@ 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 - - Song No.: + + Book: + Book: + + + + Number: - + Authors, Topics && Song Book - + Theme Theme - + New &Theme - + Copyright Information Copyright Information - + © - + CCLI number: - + Comments Comments - + Theme, Copyright Info && Comments Theme, Copyright Info && Comments @@ -3781,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Error @@ -3830,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3905,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Edit Verse -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4055,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Starting import... @@ -4174,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4293,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4314,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Finished import. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index f4b79c366..b546f1bce 100755 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Alert - + Show an alert message. Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <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 - + Alert - + Alerts Alerts @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bible - + Bibles Bibles - + Import - + Import a Bible - + Add - + Add a new Bible - + Edit Edit - + Edit the selected Bible - + Delete Delete - + Delete the selected Bible - + Preview Preview - + Preview the selected Bible - + Live Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -278,13 +274,8 @@ -<<<<<<< TREE - 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. ->>>>>>> MERGE-SOURCE @@ -305,7 +296,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 + @@ -749,20 +748,12 @@ Changes do not affect verses already in the service. No matching book could be found in this Bible. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. Bible not fully loaded. @@ -778,7 +769,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -804,97 +795,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: @@ -924,7 +915,7 @@ 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. @@ -945,92 +936,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom Custom - + Customs - + Import - + Import a Custom - + Load - + Load a new Custom - + Add - + Add a new Custom - + Edit Edit - + Edit the selected Custom - + Delete Delete - + Delete the selected Custom - + Preview Preview - + Preview the selected Custom - + Live Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1038,87 +1029,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Image - + Images - + Load - + Load a new Image - + Add - + Add a new Image - + Edit Edit - + Edit the selected Image - + Delete Delete - + Delete the selected Image - + Preview Preview - + Preview the selected Image - + Live Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1146,47 +1137,27 @@ Changes do not affect verses already in the service. Replace Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Image(s) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. You must select a media file to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background Reset Live Background @@ -1194,87 +1165,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Media - + Medias - + Load - + Load a new Media - + Add - + Add a new Media - + Edit Edit - + Edit the selected Media - + Delete Delete - + Delete the selected Media - + Preview Preview - + Preview the selected Media - + Live Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1282,11 +1253,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Media Media @@ -1306,11 +1273,7 @@ Changes do not affect verses already in the service. Replace Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. You must select a media file to delete. @@ -1318,7 +1281,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files Image Files @@ -1455,144 +1418,6 @@ Built With PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro Oxygen Icons: http://oxygen-icons.org/ -<<<<<<< TREE - - - - 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. - -======= ->>>>>>> MERGE-SOURCE @@ -2184,7 +2009,6 @@ This General Public License does not permit incorporating your program into prop Slide height is %s rows. Slide height is %s rows. -<<<<<<< TREE @@ -2198,8 +2022,6 @@ This General Public License does not permit incorporating your program into prop Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. -======= ->>>>>>> MERGE-SOURCE @@ -2759,165 +2581,91 @@ You can download the latest version from http://openlp.org/. You can download the latest version from http://openlp.org/. + + + AddHereYourLanguageName + + OpenLP.MediaManagerItem - + No Items Selected No Items Selected -<<<<<<< TREE - -======= - - 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 - - - - Preview %s - Preview %s - - - - Preview the selected item - Preview the selected item - - - - 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. - - - ->>>>>>> MERGE-SOURCE + &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 - + 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. @@ -2925,49 +2673,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Plugin List -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Plugin Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Version: - + About: About: - + Status: Status: - + Active Active - + Inactive Inactive @@ -2985,14 +2721,6 @@ You can download the latest version from http://openlp.org/. %s (Disabled) %s (Disabled) -<<<<<<< TREE - - - - TextLabel - -======= ->>>>>>> MERGE-SOURCE @@ -3031,11 +2759,7 @@ You can download the latest version from http://openlp.org/. Create a new service -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Open Service @@ -3045,7 +2769,7 @@ You can download the latest version from http://openlp.org/. Load an existing service - + Save Service Save Service @@ -3155,69 +2879,49 @@ You can download the latest version from http://openlp.org/. &Change Item Theme -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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 @@ -3251,69 +2955,31 @@ The content encoding is not UTF-8. Preview -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Move to previous -<<<<<<< TREE -======= - - Move to next - Move to next ->>>>>>> MERGE-SOURCE - - -<<<<<<< TREE Move to next Move to next -======= - ->>>>>>> MERGE-SOURCE Hide Hide -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to live Move to live -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Start continuous loop -<<<<<<< TREE -======= - - Stop continuous loop - Stop continuous loop - - - - s - s ->>>>>>> MERGE-SOURCE - - -<<<<<<< TREE Stop continuous loop Stop continuous loop @@ -3325,23 +2991,25 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Delay between slides in seconds -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Start playing media -<<<<<<< TREE + + Edit and re-preview song + Edit and re-preview song + + + + Go To + Go To + + Blank Screen @@ -3356,44 +3024,16 @@ The content encoding is not UTF-8. Show Desktop - - - Edit and re-preview Song - - - - - Go to - -======= - - Edit and re-preview song - Edit and re-preview song - - - - Go To - Go To ->>>>>>> MERGE-SOURCE - OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags Formatting Tags @@ -3574,13 +3214,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? A theme with this name already exists. Would you like to overwrite it? ->>>>>>> MERGE-SOURCE @@ -3634,67 +3269,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation - Presentation + Presentation - + Presentations Presentations - + Load - + Load a new Presentation - + Delete Delete - + Delete the selected Presentation - + Preview Preview - + Preview the selected Presentation - + Live Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3730,27 +3365,16 @@ The content encoding is not UTF-8. Unsupported File Unsupported File -<<<<<<< TREE - - - - This type of presentation is not supported - This type of presentation is not supported -======= ->>>>>>> MERGE-SOURCE You must select an item to delete. You must select an item to delete. -<<<<<<< TREE -======= - + This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3779,20 +3403,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. -<<<<<<< TREE - + Remote -======= ->>>>>>> MERGE-SOURCE - + Remotes Remotes @@ -3823,52 +3444,49 @@ The content encoding is not UTF-8. SongUsagePlugin - + &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. -<<<<<<< TREE - + SongUsage -======= ->>>>>>> MERGE-SOURCE @@ -3920,92 +3538,89 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Song - + 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. -<<<<<<< TREE - + Song Song - + Songs - + Add - + Add a new Song - + Edit Edit - + Edit the selected Song - + Delete Delete - + Delete the selected Song - + Preview Preview - + Preview the selected Song - + Live Live - + Send the selected Song live - + Service - + Add the selected Song to the service -======= ->>>>>>> MERGE-SOURCE @@ -4054,117 +3669,117 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor Song Editor - + &Title: &Title: - + &Lyrics: &Lyrics: - + &Add &Add - + &Edit &Edit - + Ed&it All Ed&it All - + &Delete &Delete - + Title && Lyrics Title && Lyrics - + Authors Authors - + &Add to Song &Add to Song - + &Remove &Remove - + &Manage Authors, Topics, Song Books &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 Authors, Topics && Song Book - + Theme Theme - + New &Theme New &Theme - + Copyright Information Copyright Information - + © © - + Comments Comments - + Theme, Copyright Info && Comments Theme, Copyright Info && Comments @@ -4184,11 +3799,7 @@ The content encoding is not UTF-8. This author does not exist, do you want to add them? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Error @@ -4233,128 +3844,85 @@ The content encoding is not UTF-8. 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. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? This song book does not exist, do you want to add it? - + Alt&ernate title: Alt&ernate title: - + &Verse order: &Verse order: - + CCLI number: -<<<<<<< TREE CCLI number: -======= - CCLI number: ->>>>>>> MERGE-SOURCE - - Song No.: + + Book: + Book: + + + + Number: SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Edit Verse -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4392,11 +3960,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Starting import... @@ -4601,12 +4165,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4720,20 +4284,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © © @@ -4741,20 +4297,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Finished import. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 7e57a7107..eba4f91cc 100755 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Alerta - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Alertas @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Biblia - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Biblia - + Bibles Biblias - + Import Importar - + Import a Bible - + Add Agregar - + Add a new Bible - + Edit Editar - + Edit the selected Bible - + Delete Eliminar - + Delete the selected Bible - + Preview Vista Previa - + Preview the selected Bible - + Live En vivo - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. No se encuentra un libro que concuerde, en esta Biblia. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import Importar - + Import a Custom - + Load - + Load a new Custom - + Add Agregar - + Add a new Custom - + Edit Editar - + Edit the selected Custom - + Delete Eliminar - + Delete the selected Custom - + Preview Vista Previa - + Preview the selected Custom - + Live En vivo - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Imagen - + Images Imágenes - + Load - + Load a new Image - + Add Agregar - + Add a new Image - + Edit Editar - + Edit the selected Image - + Delete Eliminar - + Delete the selected Image - + Preview Vista Previa - + Preview the selected Image - + Live En vivo - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Imagen(es) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Medios - + Medias - + Load - + Load a new Media - + Add Agregar - + Add a new Media - + Edit Editar - + Edit the selected Media - + Delete Eliminar - + Delete the selected Media - + Preview Vista Previa - + Preview the selected Media - + Live En vivo - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Medios - - - ->>>>>>> MERGE-SOURCE Select Media Seleccionar Medios @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media Medios -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,15 +1985,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + Servicio Nuevo + + + + Open Service + Abrir Servicio + + + + Save Service + Guardar Servicio + OpenLP 2.0 OpenLP 2.0 - - English - Ingles + + AddHereYourLanguageName + @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New &Nuevo - - - New Service - Servicio Nuevo - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open &Abrir - - - Open Service - Abrir Servicio - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save &Guardar - - - Save Service - Guardar Servicio - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Ingles + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live Mo&star En Vivo - + &Add to Service &Agregar al Servicio - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items Usted debe seleccionar uno o más elementos - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Lista de Plugins -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Detalles de Plugin -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Versión: -<<<<<<< TREE - - TextLabel - TextLabel - - -======= ->>>>>>> MERGE-SOURCE - + About: Acerca de: - + Status: Estado: - + Active Activo - + Inactive Inactivo @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Crear un servicio nuevo -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Abrir Servicio @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. Abrir un servicio existente - + Save Service Guardar Servicio @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Cambiar Tema de Ítem -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. Vista Previa -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Regresar al anterior -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Ir al siguiente -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Pantalla en Blanco @@ -2898,96 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Proyectar en vivo -<<<<<<< TREE - Edit and re-preview Song - Editar y re-visualizar Canción -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Iniciar bucle continuo -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Detener el bucle -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Espera entre diapositivas en segundos -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Iniciar la reproducción de medios -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3167,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3226,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Presentación - + Presentations Presentaciones - + Load - + Load a new Presentation - + Delete Eliminar - + Delete the selected Presentation - + Preview Vista Previa - + Preview the selected Presentation - + Live En vivo - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3324,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3365,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Remotas @@ -3406,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3500,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Canción - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Canción - + Songs Canciones - + Add Agregar - + Add a new Song - + Edit Editar - + Edit the selected Song - + Delete Eliminar - + Delete the selected Song - + Preview Vista Previa - + Preview the selected Song - + Live En vivo - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3631,137 +3483,142 @@ 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 - - Song No.: + + Book: + Libro: + + + + Number: - + 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 @@ -3781,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Error @@ -3830,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3905,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Editar Verso -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4055,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Iniciando importación... @@ -4174,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4293,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4314,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Importación finalizada. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts index dd485b79f..9ba29a478 100755 --- a/resources/i18n/et.ts +++ b/resources/i18n/et.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts @@ -52,12 +48,12 @@ &New - &Uus + &Save - &Salvesta + @@ -110,46 +106,6 @@ Font - - - pt - pt - - - - Alert timeout: - - - - - s - s - - - - Location: - - - - - Preview - Eelvaade - - - - Top - Üleval - - - - Bottom - All - - - - Middle - Keskel - Font name: @@ -170,101 +126,141 @@ Font size: + + + pt + + + + + Alert timeout: + + + + + s + + + + + Location: + + + + + Preview + + OpenLP 2.0 - OpenLP 2.0 + + + + + Top + + + + + Middle + + + + + Bottom + BiblesPlugin - + &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - - Import a Bible - - - - - Add a new Bible - - - - - Edit the selected Bible - - - - - Delete the selected Bible - - - - - Preview the selected Bible - - - - - Send the selected Bible live - - - - + Bible - + Bibles - + Import - + + Import a Bible + + + + Add - + + Add a new Bible + + + + Edit - + + Edit the selected Bible + + + + Delete - + + Delete the selected Bible + + + + Preview - + + Preview the selected Bible + + + + Live - + + Send the selected Bible live + + + + Service - + Add the selected Bible to the service @@ -305,6 +301,11 @@ Book Chapter:Verse-Chapter:Verse BiblesPlugin.BiblesTab + + + Bibles + + Verse Display @@ -376,11 +377,6 @@ Changes do not affect verses already in the service. Display dual Bible verses - - - Bibles - - BiblesPlugin.ImportWizardForm @@ -389,6 +385,26 @@ Changes do not affect verses already in the service. Bible Import Wizard + + + Welcome to the Bible Import Wizard + + + + + This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from. + + + + + Select Import Source + + + + + Select the import format, and where to import from. + + Format: @@ -414,6 +430,26 @@ Changes do not affect verses already in the service. Web Download + + + File location: + + + + + Books location: + + + + + Verse location: + + + + + Bible filename: + + Location: @@ -454,11 +490,26 @@ Changes do not affect verses already in the service. Password: + + + Proxy Server (Optional) + + License Details + + + Set up the Bible's license details. + + + + + Version name: + + Copyright: @@ -474,66 +525,16 @@ Changes do not affect verses already in the service. Importing - - - Ready. - - - - - Open OSIS File - - - - - Open Books CSV File - - - - - Open OpenSong Bible - - - - - Starting import... - - - - - Welcome to the Bible Import Wizard - - - - - This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from. - - - - - Select Import Source - - - - - Select the import format, and where to import from. - - - - - Proxy Server (Optional) - - - - - Set up the Bible's license details. - - Please wait while your Bible is imported. + + + Ready. + + Invalid Bible Location @@ -604,11 +605,31 @@ Changes do not affect verses already in the service. This Bible already exists! Please import a different Bible or first delete the existing one. + + + Open OSIS File + + + + + Open Books CSV File + + Open Verses CSV File + + + Open OpenSong Bible + + + + + Starting import... + + Finished import. @@ -619,31 +640,6 @@ Changes do not affect verses already in the service. Your Bible import failed. - - - File location: - - - - - Books location: - - - - - Verse location: - - - - - Bible filename: - - - - - Version name: - - BiblesPlugin.MediaItem @@ -660,13 +656,18 @@ Changes do not affect verses already in the service. Version: - Versioon: + Dual: + + + Search type: + + Find: @@ -732,31 +733,18 @@ Changes do not affect verses already in the service. No Book Found - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - etc - - No matching book could be found in this Bible. - - Search type: + + etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,110 +786,115 @@ Changes do not affect verses already in the service. CustomPlugin.EditCustomForm - + Edit Custom Slides - Kohandatud slaidide muutmine + - - Add New - Uue lisamine + + Move slide up one position. + - - Edit - Muuda - - - - Edit All - Kõigi muutmine - - - - Save - Salvesta - - - - Delete - Kustuta - - - - Clear - Puhasta - - - - Clear edit area - Muutmise ala puhastamine - - - - Split Slide - Tükelda slaid - - - - Save && Preview - Salvesta && eelvaatle - - - - Error - Viga - - - + 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: + + + Save && Preview + + + + + Error + + You need to type in a title. @@ -917,11 +910,6 @@ 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. - - CustomPlugin.MediaItem @@ -939,190 +927,190 @@ Changes do not affect verses already in the service. CustomsPlugin - - Import a Custom - - - - - Load a new Custom - - - - - Add a new Custom - - - - - Edit the selected Custom - - - - - Delete the selected Custom - - - - - Preview the selected Custom - - - - - Send the selected Custom live - - - - - Add the selected Custom to the service - - - - + Custom - + Customs - + Import - + + Import a Custom + + + + Load - + + Load a new Custom + + + + Add - + + Add a new Custom + + + + Edit - + + Edit the selected Custom + + + + Delete - + + Delete the selected Custom + + + + Preview - + + Preview the selected Custom + + + + Live - + + Send the selected Custom live + + + + Service + + + Add the selected Custom to the service + + ImagePlugin - - Load a new Image - - - - - Add a new Image - - - - - Edit the selected Image - - - - - Delete the selected Image - - - - - Preview the selected Image - - - - - Send the selected Image live - - - - - Add the selected Image to the service - - - - - Image - Pilt - - - - Images - - - - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + + Image + + + + + Images + + + + Load - + + Load a new Image + + + + Add - + + Add a new Image + + + + Edit - + + Edit the selected Image + + + + Delete - + + Delete the selected Image + + + + Preview - + + Preview the selected Image + + + + Live - + + Send the selected Image live + + + + Service + + + Add the selected Image to the service + + ImagePlugin.MediaItem Select Image(s) - Pildi (piltide) valimine + @@ -1132,16 +1120,7 @@ Changes do not affect verses already in the service. Replace Live Background - Ekraani tausta asendamine - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Image(s) - Pilt(pildid) + @@ -1149,145 +1128,125 @@ Changes do not affect verses already in the service. -<<<<<<< TREE + + Reset Live Background + + + -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE + + Image(s) + + + -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Reset Live Background - - MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - - Load a new Media - - - - - Add a new Media - - - - - Edit the selected Media - - - - - Delete the selected Media - - - - - Preview the selected Media - - - - - Send the selected Media live - - - - - Add the selected Media to the service - - - - + Media - + Medias - + Load - + + Load a new Media + + + + Add - + + Add a new Media + + + + Edit - + + Edit the selected Media + + + + Delete - + + Delete the selected Media + + + + Preview - + + Preview the selected Media + + + + Live - + + Send the selected Media live + + + + Service + + + Add the selected Media to the service + + MediaPlugin.MediaItem - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Media - Meedia - Select Media - Meedia valimine + @@ -1300,11 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE + + Media + + + -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1312,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -1322,7 +1282,7 @@ Changes do not affect verses already in the service. About OpenLP - OpenLP-st lähemalt + @@ -1333,42 +1293,11 @@ OpenLP is free church presentation software, or lyrics projection software, used Find out more about OpenLP: http://openlp.org/ OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below. - OpenLP <version><revision> - avatud lähtekoodiga laulusõnade kuvaja - -OpenLP on vaba esitlustarkvara kirikusse võib öelda ka laulusõnade projitseerimise tarkvara, mida kasutatakse lauluslaidide, piiblisalmide, videote, piltide ja isegi esitluste (kui OpenOffice.org, PowerPoint või PowerPoint Viewer on paigaldatud) kirikus installed) kuvamiseks dataprojektori kaudu kirikus. - -OpenLP kohta võid lähemalt uurida aadressil: http://openlp.org/ - -OpenLP on kirjutatud vabatahtlike poolt. Kui sulle meeldiks näha rohkem kristlikku tarkvara, siis võid kaaluda annetamist, selleks klõpsa alumisele nupule. + About - Programmist - - - - Credits - Autorid - - - - License - Litsents - - - - Contribute - Aita kaasa - - - - Close - Sulge - - - - build %s @@ -1413,6 +1342,11 @@ Built With + + + Credits + + Copyright © 2004-2010 Raoul Snyman @@ -1548,6 +1482,26 @@ 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 + + + + + Contribute + + + + + Close + + + + + build %s + + OpenLP.AdvancedTab @@ -1567,13 +1521,13 @@ This General Public License does not permit incorporating your program into prop - - Double-click to send items straight to live (requires restart) + + Remember active media manager tab on startup - - Remember active media manager tab on startup + + Double-click to send items straight to live (requires restart) @@ -1582,7 +1536,7 @@ This General Public License does not permit incorporating your program into prop Theme Maintenance - Kujunduste haldus + @@ -1592,27 +1546,27 @@ This General Public License does not permit incorporating your program into prop Type: - Liik: + Solid Color - Ühtlane värv + Gradient - Üleminek + Image - Pilt + Image: - Pilt: + @@ -1622,17 +1576,17 @@ This General Public License does not permit incorporating your program into prop Horizontal - Horisontaalne + Vertical - Vertikaalne + Circular - Ümmargune + @@ -1642,12 +1596,12 @@ This General Public License does not permit incorporating your program into prop Main Font - Peamine kirjastiil + Font: - Kirjastiil: + @@ -1657,12 +1611,12 @@ This General Public License does not permit incorporating your program into prop Size: - Suurus: + pt - pt + @@ -1672,22 +1626,22 @@ This General Public License does not permit incorporating your program into prop Normal - Tavaline + Bold - Rasvane + Italics - Kursiiv + Bold/Italics - Rasvane/kaldkiri + @@ -1697,7 +1651,7 @@ This General Public License does not permit incorporating your program into prop Display Location - Kuva asukoht + @@ -1717,17 +1671,17 @@ This General Public License does not permit incorporating your program into prop Width: - Laius: + Height: - Kõrgus: + px - px + @@ -1737,7 +1691,7 @@ This General Public License does not permit incorporating your program into prop Footer Font - Jaluse kirjatüüp + @@ -1747,7 +1701,7 @@ This General Public License does not permit incorporating your program into prop Outline - Välisjoon + @@ -1767,7 +1721,7 @@ This General Public License does not permit incorporating your program into prop Shadow - Vari + @@ -1787,7 +1741,7 @@ This General Public License does not permit incorporating your program into prop Alignment - Joondus + @@ -1797,17 +1751,17 @@ This General Public License does not permit incorporating your program into prop Left - Vasakul + Right - Paremal + Center - Keskel + @@ -1817,22 +1771,22 @@ This General Public License does not permit incorporating your program into prop Top - Üleval + Middle - Keskel + Bottom - All + Slide Transition - Slaidide üleminek + @@ -1847,7 +1801,7 @@ This General Public License does not permit incorporating your program into prop Preview - Eelvaade + @@ -1890,40 +1844,90 @@ This General Public License does not permit incorporating your program into prop OpenLP.GeneralTab + + + General + + + + + Monitors + + Select monitor for output display: - Vali väljundkuva monitor: + Display if a single screen - Kuvatakse, kui on ainult üks ekraan + Application Startup - Rakenduse käivitumine + Show blank screen warning - Kuvatakse tühja ekraani hoiatust + Automatically open the last service - Automaatselt avatakse viimane teenistus + Show the splash screen - Käivitumisel kuvatakse logo + Application Settings - Rakenduse sätted + + + + + Prompt to save before starting a new service + + + + + Automatically preview next item in service + + + + + Slide loop delay: + + + + + sec + + + + + CCLI Details + + + + + CCLI number: + + + + + SongSelect username: + + + + + SongSelect password: + @@ -1955,64 +1959,14 @@ This General Public License does not permit incorporating your program into prop Override display position - - - General - Üldine - - - - Monitors - Monitorid - Screen - Ekraan + primary - peamine - - - - CCLI Details - CCLI andmed - - - - CCLI number: - - - - - SongSelect username: - - - - - SongSelect password: - - - - - Prompt to save before starting a new service - - - - - Automatically preview next item in service - - - - - Slide loop delay: - - - - - sec @@ -2021,7 +1975,7 @@ This General Public License does not permit incorporating your program into prop Language - Keel + @@ -2032,84 +1986,94 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow - - English - Eesti + + New Service + + + + + Open Service + + + + + Save Service + OpenLP 2.0 - OpenLP 2.0 + + + + + AddHereYourLanguageName + &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 + @@ -2119,17 +2083,12 @@ This General Public License does not permit incorporating your program into prop Ctrl+N - Ctrl+N + &Open - &Ava - - - - Open Service - Teenistuse avamine + @@ -2139,17 +2098,12 @@ This General Public License does not permit incorporating your program into prop Ctrl+O - Ctrl+O + &Save - &Salvesta - - - - Save Service - Salvesta teenistus + @@ -2159,17 +2113,17 @@ This General Public License does not permit incorporating your program into prop Ctrl+S - Ctrl+S + Save &As... - Salvesta &kui... + Save Service As - Salvesta teenistus kui + @@ -2184,22 +2138,22 @@ This General Public License does not permit incorporating your program into prop E&xit - &Välju + Quit OpenLP - Lahku OpenLPst + Alt+F4 - Alt+F4 + &Theme - &Kujundus + @@ -2209,12 +2163,12 @@ This General Public License does not permit incorporating your program into prop &Media Manager - &Meediahaldur + Toggle Media Manager - Meediahalduri lüliti + @@ -2224,17 +2178,17 @@ This General Public License does not permit incorporating your program into prop F8 - F8 + &Theme Manager - &Kujunduse haldur + Toggle Theme Manager - Kujunduse halduri lüliti + @@ -2244,17 +2198,17 @@ This General Public License does not permit incorporating your program into prop F10 - F10 + &Service Manager - &Teenistuse haldur + Toggle Service Manager - Teenistuse halduri lüliti + @@ -2264,17 +2218,17 @@ This General Public License does not permit incorporating your program into prop F9 - F9 + &Preview Panel - &Eelvaatluspaneel + Toggle Preview Panel - Eelvaatluspaneeli lüliti + @@ -2284,7 +2238,7 @@ This General Public License does not permit incorporating your program into prop F11 - F11 + @@ -2304,57 +2258,57 @@ This General Public License does not permit incorporating your program into prop 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 + @@ -2369,7 +2323,7 @@ This General Public License does not permit incorporating your program into prop Add &Tool... - Lisa &tööriist... + @@ -2399,32 +2353,39 @@ This General Public License does not permit incorporating your program into prop &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 http://openlp.org/. + + 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? + @@ -2437,92 +2398,90 @@ This General Public License does not permit incorporating your program into prop - - 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/. + + English OpenLP.MediaManagerItem - + + No Items Selected + + + + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live - &Kuva ekraanil + - + &Add to Service - &Lisa teenistusele + - + &Add to selected Service Item - &Lisa valitud teenistuse elemendile + - - No Items Selected - Ühtegi elementi pole valitud - - - + 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. - Pead valima vähemalt ühe elemendi. + - + No items selected - Ühtegi elementi pole valitud + - + You must select one or more items - Pead valima vähemalt ühe elemendi + - + No Service Item Selected - Ühtegi teenistuse elementi pole valitud + - + You must select an existing service item to add to. - Pead valima olemasoleva teenistuse, millele lisada. + - + Invalid Service Item - Vigane teenistuse element + - + You must select a %s service item. @@ -2530,59 +2489,39 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List - Pluginate loend + -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details - Plugina andmed + -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: - Versioon: + -<<<<<<< TREE - - TextLabel - TekstiPealdis - - -======= ->>>>>>> MERGE-SOURCE - + About: - Kirjeldus: + - + Status: - Olek: + - + Active - Aktiivne + - + Inactive - Pole aktiivne + @@ -2610,17 +2549,17 @@ You can download the latest version from http://openlp.org/. Up - Üles + Delete - Kustuta + Down - Alla + @@ -2628,41 +2567,37 @@ You can download the latest version from http://openlp.org/. New Service - Uus teenistus + Create a new service - Uue teenistuse loomine + -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service - Teenistuse avamine + Load an existing service - Välise teenistuse laadimine + - + Save Service - Salvesta teenistus + Save this service - Selle teenistuse salvestamine + Theme: - Kujundus: + @@ -2672,166 +2607,146 @@ You can download the latest version from http://openlp.org/. Move to &top - Liiguta ü&lemiseks - - - - Move &up - Liiguta &üles - - - - Move &down - Liiguta &alla - - - - Move to &bottom - Liiguta &alumiseks - - - - &Delete From Service - &Kustuta teenistusest - - - - &Add New Item - &Lisa uus element - - - - &Add to Selected Item - &Lisa valitud elemendile - - - - &Edit Item - &Muuda kirjet - - - - &Reorder Item - - - &Notes - &Märkmed - - - - &Preview Verse - &Salmi eelvaatlus - - - - &Live Verse - &Otsesalm - - - - &Change Item Theme - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - 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) - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - 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? - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Error - Viga - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - File is not a valid service. -The content encoding is not UTF-8. - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - File is not a valid service. - - - - - Missing Display Handler - - - - - Your item cannot be displayed as there is no handler to display it - Seda elementi pole võimalik näidata ekraanil, kuna puudub seda käsitsev programm - Move item to the top of the service. + + + Move &up + + Move item up one position in the service. + + + Move &down + + Move item down one position in the service. + + + Move to &bottom + + Move item to the end of the service. + + + &Delete From Service + + Delete the selected item from the service. + + + &Add New Item + + + + + &Add to Selected Item + + + + + &Edit Item + + + + + &Reorder Item + + + + + &Notes + + + + + &Preview Verse + + + + + &Live Verse + + + + + &Change Item Theme + + + + + 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. + + + + + Missing Display Handler + + + + + Your item cannot be displayed as there is no handler to display it + + OpenLP.ServiceNoteForm Service Item Notes - Teenistuse elemendi märkmed + @@ -2847,103 +2762,26 @@ The content encoding is not UTF-8. Live - Ekraan + Preview - Eelvaade - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Move to previous - Eelmisele liikumine - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Move to next - Liikumine järgmisele - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Hide -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Move to live - Tõsta ekraanile + + Move to previous + -<<<<<<< TREE - - Edit and re-preview Song - Muuda ja kuva laulu eelvaade uuesti + + Move to next + - -======= - ->>>>>>> MERGE-SOURCE - Start continuous loop - Katkematu korduse alustamine - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Stop continuous loop - Katkematu korduse lõpetamine - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - s - s - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Delay between slides in seconds - Viivitus slaidide vahel sekundites - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Start playing media - Meediaesituse alustamine - - -<<<<<<< TREE - - Go to + + Hide @@ -2959,35 +2797,58 @@ The content encoding is not UTF-8. Show Desktop -======= - + + + + + Move to live + + + + Edit and re-preview song - + + Start continuous loop + + + + + Stop continuous loop + + + + + s + + + + + Delay between slides in seconds + + + + + Start playing media + + + + Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -2997,7 +2858,7 @@ The content encoding is not UTF-8. New Theme - Uus kujundus + @@ -3007,7 +2868,7 @@ The content encoding is not UTF-8. Edit Theme - Kujunduse muutmine + @@ -3017,7 +2878,7 @@ The content encoding is not UTF-8. Delete Theme - Teema kustutamine + @@ -3027,7 +2888,7 @@ The content encoding is not UTF-8. Import Theme - Teema importimine + @@ -3037,7 +2898,7 @@ The content encoding is not UTF-8. Export Theme - Kujunduse eksportimine + @@ -3092,12 +2953,12 @@ The content encoding is not UTF-8. Error - Viga + You are unable to delete the default theme. - Vaikimisi kujundust pole võimalik kustutada. + @@ -3112,12 +2973,12 @@ The content encoding is not UTF-8. You have not selected a theme. - Sa ei ole teemat valinud. + Save Theme - (%s) - Salvesta kujundus - (%s) + @@ -3142,7 +3003,7 @@ The content encoding is not UTF-8. Select Theme Import File - Importimiseks kujunduse faili valimine + @@ -3158,20 +3019,16 @@ 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 + -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3180,7 +3037,7 @@ The content encoding is not UTF-8. Themes - Kujundused + @@ -3200,7 +3057,7 @@ The content encoding is not UTF-8. 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. - Iga laulu jaoks kasutatakse andmebaasis sellele määratud kujundust. Kui laulul kujundus puudub, kasutatakse teenistuse teemat. Kui teenistusel kujundus puudub, siis kasutatakse üleüldist teemat. + @@ -3210,7 +3067,7 @@ The content encoding is not UTF-8. 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. - Kasutatakse teenistuse kujundust, eirates laulude kujundusi. Kui teenistusel kujundust pole, kasutatakse globaalset. + @@ -3220,84 +3077,79 @@ The content encoding is not UTF-8. Use the global theme, overriding any themes associated with either the service or the songs. - Kasutatakse globaalset kujundust, eirates nii teenistuse kui laulu kujundust. + PresentationPlugin - + <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. - - Load a new Presentation - - - - - Delete the selected Presentation - - - - - Preview the selected Presentation - - - - - Send the selected Presentation live - - - - - Add the selected Presentation to the service - - - - + Presentation - + Presentations - + Load - + + Load a new Presentation + + + + Delete - + + Delete the selected Presentation + + + + Preview - + + Preview the selected Presentation + + + + Live - + + Send the selected Presentation live + + + + Service + + + Add the selected Presentation to the service + + PresentationPlugin.MediaItem - - - Present using: - - Select Presentation(s) @@ -3308,40 +3160,36 @@ The content encoding is not UTF-8. Automatic + + + Present using: + + + + + File Exists + + A presentation with that filename already exists. - - - You must select an item to delete. - - - -<<<<<<< TREE - - This type of presentation is not supported - - - - -======= - ->>>>>>> MERGE-SOURCE - File Exists - - Unsupported File - + This type of presentation is not supported. + + + You must select an item to delete. + + PresentationPlugin.PresentationTab @@ -3369,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes @@ -3410,53 +3258,58 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage SongUsagePlugin.SongUsageDeleteForm + + + Delete Song Usage Data + + Delete Selected Song Usage Events? @@ -3467,19 +3320,9 @@ The content encoding is not UTF-8. Are you sure you want to delete selected Song Usage data? - - - Delete Song Usage Data - - SongUsagePlugin.SongUsageDetailForm - - - Output File Location - - Song Usage Extraction @@ -3500,131 +3343,136 @@ The content encoding is not UTF-8. Report Location + + + Output File Location + + SongsPlugin - + &Song - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - - Add a new Song - - - - - Edit the selected Song - - - - - Delete the selected Song - - - - - Preview the selected Song - - - - - Send the selected Song live - - - - - Add the selected Song to the service - - - - + Song - + Songs - + Add - + + Add a new Song + + + + Edit - + + Edit the selected Song + + + + Delete - + + Delete the selected Song + + + + Preview - + + Preview the selected Song + + + + Live - + + Send the selected Song live + + + + Service + + + Add the selected Song to the service + + SongsPlugin.AuthorsForm Author Maintenance - Autorite haldus + Display name: - Kuvatav nimi: + First name: - Eesnimi: + Last name: - Perekonnanimi: + Error - Viga + You need to type in the first name of the author. - Pead sisestama autori eesnime. + You need to type in the last name of the author. - Pead sisestama autori perekonnanime. + @@ -3635,99 +3483,149 @@ The content encoding is not UTF-8. SongsPlugin.EditSongForm - + Song Editor - Lauluredaktor + - + &Title: - + + Alt&ernate title: + + + + &Lyrics: - + + &Verse order: + + + + &Add - + &Edit - &Muuda + - + Ed&it All - + &Delete - &Kustuta + - + Title && Lyrics - Pealkiri && laulusõnad + - + Authors - Autorid + - + &Add to Song - &Lisa laulule + - + &Remove - &Eemalda + - + + &Manage Authors, Topics, Song Books + + + + Topic - Teema + - + A&dd to Song - L&isa laulule + - + R&emove - &Eemalda + - + Song Book - Laulik + - + + Book: + + + + + Number: + + + + + Authors, Topics && Song Book + + + + Theme - Kujundus + - + + New &Theme + + + + Copyright Information - Autoriõiguse andmed + - + + © + + + + + CCLI number: + + + + Comments - Kommentaarid + - + Theme, Copyright Info && Comments - Kujundus, autoriõigus && kommentaarid + + + + + Save && Preview + @@ -3739,6 +3637,16 @@ The content encoding is not UTF-8. This author does not exist, do you want to add them? + + + Error + + + + + This author is already in the list. + + No Author Selected @@ -3759,6 +3667,11 @@ The content encoding is not UTF-8. This topic does not exist, do you want to add it? + + + This topic is already in the list. + + No Topic Selected @@ -3770,293 +3683,66 @@ The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Add Book - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - This song book does not exist, do you want to add it? - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. - - - - - New &Theme - - - - - © - - - - - Save && Preview - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Error - Viga - - -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE + + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. + + + -======= - ->>>>>>> MERGE-SOURCE 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 + + Add Book - - 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.: + + This song book does not exist, do you want to add it? SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert SongsPlugin.ImportWizardForm - - - No OpenLyrics Files Selected - - - - - You need to add at least one OpenLyrics song file to import from. - - - - - No OpenSong Files Selected - - - - - You need to add at least one OpenSong song file to import from. - - - - - No CCLI Files Selected - - - - - You need to add at least one CCLI file to import from. - - - - - 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% - - - -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE - Starting import... - - No OpenLP 2.0 Song Database Selected @@ -4077,6 +3763,26 @@ The content encoding is not UTF-8. You need to select an openlp.org 1.x song database file to import from. + + + No OpenLyrics Files Selected + + + + + You need to add at least one OpenLyrics song file to import from. + + + + + No OpenSong Files Selected + + + + + You need to add at least one OpenSong song file to import from. + + No Words of Worship Files Selected @@ -4087,6 +3793,16 @@ The content encoding is not UTF-8. You need to add at least one Words of Worship file to import from. + + + No CCLI Files Selected + + + + + You need to add at least one CCLI file to import from. + + No Songs of Fellowship File Selected @@ -4132,6 +3848,11 @@ The content encoding is not UTF-8. Select Words of Worship Files + + + Select CCLI Files + + Select Songs of Fellowship Files @@ -4142,6 +3863,41 @@ The content encoding is not UTF-8. Select Document/Presentation Files + + + 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 the import format, and where to import from. + + + + + Format: + + OpenLP 2.0 @@ -4152,6 +3908,16 @@ The content encoding is not UTF-8. openlp.org 1.x + + + OpenLyrics + + + + + OpenSong + + Words of Worship @@ -4173,17 +3939,52 @@ The content encoding is not UTF-8. - - Select CCLI Files + + Filename: - + + Browse... + + + + + Add Files... + + + + + Remove File(s) + + + + + Importing + + + + + Please wait while your songs are imported. + + + + + Ready. + + + + + %p% + + + + Importing "%s"... - + Importing %s... @@ -4195,6 +3996,11 @@ The content encoding is not UTF-8. Song Maintenance + + + Maintain the lists of authors, topics and books + + Search: @@ -4203,7 +4009,7 @@ The content encoding is not UTF-8. Type: - Liik: + @@ -4230,16 +4036,6 @@ The content encoding is not UTF-8. Authors - - - CCLI Licence: - - - - - Maintain the lists of authors, topics and books - - You must select an item to edit. @@ -4265,9 +4061,19 @@ The content encoding is not UTF-8. Delete Song(s)? + + + CCLI Licence: + + SongsPlugin.SongBookForm + + + Song Book Maintenance + + &Name: @@ -4281,36 +4087,23 @@ The content encoding is not UTF-8. Error - Viga + You need to type in a name for the book. - - - Song Book Maintenance - - SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4318,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. @@ -4341,17 +4126,22 @@ The content encoding is not UTF-8. Song Maintenance - Laulude haldus + Authors - Autorid + Topics - Teemad + + + + + Song Books + @@ -4361,61 +4151,16 @@ The content encoding is not UTF-8. &Edit - &Muuda + &Delete - &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? - - - - - Song Books @@ -4463,16 +4208,56 @@ The content encoding is not UTF-8. 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. @@ -4522,7 +4307,7 @@ The content encoding is not UTF-8. Error - Viga + diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 5560ac59b..031a9de32 100755 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Figyelmeztetés - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Figyelmeztetések @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Biblia - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Biblia - + Bibles Bibliák - + Import Importálás - + Import a Bible - + Add Hozzáadás - + Add a new Bible - + Edit Szerkesztés - + Edit the selected Bible - + Delete Törlés - + Delete the selected Bible - + Preview Előnézet - + Preview the selected Bible - + Live Egyenes adás - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. Nem található ilyen könyv ebben a Bibliában. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom Egyedi - + Customs - + Import Importálás - + Import a Custom - + Load - + Load a new Custom - + Add Hozzáadás - + Add a new Custom - + Edit Szerkesztés - + Edit the selected Custom - + Delete Törlés - + Delete the selected Custom - + Preview Előnézet - + Preview the selected Custom - + Live Egyenes adás - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Kép - + Images Képek - + Load - + Load a new Image - + Add Hozzáadás - + Add a new Image - + Edit Szerkesztés - + Edit the selected Image - + Delete Törlés - + Delete the selected Image - + Preview Előnézet - + Preview the selected Image - + Live Egyenes adás - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Kép(ek) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Média - + Medias - + Load - + Load a new Media - + Add Hozzáadás - + Add a new Media - + Edit Szerkesztés - + Edit the selected Media - + Delete Törlés - + Delete the selected Media - + Preview Előnézet - + Preview the selected Media - + Live Egyenes adás - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Média - - - ->>>>>>> MERGE-SOURCE Select Media Média kiválasztása @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media Média -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2036,15 +1991,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + Új szolgálat + + + + Open Service + Szolgálat megnyitása + + + + Save Service + Szolgálat mentése + OpenLP 2.0 - - English - Magyar + + AddHereYourLanguageName + @@ -2111,11 +2081,6 @@ This General Public License does not permit incorporating your program into prop &New &Új - - - New Service - Új szolgálat - Create a new service. @@ -2131,11 +2096,6 @@ This General Public License does not permit incorporating your program into prop &Open &Megnyitás - - - Open Service - Szolgálat megnyitása - Open an existing service. @@ -2151,11 +2111,6 @@ This General Public License does not permit incorporating your program into prop &Save - - - Save Service - Szolgálat mentése - Save the current service to disk. @@ -2448,86 +2403,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Magyar + OpenLP.MediaManagerItem - + No Items Selected Nincs kiválasztott elem - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live Egyenes &adásba - + &Add to Service &Hozzáadás a szolgálathoz - + &Add to selected Service Item &Hozzáadás a kiválasztott szolgálat elemhez - + 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. Ki kell választani egy vagy több elemet. - + No items selected Nincs kiválasztott elem - + You must select one or more items Ki kell választani egy vagy több elemet - + No Service Item Selected Nincs kiválasztott szolgálat elem - + You must select an existing service item to add to. Ki kell választani egy szolgálati elemet, amihez hozzá szeretné adni. - + Invalid Service Item Érvénytelen szolgálat elem - + You must select a %s service item. @@ -2535,57 +2495,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Bővítménylista -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Bővítmény részletei -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Verzió: -<<<<<<< TREE - - TextLabel - Szövegcímke - - -======= ->>>>>>> MERGE-SOURCE - + About: Névjegy: - + Status: Állapot: - + Active Aktív - + Inactive Inaktív @@ -2641,11 +2581,7 @@ You can download the latest version from http://openlp.org/. Új szolgálat létrehozása -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Szolgálat megnyitása @@ -2655,7 +2591,7 @@ You can download the latest version from http://openlp.org/. Egy meglévő szolgálat betöltése - + Save Service Szolgálat mentése @@ -2765,68 +2701,48 @@ You can download the latest version from http://openlp.org/. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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á? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Hiba -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler Hiányzó képernyő kezelő - + Your item cannot be displayed as there is no handler to display it Az elemet nem lehet megjeleníteni, mert nincs kezelő, amely megjelenítené @@ -2860,34 +2776,21 @@ The content encoding is not UTF-8. Előnézet -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Mozgatás az előzőre -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Mozgatás a következőre -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Elsötétített képernyő @@ -2904,96 +2807,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Mozgatás az egyenes adásban lévőre -<<<<<<< TREE - Edit and re-preview Song - Dal szerkesztése, majd újra az előnézet megnyitása -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Folyamatos vetítés indítása -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Folyamatos vetítés leállítása -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s mp -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Diák közötti késleltetés másodpercben -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Médialejátszás indítása -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3173,11 +3034,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3232,67 +3089,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Bemutató - + Presentations Bemutatók - + Load - + Load a new Presentation - + Delete Törlés - + Delete the selected Presentation - + Preview Előnézet - + Preview the selected Presentation - + Live Egyenes adás - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3330,13 +3187,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3371,17 +3223,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Távvezérlés @@ -3412,47 +3264,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3506,87 +3358,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Dal - + Import songs using the import wizard. Dalok importálása az importálás tündérrel. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Dal - + Songs Dalok - + Add Hozzáadás - + Add a new Song - + Edit Szerkesztés - + Edit the selected Song - + Delete Törlés - + Delete the selected Song - + Preview Előnézet - + Preview the selected Song - + Live Egyenes adás - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3637,137 +3489,142 @@ 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 - - Song No.: + + Book: + Könyv: + + + + Number: - + 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 @@ -3787,11 +3644,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Hiba @@ -3836,74 +3689,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3911,29 +3732,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Versszak szerkesztése -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4061,11 +3870,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Importálás indítása... @@ -4180,12 +3985,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4299,20 +4104,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4320,20 +4117,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Az importálás befejeződött. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 26b1f425e..59be559d5 100755 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible 성경 - + Bibles - + Import - + Import a Bible - + Add - + Add a new Bible - + Edit - + Edit the selected Bible - + Delete - + Delete the selected Bible - + Preview - + Preview the selected Bible - + Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import - + Import a Custom - + Load - + Load a new Custom - + Add - + Add a new Custom - + Edit - + Edit the selected Custom - + Delete - + Delete the selected Custom - + Preview - + Preview the selected Custom - + Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image - + Images - + Load - + Load a new Image - + Add - + Add a new Image - + Edit - + Edit the selected Image - + Delete - + Delete the selected Image - + Preview - + Preview the selected Image - + Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media - + Medias - + Load - + Load a new Media - + Add - + Add a new Media - + Edit - + Edit the selected Media - + Delete - + Delete the selected Media - + Preview - + Preview the selected Media - + Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - - - - ->>>>>>> MERGE-SOURCE Select Media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,14 +1985,29 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + + + + + Open Service + + + + + Save Service + + OpenLP 2.0 - - English + + AddHereYourLanguageName @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New - - - New Service - - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open - - - Open Service - - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save - - - Save Service - - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live - + &Add to Service - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: -<<<<<<< TREE - - TextLabel - - - -======= ->>>>>>> MERGE-SOURCE - + About: - + Status: - + Active - + Inactive @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. - + Save Service @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen @@ -2898,95 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live -<<<<<<< TREE - Edit and re-preview Song -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3166,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3225,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation - + Presentations - + Load - + Load a new Presentation - + Delete - + Delete the selected Presentation - + Preview - + Preview the selected Presentation - + Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3323,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3364,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes @@ -3405,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3499,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song - + Songs - + Add - + Add a new Song - + Edit - + Edit the selected Song - + Delete - + Delete the selected Song - + Preview - + Preview the selected Song - + Live - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3630,137 +3483,142 @@ 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 - - Song No.: + + Book: - + + Number: + + + + Authors, Topics && Song Book - + Theme - + New &Theme - + Copyright Information - + © - + CCLI number: - + Comments - + Theme, Copyright Info && Comments @@ -3780,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error @@ -3829,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3904,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4054,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... @@ -4173,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4292,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4313,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index fb7040fe8..316e1ecc3 100755 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bibel - + Bibles Bibler - + Import - + Import a Bible - + Add - + Add a new Bible - + Edit - + Edit the selected Bible - + Delete - + Delete the selected Bible - + Preview - + Preview the selected Bible - + Live Direkte - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. Finner ingen matchende bøker i denne Bibelen. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import - + Import a Custom - + Load - + Load a new Custom - + Add - + Add a new Custom - + Edit - + Edit the selected Custom - + Delete - + Delete the selected Custom - + Preview - + Preview the selected Custom - + Live Direkte - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image - + Images - + Load - + Load a new Image - + Add - + Add a new Image - + Edit - + Edit the selected Image - + Delete - + Delete the selected Image - + Preview - + Preview the selected Image - + Live Direkte - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Bilde(r) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media - + Medias - + Load - + Load a new Media - + Add - + Add a new Media - + Edit - + Edit the selected Media - + Delete - + Delete the selected Media - + Preview - + Preview the selected Media - + Live Direkte - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - - - - ->>>>>>> MERGE-SOURCE Select Media Velg media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,15 +1985,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + + + + + Open Service + Åpne møteplan + + + + Save Service + + OpenLP 2.0 OpenLP 2.0 - - English - Norsk + + AddHereYourLanguageName + @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New &Ny - - - New Service - - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open &Åpne - - - Open Service - Åpne møteplan - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save &Lagre - - - Save Service - - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Norsk + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live - + &Add to Service &Legg til i møteplan - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: -<<<<<<< TREE - - TextLabel - - - -======= ->>>>>>> MERGE-SOURCE - + About: Om: - + Status: Status: - + Active Aktiv - + Inactive @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Opprett ny møteplan -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service Åpne møteplan @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. - + Save Service @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Bytt objekttema -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Flytt til forrige -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen @@ -2898,96 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live -<<<<<<< TREE - Edit and re-preview Song - Endre og forhåndsvis sang -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Start kontinuerlig løkke -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Forsinkelse mellom lysbilder i sekund -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Start avspilling av media -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3167,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3226,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Presentasjon - + Presentations - + Load - + Load a new Presentation - + Delete - + Delete the selected Presentation - + Preview - + Preview the selected Presentation - + Live Direkte - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3324,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3365,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Fjernmeldinger @@ -3406,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3500,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Sang - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Sang - + Songs Sanger - + Add - + Add a new Song - + Edit - + Edit the selected Song - + Delete - + Delete the selected Song - + Preview - + Preview the selected Song - + Live Direkte - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3631,137 +3483,142 @@ 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 - - Song No.: + + Book: + Bok: + + + + Number: - + Authors, Topics && Song Book - + Theme Tema - + New &Theme - + Copyright Information Copyright-informasjon - + © - + CCLI number: - + Comments - + Theme, Copyright Info && Comments @@ -3781,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error @@ -3830,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3905,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Rediger Vers -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4055,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... @@ -4174,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4293,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4314,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Import fullført. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index 8f1607c1c..23e3dc594 100755 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Alerta - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Alertas @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bíblia - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. <strong>Bible Plugin</strong><br />Este plugin permite exibir versículos bíblicos de diferentes fontes durante o culto. - + Bible Bíblia - + Bibles Bíblias - + Import Importar - + Import a Bible - + Add Adicionar - + Add a new Bible - + Edit Editar - + Edit the selected Bible - + Delete Deletar - + Delete the selected Bible - + Preview - + Preview the selected Bible - + Live Ao Vivo - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. Nenhum livro foi encontrado nesta Bíblia -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom Customizado - + Customs - + Import Importar - + Import a Custom - + Load - + Load a new Custom - + Add Adicionar - + Add a new Custom - + Edit Editar - + Edit the selected Custom - + Delete Deletar - + Delete the selected Custom - + Preview - + Preview the selected Custom - + Live Ao Vivo - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Imagem - + Images Imagens - + Load - + Load a new Image - + Add Adicionar - + Add a new Image - + Edit Editar - + Edit the selected Image - + Delete Deletar - + Delete the selected Image - + Preview - + Preview the selected Image - + Live Ao Vivo - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. Substituir Plano de Fundo -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Imagem(s) -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Mídia - + Medias - + Load - + Load a new Media - + Add Adicionar - + Add a new Media - + Edit Editar - + Edit the selected Media - + Delete Deletar - + Delete the selected Media - + Preview - + Preview the selected Media - + Live Ao Vivo - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Mídia - - - ->>>>>>> MERGE-SOURCE Select Media Selecionar Mídia @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. Substituir Plano de Fundo -<<<<<<< TREE Media Mídia -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2067,15 +2022,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + Novo Culto + + + + Open Service + + + + + Save Service + Salvar Culto + OpenLP 2.0 OpenLP 2.0 - - English - Inglês + + AddHereYourLanguageName + @@ -2142,11 +2112,6 @@ This General Public License does not permit incorporating your program into prop &New &Novo - - - New Service - Novo Culto - Create a new service. @@ -2162,11 +2127,6 @@ This General Public License does not permit incorporating your program into prop &Open &Abrir - - - Open Service - - Open an existing service. @@ -2182,11 +2142,6 @@ This General Public License does not permit incorporating your program into prop &Save &Salvar - - - Save Service - Salvar Culto - Save the current service to disk. @@ -2479,86 +2434,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s Tema padrão: %s + + + English + Inglês + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s &Deletar %s - + &Preview %s - + &Show Live &Mostrar Ao Vivo - + &Add to Service &Adicionar ao Culto - + &Add to selected Service Item - + 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. Você precisa selecionar um ou mais itens. - + No items selected - + You must select one or more items Você precisa selecionar um ou mais itens - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2566,57 +2526,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Lista de Plugins -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Detalhes do Plugin -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Versão: -<<<<<<< TREE - - TextLabel - TextLabel - - -======= ->>>>>>> MERGE-SOURCE - + About: Sobre: - + Status: Status: - + Active Ativo - + Inactive Inativo @@ -2672,11 +2612,7 @@ You can download the latest version from http://openlp.org/. Criar um novo culto -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service @@ -2686,7 +2622,7 @@ You can download the latest version from http://openlp.org/. Carregar um culto existente - + Save Service Salvar Culto @@ -2796,68 +2732,48 @@ You can download the latest version from http://openlp.org/. &Alterar Tema do Item -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + 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) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Erro -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2891,34 +2807,21 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Mover para o anterior -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Mover para o próximo -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Tela em Branco @@ -2935,96 +2838,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Mover para ao vivo -<<<<<<< TREE - Edit and re-preview Song - Editar e pré-visualizar Música novamente -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Iniciar repetição contínua -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Parar repetição contínua -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Intervalo entre slides em segundos -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Iniciar a reprodução de mídia -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3205,13 +3066,8 @@ A codificação do conteúdo não é UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3265,67 +3121,67 @@ A codificação do conteúdo não é UTF-8. PresentationPlugin - + <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. - + Presentation Apresentação - + Presentations Apresentações - + Load - + Load a new Presentation - + Delete Deletar - + Delete the selected Presentation - + Preview - + Preview the selected Presentation - + Live Ao Vivo - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3363,13 +3219,8 @@ A codificação do conteúdo não é UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3404,17 +3255,17 @@ A codificação do conteúdo não é UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Remoto @@ -3445,47 +3296,47 @@ A codificação do conteúdo não é UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3539,87 +3390,87 @@ A codificação do conteúdo não é UTF-8. SongsPlugin - + &Song &Música - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Música - + Songs Músicas - + Add Adicionar - + Add a new Song - + Edit Editar - + Edit the selected Song - + Delete Deletar - + Delete the selected Song - + Preview - + Preview the selected Song - + Live Ao Vivo - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3670,137 +3521,142 @@ 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 - - Song No.: + + Book: + Livro: + + + + Number: - + 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 @@ -3820,11 +3676,7 @@ A codificação do conteúdo não é UTF-8. Este autor não existe, deseja adicioná-lo? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Erro @@ -3869,74 +3721,42 @@ A codificação do conteúdo não é UTF-8. 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. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE 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? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? Este hinário não existe, deseja adicioná-lo? @@ -3944,29 +3764,17 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Editar Versículo -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: Tipo de &Versículo: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4094,11 +3902,7 @@ A codificação do conteúdo não é UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Iniciando importação... @@ -4213,12 +4017,12 @@ A codificação do conteúdo não é UTF-8. - + Importing "%s"... - + Importing %s... @@ -4332,20 +4136,12 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4353,20 +4149,12 @@ A codificação do conteúdo não é UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Importação Finalizada. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed. diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index 51b3bca96..701f2e3f0 100755 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -3,31 +3,27 @@ AlertsPlugin - + &Alert &Alarm - + Show an alert message. -<<<<<<< TREE - -======= ->>>>>>> MERGE-SOURCE <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - + Alert - + Alerts Alarm @@ -179,92 +175,92 @@ BiblesPlugin - + &Bible &Bibel - + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. - + Bible Bibel - + Bibles Biblar - + Import Importera - + Import a Bible - + Add Lägg till - + Add a new Bible - + Edit Redigera - + Edit the selected Bible - + Delete Ta bort - + Delete the selected Bible - + Preview Förhandsgranska - + Preview the selected Bible - + Live Live - + Send the selected Bible live - + Service - + Add the selected Bible to the service @@ -743,20 +739,12 @@ Changes do not affect verses already in the service. Ingen matchande bok kunde hittas i den här Bibeln. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE etc -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Bible not fully loaded. @@ -772,7 +760,7 @@ Changes do not affect verses already in the service. CustomPlugin - + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way Customs are. This plugin provides greater freedom over the Customs plugin. @@ -798,102 +786,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: @@ -939,92 +927,92 @@ Changes do not affect verses already in the service. CustomsPlugin - + Custom - + Customs - + Import Importera - + Import a Custom - + Load - + Load a new Custom - + Add Lägg till - + Add a new Custom - + Edit Redigera - + Edit the selected Custom - + Delete Ta bort - + Delete the selected Custom - + Preview Förhandsgranska - + Preview the selected Custom - + Live Live - + Send the selected Custom live - + Service - + Add the selected Custom to the service @@ -1032,87 +1020,87 @@ Changes do not affect verses already in the service. ImagePlugin - + <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like Images with the selected image as a background instead of the background provided by the theme. - + Image Bild - + Images Bilder - + Load - + Load a new Image - + Add Lägg till - + Add a new Image - + Edit Redigera - + Edit the selected Image - + Delete Ta bort - + Delete the selected Image - + Preview Förhandsgranska - + Preview the selected Image - + Live Live - + Send the selected Image live - + Service - + Add the selected Image to the service @@ -1140,47 +1128,27 @@ Changes do not affect verses already in the service. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Reset Live Background -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to delete. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Image(s) Bilder -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select an image to replace the background with. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You must select a media file to replace the background with. @@ -1188,87 +1156,87 @@ Changes do not affect verses already in the service. MediaPlugin - + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. - + Media Media - + Medias - + Load - + Load a new Media - + Add Lägg till - + Add a new Media - + Edit Redigera - + Edit the selected Media - + Delete Ta bort - + Delete the selected Media - + Preview Förhandsgranska - + Preview the selected Media - + Live Live - + Send the selected Media live - + Service - + Add the selected Media to the service @@ -1276,16 +1244,7 @@ Changes do not affect verses already in the service. MediaPlugin.MediaItem -<<<<<<< TREE -======= - - Media - Media - - - ->>>>>>> MERGE-SOURCE Select Media Välj media @@ -1300,16 +1259,12 @@ Changes do not affect verses already in the service. -<<<<<<< TREE Media Media -======= - ->>>>>>> MERGE-SOURCE You must select a media file to delete. @@ -1317,7 +1272,7 @@ Changes do not affect verses already in the service. OpenLP - + Image Files @@ -2030,15 +1985,30 @@ This General Public License does not permit incorporating your program into prop OpenLP.MainWindow + + + New Service + + + + + Open Service + + + + + Save Service + + OpenLP 2.0 OpenLP 2.0 - - English - Engelska + + AddHereYourLanguageName + @@ -2105,11 +2075,6 @@ This General Public License does not permit incorporating your program into prop &New &Ny - - - New Service - - Create a new service. @@ -2125,11 +2090,6 @@ This General Public License does not permit incorporating your program into prop &Open &Öppna - - - Open Service - - Open an existing service. @@ -2145,11 +2105,6 @@ This General Public License does not permit incorporating your program into prop &Save &Spara - - - Save Service - - Save the current service to disk. @@ -2442,86 +2397,91 @@ You can download the latest version from http://openlp.org/. Default Theme: %s + + + English + Engelska + OpenLP.MediaManagerItem - + No Items Selected - + &Edit %s - + &Delete %s - + &Preview %s - + &Show Live &Visa Live - + &Add to Service &Lägg till i mötesplanering - + &Add to selected Service Item - + 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. - + No items selected - + You must select one or more items Du måste välja ett eller flera objekt - + No Service Item Selected - + You must select an existing service item to add to. - + Invalid Service Item - + You must select a %s service item. @@ -2529,57 +2489,37 @@ You can download the latest version from http://openlp.org/. OpenLP.PluginForm -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin List Pluginlista -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Plugin Details Plugindetaljer -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Version: Version: -<<<<<<< TREE - - TextLabel - TextLabel - - -======= ->>>>>>> MERGE-SOURCE - + About: Om: - + Status: Status: - + Active Aktiv - + Inactive Inaktiv @@ -2635,11 +2575,7 @@ You can download the latest version from http://openlp.org/. Skapa en ny mötesplanering -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Open Service @@ -2649,7 +2585,7 @@ You can download the latest version from http://openlp.org/. Ladda en planering - + Save Service @@ -2759,68 +2695,48 @@ You can download the latest version from http://openlp.org/. &Byt objektets tema -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Save Changes to Service? - + Your service is unsaved, do you want to save those changes before creating a new one? - + OpenLP Service Files (*.osz) -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Your current service is unsaved, do you want to save the changes before opening a new one? -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + Error Fel -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. The content encoding is not UTF-8. -<<<<<<< TREE - -======= - ->>>>>>> MERGE-SOURCE + File is not a valid service. - + Missing Display Handler - + Your item cannot be displayed as there is no handler to display it @@ -2854,34 +2770,21 @@ The content encoding is not UTF-8. Förhandsgranska -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to previous Flytta till föregående -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Move to next Flytta till nästa -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Hide -<<<<<<< TREE Blank Screen Töm skärm @@ -2898,96 +2801,54 @@ The content encoding is not UTF-8. -======= - ->>>>>>> MERGE-SOURCE Move to live Flytta till live -<<<<<<< TREE - Edit and re-preview Song - Ändra och åter-förhandsgranska sång -======= - Edit and re-preview song ->>>>>>> MERGE-SOURCE -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start continuous loop Börja oändlig loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Stop continuous loop Stoppa upprepad loop -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE s s -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Delay between slides in seconds Fördröjning mellan bilder, i sekunder -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Start playing media Börja spela media -<<<<<<< TREE - Go to -======= - Go To ->>>>>>> MERGE-SOURCE OpenLP.SpellTextEdit -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Spelling Suggestions -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Formatting Tags @@ -3167,11 +3028,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE - 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? ->>>>>>> MERGE-SOURCE @@ -3226,67 +3083,67 @@ The content encoding is not UTF-8. PresentationPlugin - + <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. - + Presentation Presentation - + Presentations Presentationer - + Load - + Load a new Presentation - + Delete Ta bort - + Delete the selected Presentation - + Preview Förhandsgranska - + Preview the selected Presentation - + Live Live - + Send the selected Presentation live - + Service - + Add the selected Presentation to the service @@ -3324,13 +3181,8 @@ The content encoding is not UTF-8. -<<<<<<< TREE - This type of presentation is not supported -======= - This type of presentation is not supported. ->>>>>>> MERGE-SOURCE @@ -3365,17 +3217,17 @@ The content encoding is not UTF-8. RemotePlugin - + <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. - + Remote - + Remotes Fjärrstyrningar @@ -3406,47 +3258,47 @@ The content encoding is not UTF-8. SongUsagePlugin - + &Song Usage Tracking - + &Delete Tracking Data - + Delete song usage data up to a specified date. - + &Extract Tracking Data - + Generate a report on song usage. - + Toggle Tracking - + Toggle the tracking of song usage. - + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - + SongUsage @@ -3500,87 +3352,87 @@ The content encoding is not UTF-8. SongsPlugin - + &Song &Sång - + Import songs using the import wizard. - + <strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs. - + Song Sång - + Songs Sånger - + Add Lägg till - + Add a new Song - + Edit Redigera - + Edit the selected Song - + Delete Ta bort - + Delete the selected Song - + Preview Förhandsgranska - + Preview the selected Song - + Live Live - + Send the selected Song live - + Service - + Add the selected Song to the service @@ -3631,137 +3483,142 @@ 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 - - Song No.: + + Book: + Bok: + + + + Number: - + Authors, Topics && Song Book - + Theme Tema - + New &Theme - + Copyright Information Copyright-information - + © - + CCLI number: - + Comments Kommentarer - + Theme, Copyright Info && Comments Tema, copyright-info && kommentarer @@ -3781,11 +3638,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Error Fel @@ -3830,74 +3683,42 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in a song title. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You need to type in at least one verse. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Warning -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not added any authors for this song. Do you want to add an author now? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Add Book -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE This song book does not exist, do you want to add it? @@ -3905,29 +3726,17 @@ The content encoding is not UTF-8. SongsPlugin.EditVerseForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Edit Verse Redigera vers -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Verse type: -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE &Insert @@ -4055,11 +3864,7 @@ The content encoding is not UTF-8. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Starting import... Påbörjar import... @@ -4174,12 +3979,12 @@ The content encoding is not UTF-8. - + Importing "%s"... - + Importing %s... @@ -4293,20 +4098,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImport -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE copyright -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE © @@ -4314,20 +4111,12 @@ The content encoding is not UTF-8. SongsPlugin.SongImportForm -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Finished import. Importen är färdig. -<<<<<<< TREE -======= - ->>>>>>> MERGE-SOURCE Your song import failed.