diff --git a/resources/i18n/openlp_af.qm b/resources/i18n/openlp_af.qm index 785a97249..6048181b7 100644 Binary files a/resources/i18n/openlp_af.qm and b/resources/i18n/openlp_af.qm differ diff --git a/resources/i18n/openlp_de.qm b/resources/i18n/openlp_de.qm index 7197719b3..860e84dc8 100644 Binary files a/resources/i18n/openlp_de.qm and b/resources/i18n/openlp_de.qm differ diff --git a/resources/i18n/openlp_en.qm b/resources/i18n/openlp_en.qm new file mode 100644 index 000000000..6bd22c41d Binary files /dev/null and b/resources/i18n/openlp_en.qm differ diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts index c3cb8a595..a00e05646 100644 --- a/resources/i18n/openlp_en.ts +++ b/resources/i18n/openlp_en.ts @@ -2,11 +2,6 @@ AboutForm - - - build - - About OpenLP @@ -216,19 +211,14 @@ This General Public License does not permit incorporating your program into prop Close + + + build + + AlertForm - - - Item selected to Add - - - - - Missing data - - Alert Message @@ -274,6 +264,89 @@ This General Public License does not permit incorporating your program into prop &Close + + + Item selected to Add + + + + + Missing data + + + + + AlertsTab + + + pt + + + + + Location: + + + + + Font Color: + + + + + Font + + + + + Font Name: + + + + + Preview + + + + + Alerts + + + + + Alert timeout: + + + + + openlp.org + + + + + Background Color: + + + + + s + + + + + Bottom + + + + + Top + + + + + Font Size: + + AmendThemeForm @@ -685,8 +758,18 @@ This General Public License does not permit incorporating your program into prop - - Book: + + Clear + + + + + Search + + + + + To: @@ -694,21 +777,11 @@ This General Public License does not permit incorporating your program into prop Text Search - - - Find: - - Search Type: - - - Bible not fully loaded - - No matching book could be found in this Bible. @@ -725,8 +798,13 @@ This General Public License does not permit incorporating your program into prop - - Search + + Bible not fully loaded + + + + + No Book Found @@ -755,8 +833,13 @@ This General Public License does not permit incorporating your program into prop - - No Book Found + + Find: + + + + + Book: @@ -764,16 +847,6 @@ This General Public License does not permit incorporating your program into prop Advanced - - - To: - - - - - Clear - - Verse: @@ -816,13 +889,13 @@ This General Public License does not permit incorporating your program into prop - - Verse Display + + Display Dual Bible Verses - - Display Dual Bible Verses + + Bibles @@ -831,8 +904,8 @@ This General Public License does not permit incorporating your program into prop - - Layout Style: + + Verse Display @@ -840,11 +913,6 @@ This General Public License does not permit incorporating your program into prop No brackets - - - Bibles - - { and } @@ -866,6 +934,11 @@ Changes don't affect verses already in the service Bible Theme: + + + Layout Style: + + CustomMediaItem @@ -901,6 +974,14 @@ Changes don't affect verses already in the service + + DisplayTab + + + Displays + + + EditCustomForm @@ -923,11 +1004,6 @@ Changes don't affect verses already in the service Save && Preview - - - You have unsaved data, please save or clear - - Edit Custom Slides @@ -1028,6 +1104,11 @@ Changes don't affect verses already in the service Credits: + + + You have unsaved data, please save or clear + + EditSongForm @@ -1051,31 +1132,6 @@ Changes don't affect verses already in the service Error - - - bitped - - - - - v - - - - - c - - - - - Invalid verse entry - Vx or Cx - - - - - Invalid verse entry, values must be I,B,T,P,E,O,Vx,Cx - - Song Editor @@ -1201,19 +1257,34 @@ Changes don't affect verses already in the service Theme, Copyright Info && Comments + + + bitped + + + + + v + + + + + c + + + + + Invalid verse entry - Vx or Cx + + + + + Invalid verse entry, values must be I,B,T,P,E,O,Vx,Cx + + EditVerseForm - - - Verse - - - - - Chrous - - Edit Verse @@ -1229,6 +1300,11 @@ Changes don't affect verses already in the service Intro + + + Verse + + Pre-Chorus @@ -1259,6 +1335,11 @@ Changes don't affect verses already in the service Number + + + Chrous + + GeneralTab @@ -1267,6 +1348,11 @@ Changes don't affect verses already in the service CCLI Details + + + SongSelect Password: + + primary @@ -1337,11 +1423,6 @@ Changes don't affect verses already in the service Monitors - - - SongSelect Password: - - Display if a single screen @@ -1420,8 +1501,8 @@ Changes don't affect verses already in the service ImportWizardForm - - You need to specify a file with books of the Bible to use in the import. + + Bible Exists @@ -1434,11 +1515,6 @@ Changes don't affect verses already in the service You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such. - - - Bible Exists - - Empty Copyright @@ -1464,16 +1540,6 @@ Changes don't affect verses already in the service Finished import. - - - You need to specify a file of Bible verses to import. - - - - - You need to specify a version name for your Bible. - - This Bible already exists! Please import a different Bible or first delete the existing one. @@ -1489,16 +1555,6 @@ Changes don't affect verses already in the service Invalid Books File - - - You need to specify a file to import your Bible from. - - - - - You need to specify an OpenSong Bible file to import. - - Invalid Verse File @@ -1509,21 +1565,6 @@ Changes don't affect verses already in the service Open OpenSong Bible - - - Open OSIS File - - - - - Open Books CSV File - - - - - Open Verses CSV File - - Bible Import Wizard @@ -1679,16 +1720,56 @@ Changes don't affect verses already in the service Ready. + + + You need to specify a file to import your Bible from. + + + + + You need to specify a file with books of the Bible to use in the import. + + + + + You need to specify a file of Bible verses to import. + + + + + You need to specify an OpenSong Bible file to import. + + + + + You need to specify a version name for your Bible. + + + + + Open OSIS File + + + + + Open Books CSV File + + + + + Open Verses CSV File + + LanguageManager - + Language - + After restart new Language settings will be used. @@ -1715,21 +1796,6 @@ Changes don't affect verses already in the service OpenLP Main Display Blanked - - - New Service - - - - - Open Service - - - - - Save Service - - OpenLP 2.0 @@ -1805,6 +1871,11 @@ Changes don't affect verses already in the service &New + + + New Service + + Create a new Service @@ -1820,6 +1891,11 @@ Changes don't affect verses already in the service &Open + + + Open Service + + Open an existing service @@ -1835,6 +1911,11 @@ Changes don't affect verses already in the service &Save + + + Save Service + + Save the current service to disk @@ -2090,11 +2171,6 @@ You can download the latest version from http://openlp.org Load a new - - - Delete the selected item - - &Edit @@ -2120,6 +2196,11 @@ You can download the latest version from http://openlp.org Edit the selected + + + Delete the selected item + + Add a new @@ -2171,26 +2252,26 @@ You can download the latest version from http://openlp.org - - Invalid Service Item + + You must select an existing service item to add to. - - You must select an existing service item to add to. + + Invalid Service Item MediaMediaItem - - Media + + Select Media - - Select Media + + Media @@ -2378,6 +2459,11 @@ You can download the latest version from http://openlp.org OpenSongExportForm + + + OpenSong Song Exporter + + Select OpenSong song folder: @@ -2443,11 +2529,6 @@ You can download the latest version from http://openlp.org Close - - - OpenSong Song Exporter - - OpenSongImportForm @@ -2538,8 +2619,8 @@ You can download the latest version from http://openlp.org - - Automatic + + Select Presentation(s) @@ -2548,13 +2629,13 @@ You can download the latest version from http://openlp.org - - Select Presentation(s) + + File exists - - File exists + + Automatic @@ -2635,6 +2716,11 @@ You can download the latest version from http://openlp.org ServiceManager + + + Save Service + + Save Changes to Service? @@ -2671,8 +2757,8 @@ You can download the latest version from http://openlp.org - - Save Service + + &Preview Verse @@ -2680,11 +2766,6 @@ You can download the latest version from http://openlp.org &Live Verse - - - Move to &top - - New Service @@ -2695,16 +2776,6 @@ You can download the latest version from http://openlp.org &Notes - - - Move to end - - - - - &Delete From Service - - Move up order @@ -2715,24 +2786,14 @@ You can download the latest version from http://openlp.org Move down order - - - Move &down - - Load an existing service - - &Preview Verse - - - - - Move &up + + Move to end @@ -2740,11 +2801,41 @@ You can download the latest version from http://openlp.org &Edit Item + + + Move to &top + + + + + Move &up + + + + + Move &down + + Move to &bottom + + + &Delete From Service + + + + + &Add New Item + + + + + &Add to Selected Item + + &Maintain Item @@ -2760,16 +2851,6 @@ You can download the latest version from http://openlp.org Your current service is unsaved, do you want to save the changes before opening a new one? - - - &Add New Item - - - - - &Add to Selected Item - - Missing Display Handler @@ -2804,6 +2885,16 @@ You can download the latest version from http://openlp.org Move to previous + + + Edit and re-preview Song + + + + + Delay between slides in seconds + + Go to Verse @@ -2829,24 +2920,14 @@ You can download the latest version from http://openlp.org Move to live - - - Preview - - Move to last - - Edit and re-preview Song - - - - - Delay between slides in seconds + + Verse @@ -2865,8 +2946,8 @@ You can download the latest version from http://openlp.org - - Verse + + Preview @@ -2925,26 +3006,6 @@ You can download the latest version from http://openlp.org SongMaintenanceForm - - - Are you sure you want to delete the selected book? - - - - - Couldn't save your author. - - - - - This author can't be deleted, they are currently assigned to at least one song. - - - - - Couldn't add your book. - - Error @@ -2956,13 +3017,13 @@ You can download the latest version from http://openlp.org - - Couldn't add your topic. + + Are you sure you want to delete the selected book? - - This book can't be deleted, it is currently assigned to at least one song. + + Delete Topic @@ -2980,26 +3041,6 @@ You can download the latest version from http://openlp.org Are you sure you want to delete the selected author? - - - Couldn't add your author. - - - - - Couldn't save your topic. - - - - - Couldn't save your book. - - - - - Delete Topic - - Delete Author @@ -3010,11 +3051,6 @@ You can download the latest version from http://openlp.org No topic selected! - - - This topic can't be deleted, it is currently assigned to at least one song. - - Are you sure you want to delete the selected topic? @@ -3055,6 +3091,51 @@ You can download the latest version from http://openlp.org Delete + + + Couldn't add your author. + + + + + Couldn't add your topic. + + + + + Couldn't add your book. + + + + + Couldn't save your author. + + + + + Couldn't save your topic. + + + + + Couldn't save your book. + + + + + This author can't be deleted, they are currently assigned to at least one song. + + + + + This topic can't be deleted, it is currently assigned to at least one song. + + + + + This book can't be deleted, it is currently assigned to at least one song. + + SongMediaItem @@ -3073,6 +3154,11 @@ You can download the latest version from http://openlp.org Maintain the lists of authors, topics and books + + + Titles + + Lyrics @@ -3083,11 +3169,6 @@ You can download the latest version from http://openlp.org Type: - - - Titles - - Clear @@ -3236,11 +3317,6 @@ You can download the latest version from http://openlp.org Delete a theme - - - File is not a valid theme. - - Edit a theme @@ -3256,11 +3332,6 @@ You can download the latest version from http://openlp.org Export Theme - - - You are unable to delete the default theme. - - Theme Exists @@ -3301,11 +3372,6 @@ You can download the latest version from http://openlp.org Export theme - - - You have not selected a theme. - - A theme with this name already exists, would you like to overwrite it? @@ -3316,6 +3382,11 @@ You can download the latest version from http://openlp.org Export a theme + + + You are unable to delete the default theme. + + Theme %s is use in %s plugin @@ -3326,6 +3397,16 @@ You can download the latest version from http://openlp.org Theme %s is use by Service Manager + + + You have not selected a theme. + + + + + File is not a valid theme. + + ThemesTab @@ -3340,8 +3421,8 @@ You can download the latest version from http://openlp.org - - Use the global theme, overriding any themes associated with either the service or the songs. + + Global level @@ -3355,8 +3436,8 @@ You can download the latest version from http://openlp.org - - Global level + + Use the global theme, overriding any themes associated with either the service or the songs. @@ -3365,13 +3446,13 @@ You can download the latest version from http://openlp.org - - 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. + + Themes - - Themes + + 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. @@ -3502,6 +3583,54 @@ You can download the latest version from http://openlp.org + + self + + + Amend Display Settings + + + + + Default Settings + + + + + X + + + + + 0 + + + + + Y + + + + + Height + + + + + Width + + + + + Amend Settings + + + + + Override Output Display + + + self.ImportSongMenu diff --git a/resources/i18n/openlp_en_GB.qm b/resources/i18n/openlp_en_GB.qm index b2dc81931..5a31382cf 100644 Binary files a/resources/i18n/openlp_en_GB.qm and b/resources/i18n/openlp_en_GB.qm differ diff --git a/resources/i18n/openlp_en_ZA.qm b/resources/i18n/openlp_en_ZA.qm index 58ee3e02c..344aec034 100644 Binary files a/resources/i18n/openlp_en_ZA.qm and b/resources/i18n/openlp_en_ZA.qm differ diff --git a/resources/i18n/openlp_es.qm b/resources/i18n/openlp_es.qm index f128095b8..da03a2e0f 100644 Binary files a/resources/i18n/openlp_es.qm and b/resources/i18n/openlp_es.qm differ diff --git a/resources/i18n/openlp_hu.qm b/resources/i18n/openlp_hu.qm index dc4e5fba2..4f2c11f7b 100644 Binary files a/resources/i18n/openlp_hu.qm and b/resources/i18n/openlp_hu.qm differ diff --git a/resources/i18n/openlp_nb.qm b/resources/i18n/openlp_nb.qm index f88756cab..fb6ae4493 100644 Binary files a/resources/i18n/openlp_nb.qm and b/resources/i18n/openlp_nb.qm differ diff --git a/resources/i18n/openlp_pt_BR.qm b/resources/i18n/openlp_pt_BR.qm index 4e075ec64..2ad079b4b 100644 Binary files a/resources/i18n/openlp_pt_BR.qm and b/resources/i18n/openlp_pt_BR.qm differ diff --git a/resources/i18n/openlp_sv.qm b/resources/i18n/openlp_sv.qm index f7b80c6ed..ae9d9fec0 100644 Binary files a/resources/i18n/openlp_sv.qm and b/resources/i18n/openlp_sv.qm differ diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index 7a76a5566..0135efeb6 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -38,7 +38,8 @@ from PyQt4 import QtCore ignore_pathes = [u"./scripts", u"./openlp/core/test"] ignore_files = [u"setup.py"] translation_path = u"http://pootle.projecthq.biz/export/openlp/" -translations = [ u"af" +translations = [ u"en" + , u"af" , u"en_ZA" , u"en_GB" , u"de"