From 234e8ba43b43fa0fbd2554f671ee7c8bc0ed9325 Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Tue, 8 Dec 2015 02:57:48 +0100
Subject: [PATCH] Fixed merge between locale and master

Creation option now also contains translations in DE,FR,NL.
---
 chrome/content/options.xul           | 3 +--
 chrome/locale/de/options.dtd         | 1 +
 chrome/locale/en-US/options.dtd      | 1 +
 chrome/locale/fr/options.dtd         | 1 +
 chrome/locale/nl/options.dtd         | 1 +
 components/calTodotxt.js             | 2 +-
 defaults/preferences/todo.txt-ext.js | 1 -
 7 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index d710b04..578b200 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -10,6 +10,5 @@
   <setting pref="extensions.todotxt.todo-txt" type="file" title="&todotxt.todofile;" />
   <setting pref="extensions.todotxt.done-txt" type="file" title="&todotxt.donefile;" />
   <setting pref="extensions.todotxt.thunderbird" type="bool" title="&todotxt.thunderbird;" />
-  <setting pref="extensions.todotxt.creation" type="bool" title="Use the Todo's creation timestamp. "/>
-
+  <setting pref="extensions.todotxt.creation" type="bool" title="&todotxt.creation;"/>
 </vbox>
diff --git a/chrome/locale/de/options.dtd b/chrome/locale/de/options.dtd
index 9594885..7637bf4 100644
--- a/chrome/locale/de/options.dtd
+++ b/chrome/locale/de/options.dtd
@@ -1,3 +1,4 @@
 <!ENTITY todotxt.todofile "Lage von Todo.txt">
 <!ENTITY todotxt.donefile "Lage von Done.txt">
 <!ENTITY todotxt.thunderbird "Benutzen Thunderbird's Funktionalität">
+<!ENTITY todotxt.creation "Benutzen die Todo's Schaffung Zeitstempel">
diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
index dd9f46a..084d586 100644
--- a/chrome/locale/en-US/options.dtd
+++ b/chrome/locale/en-US/options.dtd
@@ -1,3 +1,4 @@
 <!ENTITY todotxt.todofile "Location of Todo.txt">
 <!ENTITY todotxt.donefile "Location of Done.txt">
 <!ENTITY todotxt.thunderbird "Use Thunderbird's functionality">
+<!ENTITY todotxt.creation "Use the Todo's creation timestamp">
diff --git a/chrome/locale/fr/options.dtd b/chrome/locale/fr/options.dtd
index ab043fa..bdbf621 100644
--- a/chrome/locale/fr/options.dtd
+++ b/chrome/locale/fr/options.dtd
@@ -1,3 +1,4 @@
 <!ENTITY todotxt.todofile "Lieu de Todo.txt">
 <!ENTITY todotxt.donefile "Lieu de Done.txt">
 <!ENTITY todotxt.thunderbird "Utilisez la fonctionnalité de Thunderbird">
+<!ENTITY todotxt.creation "Utiliser l'horodatage de création de todo">
diff --git a/chrome/locale/nl/options.dtd b/chrome/locale/nl/options.dtd
index 6f6d3ed..663f150 100644
--- a/chrome/locale/nl/options.dtd
+++ b/chrome/locale/nl/options.dtd
@@ -1,3 +1,4 @@
 <!ENTITY todotxt.todofile "Locatie van het Todo.txt bestand">
 <!ENTITY todotxt.donefile "Locatie van het Done.txt bestand">
 <!ENTITY todotxt.thunderbird "Gebruik de functionaliteit van Thunderbird">
+<!ENTITY todotxt.creation "Gebruik de startdatum van de Todo's in Thunderbird">
diff --git a/components/calTodotxt.js b/components/calTodotxt.js
index d503788..702360a 100644
--- a/components/calTodotxt.js
+++ b/components/calTodotxt.js
@@ -17,7 +17,7 @@ Components.utils.import("resource://todotxt/todo-txt-js/todotxt.js");
 function calTodoTxt() {
   this.initProviderBase();
   
-  todotxtLogger.debugMode = true;
+  todotxtLogger.debugMode = false;
   todotxtLogger.debug("calTodoTxt", "Constructor");
 
   myPrefObserver.register(this);
diff --git a/defaults/preferences/todo.txt-ext.js b/defaults/preferences/todo.txt-ext.js
index 3d72083..a167b0e 100644
--- a/defaults/preferences/todo.txt-ext.js
+++ b/defaults/preferences/todo.txt-ext.js
@@ -1,3 +1,2 @@
 pref("extensions.todotxt.thunderbird", true);
 pref("extensions.todotxt.creation", true);
-pref("general.useragent.locale","en-US");