i18n: fixes

diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGui.java b/src/be/nikiroo/fanfix/bundles/StringIdGui.java
index 705eef483e8c1b591b35c63f9488cbd439eb6c94..e31da64d4427e8251a5ff1ea5dcde462c4d36172 100644 (file)
--- 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 = "&nbsp;&nbsp;<B>Chapter <P COLOR='#7777DD'>%d</P>/%d</B>", format = Format.STRING, description = "(html) the chapter progression value used on the viewers", info = "%d = chapter number, %d = total chapters")
+       @Meta(def = "&nbsp;&nbsp;<B>Chapitre <SPAN COLOR='#444466'>%d</SPAN>&nbsp;/&nbsp;%d</B>", 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 = "&nbsp;&nbsp;<B>Chapter <P COLOR='#7777DD'>%d</P>/%d</B>: %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 = "&nbsp;&nbsp;<B>Chapitre <SPAN COLOR='#444466'>%d</SPAN>&nbsp;/&nbsp;%d</B>: %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 <P COLOR='#7777DD'>%d</P>/%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 9755213e6c10c2cb1a887d7cd25f0782d7435e38..30a48c68e634ac1c8309bfca907a8ecd76e3c6b0 100644 (file)
--- 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 = &nbsp;&nbsp;<B>Chapter <P COLOR='#7777DD'>%d</P>/%d</B>
+CHAPTER_HTML_UNNAMED = &nbsp;&nbsp;<B>Chapter <SPAN COLOR='#7777DD'>%d</SPAN>/%d</B>
 # (html) the chapter progression value used on the viewers
 # (FORMAT: STRING) %d = chapter number, %d = total chapters, %s = chapter name
-CHAPTER_HTML_NAMED = &nbsp;&nbsp;<B>Chapter <P COLOR='#7777DD'>%d</P>/%d</B>: %s
-# (html) the chapter progression value used on the viewers
-# (FORMAT: STRING) %d = currnt image number, %d = total images
-IMAGE_PROGRESSION = Image <P COLOR='#7777DD'>%d</P>/%d
+CHAPTER_HTML_NAMED = &nbsp;&nbsp;<B>Chapter <SPAN COLOR='#7777DD'>%d</SPAN>/%d</B>: %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 8e832f0d515f3a55a16873a22089b6cbd108b95b..0dd0f97001e99c3fedfca4e183664b7305e00170 100644 (file)
--- 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 = &nbsp;&nbsp;<B>Chapitre <P COLOR='#7777DD'>%d</P>/%d</B>
+CHAPTER_HTML_UNNAMED = &nbsp;&nbsp;<B>Chapitre <SPAN COLOR='#444466'>%d</SPAN>&nbsp;/&nbsp;%d</B>
 # (html) the chapter progression value used on the viewers
 # (FORMAT: STRING) %d = chapter number, %d = total chapters, %s = chapter name
-CHAPTER_HTML_NAMED = &nbsp;&nbsp;<B>Chapitre <P COLOR='#7777DD'>%d</P>/%d</B>: %s
-# (html) the chapter progression value used on the viewers
-# (FORMAT: STRING) %d = currnt image number, %d = total images
-IMAGE_PROGRESSION = Image <P COLOR='#7777DD'>%d</P>/%d
+CHAPTER_HTML_NAMED = &nbsp;&nbsp;<B>Chapitre <SPAN COLOR='#444466'>%d</SPAN>&nbsp;/&nbsp;%d</B>: %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