Sukhbir Singh · Sukhbir Singh · Sukhbir Singh · Sukhbir Singh · Sukhbir Singh · Sukhbir Singh
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -102,13 +102,15 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
          // Gmail uses OAuth2, which we deal with later.
          pub.isGmail = true;
          break;
+        // From https://riseup.net/security/network-security/tor/hs-addresses-signed.txt
        case "riseup.net":
-          config.incoming.hostname = "mail.%EMAILDOMAIN%";
-          config.outgoing.hostname = "mail.%EMAILDOMAIN%";
+          config.incoming.hostname = "5gdvpfoh6kb2iqbizb37lzk2ddzrwa47m6rpdueg2m656fovmbhoptqd.onion";
+          config.outgoing.hostname = "5gdvpfoh6kb2iqbizb37lzk2ddzrwa47m6rpdueg2m656fovmbhoptqd.onion";
          break;
+        // From https://www.systemli.org/en/service/mail.html
        case "systemli.org":
-          config.incoming.hostname = "mail.%EMAILDOMAIN%";
-          config.outgoing.hostname = "mail.%EMAILDOMAIN%";
+          config.incoming.hostname = "h2qkxasmmqdmyiov.onion";
+          config.outgoing.hostname = "h2qkxasmmqdmyiov.onion";
          break;
      }


--- a/chrome/content/firstruninfo.js
+++ b/chrome/content/firstruninfo.js
-if (!org) var org = {};
-if (!org.torbirdy) org.torbirdy = {};
-
-if (!org.torbirdy.firstrun) org.torbirdy.firstrun = new function() {
-  var pub = {};
-
-  pub.onLoad = function() {
-    var strings = document.getElementById("torbirdy-strings-firstrun");
-
-    var description = document.getElementById("torbirdy-firstrun-info");
-    description.textContent = strings.getString("torbirdy.firstrun");
-
-    var torbirdyWebsite = strings.getString("torbirdy.website");
-    var website = document.getElementById("torbirdy-website");
-    website.value = torbirdyWebsite;
-  };
-
-  return pub;
-};
--- a/chrome/content/firstruninfo.xul
+++ b/chrome/content/firstruninfo.xul
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://castironthunderbirdclub/locale/torbirdy.dtd">
-
-<dialog id="castironthunderbird-firstrun-info" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&torbirdy.firstrun.title;"
-        buttons="accept"
-        onload="return org.torbirdy.firstrun.onLoad();"
-        ondialogaccept="window.close();">
-
-   <script type="application/javascript"
-     src="chrome://castironthunderbirdclub/content/firstruninfo.js"></script>
-
-   <stringbundleset id="stringbundleset">
-     <stringbundle id="torbirdy-strings-firstrun" src="chrome://castironthunderbirdclub/locale/torbirdy.properties"/>
-   </stringbundleset>
-
-   <vbox flex="1" pack="start">
-     <description id="torbirdy-firstrun-info" style="white-space: pre-wrap; width: 400px"></description>
-     <textbox id="torbirdy-website" readonly="true" />
-   </vbox>
-
-</dialog>
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -15,14 +15,6 @@

  window.TorBirdy = {
    onLoad: function() {
-      var infoRun = "extensions.torbirdy.info_run";
-      if (prefs.getBoolPref(infoRun)) {
-        window.open("chrome://castironthunderbirdclub/content/firstruninfo.xul",
-                    "FirstRunWindow",
-                    "chrome, dialog, centerscreen, resizable=no");
-        prefs.setBoolPref(infoRun, false);
-      }
-
      // Check if we are running Whonix.
      var whonix = false;
      if (env.exists("WHONIX")) {

--- a/chrome/locale/ach/torbirdy.dtd
+++ b/chrome/locale/ach/torbirdy.dtd
@@ -40,8 +40,6 @@
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
 <!ENTITY torbirdy.prefs.enigmail_protected.key "d">
-<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
-<!ENTITY torbirdy.prefs.enigmail_protected.key "d">
 <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
@@ -58,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
--- a/chrome/locale/ach/torbirdy.properties
+++ b/chrome/locale/ach/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/af/torbirdy.dtd
+++ b/chrome/locale/af/torbirdy.dtd
@@ -56,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "Gebruik JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Gebruik Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Maak Verkiesde TorBirdy Instellings Oop">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
--- a/chrome/locale/af/torbirdy.properties
+++ b/chrome/locale/af/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/ak/torbirdy.dtd
+++ b/chrome/locale/ak/torbirdy.dtd
@@ -40,8 +40,6 @@
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
 <!ENTITY torbirdy.prefs.enigmail_protected.key "d">
-<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
-<!ENTITY torbirdy.prefs.enigmail_protected.key "d">
 <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
@@ -58,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
--- a/chrome/locale/ak/torbirdy.properties
+++ b/chrome/locale/ak/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/am/torbirdy.dtd
+++ b/chrome/locale/am/torbirdy.dtd
@@ -56,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "JonDoን (Premium) ተጠቀም">
 <!ENTITY torbirdy.panel.usewhonix.label "Whonixን ተጠቀም">
 <!ENTITY torbirdy.panel.preferences.label "የTorBirdy ምርጫዎችን ተጠቀም">
-
-<!ENTITY torbirdy.firstrun.title "የTorBirdy መጀመሪያ አሄድ">
--- a/chrome/locale/am/torbirdy.properties
+++ b/chrome/locale/am/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/ar/torbirdy.dtd
+++ b/chrome/locale/ar/torbirdy.dtd
@@ -56,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "قم باستخدام جون دو (نسخة المدفوعة) ">
 <!ENTITY torbirdy.panel.usewhonix.label "استخدم Whonix">
 <!ENTITY torbirdy.panel.preferences.label "افتح تفضيلات توربيردي">
-
-<!ENTITY torbirdy.firstrun.title "توربيردي أول تشغيل">
--- a/chrome/locale/ar/torbirdy.properties
+++ b/chrome/locale/ar/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=توربيردي عطل التكوين التلقائي ل
 torbirdy.email.advanced=الرجاء الملاحظة ان تغير الإعدادات المتقدمة لتوربيردي غير موصي به.\nيجب أن تستمر فقط إذا كنت متأكدا مما تقوم به.
 torbirdy.email.advanced.nextwarning=اظهار هذا التحذير في المرة القادمة
 torbirdy.email.advanced.title=الإعدادات المتقدمة لتوربيردي
-
-torbirdy.firstrun=انت الان تعمل بتوربيردي.\n\nللمساعدة على حماية هويتك, توربيردي سوف يفرض إعدادات ثاندربيرد التي اعدها, و ذلك يؤدي إلي منعك انت او اي برنامج إضافي من تغيرها. ولكن يوجد بعض الإعدادات التي يمكن تغييرها و تستطيع الوصول لتلك الإعدادات عن طريق نافذة إعدادات توربيردي. وفي حالة إلغاء او تعطيل توربيردي, سيتم استرجاع كل الإعدادات (التي كانت موجودة قبل تثبيت توربيردي).\n\nإذا كنت مستخدم جديد, فمن المستحسن أن تقرأ محتويات موقع توربيردي حتي تستطيع ان تفهم ما الذي نحاول إنجازه بتوربيردي لمستخدمينا.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/arn/torbirdy.dtd
+++ b/chrome/locale/arn/torbirdy.dtd
@@ -40,8 +40,6 @@
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
 <!ENTITY torbirdy.prefs.enigmail_protected.key "d">
-<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]">
-<!ENTITY torbirdy.prefs.enigmail_protected.key "d">
 <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
@@ -58,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
--- a/chrome/locale/arn/torbirdy.properties
+++ b/chrome/locale/arn/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/ast/torbirdy.dtd
+++ b/chrome/locale/ast/torbirdy.dtd
@@ -56,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
--- a/chrome/locale/ast/torbirdy.properties
+++ b/chrome/locale/ast/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz
 torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
-
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
--- a/chrome/locale/az/torbirdy.dtd
+++ b/chrome/locale/az/torbirdy.dtd
@@ -56,5 +56,3 @@
 <!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) İstifadə Et">
 <!ENTITY torbirdy.panel.usewhonix.label "Whonix istifadə et">
 <!ENTITY torbirdy.panel.preferences.label "TorBordy Xüsusiyyətlərini Aç">
-
-<!ENTITY torbirdy.firstrun.title "TorBirdy-nin İlk-İşi">
--- a/chrome/locale/az/torbirdy.properties
+++ b/chrome/locale/az/torbirdy.properties
@@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy sənin anonimliyini qorumaq üçün Thunderbird-i
 torbirdy.email.advanced=Lütfən, nəzərdə saxla ki, TorBirdy-nin ətraflı parametrlərini dəyişmək tövsiyyə EDİLMİR.\n\nYalnız nə etdiyinə əmin olduğun halda dəyişiklik etməlisən.
 torbirdy.email.advanced.nextwarning=Bu xəbərdarlığı gələn dəfə göstər
 torbirdy.email.advanced.title=TorBirdy Ətraflı Parametrlər
-
-torbirdy.firstrun=Hazırda TorBirdy-ni işlədirsən.\n\nSənin təhlükəsizliyini qorumaq üçün TorBirdy Thunderbird-ün parametrlərinin sən və ya digər proqramlar tərəfindən dəyişdirilməsini qadağa edəcəkdir. Bəzi dəyişdirilə bilən parametrlər TorBirdy-nin göstəricilər dialoqunda təqdim edilmişdir. TorBirdy ləğv edildiyi zaman bütün parametrlər ilkin vəziyyətə qaytarilacaqdır (TorBordy-dən əvvəlki vəziyyətə).\n\nYeni istifadəçisənsə, TorBirdy-nin veb səhifəsinə keçib bizim istifadəçilər üçün nə etmək istədiyimizlə yaxından yanış ol.
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy