merge 581892 583223
tag 581892 + patch
thanks

On Mon, May 17, 2010 at 12:58:09AM +0100, Luís Picciochi Oliveira wrote:
> WARNING: Failed to parse default value `SANT' for schema 
> (/schemas/apps/gtodo/view/show-priority-column)

Translating boolean values and color names is rarely a good idea.  :)

Attaching patch.


-- 
Whom computers would destroy, they must first drive mad.
>From 317e0204638357ba5e8538e4d3e8db8383041ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <[email protected]>
Date: Mon, 31 May 2010 10:45:21 -0400
Subject: [PATCH] Move all GConf <default> values outside of the <locale> element

All default values (bool, int and color names) present in this schema
are independent of the locale and should not be translated.
---
 gtodo.schemas.in |   62 +++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/gtodo.schemas.in b/gtodo.schemas.in
index 1befdc9..11e72d6 100644
--- a/gtodo.schemas.in
+++ b/gtodo.schemas.in
@@ -5,8 +5,8 @@
       <applyto>/apps/gtodo/view/show-category-column</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>FALSE</default>
       <locale name="C">
-        <default>FALSE</default>
         <short>Show or hide the category column</short>
         <long>Show or hide the category column</long>
       </locale>
@@ -16,8 +16,8 @@
       <applyto>/apps/gtodo/view/show-priority-column</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Show or hide the priority column</short>
         <long>Show or hide the priority column</long>
       </locale>
@@ -29,8 +29,8 @@
       <applyto>/apps/gtodo/view/enable-tray</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>FALSE</default>
       <locale name="C">
-        <default>FALSE</default>
         <short>Show or hide the Tray Icon</short>
         <long>Show or hide the tray icon</long>
       </locale>
@@ -40,8 +40,8 @@
       <applyto>/apps/gtodo/view/last-category</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>0</default>
       <locale name="C">
-        <default>0</default>
         <short>Remembers the Last visited category</short>
         <long>Remembers the Last visited category</long>
       </locale>
@@ -54,8 +54,8 @@
       <applyto>/apps/gtodo/prefs/do_notification</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Notify the user when items are due.</short>
         <long>Notify the user when items are due.</long>
       </locale>
@@ -66,8 +66,8 @@
       <applyto>/apps/gtodo/prefs/notify_in_minutes</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>15</default>
       <locale name="C">
-        <default>15</default>
         <short>The time before the end of a todo item the user should be notified</short>
         <long>The time before the end of a todo item the user should be notified</long>
       </locale>
@@ -78,8 +78,8 @@
       <applyto>/apps/gtodo/prefs/restore-size</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>If on program startup the previous size should be restored</short>
         <long>If on program startup the previous size should be restored</long>
       </locale>
@@ -90,8 +90,8 @@
       <applyto>/apps/gtodo/prefs/restore-position</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>If on program startup the previous position should be restored</short>
         <long>If on program startup the previous position should be restored</long>
       </locale>
@@ -102,8 +102,8 @@
       <applyto>/apps/gtodo/prefs/show-tooltip</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>FALSE</default>
       <locale name="C">
-        <default>FALSE</default>
         <short>Show a nice tooltip</short>
         <long>Show a tooltip when floating above the item in the main menu.
 	Warning this option is considered broken. Use with care.</long>
@@ -115,8 +115,8 @@
       <applyto>/apps/gtodo/prefs/ask-delete-category</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Ask the user if he realy wants to delete the category</short>
         <long>long description of foo and bar in C locale</long>
       </locale>
@@ -126,8 +126,8 @@
       <applyto>/apps/gtodo/prefs/show-due-column</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>short description in C locale</short>
         <long>long description of foo and bar in C locale</long>
       </locale>
@@ -137,8 +137,8 @@
       <applyto>/apps/gtodo/prefs/auto-purge</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>short description in C locale</short>
         <long>long description of foo and bar in C locale</long>
       </locale>
@@ -148,8 +148,8 @@
        <applyto>/apps/gtodo/prefs/auto-purge-days</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>7</default>
       <locale name="C">
-        <default>7</default>
         <short>short description in C locale</short>
         <long>long description of foo and bar in C locale</long>
       </locale>
@@ -159,8 +159,8 @@
       <applyto>/apps/gtodo/prefs/due-days</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>7</default>
       <locale name="C">
-        <default>7</default>
         <short>Show an nice icon in the notification tray.</short>
         <long>Show an nice icon in the notification tray. this is not hig compliant</long>
       </locale>
@@ -171,8 +171,8 @@
        <applyto>/apps/gtodo/prefs/due-in-days-color</applyto>
       <owner>gtodo</owner>
       <type>string</type>
+      <default>dark green</default>
       <locale name="C">
-        <default>dark green</default>
         <short>Show an nice icon in the notification tray.</short>
         <long>Show an nice icon in the notification tray. this is not hig compliant</long>
       </locale>
@@ -182,8 +182,8 @@
        <applyto>/apps/gtodo/prefs/due-today-color</applyto>
       <owner>gtodo</owner>
       <type>string</type>
+      <default>blue</default>
       <locale name="C">
-        <default>blue</default>
         <short>Show an nice icon in the notification tray.</short>
         <long>Show an nice icon in the notification tray. this is not hig compliant</long>
       </locale>
@@ -193,8 +193,8 @@
        <applyto>/apps/gtodo/prefs/due-color</applyto>
       <owner>gtodo</owner>
       <type>string</type>
+      <default>red</default>
       <locale name="C">
-        <default>red</default>
         <short>Show an nice icon in the notification tray.</short>
         <long>Show an nice icon in the notification tray. this is not hig compliant</long>
       </locale>
@@ -208,8 +208,8 @@
        <applyto>/apps/gtodo/prefs/add-item-dialog-size-x</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Add Item dialog width.</short>
         <long>	This is the width of the Add Item dialog.</long>
       </locale>
@@ -220,8 +220,8 @@
        <applyto>/apps/gtodo/prefs/add-item-dialog-size-y</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Add Item dialog height.</short>
         <long>	This is the height of the Add Item dialog.</long>
       </locale>
@@ -232,8 +232,8 @@
        <applyto>/apps/gtodo/prefs/size-x</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Hide items from the list that are due.</short>
         <long>	Hide items from the list that are due.</long>
       </locale>
@@ -244,8 +244,8 @@
        <applyto>/apps/gtodo/prefs/size-y</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Hide items from the list that are due.</short>
         <long>	Hide items from the list that are due.</long>
       </locale>
@@ -256,8 +256,8 @@
        <applyto>/apps/gtodo/prefs/pos-x</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Hide items from the list that are due.</short>
         <long>	Hide items from the list that are due.</long>
       </locale>
@@ -268,8 +268,8 @@
        <applyto>/apps/gtodo/prefs/pos-y</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>-1</default>
       <locale name="C">
-        <default>-1</default>
         <short>Hide items from the list that are due.</short>
         <long>	Hide items from the list that are due.</long>
       </locale>
@@ -280,8 +280,8 @@
        <applyto>/apps/gtodo/prefs/hide-due</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>FALSE</default>
       <locale name="C">
-        <default>FALSE</default>
         <short>Hide items from the list that are due.</short>
         <long>	Hide items from the list that are due.</long>
       </locale>
@@ -292,8 +292,8 @@
        <applyto>/apps/gtodo/prefs/hide-nodate</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>FALSE</default>
       <locale name="C">
-        <default>FALSE</default>
         <short>Hide items from the list that have no date.</short>
         <long>Hide items from the list that have no date.</long>
       </locale>
@@ -304,8 +304,8 @@
        <applyto>/apps/gtodo/prefs/sort-type</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>0</default>
       <locale name="C">
-        <default>0</default>
         <short>Defines the sort order.</short>
         <long>Defines the sort order. f.e. 0 is done, date, priority</long>
       </locale>
@@ -316,8 +316,8 @@
        <applyto>/apps/gtodo/prefs/sort-order</applyto>
       <owner>gtodo</owner>
       <type>int</type>
+      <default>1</default>
       <locale name="C">
-        <default>1</default>
         <short>Defines the way the tree is sorted, Ascending, or Descending</short>
         <long>Defeines the way the todo tree is sorted. 0 for Ascending, 1 for Descending</long>
       </locale>
@@ -328,8 +328,8 @@
        <applyto>/apps/gtodo/prefs/hide-done</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Hide items from the list that are done..</short>
         <long>Show an nice icon in the notification tray. this is not hig compliant</long>
       </locale>
@@ -340,8 +340,8 @@
        <applyto>/apps/gtodo/prefs/hl-due</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Higlight the due item in the list.</short>
         <long></long>
       </locale>
@@ -352,8 +352,8 @@
        <applyto>/apps/gtodo/prefs/hl-today</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Higlight the due today item in the list.</short>
         <long></long>
       </locale>
@@ -364,8 +364,8 @@
        <applyto>/apps/gtodo/prefs/hl-indays</applyto>
       <owner>gtodo</owner>
       <type>bool</type>
+      <default>TRUE</default>
       <locale name="C">
-        <default>TRUE</default>
         <short>Higlight the due today item in the list.</short>
         <long></long>
       </locale>
-- 
1.7.1

Reply via email to