From 06146e00893afa7a42e2d0c5dbd57c9e7748885a Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Tue, 26 Mar 2019 08:36:10 +0100 Subject: [PATCH] i18n: fixes --- src/be/nikiroo/fanfix/bundles/StringIdGui.java | 10 +++++----- .../fanfix/bundles/resources_gui.properties | 14 +++++++------- .../fanfix/bundles/resources_gui_fr.properties | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGui.java b/src/be/nikiroo/fanfix/bundles/StringIdGui.java index 705eef4..e31da64 100644 --- a/src/be/nikiroo/fanfix/bundles/StringIdGui.java +++ b/src/be/nikiroo/fanfix/bundles/StringIdGui.java @@ -32,10 +32,10 @@ public enum StringIdGui { * Use it when you need a real translation but still don't have a key. */ DUMMY, // - @Meta(def = "Fanfix %s local library", format = Format.STRING, description = "the title of the main window of Fanfix, the library", info = "%s = current Fanfix version") + @Meta(def = "Fanfix %s", format = Format.STRING, description = "the title of the main window of Fanfix, the library", info = "%s = current Fanfix version") // The titles/subtitles: TITLE_LIBRARY, // - @Meta(def = "Fanfix %s on %s", format = Format.STRING, description = "the title of the main window of Fanfix, the library, when the library has a name (i.e., is not local)", info = "%s = current Fanfix version, %s = library name") + @Meta(def = "Fanfix %s", format = Format.STRING, description = "the title of the main window of Fanfix, the library, when the library has a name (i.e., is not local)", info = "%s = current Fanfix version, %s = library name") TITLE_LIBRARY_WITH_NAME, // @Meta(def = "Fanfix Configuration", format = Format.STRING, description = "the title of the configuration window of Fanfix, also the name of the menu button") TITLE_CONFIG, // @@ -161,11 +161,11 @@ public enum StringIdGui { ERROR_URL_IMPORT_FAILED, // Others - @Meta(def = "  Chapter

%d

/%d", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = chapter number, %d = total chapters") + @Meta(def = "  Chapitre %d / %d", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = chapter number, %d = total chapters") CHAPTER_HTML_UNNAMED, // - @Meta(def = "  Chapter

%d

/%d: %s", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = chapter number, %d = total chapters, %s = chapter name") + @Meta(def = "  Chapitre %d / %d: %s", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = chapter number, %d = total chapters, %s = chapter name") CHAPTER_HTML_NAMED, // - @Meta(def = "Image

%d

/%d", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = currnt image number, %d = total images") + @Meta(def = "Image %d / %d", format = Format.STRING, description = "(NO html) the chapter progression value used on the viewers", info = "%d = current image number, %d = total images") IMAGE_PROGRESSION, // ; diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui.properties b/src/be/nikiroo/fanfix/bundles/resources_gui.properties index 9755213..30a48c6 100644 --- a/src/be/nikiroo/fanfix/bundles/resources_gui.properties +++ b/src/be/nikiroo/fanfix/bundles/resources_gui.properties @@ -9,10 +9,10 @@ # the title of the main window of Fanfix, the library # (FORMAT: STRING) %s = current Fanfix version -TITLE_LIBRARY = Fanfix %s local library +TITLE_LIBRARY = Fanfix %s # the title of the main window of Fanfix, the library, when the library has a name (i.e., is not local) # (FORMAT: STRING) %s = current Fanfix version, %s = library name -TITLE_LIBRARY_WITH_NAME = Fanfix %s on %s +TITLE_LIBRARY_WITH_NAME = Fanfix %s # the title of the configuration window of Fanfix, also the name of the menu button # (FORMAT: STRING) TITLE_CONFIG = Fanfix Configuration @@ -181,10 +181,10 @@ ERROR_URL_IMPORT_FAILED = Failed to import %s:\n\ %s # (html) the chapter progression value used on the viewers # (FORMAT: STRING) %d = chapter number, %d = total chapters -CHAPTER_HTML_UNNAMED =   Chapter

%d

/%d +CHAPTER_HTML_UNNAMED =   Chapter %d/%d # (html) the chapter progression value used on the viewers # (FORMAT: STRING) %d = chapter number, %d = total chapters, %s = chapter name -CHAPTER_HTML_NAMED =   Chapter

%d

/%d: %s -# (html) the chapter progression value used on the viewers -# (FORMAT: STRING) %d = currnt image number, %d = total images -IMAGE_PROGRESSION = Image

%d

/%d +CHAPTER_HTML_NAMED =   Chapter %d/%d: %s +# (NO html) the chapter progression value used on the viewers +# (FORMAT: STRING) %d = current image number, %d = total images +IMAGE_PROGRESSION = Image %d / %d diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties index 8e832f0..0dd0f97 100644 --- a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties +++ b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties @@ -9,10 +9,10 @@ # the title of the main window of Fanfix, the library # (FORMAT: STRING) %s = current Fanfix version -TITLE_LIBRARY = Fanfix %s librairie locale +TITLE_LIBRARY = Fanfix %s # the title of the main window of Fanfix, the library, when the library has a name (i.e., is not local) # (FORMAT: STRING) %s = current Fanfix version, %s = library name -TITLE_LIBRARY_WITH_NAME = Fanfix %s sur %s +TITLE_LIBRARY_WITH_NAME = Fanfix %s # the title of the configuration window of Fanfix, also the name of the menu button # (FORMAT: STRING) TITLE_CONFIG = Configuration de Fanfix @@ -181,10 +181,10 @@ ERROR_URL_IMPORT_FAILED = Erreur lors de l'import de %s:\n\ %s # (html) the chapter progression value used on the viewers # (FORMAT: STRING) %d = chapter number, %d = total chapters -CHAPTER_HTML_UNNAMED =   Chapitre

%d

/%d +CHAPTER_HTML_UNNAMED =   Chapitre %d / %d # (html) the chapter progression value used on the viewers # (FORMAT: STRING) %d = chapter number, %d = total chapters, %s = chapter name -CHAPTER_HTML_NAMED =   Chapitre

%d

/%d: %s -# (html) the chapter progression value used on the viewers -# (FORMAT: STRING) %d = currnt image number, %d = total images -IMAGE_PROGRESSION = Image

%d

/%d +CHAPTER_HTML_NAMED =   Chapitre %d / %d: %s +# (NO html) the chapter progression value used on the viewers +# (FORMAT: STRING) %d = current image number, %d = total images +IMAGE_PROGRESSION = Image %d / %d -- 2.27.0