Merge branch 'locale'

Conflicts:
	chrome/content/options.xul
	defaults/preferences/todo.txt-ext.js

.gitignore

@@ -1 +1,2 @@
 todotxt.xpi
+todo.xpi

chrome.manifest

@@ -1,4 +1,11 @@
 content     todotxt   chrome/content/
 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
-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
+

chrome/content/options.xul

@@ -1,13 +1,15 @@
 <?xml version="1.0"?> 
-<!--
-    Google Tasks sync for Mozilla Thunderbird
--->
+
+<!DOCTYPE window [
+	<!ENTITY % todotxt SYSTEM "chrome://todotxt/locale/options.dtd">
+	%todotxt;
+]> 
 
 <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 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;" />
   <setting pref="extensions.todotxt.creation" type="bool" title="Use the Todo's creation timestamp. "/>
 
 </vbox>

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">

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">

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">

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">

defaults/preferences/todo.txt-ext.js

@@ -1,2 +1,3 @@
 pref("extensions.todotxt.thunderbird", true);
 pref("extensions.todotxt.creation", true);
+pref("general.useragent.locale","en-US");