Bugfixes + "strings.po" renumbering!

aassif · Apr 13, 2019 · 531a378 · 531a378
1 parent 93eb4f9
commit 531a378
Show file tree

Hide file tree

Showing 7 changed files with 303 additions and 135 deletions.
diff --git a/pvr.freebox/addon.xml.in b/pvr.freebox/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.freebox"
-  version="2.0.0~beta2"
+  version="2.0.0~beta3"
   name="PVR Freebox TV"
   provider-name="aassif">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.freebox/resources/language/resource.language.fr_fr/strings.po b/pvr.freebox/resources/language/resource.language.fr_fr/strings.po
@@ -21,98 +21,98 @@ msgid "%d channels loaded"
 msgstr "%d chaînes chargées"
 
 msgctxt "#30001"
-msgid "Authorization required"
-msgstr "Autorisation requise"
+msgid "Authorize Kodi on Freebox Server"
+msgstr "Autorisez Kodi sur le Freebox Server"
 
-msgctxt "#40000"
-msgid "Section 1"
-msgstr "Section 1"
-
-msgctxt "#41000"
-msgid "General"
-msgstr "Général"
-
-msgctxt "#41100"
+msgctxt "#30002"
 msgid "General"
 msgstr "Général"
 
-msgctxt "#41110"
+msgctxt "#30003"
 msgid "Delay"
 msgstr "Délai"
 
-msgctxt "#41111"
+msgctxt "#30004"
 msgid "Delay between queries."
 msgstr "Délai entre chaque requête."
 
-msgctxt "#41120"
+msgctxt "#30005"
 msgid "Restart"
 msgstr "Redémarrer"
 
-msgctxt "#41121"
-msgid "Restart"
-msgstr "Redémarrer"
+msgctxt "#30006"
+msgid "Restart addon after saving settings."
+msgstr "Redémarre le logiciel après enregistrement des paramètres."
 
-msgctxt "#41200"
+msgctxt "#30007"
 msgid "Television"
 msgstr "Télévision"
 
-msgctxt "#41210"
+msgctxt "#30008"
 msgid "Source"
 msgstr "Source"
 
-msgctxt "#41211"
+msgctxt "#30009"
 msgid "Source"
 msgstr "Source du flux TV : auto, IPTV ou TNT."
 
-msgctxt "#41212"
+msgctxt "#30010"
 msgid "Auto"
 msgstr "Auto"
 
-msgctxt "#41213"
+msgctxt "#30011"
 msgid "IPTV"
 msgstr "IPTV"
 
-msgctxt "#41214"
+msgctxt "#30012"
 msgid "DVB"
 msgstr "TNT"
 
-msgctxt "#41220"
+msgctxt "#30013"
 msgid "Quality"
 msgstr "Qualité"
 
-msgctxt "#41221"
+msgctxt "#30014"
 msgid "Quality"
 msgstr "Qualité du flux TV : auto, haute, standard, basse ou 3D."
 
-msgctxt "#41222"
+msgctxt "#30015"
 msgid "Auto"
 msgstr "Auto"
 
-msgctxt "#41223"
+msgctxt "#30016"
 msgid "High"
 msgstr "Haute"
 
-msgctxt "#41224"
+msgctxt "#30017"
 msgid "Standard"
 msgstr "Standard"
 
-msgctxt "#41225"
+msgctxt "#30018"
 msgid "Low"
 msgstr "Basse"
 
-msgctxt "#41226"
+msgctxt "#30019"
 msgid "3D"
 msgstr "3D"
 
-msgctxt "#41300"
+msgctxt "#30020"
 msgid "EPG"
 msgstr "Guide TV"
 
-msgctxt "#41310"
+msgctxt "#30021"
 msgid "Extended"
 msgstr "Étendu"
 
-msgctxt "#41311"
-msgid "Extended EPG."
-msgstr "Guide TV étendu (résumé)."
+msgctxt "#30022"
+msgid "Extended EPG: plot, cast, etc."
+msgstr "Guide TV étendu : chargement du résumé, des acteurs, etc."
+
+msgctxt "#30023"
+msgid "Category conversion"
+msgstr "Conversion des catégories"
+
+msgctxt "#30024"
+msgid "Convert French categories into standard categories."
+msgstr "Conversion des catégories françaises en catégories standard."
 
diff --git a/pvr.freebox/resources/settings.xml b/pvr.freebox/resources/settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings version="1">
-  <section id="section" label="40000" description="40001">
-    <category id="category" label="41000" description="41001">
-      <group id="pvr.freebox.general" label="41100">
-        <setting id="delay" type="integer" label="41110" help="41111">
+  <section id="section" label="30002" description="30002">
+    <category id="category" label="30002" description="30002">
+      <group id="pvr.freebox.general" label="30002">
+        <setting id="delay" type="integer" label="30003" help="30004">
           <level>0</level>
           <default>10</default>
           <constraints>
@@ -13,42 +13,47 @@
           </constraints>
           <control type="spinner" format="string" />
         </setting>
-        <setting id="restart" type="boolean" label="41120" help="41121">
+        <setting id="restart" type="boolean" label="30005" help="30006">
           <level>0</level>
           <default>false</default>
           <control type="toggle" />
         </setting>
       </group> <!-- pvr.freebox.general -->
-      <group id="pvr.freebox.television" label="41200">
-        <setting id="source" type="integer" label="41210" help="41211">
+      <group id="pvr.freebox.television" label="30007">
+        <setting id="source" type="integer" label="30008" help="30009">
           <level>0</level>
           <default>1</default> <!-- Auto -->
           <constraints>
             <options>
-              <option label="41212">1</option> <!-- Auto -->
-              <option label="41213">2</option> <!-- IPTV -->
-              <option label="41214">3</option> <!-- DVB -->
+              <option label="30010">1</option> <!-- Auto -->
+              <option label="30011">2</option> <!-- IPTV -->
+              <option label="30012">3</option> <!-- DVB -->
             </options>
           </constraints>
           <control type="list" format="string" />
         </setting>
-        <setting id="quality" type="integer" label="41220" help="41221">
+        <setting id="quality" type="integer" label="30013" help="30014">
           <level>0</level>
           <default>1</default> <!-- Auto -->
           <constraints>
             <options>
-              <option label="41222">1</option> <!-- Auto -->
-              <option label="41223">2</option> <!-- High -->
-              <option label="41224">3</option> <!-- Standard -->
-              <option label="41225">4</option> <!-- Low -->
-              <option label="41226">5</option> <!-- 3D -->
+              <option label="30015">1</option> <!-- Auto -->
+              <option label="30016">2</option> <!-- High -->
+              <option label="30017">3</option> <!-- Standard -->
+              <option label="30018">4</option> <!-- Low -->
+              <option label="30019">5</option> <!-- 3D -->
             </options>
           </constraints>
           <control type="list" format="string" />
         </setting>
       </group> <!-- pvr.freebox.television -->
-      <group id="pvr.freebox.epg" label="41300">
-        <setting id="extended" type="boolean" label="41310" help="41311">
+      <group id="pvr.freebox.epg" label="30020">
+        <setting id="extended" type="boolean" label="30021" help="30022">
+          <level>0</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="colors" type="boolean" label="30023" help="30024">
           <level>0</level>
           <default>false</default>
           <control type="toggle" />