diff --git a/Quelea/languages/fr.lang b/Quelea/languages/fr.lang index f1c9df06a..e6e5f612a 100644 --- a/Quelea/languages/fr.lang +++ b/Quelea/languages/fr.lang @@ -811,3 +811,8 @@ black.stage.view=Vue scène en noir avec écran principale gstreamer.warning.title=GStreamer est introuvable download.gstreamer=Télécharger GStreamer continue.without.gstreamer=Continuer sans GStreamer +show.small.song.on.slides.label=Afficher sur les diapositifs +all=Toutes +last=Dernière +confirm.remove.bulk.question=Voulez-vous vraiment supprimer $1 chants de la base de données? Cette action est irréversible. +first=Première diff --git a/Quelea/languages/gb.lang b/Quelea/languages/gb.lang index 1fadec511..4f82fea01 100644 --- a/Quelea/languages/gb.lang +++ b/Quelea/languages/gb.lang @@ -790,4 +790,70 @@ use.default.translation.label=Use Default Translation translation.name.label=Translation name ccli.licence=CCLI Licence dialog.image.group.header=Image Group -dialog.image.group.title=Rename image group \ No newline at end of file +dialog.image.group.title=Rename image group +bible.book.genesis=Genesis +bible.book.exodus=Exodus +bible.book.leviticus=Leviticus +bible.book.numbers=Numbers +bible.book.deuteronomy=Deuteronomy +bible.book.joshua=Joshua +bible.book.judges=Judges +bible.book.ruth=Ruth +bible.book.1samuel=1 Samuel +bible.book.2samuel=2 Samuel +bible.book.1kings=1 Kings +bible.book.2kings=2 Kings +bible.book.1chronicles=1 Chronicles +bible.book.2chronicles=2 Chronicles +bible.book.ezra=Ezra +bible.book.nehemiah=Nehemiah +bible.book.esther=Esther +bible.book.job=Job +bible.book.psalms=Psalms +bible.book.proverbs=Proverbs +bible.book.ecclesiastes=Ecclesiastes +bible.book.songofsolomon=Song of Solomon +bible.book.isaiah=Isaiah +bible.book.jeremiah=Jeremiah +bible.book.lamentations=Lamentations +bible.book.ezekiel=Ezekiel +bible.book.daniel=Daniel +bible.book.hosea=Hosea +bible.book.joel=Joel +bible.book.amos=Amos +bible.book.obadiah=Obadiah +bible.book.jonah=Jonah +bible.book.micah=Micah +bible.book.nahum=Nahum +bible.book.habakkuk=Habakkuk +bible.book.zephaniah=Zephaniah +bible.book.haggai=Haggai +bible.book.zechariah=Zechariah +bible.book.malachi=Malachi +bible.book.matthew=Matthew +bible.book.mark=Mark +bible.book.luke=Luke +bible.book.john=John +bible.book.acts=Acts +bible.book.romans=Romans +bible.book.1corinthians=1 Corinthians +bible.book.2corinthians=2 Corinthians +bible.book.galatians=Galatians +bible.book.ephesians=Ephesians +bible.book.philippians=Philippians +bible.book.colossians=Colossians +bible.book.1thessalonians=1 Thessalonians +bible.book.2thessalonians=2 Thessalonians +bible.book.1timothy=1 Timothy +bible.book.2timothy=2 Timothy +bible.book.titus=Titus +bible.book.philemon=Philemon +bible.book.hebrews=Hebrews +bible.book.james=James +bible.book.1peter=1 Peter +bible.book.2peter=2 Peter +bible.book.1john=1 John +bible.book.2john=2 John +bible.book.3john=3 John +bible.book.jude=Jude +bible.book.revelation=Revelation \ No newline at end of file diff --git a/Quelea/languages/ru.lang b/Quelea/languages/ru.lang index 336ccc802..38dd9498e 100644 --- a/Quelea/languages/ru.lang +++ b/Quelea/languages/ru.lang @@ -786,3 +786,69 @@ use.default.translation.label=Использовать перевод по-ум bible.load.error.title=Ошибка загрузки Библии translation.name.label=Название перевода bible.load.error.question=Невозможно загрузить Библию, возможно файл поврежден или имеет неверный формат. +bible.book.genesis=Бытие +bible.book.exodus=Исход +bible.book.leviticus=Левит +bible.book.numbers=Числа +bible.book.deuteronomy=Второзаконие +bible.book.joshua=Иисус Навин +bible.book.judges=Судьи +bible.book.ruth=Руфь +bible.book.1samuel=1 Царств +bible.book.2samuel=2 Царств +bible.book.1kings=3 Царств +bible.book.2kings=4 Царств +bible.book.1chronicles=1 Паралипоменон +bible.book.2chronicles=2 Паралипоменон +bible.book.ezra=Ездра +bible.book.nehemiah=Неемия +bible.book.esther=Есфирь +bible.book.job=Иов +bible.book.psalms=Псалтырь +bible.book.proverbs=Притчи +bible.book.ecclesiastes=Екклезиаст +bible.book.songofsolomon=Песнь песней +bible.book.isaiah=Исаия +bible.book.jeremiah=Иеремия +bible.book.lamentations=Плач Иеремии +bible.book.ezekiel=Иезекииль +bible.book.daniel=Даниил +bible.book.hosea=Осия +bible.book.joel=Иоиль +bible.book.amos=Амос +bible.book.obadiah=Авдий +bible.book.jonah=Иона +bible.book.micah=Михей +bible.book.nahum=Наум +bible.book.habakkuk=Аввакум +bible.book.zephaniah=Софония +bible.book.haggai=Аггей +bible.book.zechariah=Захария +bible.book.malachi=Малахия +bible.book.matthew=Матфей +bible.book.mark=Марк +bible.book.luke=Лука +bible.book.john=Иоанн +bible.book.acts=Деяния +bible.book.romans=Римлянам +bible.book.1corinthians=1 Коринфянам +bible.book.2corinthians=2 Коринфянам +bible.book.galatians=Галатам +bible.book.ephesians=Ефесянам +bible.book.philippians=Филиппийцам +bible.book.colossians=Колоссянам +bible.book.1thessalonians=1 Фессалоникийцам +bible.book.2thessalonians=2 Фессалоникийцам +bible.book.1timothy=1 Тимофею +bible.book.2timothy=2 Тимофею +bible.book.titus=Титу +bible.book.philemon=Филемону +bible.book.hebrews=Евреям +bible.book.james=Иакова +bible.book.1peter=1 Петра +bible.book.2peter=2 Петра +bible.book.1john=1 Иоанна +bible.book.2john=2 Иоанна +bible.book.3john=3 Иоанна +bible.book.jude=Иуды +bible.book.revelation=Откровение diff --git a/Quelea/src/main/java/org/quelea/data/bible/BibleBookNameUtil.java b/Quelea/src/main/java/org/quelea/data/bible/BibleBookNameUtil.java index 8291f2426..2f2167e5b 100644 --- a/Quelea/src/main/java/org/quelea/data/bible/BibleBookNameUtil.java +++ b/Quelea/src/main/java/org/quelea/data/bible/BibleBookNameUtil.java @@ -1,5 +1,6 @@ package org.quelea.data.bible; +import org.quelea.services.languages.LabelGrabber; import org.quelea.services.utils.LoggerUtils; import java.util.Arrays; import java.util.HashMap; @@ -14,72 +15,74 @@ public class BibleBookNameUtil { private static Map> BOOK_NAME_STRATEGIES = new HashMap<>(); static { - BOOK_NAME_STRATEGIES.put(66, Arrays.asList("Genesis", - "Exodus", - "Leviticus", - "Numbers", - "Deuteronomy", - "Joshua", - "Judges", - "Ruth", - "1 Samuel", - "2 Samuel", - "1 Kings", - "2 Kings", - "1 Chronicles", - "2 Chronicles", - "Ezra", - "Nehemiah", - "Esther", - "Job", - "Psalms", - "Proverbs", - "Ecclesiastes", - "Song of Solomon", - "Isaiah", - "Jeremiah", - "Lamentations", - "Ezekiel", - "Daniel", - "Hosea", - "Joel", - "Amos", - "Obadiah", - "Jonah", - "Micah", - "Nahum", - "Habakkuk", - "Zephaniah", - "Haggai", - "Zechariah", - "Malachi", - "Matthew", - "Mark", - "Luke", - "John", - "Acts", - "Romans", - "1 Corinthians", - "2 Corinthians", - "Galatians", - "Ephesians", - "Philippians", - "Colossians", - "1 Thessalonians", - "2 Thessalonians", - "1 Timothy", - "2 Timothy", - "Titus", - "Philemon", - "Hebrews", - "James", - "1 Peter", - "2 Peter", - "1 John", - "2 John", - "3 John", - "Jude", - "Revelation")); + BOOK_NAME_STRATEGIES.put(66, Arrays.asList( + LabelGrabber.INSTANCE.getLabel("bible.book.genesis"), + LabelGrabber.INSTANCE.getLabel("bible.book.exodus"), + LabelGrabber.INSTANCE.getLabel("bible.book.leviticus"), + LabelGrabber.INSTANCE.getLabel("bible.book.numbers"), + LabelGrabber.INSTANCE.getLabel("bible.book.deuteronomy"), + LabelGrabber.INSTANCE.getLabel("bible.book.joshua"), + LabelGrabber.INSTANCE.getLabel("bible.book.judges"), + LabelGrabber.INSTANCE.getLabel("bible.book.ruth"), + LabelGrabber.INSTANCE.getLabel("bible.book.1samuel"), + LabelGrabber.INSTANCE.getLabel("bible.book.2samuel"), + LabelGrabber.INSTANCE.getLabel("bible.book.1kings"), + LabelGrabber.INSTANCE.getLabel("bible.book.2kings"), + LabelGrabber.INSTANCE.getLabel("bible.book.1chronicles"), + LabelGrabber.INSTANCE.getLabel("bible.book.2chronicles"), + LabelGrabber.INSTANCE.getLabel("bible.book.ezra"), + LabelGrabber.INSTANCE.getLabel("bible.book.nehemiah"), + LabelGrabber.INSTANCE.getLabel("bible.book.esther"), + LabelGrabber.INSTANCE.getLabel("bible.book.job"), + LabelGrabber.INSTANCE.getLabel("bible.book.psalms"), + LabelGrabber.INSTANCE.getLabel("bible.book.proverbs"), + LabelGrabber.INSTANCE.getLabel("bible.book.ecclesiastes"), + LabelGrabber.INSTANCE.getLabel("bible.book.songofsolomon"), + LabelGrabber.INSTANCE.getLabel("bible.book.isaiah"), + LabelGrabber.INSTANCE.getLabel("bible.book.jeremiah"), + LabelGrabber.INSTANCE.getLabel("bible.book.lamentations"), + LabelGrabber.INSTANCE.getLabel("bible.book.ezekiel"), + LabelGrabber.INSTANCE.getLabel("bible.book.daniel"), + LabelGrabber.INSTANCE.getLabel("bible.book.hosea"), + LabelGrabber.INSTANCE.getLabel("bible.book.joel"), + LabelGrabber.INSTANCE.getLabel("bible.book.amos"), + LabelGrabber.INSTANCE.getLabel("bible.book.obadiah"), + LabelGrabber.INSTANCE.getLabel("bible.book.jonah"), + LabelGrabber.INSTANCE.getLabel("bible.book.micah"), + LabelGrabber.INSTANCE.getLabel("bible.book.nahum"), + LabelGrabber.INSTANCE.getLabel("bible.book.habakkuk"), + LabelGrabber.INSTANCE.getLabel("bible.book.zephaniah"), + LabelGrabber.INSTANCE.getLabel("bible.book.haggai"), + LabelGrabber.INSTANCE.getLabel("bible.book.zechariah"), + LabelGrabber.INSTANCE.getLabel("bible.book.malachi"), + LabelGrabber.INSTANCE.getLabel("bible.book.matthew"), + LabelGrabber.INSTANCE.getLabel("bible.book.mark"), + LabelGrabber.INSTANCE.getLabel("bible.book.luke"), + LabelGrabber.INSTANCE.getLabel("bible.book.john"), + LabelGrabber.INSTANCE.getLabel("bible.book.acts"), + LabelGrabber.INSTANCE.getLabel("bible.book.romans"), + LabelGrabber.INSTANCE.getLabel("bible.book.1corinthians"), + LabelGrabber.INSTANCE.getLabel("bible.book.2corinthians"), + LabelGrabber.INSTANCE.getLabel("bible.book.galatians"), + LabelGrabber.INSTANCE.getLabel("bible.book.ephesians"), + LabelGrabber.INSTANCE.getLabel("bible.book.philippians"), + LabelGrabber.INSTANCE.getLabel("bible.book.colossians"), + LabelGrabber.INSTANCE.getLabel("bible.book.1thessalonians"), + LabelGrabber.INSTANCE.getLabel("bible.book.2thessalonians"), + LabelGrabber.INSTANCE.getLabel("bible.book.1timothy"), + LabelGrabber.INSTANCE.getLabel("bible.book.2timothy"), + LabelGrabber.INSTANCE.getLabel("bible.book.titus"), + LabelGrabber.INSTANCE.getLabel("bible.book.philemon"), + LabelGrabber.INSTANCE.getLabel("bible.book.hebrews"), + LabelGrabber.INSTANCE.getLabel("bible.book.james"), + LabelGrabber.INSTANCE.getLabel("bible.book.1peter"), + LabelGrabber.INSTANCE.getLabel("bible.book.2peter"), + LabelGrabber.INSTANCE.getLabel("bible.book.1john"), + LabelGrabber.INSTANCE.getLabel("bible.book.2john"), + LabelGrabber.INSTANCE.getLabel("bible.book.3john"), + LabelGrabber.INSTANCE.getLabel("bible.book.jude"), + LabelGrabber.INSTANCE.getLabel("bible.book.revelation") + )); } public static String getBookNameForIndex(int index, int length) {