From a82abb7147c194d67af75a1da8c21a9e3d6fdcdb Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 13:38:26 +0100
Subject: [PATCH 1/6] Temporary work on localization

---
 .gitignore                           | 1 +
 chrome.manifest                      | 6 +++++-
 chrome/content/options.xul           | 8 +++++++-
 defaults/preferences/todo.txt-ext.js | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index dab022d..62e5773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 todotxt.xpi
+todo.xpi
diff --git a/chrome.manifest b/chrome.manifest
index 9e37baf..35aed74 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,4 +1,8 @@
 content     todotxt   chrome/content/
 resource 		todotxt 	modules/
+
+locale      todotxt   en-US   chrome/locale/en-US/
+
 manifest 		components/calTodotxt.manifest
-overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://todotxt/content/todotxt.xul
+overlay     chrome://lightning/content/messenger-overlay-sidebar.xul  chrome://todotxt/content/todotxt.xul
+
diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index e2b9723..c8dded3 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -1,11 +1,17 @@
 <?xml version="1.0"?> 
+
+<!DOCTYPE window [
+	<!ENTITY % todotxt SYSTEM "chrome://todotxt/locale/options.dtd">
+	%todotxt;
+]> 
+
 <!--
     Google Tasks sync for Mozilla Thunderbird
 -->
  
 <vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<setting pref="extensions.todotxt.todo-txt" type="file" title="Location of todo.txt file" />
+  <setting label="foobar" title="&todotxt.todofile;" pref="extensions.todotxt.todo-txt" type="file" />
 	<setting pref="extensions.todotxt.done-txt" type="file" title="Location of done.txt file" />
 	<setting pref="extensions.todotxt.thunderbird" type="bool" title="Use thunderbird's functionality, such as categories and priorities." />
 
diff --git a/defaults/preferences/todo.txt-ext.js b/defaults/preferences/todo.txt-ext.js
index 4739de3..dcd9099 100644
--- a/defaults/preferences/todo.txt-ext.js
+++ b/defaults/preferences/todo.txt-ext.js
@@ -1 +1,2 @@
 pref("extensions.todotxt.thunderbird", true);
+pref("general.useragent.locale","en-US");

From 6e9f1efbea74a53724242296b79f3ee27e10e083 Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 13:40:05 +0100
Subject: [PATCH 2/6] Added en_US dtd's

---
 chrome/locale/en-US/options.dtd         | 3 +++
 chrome/locale/en-US/settings.properties | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 chrome/locale/en-US/options.dtd
 create mode 100644 chrome/locale/en-US/settings.properties

diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
new file mode 100644
index 0000000..f20cc74
--- /dev/null
+++ b/chrome/locale/en-US/options.dtd
@@ -0,0 +1,3 @@
+<!ENTITY todotxt.todofile "Location of Todo.txt">
+<!ENTITY todotxt.donefile "Location of Done.txt">
+<!ENTITY todotxt.thunderbird "Use Thunderbird's functionality>
diff --git a/chrome/locale/en-US/settings.properties b/chrome/locale/en-US/settings.properties
new file mode 100644
index 0000000..4166ec8
--- /dev/null
+++ b/chrome/locale/en-US/settings.properties
@@ -0,0 +1,3 @@
+todo_txt=Location of Todo.txt file
+done_txt=Location of Done.txt file
+Thunderbird=Use Thunderbird's functionality

From 2550b4b5969b8ba8e6212bb495f694bf3fba6b77 Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 15:06:10 +0100
Subject: [PATCH 3/6] Fixed locale properties

---
 chrome/content/options.xul              | 6 +++---
 chrome/locale/en-US/options.dtd         | 2 +-
 chrome/locale/en-US/settings.properties | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 chrome/locale/en-US/settings.properties

diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index c8dded3..3255896 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -11,8 +11,8 @@
  
 <vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <setting label="foobar" title="&todotxt.todofile;" pref="extensions.todotxt.todo-txt" type="file" />
-	<setting pref="extensions.todotxt.done-txt" type="file" title="Location of done.txt file" />
-	<setting pref="extensions.todotxt.thunderbird" type="bool" title="Use thunderbird's functionality, such as categories and priorities." />
+  <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;" />
 
 </vbox>
diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
index f20cc74..dd9f46a 100644
--- a/chrome/locale/en-US/options.dtd
+++ b/chrome/locale/en-US/options.dtd
@@ -1,3 +1,3 @@
 <!ENTITY todotxt.todofile "Location of Todo.txt">
 <!ENTITY todotxt.donefile "Location of Done.txt">
-<!ENTITY todotxt.thunderbird "Use Thunderbird's functionality>
+<!ENTITY todotxt.thunderbird "Use Thunderbird's functionality">
diff --git a/chrome/locale/en-US/settings.properties b/chrome/locale/en-US/settings.properties
deleted file mode 100644
index 4166ec8..0000000
--- a/chrome/locale/en-US/settings.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-todo_txt=Location of Todo.txt file
-done_txt=Location of Done.txt file
-Thunderbird=Use Thunderbird's functionality

From 6cc194ec14aca330d87a6d8ffa7cdf7582d260b1 Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 22:34:10 +0100
Subject: [PATCH 4/6] Added dutch locale

---
 chrome.manifest              | 1 +
 chrome/locale/nl/options.dtd | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 chrome/locale/nl/options.dtd

diff --git a/chrome.manifest b/chrome.manifest
index 35aed74..42b7592 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -2,6 +2,7 @@ content     todotxt   chrome/content/
 resource 		todotxt 	modules/
 
 locale      todotxt   en-US   chrome/locale/en-US/
+locale      todotxt   nl      chrome/locale/nl/
 
 manifest 		components/calTodotxt.manifest
 overlay     chrome://lightning/content/messenger-overlay-sidebar.xul  chrome://todotxt/content/todotxt.xul
diff --git a/chrome/locale/nl/options.dtd b/chrome/locale/nl/options.dtd
new file mode 100644
index 0000000..6f6d3ed
--- /dev/null
+++ b/chrome/locale/nl/options.dtd
@@ -0,0 +1,3 @@
+<!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">

From 4d37d40c2787fadd49df38f14cabbc7ba3b52c6e Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 22:40:56 +0100
Subject: [PATCH 5/6] Added German locale

---
 chrome.manifest              | 1 +
 chrome/locale/de/options.dtd | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 chrome/locale/de/options.dtd

diff --git a/chrome.manifest b/chrome.manifest
index 42b7592..2db3264 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -2,6 +2,7 @@ content     todotxt   chrome/content/
 resource 		todotxt 	modules/
 
 locale      todotxt   en-US   chrome/locale/en-US/
+locale      todotxt   de      chrome/locale/de/
 locale      todotxt   nl      chrome/locale/nl/
 
 manifest 		components/calTodotxt.manifest
diff --git a/chrome/locale/de/options.dtd b/chrome/locale/de/options.dtd
new file mode 100644
index 0000000..9594885
--- /dev/null
+++ b/chrome/locale/de/options.dtd
@@ -0,0 +1,3 @@
+<!ENTITY todotxt.todofile "Lage von Todo.txt">
+<!ENTITY todotxt.donefile "Lage von Done.txt">
+<!ENTITY todotxt.thunderbird "Benutzen Thunderbird's Funktionalität">

From b75077029c6fb044dee11f5f3e41c40bcfda87f1 Mon Sep 17 00:00:00 2001
From: Roy Kokkelkoren <roy.kokkelkoren@gmail.com>
Date: Mon, 16 Nov 2015 22:44:03 +0100
Subject: [PATCH 6/6] Added France locale

---
 chrome.manifest              | 1 +
 chrome/locale/fr/options.dtd | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 chrome/locale/fr/options.dtd

diff --git a/chrome.manifest b/chrome.manifest
index 2db3264..f90be61 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -3,6 +3,7 @@ resource 		todotxt 	modules/
 
 locale      todotxt   en-US   chrome/locale/en-US/
 locale      todotxt   de      chrome/locale/de/
+locale      todotxt   fr      chrome/locale/fr/
 locale      todotxt   nl      chrome/locale/nl/
 
 manifest 		components/calTodotxt.manifest
diff --git a/chrome/locale/fr/options.dtd b/chrome/locale/fr/options.dtd
new file mode 100644
index 0000000..ab043fa
--- /dev/null
+++ b/chrome/locale/fr/options.dtd
@@ -0,0 +1,3 @@
+<!ENTITY todotxt.todofile "Lieu de Todo.txt">
+<!ENTITY todotxt.donefile "Lieu de Done.txt">
+<!ENTITY todotxt.thunderbird "Utilisez la fonctionnalité de Thunderbird">