diff -ru cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.js cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.js
--- cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.js	2018-06-05 16:56:28.000000000 -0400
+++ cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.js	2018-09-14 22:45:21.000000000 -0400
@@ -248,31 +248,13 @@
 			document.getElementById('remotePagePassword').value = "";
 			
 			var type = document.getElementById('remotePageType').selectedItem.value;
-			if (type == 'GOOGLE' || type == 'YAHOO') {
-				document.getElementById('remotePageUriLabel').disabled=true;
-				document.getElementById('remotePageURI').disabled=true;
-				document.getElementById('remotePageURI').setAttribute('required', 'false');
-				document.getElementById('remotePagePasswordLabel').disabled=true;
-				document.getElementById('remotePagePassword').disabled=true;
-				document.getElementById('remotePagePassword').setAttribute('required', 'false');
-				document.getElementById('passwordCheckBox').disabled=true;
-			} else if (type == 'APPLE') {
-				document.getElementById('remotePageUriLabel').disabled=true;
-				document.getElementById('remotePageURI').disabled=true;
-				document.getElementById('remotePageURI').setAttribute('required', 'false');
-				document.getElementById('remotePagePasswordLabel').disabled=false;
-				document.getElementById('remotePagePassword').disabled=false;
-				document.getElementById('remotePagePassword').setAttribute('required', 'true');
-				document.getElementById('passwordCheckBox').disabled=false;
-			} else {
-				document.getElementById('remotePageUriLabel').disabled=false;
-				document.getElementById('remotePageURI').disabled=false;
-				document.getElementById('remotePageURI').setAttribute('required', 'true');
-				document.getElementById('remotePagePasswordLabel').disabled=false;
-				document.getElementById('remotePagePassword').disabled=false;
-				document.getElementById('remotePagePassword').setAttribute('required', 'true');
-				document.getElementById('passwordCheckBox').disabled=false;
-			}
+			document.getElementById('remotePageUriLabel').disabled=false;
+			document.getElementById('remotePageURI').disabled=false;
+			document.getElementById('remotePageURI').setAttribute('required', 'true');
+			document.getElementById('remotePagePasswordLabel').disabled=false;
+			document.getElementById('remotePagePassword').disabled=false;
+			document.getElementById('remotePagePassword').setAttribute('required', 'true');
+			document.getElementById('passwordCheckBox').disabled=false;
 			wdw_addressbooksAdd.checklocationNetwork();
 			cardbookNotifications.setNotification("resultNotifications", "OK");
 		},
@@ -357,46 +339,21 @@
 			var type = document.getElementById('remotePageType').selectedItem.value;
 			var username = document.getElementById('remotePageUsername').value;
 			var password = document.getElementById('remotePagePassword').value;
-			if (type == 'GOOGLE') {
-				var url = cardbookRepository.cardbookOAuthData.GOOGLE.ROOT_API;
-			} else if (type == 'YAHOO') {
-				var url = cardbookRepository.cardbookOAuthData.YAHOO.ROOT_API;
-			} else if (type == 'APPLE') {
-				var url = cardbookRepository.APPLE_API;
-				wdw_addressbooksAdd.gCardDAVURLs.push([cardbookSynchronization.getSlashedUrl(url), true]); // [url, discovery]
-			} else {
-				var url = document.getElementById('remotePageURI').value;
-				if (cardbookSynchronization.getRootUrl(url) == "") {
-					cardbookNotifications.setNotification("resultNotifications", "ValidatingURLFailedLabel");
-					return;
-				}
-				wdw_addressbooksAdd.gCardDAVURLs.push([url, false]); // [url, discovery]
-				wdw_addressbooksAdd.gCardDAVURLs.push([cardbookSynchronization.getWellKnownUrl(url), true]);
-				var carddavURL = cardbookSynchronization.getCardDAVUrl(url, username);
-				if (carddavURL != "") {
+			var url = document.getElementById('remotePageURI').value;
+			if (cardbookSynchronization.getRootUrl(url) == "") {
+				cardbookNotifications.setNotification("resultNotifications", "ValidatingURLFailedLabel");
+				return;
+			}
+			wdw_addressbooksAdd.gCardDAVURLs.push([url, false]); // [url, discovery]
+			wdw_addressbooksAdd.gCardDAVURLs.push([cardbookSynchronization.getWellKnownUrl(url), true]);
+			var carddavURL = cardbookSynchronization.getCardDAVUrl(url, username);
+			if (carddavURL != "") {
 					wdw_addressbooksAdd.gCardDAVURLs.push([carddavURL, false]);
-				}
 			}
 			
 			var dirPrefId = cardbookUtils.getUUID();
-			if (type == 'GOOGLE') {
-				cardbookNotifications.setNotification("resultNotifications", "ValidatingLabel", url, "PRIORITY_INFO_MEDIUM");
-				cardbookSynchronization.initMultipleOperations(dirPrefId);
-				cardbookRepository.cardbookServerSyncRequest[dirPrefId]++;
-				var connection = {connUser: username, connPrefId: dirPrefId, connDescription: wdw_addressbooksAdd.gValidateDescription};
-				cardbookSynchronizationGoogle.requestNewRefreshTokenForGoogle(connection, null, type, null);
-				wdw_addressbooksAdd.waitForRefreshTokenFinished(dirPrefId, url);
-			} else if (type == 'YAHOO') {
-				cardbookNotifications.setNotification("resultNotifications", "ValidatingLabel", url, "PRIORITY_INFO_MEDIUM");
-				cardbookSynchronization.initMultipleOperations(dirPrefId);
-				cardbookRepository.cardbookServerSyncRequest[dirPrefId]++;
-				var connection = {connUser: username, connPrefId: dirPrefId, connDescription: wdw_addressbooksAdd.gValidateDescription};
-				cardbookSynchronizationYahoo.requestNewRefreshTokenForYahoo(connection, null, type, null);
-				wdw_addressbooksAdd.waitForRefreshTokenFinished(dirPrefId, url);
-			} else {
-				cardbookSynchronization.initDiscovery(dirPrefId);
-				wdw_addressbooksAdd.validateCardDAVURL(dirPrefId, username, password, type);
-			}
+			cardbookSynchronization.initDiscovery(dirPrefId);
+			wdw_addressbooksAdd.validateCardDAVURL(dirPrefId, username, password, type);
 		},
 
 		validateCardDAVURL: function (aDirPrefId, aUsername, aPassword, aType) {
@@ -544,18 +501,6 @@
 				} else if (wdw_addressbooksAdd.gType == 'FILE' || wdw_addressbooksAdd.gType == 'DIRECTORY') {
 					aTextbox.value = wdw_addressbooksAdd.gFile.leafName;
 					cardbookElementTools.loadVCardVersions("vCardVersionPageNameMenupopup", "vCardVersionPageName");
-				} else if (wdw_addressbooksAdd.gType == 'GOOGLE') {
-					aTextbox.value = document.getElementById('remotePageUsername').value;
-					// does not work with 4.0
-					cardbookElementTools.loadVCardVersions("vCardVersionPageNameMenupopup", "vCardVersionPageName", ["3.0"]);
-				} else if (wdw_addressbooksAdd.gType == 'YAHOO') {
-					aTextbox.value = document.getElementById('remotePageUsername').value;
-					// does not work with 4.0
-					cardbookElementTools.loadVCardVersions("vCardVersionPageNameMenupopup", "vCardVersionPageName", ["3.0"]);
-				} else if (wdw_addressbooksAdd.gType == 'APPLE') {
-					aTextbox.value = document.getElementById('remotePageUsername').value;
-					// list cannot be easily created in 4.0
-					cardbookElementTools.loadVCardVersions("vCardVersionPageNameMenupopup", "vCardVersionPageName", ["3.0"]);
 				} else {
 					if (window.arguments[0].action == "discovery") {
 						wdw_addressbooksAdd.setCanRewindFalse();
@@ -739,39 +684,6 @@
 					var enabled = true;
 				}
 				wdw_addressbooksAdd.gFinishParams.push({searchDef: wdw_addressbooksAdd.gTypeFile, name: name, username: "", color: color, vcard: vCardVersion, enabled: enabled, dirPrefId: dirPrefId, DBcached: false, firstAction: false});
-			} else if (wdw_addressbooksAdd.gType == 'GOOGLE') {
-				var url = cardbookRepository.cardbookOAuthData.GOOGLE.ROOT_API;
-				var name = document.getElementById('namePageName').value;
-				var color = document.getElementById('serverColorInput').value;
-				var vCardVersion = document.getElementById('vCardVersionPageName').value;
-				var readonly = document.getElementById('readonlyPageName').checked;
-				var dateFormat = document.getElementById('dateFormatMenuList').value;
-				var urnuuid = document.getElementById('urnuuidPageName').checked;
-				var dirPrefId = cardbookUtils.getUUID();
-				wdw_addressbooksAdd.gFinishParams.push({url: url, name: name, username: username, color: color, vcard: vCardVersion, readonly: readonly, dirPrefId: dirPrefId, dateFormat: dateFormat,
-															urnuuid: urnuuid, DBcached: true, firstAction: false});
-			} else if (wdw_addressbooksAdd.gType == 'YAHOO') {
-				var url = cardbookRepository.cardbookOAuthData.YAHOO.ROOT_API;
-				var name = document.getElementById('namePageName').value;
-				var color = document.getElementById('serverColorInput').value;
-				var vCardVersion = document.getElementById('vCardVersionPageName').value;
-				var readonly = document.getElementById('readonlyPageName').checked;
-				var dateFormat = document.getElementById('dateFormatMenuList').value;
-				var urnuuid = document.getElementById('urnuuidPageName').checked;
-				var dirPrefId = cardbookUtils.getUUID();
-				wdw_addressbooksAdd.gFinishParams.push({url: url, name: name, username: username, color: color, vcard: vCardVersion, readonly: readonly, dirPrefId: dirPrefId, dateFormat: dateFormat,
-															urnuuid: urnuuid, DBcached: true, firstAction: false});
-			} else if (wdw_addressbooksAdd.gType == 'APPLE') {
-				var url = cardbookRepository.APPLE_API;
-				var name = document.getElementById('namePageName').value;
-				var color = document.getElementById('serverColorInput').value;
-				var vCardVersion = document.getElementById('vCardVersionPageName').value;
-				var readonly = document.getElementById('readonlyPageName').checked;
-				var dateFormat = document.getElementById('dateFormatMenuList').value;
-				var urnuuid = document.getElementById('urnuuidPageName').checked;
-				var dirPrefId = cardbookUtils.getUUID();
-				wdw_addressbooksAdd.gFinishParams.push({url: url, name: name, username: username, color: color, vcard: vCardVersion, readonly: readonly, dirPrefId: dirPrefId, dateFormat: dateFormat,
-															urnuuid: urnuuid, DBcached: true, firstAction: false});
 			} else if (wdw_addressbooksAdd.gType == 'CARDDAV') {
 				for (var i = 0; i < wdw_addressbooksAdd.gAccountsFound.length; i++) {
 					if (wdw_addressbooksAdd.gAccountsFound.length > 1) {
@@ -865,7 +777,7 @@
 					return;
 				}
 			}
-			if (wdw_addressbooksAdd.gType === "GOOGLE" || wdw_addressbooksAdd.gType === "CARDDAV" || wdw_addressbooksAdd.gType === "APPLE" || wdw_addressbooksAdd.gType === "YAHOO") {
+			if (wdw_addressbooksAdd.gType === "CARDDAV") {
 				for (var i = 0; i < wdw_addressbooksAdd.gFinishParams.length; i++) {
 					cardbookRepository.addAccountToRepository(wdw_addressbooksAdd.gFinishParams[i].dirPrefId, wdw_addressbooksAdd.gFinishParams[i].name, wdw_addressbooksAdd.gType, wdw_addressbooksAdd.gFinishParams[i].url, wdw_addressbooksAdd.gFinishParams[i].username, wdw_addressbooksAdd.gFinishParams[i].color,
 																true, true, wdw_addressbooksAdd.gFinishParams[i].vcard, wdw_addressbooksAdd.gFinishParams[i].readonly, wdw_addressbooksAdd.gFinishParams[i].dateFormat, wdw_addressbooksAdd.gFinishParams[i].urnuuid,
diff -ru cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.xul cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.xul
--- cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.xul	2018-07-17 15:01:30.000000000 -0400
+++ cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksAdd.xul	2018-09-14 21:28:41.000000000 -0400
@@ -35,8 +35,6 @@
 	<script src="chrome://cardbook/content/cardbookCardParser.js"/>
 	<script src="chrome://cardbook/content/cardbookPasswordManager.js"/>
 	<script src="chrome://cardbook/content/cardbookSynchronization.js"/>
-	<script src="chrome://cardbook/content/cardbookSynchronizationGoogle.js"/>
-	<script src="chrome://cardbook/content/cardbookSynchronizationYahoo.js"/>
 	<script src="wdw_newToken.js"/>
 	<script src="chrome://cardbook/content/cardbookElementTools.js"/>
 	<script src="chrome://cardbook/content/cardbookTypes.js"/>
@@ -139,9 +137,6 @@
 					<row align="center">
 						<radiogroup id="remotePageType" onselect="wdw_addressbooksAdd.remotePageTypeSelect();" class="indent">
 							<radio value="CARDDAV" label="&remotePage.carddav.label;" selected="true"/>
-							<radio value="GOOGLE" label="&remotePage.google.label;"/>
-							<radio value="APPLE" label="&remotePage.apple.label;"/>
-							<radio value="YAHOO" label="&remotePage.yahoo.label;"/>
 						</radiogroup>
 					</row>
 				</rows>
diff -ru cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksEdit.js cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksEdit.js
--- cardbook1/chrome/content/addressbooksconfiguration/wdw_addressbooksEdit.js	2018-08-28 15:18:58.000000000 -0400
+++ cardbook2/chrome/content/addressbooksconfiguration/wdw_addressbooksEdit.js	2018-09-14 22:20:51.000000000 -0400
@@ -200,8 +200,7 @@
 			cardbookElementTools.loadDateFormats("dateFormatMenuPopup", "dateFormatMenuList", wdw_addressbooksEdit.initialDateFormat);
 			document.getElementById("urnuuidCheckBox").setAttribute('checked', cardbookPreferences.getUrnuuid(window.arguments[0].dirPrefId));
 
-			if (document.getElementById("typeTextBox").value == "GOOGLE" || document.getElementById("typeTextBox").value == "APPLE"
-					|| document.getElementById("typeTextBox").value == "CARDDAV" || document.getElementById("typeTextBox").value == "YAHOO") {
+			if (document.getElementById("typeTextBox").value == "CARDDAV") {
 				document.getElementById('syncTab').setAttribute("collapsed", false);
 				document.getElementById("autoSyncCheckBox").setAttribute('checked', cardbookPreferences.getAutoSyncEnabled(window.arguments[0].dirPrefId));
 				document.getElementById("autoSyncIntervalTextBox").value = cardbookPreferences.getAutoSyncInterval(window.arguments[0].dirPrefId);
diff -ru cardbook1/chrome/content/cardbookDirTree.js cardbook2/chrome/content/cardbookDirTree.js
--- cardbook1/chrome/content/cardbookDirTree.js	2018-08-29 13:02:34.000000000 -0400
+++ cardbook2/chrome/content/cardbookDirTree.js	2018-09-14 22:19:11.000000000 -0400
@@ -147,7 +147,7 @@
 					break;
 				case "remote":
 					function remoteAccount(element) {
-						return (element[6] === "GOOGLE" || element[6] === "CARDDAV" || element[6] === "APPLE" || element[6] === "YAHOO");
+						return (element[6] === "CARDDAV");
 					}
 					cardbookDirTreeUtils.newArray = cardbookDirTreeUtils.newArray.filter(remoteAccount);
 					typeColumn.setAttribute('hidden', 'true');
diff -ru cardbook1/chrome/content/cardbookPasswordManager.js cardbook2/chrome/content/cardbookPasswordManager.js
--- cardbook1/chrome/content/cardbookPasswordManager.js	2018-05-04 14:19:56.000000000 -0400
+++ cardbook2/chrome/content/cardbookPasswordManager.js	2018-09-14 21:29:20.000000000 -0400
@@ -7,8 +7,6 @@
 	}
 
 	var cardbookPasswordManager = {
-
-		oauthPrefix : "chrome://cardbook/oauth",
 		
 		getRootUrl: function (aUrl) {
 			try {
@@ -63,11 +61,7 @@
 		
 		getPassword: function (aUsername, aUrl) {
 			var myLoginManager = Services.logins;
-			if (aUrl.startsWith(cardbookRepository.cardbookOAuthData.GOOGLE.ROOT_API) || aUrl.startsWith(cardbookRepository.cardbookOAuthData.YAHOO.ROOT_API)) {
-				var logins = myLoginManager.findLogins({}, this.oauthPrefix, "User Refresh Token", null);
-			} else {
-				var logins = myLoginManager.findLogins({}, cardbookPasswordManager.getRootUrl(aUrl), "User login", null);
-			}
+			var logins = myLoginManager.findLogins({}, cardbookPasswordManager.getRootUrl(aUrl), "User login", null);
 			for (var i = 0; i < logins.length; i++) {
 				if (logins[i].username == aUsername) {
 					return logins[i].password;
@@ -79,24 +73,14 @@
 		addAccount: function (aUsername, aUrl, aPassword) {
 			var myLoginManager = Services.logins;
 			var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", Components.interfaces.nsILoginInfo, "init");
-			if (aUrl != null && aUrl !== undefined && aUrl != "") {
-				var login_info = new nsLoginInfo(cardbookPasswordManager.getRootUrl(aUrl), "User login", null, aUsername, aPassword, "", "");
-			} else {
-				// google and yahoo cases
-				var login_info = new nsLoginInfo(this.oauthPrefix, "User Refresh Token", null, aUsername, aPassword, "", "");
-			}
+			var login_info = new nsLoginInfo(cardbookPasswordManager.getRootUrl(aUrl), "User login", null, aUsername, aPassword, "", "");
 			myLoginManager.addLogin(login_info);
 			return true;
 		},
 		
 		removeAccount: function (aUsername, aUrl) {
 			var myLoginManager = Services.logins;
-			if (aUrl != null && aUrl !== undefined && aUrl != "") {
-				var logins = myLoginManager.findLogins({}, cardbookPasswordManager.getRootUrl(aUrl), "User login", null);
-			} else {
-				// google and yahoo cases
-				var logins = myLoginManager.findLogins({}, this.oauthPrefix, "User Refresh Token", null);
-			}
+			var logins = myLoginManager.findLogins({}, cardbookPasswordManager.getRootUrl(aUrl), "User login", null);
 			for (var i = 0; i < logins.length; i++) {
 				if (logins[i].username == aUsername) {
 					myLoginManager.removeLogin(logins[i]);
diff -ru cardbook1/chrome/content/cardbookRepository.js cardbook2/chrome/content/cardbookRepository.js
--- cardbook1/chrome/content/cardbookRepository.js	2018-09-04 10:27:24.000000000 -0400
+++ cardbook2/chrome/content/cardbookRepository.js	2018-09-14 22:42:33.000000000 -0400
@@ -11,7 +11,7 @@
 	cardbookDatabaseVersion : "6",
 	cardbookDatabaseName : "CardBook",
 	
-	LIGHTNING_ID : "{e2fda1a4-762b-4020-b5ad-a41df1933103}",
+	LIGHTNING_ID : "{ee86d35c-86ba-44f3-bd9d-854163f8f07a}",
 	
 	windowParams : "chrome,titlebar,resizable,all,dialog=no",
 	modalWindowParams : "modal,chrome,titlebar,resizable,minimizable=no",
@@ -47,27 +47,7 @@
 					"gender": ["F", "M", "N", "O", "U"]},
 
 	cardbookGenderLookup : { "F": "", "M": "", "N": "", "O": "", "U": "" },
-	cardbookCoreTypes : { "GOOGLE": { "adr" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-										"email" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-										"tel" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["celltype", "CELL"], ["faxtype", "FAX"], ["pagertype", "PAGER"], ["workfaxtype", "FAX,WORK"], ["homefaxtype", "FAX,HOME"] ],
-										"url" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["blogtype", "BLOG", "PG"], ["homepagetype", "HOMEPAGE", "PG"], ["profiletype", "PROFILE", "PG"] ],
-										"impp" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-										"addnew" : true },
-						"APPLE": { "adr" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-									"email" : [ ["hometype", "HOME;HOME,INTERNET"], ["worktype", "WORK;WORK,INTERNET"], ["othertype", "OTHER;OTHER,INTERNET"] ],
-									"tel" : [ ["hometype", "HOME;HOME,VOICE"], ["worktype", "WORK;WORK,VOICE"], ["celltype", "CELL;CELL,VOICE"], ["faxtype", "FAX;FAX,VOICE"], ["pagertype", "PAGER"],
-												["workfaxtype", "FAX,WORK;FAX,WORK,VOICE"], ["homefaxtype", "FAX,HOME;FAX,HOME,VOICE"],
-												["othertype", "OTHER;OTHER,VOICE"], ["maintype", "MAIN"], ["iphonetype", "CELL,IPHONE;CELL,IPHONE,VOICE"] ],
-									"url" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["othertype", "OTHER"] ],
-									"impp" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-									"addnew" : true },
-						"YAHOO": { "adr" : [ ["hometype", "HOME;HOME,POSTAL,PARCEL,WORK"], ["worktype", "WORK;WORK,POSTAL,PARCEL"] ],
-									"email" : [ ["hometype", "HOME;HOME,INTERNET"], ["worktype", "WORK;WORK,INTERNET"] ],
-									"tel" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["faxtype", "FAX"], ["pagertype", "PAGER"] ],
-									"url" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-									"impp" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
-									"addnew" : false },
-						"CARDDAV": { "adr" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
+	cardbookCoreTypes : { "CARDDAV": { "adr" : [ ["hometype", "HOME"], ["worktype", "WORK"] ],
 									"email" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["othertype", "OTHER"] ],
 									"tel" : [ ["hometype", "HOME"], ["worktype", "WORK"], ["celltype", "CELL;CELL,IPHONE"], ["faxtype", "FAX"], ["pagertype", "PAGER"], ["workfaxtype", "FAX,WORK"], ["homefaxtype", "FAX,HOME"],
 												["othertype", "OTHER"], ["maintype", "MAIN"] ],
@@ -218,40 +198,6 @@
 	customFields : {},
 									
 	statusInformation : [],
-
-	cardbookOAuthData : {"GOOGLE": {
-							CLIENT_ID:                  "779554755808-957jloa2c3c8n0rrm1a5304fkik7onf0.apps.googleusercontent.com",
-							CLIENT_SECRET:              "h3NUkhofCKAW2E1X_NKSn4C_",
-							REDIRECT_URI:               "urn:ietf:wg:oauth:2.0:oob",
-							REDIRECT_TITLE:             "Success code=",
-							RESPONSE_TYPE:              "code",
-							SCOPE:                      "https://www.googleapis.com/auth/carddav",
-							OAUTH_URL:                  "https://accounts.google.com/o/oauth2/auth",
-							TOKEN_REQUEST_URL:          "https://accounts.google.com/o/oauth2/token",
-							TOKEN_REQUEST_TYPE:         "POST",
-							TOKEN_REQUEST_GRANT_TYPE:   "authorization_code",
-							REFRESH_REQUEST_URL:        "https://accounts.google.com/o/oauth2/token",
-							REFRESH_REQUEST_TYPE:       "POST",
-							REFRESH_REQUEST_GRANT_TYPE: "refresh_token",
-							ROOT_API:                   "https://www.googleapis.com"},
-						"YAHOO": {
-							CLIENT_ID:                  "dj0yJmk9eWRXYWc2QmNYWndYJmQ9WVdrOVZuVkdlazl3TXpZbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD0xOQ--",
-							CLIENT_SECRET:              "a2d17e955c6c96e4d3ec08cff76f4c39fe084f78",
-							REDIRECT_URI:               "oob",
-							REDIRECT_TITLE:             "Sharing approval",
-							RESPONSE_TYPE:              "code",
-							LANGUAGE:                   "en-us",
-							OAUTH_URL:                  "https://api.login.yahoo.com/oauth2/request_auth",
-							TOKEN_REQUEST_URL:          "https://api.login.yahoo.com/oauth2/get_token",
-							TOKEN_REQUEST_TYPE:         "POST",
-							TOKEN_REQUEST_GRANT_TYPE:   "authorization_code",
-							REFRESH_REQUEST_URL:        "https://api.login.yahoo.com/oauth2/get_token",
-							REFRESH_REQUEST_TYPE:       "POST",
-							REFRESH_REQUEST_GRANT_TYPE: "refresh_token",
-							ROOT_API:                   "https://carddav.address.yahoo.com"}
-						},
-
-	APPLE_API : "https://contacts.icloud.com",
 	
 	cardbookBirthdayPopup : 0,
 	
@@ -794,7 +740,7 @@
 				}
 			} else if (myDirPrefIdType === "FILE" || myDirPrefIdType === "SEARCH") {
 				return;
-			} else if (myDirPrefIdType === "GOOGLE" || myDirPrefIdType === "APPLE" || myDirPrefIdType === "YAHOO" || myDirPrefIdType === "CARDDAV" || myDirPrefIdType === "LOCALDB") {
+			} else if (myDirPrefIdType === "CARDDAV" || myDirPrefIdType === "LOCALDB") {
 				aCard.cacheuri = aFileName;
 				if (cardbookRepository.cardbookFileCacheCards[aCard.dirPrefId]) {
 					cardbookRepository.cardbookFileCacheCards[aCard.dirPrefId][aFileName] = aCard;
@@ -854,7 +800,7 @@
 				}
 			} else if (myDirPrefIdType === "FILE" || myDirPrefIdType === "SEARCH") {
 				return;
-			} else if (myDirPrefIdType === "GOOGLE" || myDirPrefIdType === "APPLE" || myDirPrefIdType === "YAHOO" || myDirPrefIdType === "CARDDAV" || myDirPrefIdType === "LOCALDB") {
+			} else if (myDirPrefIdType === "CARDDAV" || myDirPrefIdType === "LOCALDB") {
 				cardbookIndexedDB.removeItem(myDirPrefIdName, aCard);
 				if (cardbookRepository.cardbookFileCacheCards[aCard.dirPrefId][aCard.cacheuri]) {
 					delete cardbookRepository.cardbookFileCacheCards[aCard.dirPrefId][aCard.cacheuri];
@@ -1605,10 +1551,7 @@
 			case "LOCALDB":
 				return "local";
 				break;
-			case "APPLE":
 			case "CARDDAV":
-			case "GOOGLE":
-			case "YAHOO":
 				return "remote";
 				break;
 			case "SEARCH":
Only in cardbook1/chrome/content: cardbookSynchronizationGoogle.js
diff -ru cardbook1/chrome/content/cardbookSynchronization.js cardbook2/chrome/content/cardbookSynchronization.js
--- cardbook1/chrome/content/cardbookSynchronization.js	2018-08-31 14:50:46.000000000 -0400
+++ cardbook2/chrome/content/cardbookSynchronization.js	2018-09-14 23:26:35.000000000 -0400
@@ -281,7 +281,7 @@
 		},
 		
 		finishSync: function(aPrefId, aPrefName, aPrefType) {
-			if (aPrefType === "GOOGLE" || aPrefType === "CARDDAV" || aPrefType === "APPLE" || aPrefType === "YAHOO") {
+			if (aPrefType === "CARDDAV") {
 				if (cardbookRepository.cardbookServerSyncRequest[aPrefId] == 0) {
 					cardbookUtils.formatStringForOutput("synchroNotTried", [aPrefName]);
 					wdw_cardbooklog.finishSyncActivity(aPrefId, aPrefName);
@@ -1308,88 +1308,6 @@
 			cardbookRepository.cardbookServerSyncCompareWithCacheDone[aConnection.connPrefId]++;
 		},
 
-		googleSyncCards: function(aConnection, aMode, aPrefIdType) {
-			var listener_propfind = {
-				onDAVQueryComplete: function(status, response, askCertificate) {
-					if (status == 0) {
-						if (askCertificate) {
-							var certificateExceptionAdded = false;
-							var certificateExceptionAdded = cardbookSynchronization.addCertificateException(cardbookSynchronization.getRootUrl(aConnection.connUrl));
-							if (certificateExceptionAdded) {
-								cardbookSynchronization.googleSyncCards(aConnection, aMode, aPrefIdType);
-							} else {
-								cardbookUtils.formatStringForOutput("synchronizationFailed", [aConnection.connDescription, "googleSyncCards", aConnection.connUrl, status], "Error");
-								cardbookRepository.cardbookServerSyncError[aConnection.connPrefId]++;
-								cardbookRepository.cardbookServerSyncResponse[aConnection.connPrefId]++;
-							}
-						} else {
-							cardbookUtils.formatStringForOutput("synchronizationFailed", [aConnection.connDescription, "googleSyncCards", aConnection.connUrl, status], "Error");
-							cardbookRepository.cardbookServerSyncError[aConnection.connPrefId]++;
-							cardbookRepository.cardbookServerSyncResponse[aConnection.connPrefId]++;
-						}
-					} else if (response && response["parsererror"] && response["parsererror"][0]["sourcetext"] && response["parsererror"][0]["sourcetext"][0]) {
-						cardbookUtils.formatStringForOutput("unableToParseResponse", [aConnection.connDescription, response["parsererror"][0]["sourcetext"][0]], "Error");
-						cardbookRepository.cardbookServerSyncError[aConnection.connPrefId]++;
-						cardbookRepository.cardbookServerSyncResponse[aConnection.connPrefId]++;
-					} else if (response && response["multistatus"] && (status > 199 && status < 400)) {
-						try {
-							var length = cardbookSynchronization.getCacheFiles(aConnection.connPrefId);
-							cardbookRepository.cardbookServerSyncHandleRemainingTotal[aConnection.connPrefId] = length;
-							let jsonResponses = response["multistatus"][0]["response"];
-							for (var prop in jsonResponses) {
-								var jsonResponse = jsonResponses[prop];
-								let href = decodeURIComponent(jsonResponse["href"][0]);
-								let propstats = jsonResponse["propstat"];
-								// 2015.04.27 13:53:48 : href : /carddav/v1/principals/foo.bar@gmail.com/lists/default/
-								// 2015.04.27 13:53:48 : propstats : [{status:["HTTP/1.1 200 OK"]}, {status:["HTTP/1.1 404 Not Found"], prop:[{getetag:[null]}]}]
-								// 2015.04.27 14:03:54 : href : /carddav/v1/principals/foo.bar@gmail.com/lists/default/69ada43d89c0d90b
-								// 2015.04.27 14:03:54 : propstats : [{status:["HTTP/1.1 200 OK"], prop:[{getetag:["\"2014-07-15T13:43:23.997-07:00\""]}]}]
-								for (var prop1 in propstats) {
-									var propstat = propstats[prop1];
-									if (propstat["status"][0].indexOf("HTTP/1.1 200") == 0) {
-										if (propstat["prop"] != null && propstat["prop"] !== undefined && propstat["prop"] != "") {
-											cardbookRepository.cardbookServerSyncTotal[aConnection.connPrefId]++;
-											cardbookRepository.cardbookServerSyncCompareWithCacheTotal[aConnection.connPrefId]++;
-											var prop = propstat["prop"][0];
-											var etag = prop["getetag"][0];
-											var keyArray = href.split("/");
-											var key = decodeURIComponent(keyArray[keyArray.length - 1]);
-											var myUrl = baseUrl + key;
-											var myFileName = cardbookUtils.getFileNameFromUrl(myUrl);
-											var aCardConnection = {accessToken: aConnection.accessToken, connPrefId: aConnection.connPrefId, connUrl: myUrl, connDescription: aConnection.connDescription};
-											cardbookSynchronization.compareServerCardWithCache(aCardConnection, aConnection, aMode, aPrefIdType, myUrl, etag, myFileName);
-											if (cardbookRepository.filesFromCacheDB[aConnection.connPrefId][myFileName]) {
-												delete cardbookRepository.filesFromCacheDB[aConnection.connPrefId][myFileName];
-												cardbookRepository.cardbookServerSyncHandleRemainingTotal[aConnection.connPrefId]--;
-											}
-										}
-									}
-								}
-							}
-							cardbookSynchronization.handleRemainingCache(aPrefIdType, aConnection, aMode);
-						}
-						catch(e) {
-							wdw_cardbooklog.updateStatusProgressInformation(aConnection.connDescription + " : cardbookSynchronization.googleSyncCards error : " + e, "Error");
-							cardbookRepository.cardbookServerSyncError[aConnection.connPrefId]++;
-							cardbookRepository.cardbookServerSyncHandleRemainingTotal[aConnection.connPrefId] = cardbookRepository.cardbookServerSyncHandleRemainingDone[aConnection.connPrefId];
-						}
-						cardbookRepository.cardbookServerSyncResponse[aConnection.connPrefId]++;
-					} else {
-						cardbookUtils.formatStringForOutput("synchronizationFailed", [aConnection.connDescription, "googleSyncCards", aConnection.connUrl, status], "Error");
-						cardbookRepository.cardbookServerSyncError[aConnection.connPrefId]++;
-						cardbookRepository.cardbookServerSyncResponse[aConnection.connPrefId]++;
-					}
-				}
-			};
-			var baseUrl = aConnection.connUrl;
-			if (baseUrl.indexOf("/", baseUrl.length -1) === -1) {
-				baseUrl = baseUrl + "/";
-			}
-			cardbookUtils.formatStringForOutput("synchronizationSearchingCards", [aConnection.connDescription]);
-			let request = new cardbookWebDAV(aConnection, listener_propfind, "", true);
-			request.propfind(["DAV: getetag"]);
-		},
-
 		serverSyncCards: function(aConnection, aMode, aPrefIdType) {
 			var listener_propfind = {
 				onDAVQueryComplete: function(status, response, askCertificate) {
@@ -1630,9 +1548,6 @@
 			};
 			aConnection.connUrl = cardbookSynchronization.getSlashedUrl(aConnection.connUrl);
 			cardbookRepository.cardbookServerValidation[aConnection.connPrefId][aConnection.connUrl].version = [];
-			if (aParams.aPrefIdType == "APPLE" || aParams.aPrefIdType == "YAHOO") {
-				return;
-			}
 			cardbookRepository.cardbookServerDiscoveryRequest[aConnection.connPrefId]++;
 			cardbookUtils.formatStringForOutput("synchronizationRequestDiscovery4", [aConnection.connDescription, aConnection.connUrl]);
 			var request = new cardbookWebDAV(aConnection, listener_checkpropfind4, "", false);
@@ -1701,10 +1616,6 @@
 														cardbookRepository.cardbookServerValidation[aConnection.connPrefId][aConnection.connUrl].forget = false;
 														var aABConnection = {connPrefId: aConnection.connPrefId, connUser: aConnection.connUser, connUrl: aConnection.connUrl, connDescription: aConnection.connDescription};
 														cardbookSynchronization.discoverPhase4(aABConnection, aRootUrl, aOperationType, aParams);
-													} else if (aOperationType == "GOOGLE") {
-														cardbookSynchronization.googleSyncCards(aConnection, aParams.aMode, aParams.aPrefIdType);
-													} else if (aOperationType == "YAHOO") {
-														cardbookSynchronization.serverSyncCards(aConnection, aParams.aMode, aParams.aPrefIdType);
 													} else if (aOperationType == "SYNCSERVER") {
 														cardbookSynchronization.serverSyncCards(aConnection, aParams.aMode, aParams.aPrefIdType);
 													}
@@ -1906,8 +1817,7 @@
 
 		setPeriodicSync: function () {
 			for (var i = 0; i < cardbookRepository.cardbookAccounts.length; i++) {
-				if (cardbookRepository.cardbookAccounts[i][5] && (cardbookRepository.cardbookAccounts[i][6] == "GOOGLE" || cardbookRepository.cardbookAccounts[i][6] == "CARDDAV"
-					|| cardbookRepository.cardbookAccounts[i][6] == "APPLE" || cardbookRepository.cardbookAccounts[i][6] == "YAHOO")) {
+				if (cardbookRepository.cardbookAccounts[i][5] && (cardbookRepository.cardbookAccounts[i][6] == "CARDDAV")) {
 					var dirPrefId = cardbookRepository.cardbookAccounts[i][4];
 					var dirPrefName = cardbookRepository.cardbookAccounts[i][0];
 					var autoSync = cardbookPreferences.getAutoSyncEnabled(dirPrefId);
@@ -1974,32 +1884,18 @@
 					var myMode = "WINDOW";
 				}
 				if (myPrefEnabled) {
-					if (myPrefIdType == "GOOGLE" || myPrefIdType == "CARDDAV" || myPrefIdType == "APPLE" || myPrefIdType == "YAHOO") {
+					if (myPrefIdType == "CARDDAV") {
 						wdw_cardbooklog.initSyncActivity(aPrefId, myPrefIdName);
 						cardbookSynchronization.initMultipleOperations(aPrefId);
 						cardbookRepository.cardbookServerSyncRequest[aPrefId]++;
 						var params = {aMode: myMode, aPrefIdType: myPrefIdType};
-						if (myPrefIdType == "GOOGLE") {
-							var connection = {connUser: myPrefIdUser, connPrefId: aPrefId, connUrl: cardbookRepository.cardbookOAuthData.GOOGLE.REFRESH_REQUEST_URL, connDescription: myPrefIdName};
-							var myCode = cardbookPasswordManager.getPassword(myPrefIdUser, myPrefIdUrl);
-							cardbookSynchronizationGoogle.getNewAccessTokenForGoogle(connection, myCode, "GOOGLE", params);
-						} else if (myPrefIdType == "YAHOO") {
-							var connection = {connUser: myPrefIdUser, connPrefId: aPrefId, connUrl: cardbookRepository.cardbookOAuthData.YAHOO.REFRESH_REQUEST_URL, connDescription: myPrefIdName};
-							var myCode = cardbookPasswordManager.getPassword(myPrefIdUser, myPrefIdUrl);
-							cardbookSynchronizationYahoo.getNewAccessTokenForYahoo(connection, myCode, "YAHOO", params);
-						} else if (myPrefIdType == "APPLE") {
-							var connection = {connUser: myPrefIdUser, connPrefId: aPrefId, connUrl: myPrefIdUrl, connDescription: myPrefIdName};
-							connection.connUrl = cardbookSynchronization.getSlashedUrl(connection.connUrl);
+						var connection = {connUser: myPrefIdUser, connPrefId: aPrefId, connUrl: myPrefIdUrl, connDescription: myPrefIdName};
+						// bug for supporting old format URL that might be short (for example carddav.gmx)
+						if (cardbookSynchronization.getSlashedUrl(connection.connUrl) == cardbookSynchronization.getSlashedUrl(cardbookSynchronization.getRootUrl(connection.connUrl))) {
+							connection.connUrl = cardbookSynchronization.getWellKnownUrl(connection.connUrl);
 							cardbookSynchronization.discoverPhase1(connection, "SYNCSERVER", params);
 						} else {
-							var connection = {connUser: myPrefIdUser, connPrefId: aPrefId, connUrl: myPrefIdUrl, connDescription: myPrefIdName};
-							// bug for supporting old format URL that might be short (for example carddav.gmx)
-							if (cardbookSynchronization.getSlashedUrl(connection.connUrl) == cardbookSynchronization.getSlashedUrl(cardbookSynchronization.getRootUrl(connection.connUrl))) {
-								connection.connUrl = cardbookSynchronization.getWellKnownUrl(connection.connUrl);
-								cardbookSynchronization.discoverPhase1(connection, "SYNCSERVER", params);
-							} else {
-								cardbookSynchronization.serverSyncCards(connection, "SYNCSERVER", params);
-							}
+							cardbookSynchronization.serverSyncCards(connection, "SYNCSERVER", params);
 						}
 						cardbookSynchronization.waitForSyncFinished(aPrefId, myPrefIdName, myMode);
 					}
@@ -2028,7 +1924,7 @@
 							var request = cardbookSynchronization.getRequest(aPrefId, aPrefName) + cardbookSynchronization.getTotal(aPrefId, aPrefName);
 							var response = cardbookSynchronization.getResponse(aPrefId, aPrefName) + cardbookSynchronization.getDone(aPrefId, aPrefName);
 							var myPrefIdType = cardbookPreferences.getType(aPrefId);
-							if (myPrefIdType == "GOOGLE" || myPrefIdType == "CARDDAV" || myPrefIdType == "APPLE" || myPrefIdType == "YAHOO") {
+							if (myPrefIdType == "CARDDAV") {
 								wdw_cardbooklog.fetchSyncActivity(aPrefId, cardbookRepository.cardbookServerSyncDone[aPrefId], cardbookRepository.cardbookServerSyncTotal[aPrefId]);
 							}
 							if (request == response) {
@@ -2242,7 +2138,7 @@
 				if (myPrefType !== "SEARCH") {
 					cardbookSynchronization.initMultipleOperations(aDirPrefId);
 				}
-				if (myPrefType == "GOOGLE" || myPrefType == "CARDDAV" || myPrefType == "APPLE" || myPrefType == "YAHOO") {
+				if (myPrefType == "CARDDAV") {
 					cardbookSynchronization.loadCache(aDirPrefId, myPrefName, myPrefType, myPrefUser, myPrefUrl, aSync, aMode, myPrefDBCached);
 				} else if (myPrefType === "LOCALDB") {
 					cardbookRepository.cardbookDBRequest[aDirPrefId]++;
@@ -2683,8 +2579,6 @@
 	};
 
 	var loader = Services.scriptloader;
-	loader.loadSubScript("chrome://cardbook/content/cardbookSynchronizationGoogle.js");
-	loader.loadSubScript("chrome://cardbook/content/cardbookSynchronizationYahoo.js");
 	loader.loadSubScript("chrome://cardbook/content/addressbooksconfiguration/wdw_newToken.js");
 	loader.loadSubScript("chrome://cardbook/content/birthdays/cardbookBirthdaysUtils.js");
 	loader.loadSubScript("chrome://cardbook/content/birthdays/ovl_birthdays.js");
Only in cardbook1/chrome/content: cardbookSynchronizationYahoo.js
diff -ru cardbook1/chrome/content/cardbookUtils.js cardbook2/chrome/content/cardbookUtils.js
--- cardbook1/chrome/content/cardbookUtils.js	2018-09-04 16:52:54.000000000 -0400
+++ cardbook2/chrome/content/cardbookUtils.js	2018-09-14 22:18:34.000000000 -0400
@@ -1832,11 +1832,7 @@
 			if (aUrl[aUrl.length - 1] != '/') {
 				aUrl += '/';
 			}
-			if (aPrefType === "GOOGLE") {
-				aCard.cardurl = aUrl + aCard.uid;
-			} else {
-				aCard.cardurl = aUrl + aCard.uid + ".vcf";
-			}
+			aCard.cardurl = aUrl + aCard.uid + ".vcf";
 		},
 
 		getCardsFromAccountsOrCats: function () {
@@ -2060,11 +2056,7 @@
 				if (aCard.cardurl != null && aCard.cardurl !== undefined && aCard.cardurl != "") {
 					aCard.cacheuri = cardbookUtils.getFileNameFromUrl(aCard.cardurl);
 				} else {
-					if (aPrefIdType === "GOOGLE") {
-						aCard.cacheuri = cardbookUtils.getFileNameFromUrl(aCard.uid);
-					} else {
-						aCard.cacheuri = cardbookUtils.getFileNameFromUrl(aCard.uid) + ".vcf";
-					}
+					aCard.cacheuri = cardbookUtils.getFileNameFromUrl(aCard.uid) + ".vcf";
 				}
 			}
 			return aCard.cacheuri;
diff -ru cardbook1/chrome/content/cardbookWebDAV.js cardbook2/chrome/content/cardbookWebDAV.js
--- cardbook1/chrome/content/cardbookWebDAV.js	2018-06-21 09:33:08.000000000 -0400
+++ cardbook2/chrome/content/cardbookWebDAV.js	2018-09-14 22:10:51.000000000 -0400
@@ -547,25 +547,6 @@
 			}
 			this.load("REPORT", {props: props, deep: deep});
 		},
-	
-		googleToken: function(aType, aParams, aHeaders) {
-			this.hideResponse = true;
-			var paramsArray = [];
-			for (var param in aParams) {
-				paramsArray.push(param + "=" + encodeURIComponent(aParams[param]));
-			}
-			this.sendHTTPRequest(aType, paramsArray.join("&"), aHeaders, cardbookUtils.cleanWebArray(paramsArray));
-		},
-		
-		yahooToken: function(aType, aParams, aHeaders, aClientId, aClientSecret) {
-			this.hideResponse = true;
-			var paramsArray = [];
-			for (var param in aParams) {
-				paramsArray.push(param + "=" + encodeURIComponent(aParams[param]));
-			}
-			aHeaders["Authorization"] = "Basic " + this.b64EncodeUnicode(aClientId + ':' + aClientSecret);
-			this.sendHTTPRequest(aType, paramsArray.join("&"), aHeaders, cardbookUtils.cleanWebArray(paramsArray));
-		},
 		
 		delete: function() {
 			this.load("DELETE");
diff -ru cardbook1/chrome/content/configuration/wdw_cardbookConfiguration.js cardbook2/chrome/content/configuration/wdw_cardbookConfiguration.js
--- cardbook1/chrome/content/configuration/wdw_cardbookConfiguration.js	2018-08-30 15:48:46.000000000 -0400
+++ cardbook2/chrome/content/configuration/wdw_cardbookConfiguration.js	2018-09-14 22:17:25.000000000 -0400
@@ -1127,7 +1127,7 @@
 		},
 
 		loadTypes: function () {
-			var ABTypes = [ 'CARDDAV' , 'GOOGLE', 'APPLE', 'YAHOO' ];
+			var ABTypes = [ 'CARDDAV' ];
 			for (var i in ABTypes) {
 				var myABType = ABTypes[i];
 				wdw_cardbookConfiguration.allTypes[myABType] = {};
@@ -1240,7 +1240,7 @@
 
 		validateTypes: function () {
 			Services.prefs.deleteBranch(cardbookPreferences.prefCardBookCustomTypes);
-			var ABTypes = [ 'CARDDAV' , 'GOOGLE', 'APPLE', 'YAHOO' ];
+			var ABTypes = [ 'CARDDAV' ];
 			var strBundle = document.getElementById("cardbook-strings");
 			for (var i in ABTypes) {
 				var myABType = ABTypes[i];
diff -ru cardbook1/chrome/content/configuration/wdw_cardbookConfiguration.xul cardbook2/chrome/content/configuration/wdw_cardbookConfiguration.xul
--- cardbook1/chrome/content/configuration/wdw_cardbookConfiguration.xul	2018-07-30 11:02:08.000000000 -0400
+++ cardbook2/chrome/content/configuration/wdw_cardbookConfiguration.xul	2018-09-14 21:28:51.000000000 -0400
@@ -240,8 +240,6 @@
 			<hbox flex="1" align="center">
 				<radiogroup id="localizeEngineRadiogroup" orient="horizontal" preference="extensions.cardbook.localizeEngine">
 					<radio value="OpenStreetMap" label="&localizeEngineOpenStreetMapLabel;" accesskey="&localizeEngineOpenStreetMapAccesskey;"/>
-					<radio value="GoogleMaps" label="&localizeEngineGoogleMapsLabel;" accesskey="&localizeEngineGoogleMapsAccesskey;"/>
-					<radio value="BingMaps" label="&localizeEngineBingMapsLabel;" accesskey="&localizeEngineBingMapsAccesskey;"/>
 				</radiogroup>
 			</hbox>
 		</groupbox>
@@ -349,9 +347,6 @@
 				<caption label="&ABtypesGroupboxLabel;"/>
 				<hbox align="center">
 					<radiogroup id="ABtypesCategoryRadiogroup" orient="horizontal" onselect="wdw_cardbookConfiguration.sortTrees(null, 'typesTree');">
-						<radio value="GOOGLE" label="&typesCategoryGoogleLabel;" accesskey="&typesCategoryGoogleAccesskey;" selected="true"/>
-						<radio value="APPLE" label="&typesCategoryAppleLabel;" accesskey="&typesCategoryAppleAccesskey;"/>
-						<radio value="YAHOO" label="&typesCategoryYahooLabel;" accesskey="&typesCategoryYahooAccesskey;"/>
 						<radio value="CARDDAV" label="&typesCategoryOthersLabel;" accesskey="&typesCategoryOthersAccesskey;"/>
 					</radiogroup>
 				</hbox>
diff -ru cardbook1/chrome/content/preferences/cardbookPreferences.js cardbook2/chrome/content/preferences/cardbookPreferences.js
--- cardbook1/chrome/content/preferences/cardbookPreferences.js	2018-07-25 15:47:10.000000000 -0400
+++ cardbook2/chrome/content/preferences/cardbookPreferences.js	2018-09-14 21:29:01.000000000 -0400
@@ -79,10 +79,7 @@
 
 		insertIMPPsSeed: function () {
 			var strBundle = Services.strings.createBundle("chrome://cardbook/locale/cardbook.properties");
-			this.setIMPPs(0,"skype:" + strBundle.GetStringFromName("impp.skype") + ":skype");
 			this.setIMPPs(1,"jabber:" + strBundle.GetStringFromName("impp.jabber") + ":xmpp");
-			this.setIMPPs(2,"googletalk:" + strBundle.GetStringFromName("impp.googletalk") + ":gtalk");
-			this.setIMPPs(3,"qq:" + strBundle.GetStringFromName("impp.qq") + ":qq");
 		},
 
 		getAllCustomFieldsByType: function (aType) {
diff -ru cardbook1/chrome/content/wdw_cardbook.js cardbook2/chrome/content/wdw_cardbook.js
--- cardbook1/chrome/content/wdw_cardbook.js	2018-08-30 15:49:26.000000000 -0400
+++ cardbook2/chrome/content/wdw_cardbook.js	2018-09-14 21:31:04.000000000 -0400
@@ -1273,12 +1273,8 @@
 			
 			var localizeEngine = cardbookPreferences.getStringPref("extensions.cardbook.localizeEngine");
 			var urlEngine = "";
-			if (localizeEngine === "GoogleMaps") {
-				urlEngine = "https://www.google.com/maps?q=";
-			} else if (localizeEngine === "OpenStreetMap") {
+			if (localizeEngine === "OpenStreetMap") {
 				urlEngine = "https://www.openstreetmap.org/search?query=";
-			} else if (localizeEngine === "BingMaps") {
-				urlEngine = "https://www.bing.com/maps/?q=";
 			} else {
 				return;
 			}
diff -ru cardbook1/chrome/locale/cs/cardbook.properties cardbook2/chrome/locale/cs/cardbook.properties
--- cardbook1/chrome/locale/cs/cardbook.properties	2018-07-30 09:21:18.000000000 -0400
+++ cardbook2/chrome/locale/cs/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nebyly nalezeny duplicitní kontakty.
 
-serverWarningGoogleLabel=Použití Google je experimentální, protože Google nerespektuje vCard standardy.
 
 ValidatingLabel=Ověřování (%S)…
 ValidatingURLFailedLabel=URL má nesprávný tvar
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Požadavek zjišťování fáze 2 na %2$S …
 synchronizationRequestDiscovery1=%1$S : Požadavek zjišťování fáze 1 na %2$S …
 
-googleAccessTokenOK=%1$S : Požadavek o Google access token v pořádku, access token : %2$S
-googleRefreshTokenOK=%1$S : Požadavek o Google refresh token v pořádku, refresh token : %2$S
-googleGetNewRefreshToken=%1$S : Získávání nového Google refresh tokenu na %2$S …
-googleNewRefreshTokenOK=%1$S : Získán autorizační kód : %2$S …
-googleRequestAccessToken=%1$S : Požadavek o Google access token na %2$S …
-googleRequestRefreshToken=%1$S : Požadavek o Google refresh token na %2$S …
-
-yahooAccessTokenOK=%1$S : Požadavek o Yahoo! access token v pořádku, access token : %2$S
-yahooRefreshTokenOK=%1$S : Požadavek o Yahoo! refresh token v pořádku, refresh token : %2$S
-yahooGetNewRefreshToken=%1$S : Získávání nového Yahoo! refresh tokenu na %2$S …
-yahooNewRefreshTokenOK=%1$S : Získán autorizační kód : %2$S …
-yahooRequestAccessToken=%1$S : Požadavek o Yahoo! access token na %2$S …
-yahooRequestRefreshToken=%1$S : Požadavek o Yahoo! refresh token na %2$S …
 
 periodicSyncDeleting=%1$S : Mazání procesu opakované synchronizace (id : %2$S)
 periodicSyncSetting=%1$S : Nastavování procesu opakované synchronizace (interval : %2$S ms, id : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Hodnota předvolby
 prefWeightTooltip=Předvolby mohou mít různé hodnoty od 1 do 100. Většinou můžete nechat prázdné.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Přidat do tohoto adresáře
 wdw_cardEditionViewResultTitle=Úprava výsledného kontaktu
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Upravit kontakt
 wdw_cardEditionViewContactTitle=Nahlédnutí do existujícího kontaktu
 wdw_cardEditionViewListTitle=Zobrazit seznam
-wdw_cardbookPrintTitleLong=Náhled tisku - %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Náhled tisku - %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Náhled tisku
 
 displayGroupboxLabel=Zobrazované jméno
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nový Google token pro CardBook
-YAHOONewTokenTitle=Nový Yahoo! token pro CardBook
 
 invalidEmail=%1$S není platná e-mailová adresa, protože není ve formátu uživatel@server.
 appendEmailLabel=Přidat do seznamu: %1$S
diff -ru cardbook1/chrome/locale/cs/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/cs/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/cs/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/cs/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Přidání nového adresáře">
 
 <!ENTITY welcomePage.wizard.description "Vítejte">
-<!ENTITY welcomePage.description "Vypadá to, že používáte CardBook poprvé, takže bude proveden pokus o import kontaktů z adresářů Thunderbirdu do CardBooku.">
+<!ENTITY welcomePage.description "Vypadá to, že používáte CardBook poprvé, takže bude proveden pokus o import kontaktů z adresářů Icedove-UXPu do CardBooku.">
 
 <!ENTITY initialPage.wizard.description "Umístění nového adresáře.">
 <!ENTITY initialPage.description "Je váš adresář místní nebo vzdálený ? :">
 <!ENTITY initialPage.computer.label "Místní">
 <!ENTITY initialPage.network.label "Vzdálený">
-<!ENTITY initialPage.standard.label "Importovat standardní adresáře Thunderbirdu">
+<!ENTITY initialPage.standard.label "Importovat standardní adresáře Icedove-UXPu">
 <!ENTITY initialPage.search.label "Vyhledávání do existujících adresářů">
 
 <!ENTITY localPage.wizard.description "Typ a umístění nového místního adresáře.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Procházet">
 
 <!ENTITY remotePage.wizard.description "Typ a umístění nového vzdáleného adresáře.">
-<!ENTITY remotePage.description "Jaký je typ vašeho vzdáleného adresáře ? : (Upozornění: Google nerespektuje vCard standardy)">
+<!ENTITY remotePage.description "Jaký je typ vašeho vzdáleného adresáře ?">
 <!ENTITY remotePage.type.label "Typ">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Připojení">
-<!ENTITY remotePage.url.description "Pro adresář CardDAV zadejte URL vašeho vzdáleného adresáře. Můžete zkusit částečnou URL (příklad : http(s)://carddav.example.org). Pro Google adresář toto pole nevyplňujte">
+<!ENTITY remotePage.url.description "Pro adresář CardDAV zadejte URL vašeho vzdáleného adresáře. Můžete zkusit částečnou URL (příklad : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Zadejte přihlašovací údaje pro přístup k vašemu vzdálenému adresáři. Pro Google adresář by mělo být uživatelské jméno váš Google e-mail.">
+<!ENTITY remotePage.credentials.description "Zadejte přihlašovací údaje pro přístup k vašemu vzdálenému adresáři.">
 <!ENTITY remotePage.validatebutton.label "Ověřit">
 
 <!ENTITY locationSearchPage.wizard.description "Definice pokročilého vyhledávání.">
 <!ENTITY locationSearchPage.label "Pokročilé vyhledávání">
 
-<!ENTITY googleOauthPage.wizard.description "Autentizace Google">
 
 <!ENTITY namePage.wizard.description "Vlastnosti adresáře">
 <!ENTITY namePage.selected.label "Vybraný">
diff -ru cardbook1/chrome/locale/cs/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/cs/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/cs/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/cs/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Narozeniny">
 <!ENTITY synclistTabLabel "Upozornění na narozeniny">
 
-<!ENTITY integrationGroupboxLabel "Integrace do Thunderbirdu">
+<!ENTITY integrationGroupboxLabel "Integrace do Icedove-UXPu">
 <!ENTITY autocompletionLabel "Doplňování e-mailových adres">
 <!ENTITY autocompletionAccesskey "A">
-<!ENTITY autocompletionTooltip "Rozšíří dokončování adres kontaktů Thunderbirdu o adresáře CardBooku">
+<!ENTITY autocompletionTooltip "Rozšíří dokončování adres kontaktů Icedove-UXPu o adresáře CardBooku">
 <!ENTITY autocompleteSortByPopularityLabel "Řadit e-mailové adresy podle oblíbenosti">
 <!ENTITY autocompleteSortByPopularityAccesskey "d">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Navrhovat pro každý kontakt zvlášť spojené e-maily">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "t">
 <!ENTITY exclusiveLabel "Unikátní zdroj pro kontakty">
 <!ENTITY exclusiveAccesskey "z">
-<!ENTITY exclusiveTooltip "Pokud je zakázáno, tato možnost dovolí Thunderbirdu získat údaje pro žluté hvězdy, zobrazované jméno e-mailů a dokončování z standardního adresáře.">
+<!ENTITY exclusiveTooltip "Pokud je zakázáno, tato možnost dovolí Icedove-UXPu získat údaje pro žluté hvězdy, zobrazované jméno e-mailů a dokončování z standardního adresáře.">
 <!ENTITY accountsRestrictionsLabel "Omezení e-mailových účtů">
 <!ENTITY accountsRestrictionsEnabledLabel "Povolen">
 <!ENTITY accountsRestrictionsMailNameLabel "E-mailový účet">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Smazat">
 <!ENTITY deleteRestrictionAccesskey "S">
 <!ENTITY emailsCollectionLabel "Sbírat odchozí e-mail">
-<!ENTITY emailsCollectionTooltip "Rozšiřuje standardní sběr odchozích adres Thunderbirdu. Pokud je povoleno, e-mailové adresy nevyskytující se v žádném adresáři CardBooku budou přidány do vybraného adresáře(ů).">
+<!ENTITY emailsCollectionTooltip "Rozšiřuje standardní sběr odchozích adres Icedove-UXPu. Pokud je povoleno, e-mailové adresy nevyskytující se v žádném adresáři CardBooku budou přidány do vybraného adresáře(ů).">
 <!ENTITY emailsCollectionEnabledLabel "Povolen">
 <!ENTITY emailsCollectionMailNameLabel "E-mailový účet">
 <!ENTITY emailsCollectionABNameLabel "Adresář">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Vyhledat:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Mapy Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Mapy Bing">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Otevřít externí odkazy:">
-<!ENTITY localizeTargetInLabel "v Thunderbirdu">
+<!ENTITY localizeTargetInLabel "v Icedove-UXPu">
 <!ENTITY localizeTargetInAccesskey "V">
-<!ENTITY localizeTargetOutLabel "mimo Thunderbird">
+<!ENTITY localizeTargetOutLabel "mimo Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "M">
 <!ENTITY showNameAsLabel "Zobrazit jméno jako">
 <!ENTITY showNameAsLFLabel "Příjmení Křestní jméno">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "k">
 
 <!ENTITY ABtypesGroupboxLabel "Adresář">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Ostatní">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "Typy">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Pole ORG může obsahovat strukturovanou textovou hodnotu obsahující komponenty oddělené STŘEDNÍKEM (například : vašespolečnost;vašeslužba;vašeoddělení). Pole níže popisují popisky komponent obsažených v této struktuře.">
 
-<!ENTITY listPanelLabel "Pokud váš server nepodporuje kategorie (jako Google, Apple, Zimbra, atd…), seznamy jsou dobrý způsob, ak posílat e-maily skupinám. vCard 3.0 nativne seznamy nepodporuje, ale to lze obejít pomocí vlastních polí, takže pokud ve vCard 3.0 chcete použít seznamy, musíte definovat tato pole.">
+<!ENTITY listPanelLabel "Pokud váš server nepodporuje kategorie, seznamy jsou dobrý způsob, ak posílat e-maily skupinám. vCard 3.0 nativne seznamy nepodporuje, ale to lze obejít pomocí vlastních polí, takže pokud ve vCard 3.0 chcete použít seznamy, musíte definovat tato pole.">
 <!ENTITY listGroupboxLabel "Vlastní pole pro seznamy">
 <!ENTITY kindCustomLabel "Druh">
 <!ENTITY kindCustomAccesskey "D">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synch.">
 <!ENTITY syncWarn "Synchronizace zajistí odeslání vašich úprav na server a úprav na serveru k vám.">
-<!ENTITY initialSyncLabel "Provést prvotní synchronizaci při startu Thunderbirdu">
+<!ENTITY initialSyncLabel "Provést prvotní synchronizaci při startu Icedove-UXPu">
 <!ENTITY initialSyncAccesskey "S">
 <!ENTITY initialSyncDelayLabel "Zpoždění před provedením prvních požadavků (sekundy)">
 <!ENTITY initialSyncDelayAccesskey "r">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "a">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Zobrazovat vyskakovací okno, když je seznam narozenin prázdný">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "o">
-<!ENTITY remindViaLightningGroupboxLabel "Připomenout pomocí doplňku Thunderbirdu pro kalendář Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Připomenout pomocí doplňku Icedove-UXPu pro kalendář Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Počet dnů pro zapsání narozenin">
 <!ENTITY numberOfDaysForWritingAccesskey "z">
 <!ENTITY syncWithLightningOnStartupLabel "Synchronizovat s Lightningem při startu">
diff -ru cardbook1/chrome/locale/da/cardbook.properties cardbook2/chrome/locale/da/cardbook.properties
--- cardbook1/chrome/locale/da/cardbook.properties	2018-07-30 09:11:42.000000000 -0400
+++ cardbook2/chrome/locale/da/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Ingen duplikerede kontakter er blevet fundet
 
-serverWarningGoogleLabel=Brug af Google er eksperimentel, da Google ikke respekterer vCard-standarder.
 
 ValidatingLabel=Validerer (%S)…
 ValidatingURLFailedLabel=URL er misdannet
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Opdagelsesfase-2-forespørgsel på %2$S …
 synchronizationRequestDiscovery1=%1$S : Opdagelsesfase-1-forespørgsel på %2$S …
 
-googleAccessTokenOK=%1$S : Google adgangssymbolforespørgsel o.k, adgangssymbol : %2$S
-googleRefreshTokenOK=%1$S : Google opdateringssymbolforespørgsel o.k, opdateringssymol : %2$S
-googleGetNewRefreshToken=%1$S : Forsøger at få et nyt Google opdateringssymbol på %2$S …
-googleNewRefreshTokenOK=%1$S : Modtog en autorisationskode : %2$S …
-googleRequestAccessToken=%1$S : Google adgangssymbolforespørgsel på %2$S …
-googleRequestRefreshToken=%1$S : Google opdateringssymbolforespørgsel på %2$S …
-
-yahooAccessTokenOK=%1$S : Yahoo! adgangssymbolforespørgsel o.k, adgangssymbol : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! opdateringssymbolforespørgsel o.k, opdateringssymol : %2$S
-yahooGetNewRefreshToken=%1$S : Forsøger at få et nyt Yahoo! opdateringssymbol på %2$S …
-yahooNewRefreshTokenOK=%1$S : Modtog en autorisationskode : %2$S …
-yahooRequestAccessToken=%1$S : Yahoo! adgangssymbolforespørgsel på %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! opdateringssymbolforespørgsel på %2$S …
 
 periodicSyncDeleting=%1$S : Sletter periodisk synkroniseringsproces (id : %2$S)
 periodicSyncSetting=%1$S : Sætter periodisk synkroniseringsproces (interval : %2$S ms, id : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Foretrukken værdi
 prefWeightTooltip=Foretrukne kan have forskellige værdier mellem 1 og 100. Hold den tom for normal brug.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Tilføj til denne adressebog
 wdw_cardEditionViewResultTitle=Resulterende kontaktændring
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Rediger kontakt
 wdw_cardEditionViewContactTitle=Vis kontakt
 wdw_cardEditionViewListTitle=Vis liste
-wdw_cardbookPrintTitleLong=Udskriftsforhåndsvisning af %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Udskriftsforhåndsvisning af %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Udskriftsforhåndsvisning
 
 displayGroupboxLabel=Vist navn
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nyt Google-symbol til CardBook
-YAHOONewTokenTitle=Nyt Yahoo!-symbol til CardBook
 
 invalidEmail=%1$S er ikke en gyldig mailadresse, da den ikke er i formen bruger@server.tld.
 appendEmailLabel=Tilføj til liste: %1$S
diff -ru cardbook1/chrome/locale/da/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/da/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/da/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/da/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Tilføj en ny adressebog">
 
 <!ENTITY welcomePage.wizard.description "Velkommen">
-<!ENTITY welcomePage.description "Det ser ud til at det er første gang du bruger CardBook, så vi vil prøve at importere kontakter fra Thunderbirds standard adressebøger til CardBook.">
+<!ENTITY welcomePage.description "Det ser ud til at det er første gang du bruger CardBook, så vi vil prøve at importere kontakter fra Icedove-UXPs standard adressebøger til CardBook.">
 
 <!ENTITY initialPage.wizard.description "Den nye adressebogs sted.">
 <!ENTITY initialPage.description "Adressebogens lokation:">
 <!ENTITY initialPage.computer.label "Lokal">
 <!ENTITY initialPage.network.label "Fjern">
-<!ENTITY initialPage.standard.label "Importer Thunderbirds standard adressebøger">
+<!ENTITY initialPage.standard.label "Importer Icedove-UXPs standard adressebøger">
 <!ENTITY initialPage.search.label "Søg i eksisterende adressebøger">
 
 <!ENTITY localPage.wizard.description "Type og sted for den nye lokale adressebog.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Søg">
 
 <!ENTITY remotePage.wizard.description "Type og sted for den nye fjerne adressebog.">
-<!ENTITY remotePage.description "Hvilken type er din fjerne adressebog : (Forsigtig: Google overholder IKKE vCard-standarderne) ?">
+<!ENTITY remotePage.description "Hvilken type er din fjerne adressebog?">
 <!ENTITY remotePage.type.label "Type">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Forbindelse">
-<!ENTITY remotePage.url.description "For en CardDAV-type, indtast din fjerne adressebogs URL. Du kan prøve at bruge en delvis URL (eksempel : http(s)://carddav.example.org). Specificer ikke dette felt for en Google-adressebog.">
+<!ENTITY remotePage.url.description "For en CardDAV-type, indtast din fjerne adressebogs URL. Du kan prøve at bruge en delvis URL (eksempel : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Indtast akkreditiverne for adgang til din adressebog. For en Google-adressebog, bør brugernavnet være din Google e-mail.">
+<!ENTITY remotePage.credentials.description "Indtast akkreditiverne for adgang til din adressebog.">
 <!ENTITY remotePage.validatebutton.label "Valider">
 
 <!ENTITY locationSearchPage.wizard.description "Definition af den gemte søgning.">
 <!ENTITY locationSearchPage.label "Gemt søgning">
 
-<!ENTITY googleOauthPage.wizard.description "Google-godkendelse">
 
 <!ENTITY namePage.wizard.description "Adressebogsegenskaber">
 <!ENTITY namePage.selected.label "Valgt">
diff -ru cardbook1/chrome/locale/da/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/da/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/da/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/da/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Mærkedag">
 <!ENTITY synclistTabLabel "Mærkedagspåmindelser">
 
-<!ENTITY integrationGroupboxLabel "Integration i Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integration i Icedove-UXP">
 <!ENTITY autocompletionLabel "Autofuldførelse af e-mailadresser">
 <!ENTITY autocompletionAccesskey "A">
-<!ENTITY autocompletionTooltip "Udvider den almindelige autofuldførelse af kontakter i adressebøger af Thunderbird med en autofuldførelse af kontakter i adressebøger af CardBook.">
+<!ENTITY autocompletionTooltip "Udvider den almindelige autofuldførelse af kontakter i adressebøger af Icedove-UXP med en autofuldførelse af kontakter i adressebøger af CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Sorter e-mailadresser efter popularitet">
 <!ENTITY autocompleteSortByPopularityAccesskey "o">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Foreslå sammenkædede e-mails per kontakt">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "e">
 <!ENTITY exclusiveLabel "Unik kilde til kontakter">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Hvis deaktiveret, tillader denne indstilling at hente kontakter i Thunderbirds almindelige adressebøger til de gule stjerner, til e-mailens viste navn, og til autofuldførelsen af e-mail.">
+<!ENTITY exclusiveTooltip "Hvis deaktiveret, tillader denne indstilling at hente kontakter i Icedove-UXPs almindelige adressebøger til de gule stjerner, til e-mailens viste navn, og til autofuldførelsen af e-mail.">
 <!ENTITY accountsRestrictionsLabel "Mailkontorestriktioner">
 <!ENTITY accountsRestrictionsEnabledLabel "Aktiveret">
 <!ENTITY accountsRestrictionsMailNameLabel "Mailkonto">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Slet">
 <!ENTITY deleteRestrictionAccesskey "S">
 <!ENTITY emailsCollectionLabel "Indsaml udgående e-mail">
-<!ENTITY emailsCollectionTooltip "Udvider Thunderbirds almindelige indsamling af e-mailadresser. Hvis aktiveret, vil e-mailadresser der ikke findes i nogen CardBook-adressebog blive tilføjet til de valgte adressebøger.">
+<!ENTITY emailsCollectionTooltip "Udvider Icedove-UXPs almindelige indsamling af e-mailadresser. Hvis aktiveret, vil e-mailadresser der ikke findes i nogen CardBook-adressebog blive tilføjet til de valgte adressebøger.">
 <!ENTITY emailsCollectionEnabledLabel "Aktiveret">
 <!ENTITY emailsCollectionMailNameLabel "Mailkonto">
 <!ENTITY emailsCollectionABNameLabel "Adressebog">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Lokaliser med:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Åbn eksterne links:">
-<!ENTITY localizeTargetInLabel "Indeni Thunderbird">
+<!ENTITY localizeTargetInLabel "Indeni Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "h">
-<!ENTITY localizeTargetOutLabel "Udenfor Thunderbird">
+<!ENTITY localizeTargetOutLabel "Udenfor Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Vis navn som">
 <!ENTITY showNameAsLFLabel "Efternavn Fornavn">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "P">
 
 <!ENTITY ABtypesGroupboxLabel "Adressebog">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Andet">
 <!ENTITY typesCategoryOthersAccesskey "n">
 <!ENTITY typesGroupboxLabel "Typer">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Feltet ORG kan indeholde en struktureret tekstværdi bestående af komponenter adskilt af tegnet SEMIKOLON (for eksempel : dinvirksomhed;dintjeneste;dinafdeling). Felterne herunder beskriver komponentetiketterne i denne struktur.">
 
-<!ENTITY listPanelLabel "Hvis ikke din server understøtter kategorier (som Google, Apple, Zimbra, osv…), er lister en god måde at sende e-mails til grupper. vCard 3.0 har ikke indbygget understøttelse for lister, men det kan afstedkommes med brugerdefinerede felter, så hvis du vil bruge lister i vCard 3.0, er du nødt til at definere disse felter. ">
+<!ENTITY listPanelLabel "Hvis ikke din server understøtter kategorier, er lister en god måde at sende e-mails til grupper. vCard 3.0 har ikke indbygget understøttelse for lister, men det kan afstedkommes med brugerdefinerede felter, så hvis du vil bruge lister i vCard 3.0, er du nødt til at definere disse felter. ">
 <!ENTITY listGroupboxLabel "Brugerdefinerede felter til lister">
 <!ENTITY kindCustomLabel "Type">
 <!ENTITY kindCustomAccesskey "T">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synkronisering">
 <!ENTITY syncWarn "Synkronisering sender dine ændringer til en fjern server, og sender serverens ændringer til dig.">
-<!ENTITY initialSyncLabel "Kør synkronisering når Thunderbird starter">
+<!ENTITY initialSyncLabel "Kør synkronisering når Icedove-UXP starter">
 <!ENTITY initialSyncAccesskey "K">
 <!ENTITY initialSyncDelayLabel "Forsinkelse før første synkronisering (sekunder)">
 <!ENTITY initialSyncDelayAccesskey "n">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "T">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Vis pop-op-vindue når liste over mærkedage er tom">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "s">
-<!ENTITY remindViaLightningGroupboxLabel "Påmind via Lightning (kalenderudvidelse til Thunderbird)">
+<!ENTITY remindViaLightningGroupboxLabel "Påmind via Lightning (kalenderudvidelse til Icedove-UXP)">
 <!ENTITY numberOfDaysForWritingLabel "Antal dage at skrive mærkedage">
 <!ENTITY numberOfDaysForWritingAccesskey "n">
 <!ENTITY syncWithLightningOnStartupLabel "Synkroniser med Lightning ved opstart">
diff -ru cardbook1/chrome/locale/de/cardbook.properties cardbook2/chrome/locale/de/cardbook.properties
--- cardbook1/chrome/locale/de/cardbook.properties	2018-07-30 09:20:50.000000000 -0400
+++ cardbook2/chrome/locale/de/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Keine doppelten Kontakte gefunden.
 
-serverWarningGoogleLabel=Die Benutzung mit Google ist experimentell, da Google die vCard-Spezifikationen nicht einhält.
 
 ValidatingLabel=Überprüfen (%S)…
 ValidatingURLFailedLabel=Ungültige URL
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S: Discovery-Phase 2 auf %2$S …
 synchronizationRequestDiscovery1=%1$S: Discovery-Phase 1 auf %2$S …
 
-googleAccessTokenOK=%1$S: Anforderung nach Google-Zugriffs-Token OK. Token: %2$S
-googleRefreshTokenOK=%1$S: Erneuerung des Google-Zugriffs-Token OK. Token: %2$S
-googleGetNewRefreshToken=%1$S: Trying to get a new Google refresh token on %2$S …
-googleNewRefreshTokenOK=%1$S: Authorisierungscode empfangen: %2$S …
-googleRequestAccessToken=%1$S: Anforderung nach Google-Zugriffs-Token auf %2$S …
-googleRequestRefreshToken=%1$S: Google refresh token request on %2$S …
-
-yahooAccessTokenOK=%1$S: Anforderung nach Yahoo!-Zugriffs-Token OK. Token: %2$S
-yahooRefreshTokenOK=%1$S: Erneuerung des Yahoo!-Zugriffs-Token OK. Token: %2$S
-yahooGetNewRefreshToken=%1$S: Trying to get a new Yahoo! refresh token on %2$S …
-yahooNewRefreshTokenOK=%1$S: Authorisierungscode empfangen: %2$S …
-yahooRequestAccessToken=%1$S: Anforderung nach Yahoo!-Zugriffs-Token auf %2$S …
-yahooRequestRefreshToken=%1$S: Yahoo! refresh token request on %2$S …
-
 periodicSyncDeleting=%1$S: Lösche periodischen Sync (ID: %2$S)
 periodicSyncSetting=%1$S: Richte periodischen Sync ein (Intervall: %2$S ms, ID: %3$S)
 periodicSyncSyncing=%S: Synchronisiere aufgrund des periodischen Syncs …
@@ -341,10 +326,7 @@
 prefValueLabel=Wert der Präferenz
 prefWeightTooltip=Präferenzen können verschiedene Werte zwischen 1 und 100 haben.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Füge zu diesem Adressbuch hinzu
 wdw_cardEditionViewResultTitle=Bearbeitung des resultierenden Kontakts
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Kontakt bearbeiten
 wdw_cardEditionViewContactTitle=Kontakt anzeigen
 wdw_cardEditionViewListTitle=Liste anzeigen
-wdw_cardbookPrintTitleLong=Druckvorschau von %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Druckvorschau von %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Druckvorschau
 
 displayGroupboxLabel=Anzeigename
@@ -478,11 +460,9 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Neues Google-Token für CardBook
-YAHOONewTokenTitle=Neues Yahoo!-Token für CardBook
 
 invalidEmail=%1$S ist keine gültige E-Mail-Adresse, weil sie nicht dem Format "user@host" entspricht.
 appendEmailLabel=Zur liste hinzufügen: %1$S
 
 categoryAddNew=Neue Kategorie hinzufügen
-typeAddNew=Neuen Typ hinzufügen
\ No newline at end of file
+typeAddNew=Neuen Typ hinzufügen
diff -ru cardbook1/chrome/locale/de/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/de/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/de/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/de/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Neues Adressbuch hinzufügen">
 
 <!ENTITY welcomePage.wizard.description "Willkommen">
-<!ENTITY welcomePage.description "Anscheinend verwenden Sie CardBook zum ersten Mal. Deshalb werden die Kontakte aus den Standard Adressbüchern von Thunderbird in die Adressbücher von CardBook importiert.">
+<!ENTITY welcomePage.description "Anscheinend verwenden Sie CardBook zum ersten Mal. Deshalb werden die Kontakte aus den Standard Adressbüchern von Icedove-UXP in die Adressbücher von CardBook importiert.">
 
 <!ENTITY initialPage.wizard.description "Ort des neuen Adressbuchs">
 <!ENTITY initialPage.description "Ist das Adressbuch lokal oder im Netzwerk gespeichert?">
 <!ENTITY initialPage.computer.label "Lokal">
 <!ENTITY initialPage.network.label "Im Netzwerk">
-<!ENTITY initialPage.standard.label "Standard Adressbücher von Thunderbird importieren">
+<!ENTITY initialPage.standard.label "Standard Adressbücher von Icedove-UXP importieren">
 <!ENTITY initialPage.search.label "Suche in einem existierenden Adressbuch">
 
 <!ENTITY localPage.wizard.description "Art und Ort des neuen lokalen Adressbuchs.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Durchsuchen">
 
 <!ENTITY remotePage.wizard.description "Art und Ort des neuen Netzwerk-Adressbuchs">
-<!ENTITY remotePage.description "Welcher Art ist das Netzwerk-Adressbuch? (Achtung: Google hält sich nicht an vCard-Standards.)">
+<!ENTITY remotePage.description "Welcher Art ist das Netzwerk-Adressbuch?">
 <!ENTITY remotePage.type.label "Art">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Verbindung">
-<!ENTITY remotePage.url.description "Adresse für das CardDAV-Adressbuch. Sie können versuchen, Teil-URLs anzugeben (z.B. http(s)://carddav.example.org). Für Google-Adressbücher muss keine URL angegeben werden.">
+<!ENTITY remotePage.url.description "Adresse für das CardDAV-Adressbuch. Sie können versuchen, Teil-URLs anzugeben (z.B. http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Zugangsdaten für das Adressbuch. Für Google-Adressbücher sollte der Benutzername der Email-Adresse entsprechen.">
+<!ENTITY remotePage.credentials.description "Zugangsdaten für das Adressbuch.">
 <!ENTITY remotePage.validatebutton.label "Überprüfen">
 
 <!ENTITY locationSearchPage.wizard.description "Die erweiterte Suche definieren.">
 <!ENTITY locationSearchPage.label "Erweiterte Suche">
 
-<!ENTITY googleOauthPage.wizard.description "Google-Authentifizierung">
 
 <!ENTITY namePage.wizard.description "Eigenschaften des Adressbuchs">
 <!ENTITY namePage.selected.label "Ausgewählt">
diff -ru cardbook1/chrome/locale/de/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/de/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/de/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/de/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Geburtstage">
 <!ENTITY synclistTabLabel "Geburtstage-Erinnerungen">
 
-<!ENTITY integrationGroupboxLabel "Integration in Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integration in Icedove-UXP">
 <!ENTITY autocompletionLabel "Autovervollständigung der Email-Adressen">
 <!ENTITY autocompletionAccesskey "A">
-<!ENTITY autocompletionTooltip "Erweitert die standardmäßige Autovervollständigung von Kontakten in Adressbüchern von Thunderbird um eine Autovervollständigung von Kontakten in Adressbüchern von CardBook.">
+<!ENTITY autocompletionTooltip "Erweitert die standardmäßige Autovervollständigung von Kontakten in Adressbüchern von Icedove-UXP um eine Autovervollständigung von Kontakten in Adressbüchern von CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Sortiere Email-Adressen nach Popularität">
 <!ENTITY autocompleteSortByPopularityAccesskey "S">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Verknüpfte E-Mails pro Kontakt vorschlagen">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "Einzige Quelle für Kontakte">
 <!ENTITY exclusiveAccesskey "E">
-<!ENTITY exclusiveTooltip "Falls deaktiviert, ermöglicht diese Einstellung die Zuordnung von Kontakten aus den Standardadressbüchern von Thunderbird für die Gelben Sterne, die Anzeigenamen und die Autovervollständigung.">
+<!ENTITY exclusiveTooltip "Falls deaktiviert, ermöglicht diese Einstellung die Zuordnung von Kontakten aus den Standardadressbüchern von Icedove-UXP für die Gelben Sterne, die Anzeigenamen und die Autovervollständigung.">
 <!ENTITY accountsRestrictionsLabel "Beschränkungen für Mail-Konten">
 <!ENTITY accountsRestrictionsEnabledLabel "Aktiviert">
 <!ENTITY accountsRestrictionsMailNameLabel "Email-Konto">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Löschen">
 <!ENTITY deleteRestrictionAccesskey "L">
 <!ENTITY emailsCollectionLabel "Sammlung ausgehender Email-Adressen">
-<!ENTITY emailsCollectionTooltip "Erweitert die standardmäßige Sammlung ausgehender Email-Adressen in Thunderbird. Falls aktiviert, werden Email-Adressen, die nicht in einem Adressbuch von CardBook vorhanden sind, automatisch den ausgewählten Adressbüchern hinzufügt.">
+<!ENTITY emailsCollectionTooltip "Erweitert die standardmäßige Sammlung ausgehender Email-Adressen in Icedove-UXP. Falls aktiviert, werden Email-Adressen, die nicht in einem Adressbuch von CardBook vorhanden sind, automatisch den ausgewählten Adressbüchern hinzufügt.">
 <!ENTITY emailsCollectionEnabledLabel "Aktiviert">
 <!ENTITY emailsCollectionMailNameLabel "Email-Konto">
 <!ENTITY emailsCollectionABNameLabel "Adressbuch">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Lokalisieren:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Externe Links öffnen:">
-<!ENTITY localizeTargetInLabel "Innerhalb Thunderbirds">
+<!ENTITY localizeTargetInLabel "Innerhalb Icedove-UXPs">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Außerhalb Thunderbirds">
+<!ENTITY localizeTargetOutLabel "Außerhalb Icedove-UXPs">
 <!ENTITY localizeTargetOutAccesskey "A">
 <!ENTITY showNameAsLabel "Namen anzeigen">
 <!ENTITY showNameAsLFLabel "Nachname Vorname">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "W">
 
 <!ENTITY ABtypesGroupboxLabel "Adressbuch">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Anderes">
 <!ENTITY typesCategoryOthersAccesskey "n">
 <!ENTITY typesGroupboxLabel "Typen">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Das Feld ORG darf mehrere durch SEMIKOLON getrennte Zeichenketten enthalten, z.B.: yourcompany;yourservice;yourdepartment. Die Felder unten definieren die Namen der jeweiligen Zeichenketten.">
 
-<!ENTITY listPanelLabel "Falls Ihr Server keine Kategorien unterstützt (z.B. Google, Apple, Zimbra, etc.), dann sind Listen eine gute Alternative, um Emails an Gruppen zu senden. vCard 3.0 hat keine native Unterstützung für Listen; stattdessen können Benutzerdefinierte Felder verwendet werden. Wenn Sie Listen in vCard 3.0 benutzen möchten, dann müssen Sie diese Felder definieren.">
+<!ENTITY listPanelLabel "Falls Ihr Server keine Kategorien unterstützt, dann sind Listen eine gute Alternative, um Emails an Gruppen zu senden. vCard 3.0 hat keine native Unterstützung für Listen; stattdessen können Benutzerdefinierte Felder verwendet werden. Wenn Sie Listen in vCard 3.0 benutzen möchten, dann müssen Sie diese Felder definieren.">
 <!ENTITY listGroupboxLabel "Benutzerdefinierte Felder für Listen">
 <!ENTITY kindCustomLabel "Typ">
 <!ENTITY kindCustomAccesskey "T">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synchronisieren">
 <!ENTITY syncWarn "Änderungen können nur durch eine Synchronisation auf den Server übertragen werden.">
-<!ENTITY initialSyncLabel "Initiale Synchronisation beim Start von Thunderbird">
+<!ENTITY initialSyncLabel "Initiale Synchronisation beim Start von Icedove-UXP">
 <!ENTITY initialSyncAccesskey "I">
 <!ENTITY initialSyncDelayLabel "Verzögerung für erste Server-Anfrage (Sekunden)">
 <!ENTITY initialSyncDelayAccesskey "V">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "Z">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Zeige ein Popup-Fenster, falls die Liste der Geburtstage leer ist">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "f">
-<!ENTITY remindViaLightningGroupboxLabel "Erinnerung mit Lightning (Erweiterung für Thunderbird)">
+<!ENTITY remindViaLightningGroupboxLabel "Erinnerung mit Lightning (Erweiterung für Icedove-UXP)">
 <!ENTITY numberOfDaysForWritingLabel "Anzahl der Tage zum Eintragen der Geburtstage">
 <!ENTITY numberOfDaysForWritingAccesskey "E">
 <!ENTITY syncWithLightningOnStartupLabel "Synchronisiere mit Lightning beim Starten">
diff -ru cardbook1/chrome/locale/el/cardbook.properties cardbook2/chrome/locale/el/cardbook.properties
--- cardbook1/chrome/locale/el/cardbook.properties	2018-07-30 09:24:24.000000000 -0400
+++ cardbook2/chrome/locale/el/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Δεν βρέθηκαν διπλές επαφές.
 
-serverWarningGoogleLabel=Η χρήση της Γκούγκλαρε είναι πειραματική, επειδή η Γκούγκλαρε δεν σέβεται τα πρότυπα εικονική κάρτα.
 
 ValidatingLabel=Επικύρωση (%S)…
 ValidatingURLFailedLabel=Η διεύθυνση Παγκόσμιο εντοπισμό πόρων είναι εσφαλμένη
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Ανακαλύπτοντας αίτημα φάσης 2 στο %2$S …
 synchronizationRequestDiscovery1=%1$S : Ανακαλύπτοντας αίτημα φάσης 1 στο %2$S …
 
-googleAccessTokenOK=%1$s : Γκουγκλάρε διπλή πρόσκληση πρόσβασης καλά, διακριτικό πρόσβασης : %2$S
-googleRefreshTokenOK=%1$S : Γκουγκλάρε ανανέωση του διακριτικού αιτήματος καλά, ανανέωση του διακριτικού : %2$S
-googleGetNewRefreshToken=%1$S : Προσπαθώντας να αποκτήσετε μια νέα γκουγκλάρε ανανέωση του διακριτικού επί του %2$S …
-googleNewRefreshTokenOK=%1$S : Λάβατε έναν κωδικό εξουσιοδότησης : %2$S …
-googleRequestAccessToken=%1$S : Γκουγκλάρε διακριτικό αίτημα πρόσβασης στο %2$S …
-googleRequestRefreshToken=%1$S : Γκουγκλάρε ανανέωση του διακριτικού αιτήματος για το %2$S …
-
-yahooAccessTokenOK=%1$s : Υαηοο! διπλή πρόσκληση πρόσβασης καλά, διακριτικό πρόσβασης : %2$S
-yahooRefreshTokenOK=%1$S : Υαηοο! ανανέωση του διακριτικού αιτήματος καλά, ανανέωση του διακριτικού : %2$S
-yahooGetNewRefreshToken=%1$S : Προσπαθώντας να αποκτήσετε μια νέα Υαηοο! ανανέωση του διακριτικού επί του %2$S …
-yahooNewRefreshTokenOK=%1$S : Λάβατε έναν κωδικό εξουσιοδότησης : %2$S …
-yahooRequestAccessToken=%1$S : Υαηοο! διακριτικό αίτημα πρόσβασης στο %2$S …
-yahooRequestRefreshToken=%1$S : Υαηοο! ανανέωση του διακριτικού αιτήματος για το %2$S …
 
 periodicSyncDeleting=%1$S : Διαγραφή διαδικασίας περιοδικού συγχρονισμού (αναγνωριστικό : %2$S)
 periodicSyncSetting=%1$S : Ρύθμιση της διαδικασίας περιοδικού συγχρονισμού (χρονικό διάστημα : %2$S μιλιδευτερόλεπτο, αναγνωριστικό : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Αξία προτίμηση
 prefWeightTooltip=Προτιμήσεις μπορεί να έχουν διαφορετικές τιμές μεταξύ 1 και 100. Κρατήστε το κενό για κανονική χρήση.
 
-impp.skype=Skype
 impp.jabber=Κουβεντολόι
-impp.googletalk=Γκούγκλαρε συνομιλώ
-impp.qq=Δέκα σεντ
 
 addToAddressbook=Προσθέστε σε αυτό το βιβλίο διευθύνσεων
 wdw_cardEditionViewResultTitle=Επακόλουθη τροποποίηση επαφής
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Επεξεργασία επαφή
 wdw_cardEditionViewContactTitle=Προβολή επαφή
 wdw_cardEditionViewListTitle=Προβολή λίστα
-wdw_cardbookPrintTitleLong=Προεπισκόπηση εκτύπωσης – %S –  Επαφές – Thunderbird
+wdw_cardbookPrintTitleLong=Προεπισκόπηση εκτύπωσης – %S –  Επαφές – Icedove-UXP
 wdw_cardbookPrintTitle=Προεπισκόπηση εκτύπωσης
 
 displayGroupboxLabel=Εφάνιση
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{5}} |)({{6}}|)(\n)({{7}}|)
 
-GOOGLENewTokenTitle=Νέο διακριτικό Γκούγκλαρε για το Επαφές
-YAHOONewTokenTitle=Νέο διακριτικό Yahoo! για το Επαφές
 
 invalidEmail=Το %1$S δεν είναι μια έγκυρη διεύθυνση e-mail επειδή δεν είναι της μορφής user@host.
 appendEmailLabel=Πρόσθεσε στη λίστα: %1$S
diff -ru cardbook1/chrome/locale/el/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/el/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/el/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/el/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Προσθέστε ένα νέο βιβλίο διευθύνσεων">
 
 <!ENTITY welcomePage.wizard.description "Καλώς ήρθατε">
-<!ENTITY welcomePage.description "Φαίνεται ότι είναι η πρώτη φορά που χρησιμοποιείτε τις Επαφές, επομένως θα προσπαθήσουμε να εισαγάγουμε επαφές από τα τυπικά βιβλία διευθύνσεων του Thunderbird στις Επαφές.">
+<!ENTITY welcomePage.description "Φαίνεται ότι είναι η πρώτη φορά που χρησιμοποιείτε τις Επαφές, επομένως θα προσπαθήσουμε να εισαγάγουμε επαφές από τα τυπικά βιβλία διευθύνσεων του Icedove-UXP στις Επαφές.">
 
 <!ENTITY initialPage.wizard.description "Θέση για το νέο βιβλίο διευθύνσεων.">
 <!ENTITY initialPage.description "Τοποθεσία του βιβλίου διευθύνσεων:">
 <!ENTITY initialPage.computer.label "Τοπικός">
 <!ENTITY initialPage.network.label "Μακρινός">
-<!ENTITY initialPage.standard.label "Εισαγάγετε τα συνηθισμένα βιβλία διευθύνσεων του Thunderbird">
+<!ENTITY initialPage.standard.label "Εισαγάγετε τα συνηθισμένα βιβλία διευθύνσεων του Icedove-UXP">
 <!ENTITY initialPage.search.label "Αναζήτηση στα υπάρχοντα βιβλία διευθύνσεων">
 
 <!ENTITY localPage.wizard.description "Τύπος και θέση του νέου τοπικού βιβλίου διευθύνσεων.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Εξερεύνηση">
 
 <!ENTITY remotePage.wizard.description "Τύπος και θέση του νέου απομακρυσμένου βιβλίου διευθύνσεων.">
-<!ENTITY remotePage.description "Ποιος είναι ο τύπος του απομακρυσμένου βιβλίου διευθύνσεών σας; (Προσοχή: η Google δεν συμμορφώνεται με τα πρότυπα εικονική κάρτα (vCard))">
+<!ENTITY remotePage.description "Ποιος είναι ο τύπος του απομακρυσμένου βιβλίου διευθύνσεών σας">
 <!ENTITY remotePage.type.label "Τύπος">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Γκούγκλαρε">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Σύνδεση">
-<!ENTITY remotePage.url.description "Για τύπο CardDAV, πληκτρολογήστε τη διεύθυνση URL του απομακρυσμένου βιβλίου διευθύνσεών σας. Μπορεί να προσπαθήσετε να χρησιμοποιήσετε ένα μερικό παγκόσμιο εντοπισμό πόρων (URL) (παράδειγμα: http(s)://carddav.παράδειγμα.org.gr). Για ένα βιβλίο διευθύνσεων Google, δεν καθορίζετε αυτό το πεδίο.">
+<!ENTITY remotePage.url.description "Για τύπο CardDAV, πληκτρολογήστε τη διεύθυνση URL του απομακρυσμένου βιβλίου διευθύνσεών σας. Μπορεί να προσπαθήσετε να χρησιμοποιήσετε ένα μερικό παγκόσμιο εντοπισμό πόρων (URL) (παράδειγμα: http(s)://carddav.παράδειγμα.org.gr).">
 <!ENTITY remotePage.url.label "Παγκόσμιο εντοπισμό πόρων">
-<!ENTITY remotePage.credentials.description "Καταχωρίστε τα διαπιστευτήρια για την πρόσβαση στο βιβλίο διευθύνσεών σας. Για ένα βιβλίο διευθύνσεων Google, το όνομα χρήστη πρέπει να είναι το ηλεκτρονικό ταχυδρομείο σας Google.">
+<!ENTITY remotePage.credentials.description "Καταχωρίστε τα διαπιστευτήρια για την πρόσβαση στο βιβλίο διευθύνσεών σας.">
 <!ENTITY remotePage.validatebutton.label "Επικυρώνω">
 
 <!ENTITY locationSearchPage.wizard.description "Ορισμός της αποθηκευμένης αναζήτησης.">
 <!ENTITY locationSearchPage.label "Αποθηκευμένη αναζήτηση">
 
-<!ENTITY googleOauthPage.wizard.description "Έλεγχος ταυτότητας Google">
 
 <!ENTITY namePage.wizard.description "Ιδιότητες βιβλίο διευθύνσεων">
 <!ENTITY namePage.selected.label "Επιλεγμένο">
diff -ru cardbook1/chrome/locale/el/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/el/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/el/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/el/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Επέτειος">
 <!ENTITY synclistTabLabel "Ειδοποιήσεις επετείου">
 
-<!ENTITY integrationGroupboxLabel "Ενσωμάτωση στο Thunderbird">
+<!ENTITY integrationGroupboxLabel "Ενσωμάτωση στο Icedove-UXP">
 <!ENTITY autocompletionLabel "Αυτόματη συμπλήρωση διευθύνσεων ηλεκτρονικού ταχυδρομείου">
 <!ENTITY autocompletionAccesskey "Α">
-<!ENTITY autocompletionTooltip "Επεκτείνει την τυπική αυτόματη συμπλήρωση επαφών στα βιβλία διευθύνσεων του Thunderbird με αυτόματη συμπλήρωση επαφών στα βιβλία διευθύνσεων των Επαφών.">
+<!ENTITY autocompletionTooltip "Επεκτείνει την τυπική αυτόματη συμπλήρωση επαφών στα βιβλία διευθύνσεων του Icedove-UXP με αυτόματη συμπλήρωση επαφών στα βιβλία διευθύνσεων των Επαφών.">
 <!ENTITY autocompleteSortByPopularityLabel "Ταξινόμηση των διευθύνσεων ηλεκτρονικού ταχυδρομείου κατά δημοτικότητα">
 <!ENTITY autocompleteSortByPopularityAccesskey "δ">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Προτείνετε αλληλοσυνδεόμενα μηνύματα ηλεκτρονικού ταχυδρομείου ανά επαφή">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Διαγραφή">
 <!ENTITY deleteRestrictionAccesskey "φ">
 <!ENTITY emailsCollectionLabel "Συλλογή εξερχόμενου ηλεκτρονικού ταχυδρομείου">
-<!ENTITY emailsCollectionTooltip "Επεκτείνει την τυπική συλλογή διευθύνσεων εξερχόμενων διευθύνσεων ηλεκτρονικού ταχυδρομείου του Thunderbird. Εάν είναι ενεργοποιημένη, οι διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν θα εμφανίζονται σε κανένα Βιβλίο διευθύνσεων επαφών θα προστεθούν στα επιλεγμένα βιβλία διευθύνσεων.">
+<!ENTITY emailsCollectionTooltip "Επεκτείνει την τυπική συλλογή διευθύνσεων εξερχόμενων διευθύνσεων ηλεκτρονικού ταχυδρομείου του Icedove-UXP. Εάν είναι ενεργοποιημένη, οι διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν θα εμφανίζονται σε κανένα Βιβλίο διευθύνσεων επαφών θα προστεθούν στα επιλεγμένα βιβλία διευθύνσεων.">
 <!ENTITY emailsCollectionEnabledLabel "Ενεργοποιήθηκε">
 <!ENTITY emailsCollectionMailNameLabel "Λογαριασμός αλληλογραφίας">
 <!ENTITY emailsCollectionABNameLabel "Βιβλίο διευθύνσεων">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Εμφάνιση στο χάρτη με:">
 <!ENTITY localizeEngineOpenStreetMapLabel "Ανοιξε Δρόμος Χάρτης">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "Α">
-<!ENTITY localizeEngineGoogleMapsLabel "Γκούγκλαρε Χάρτες">
-<!ENTITY localizeEngineGoogleMapsAccesskey "Γ">
-<!ENTITY localizeEngineBingMapsLabel "Bing Χάρτες">
-<!ENTITY localizeEngineBingMapsAccesskey "Χ">
 <!ENTITY localizeTargetLabel "Άνοιγμα εξωτερικών συνδέσμων:">
-<!ENTITY localizeTargetInLabel "Μέσα στο Thunderbird">
+<!ENTITY localizeTargetInLabel "Μέσα στο Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "Μ">
-<!ENTITY localizeTargetOutLabel "Έξω από τον Thunderbird">
+<!ENTITY localizeTargetOutLabel "Έξω από τον Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "α">
 <!ENTITY showNameAsLabel "Εμφάνιση ονόματος ως">
 <!ENTITY showNameAsLFLabel "Επίθετο Όνομα">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "Ε">
 
 <!ENTITY ABtypesGroupboxLabel "βιβλίο διευθύνσεων">
-<!ENTITY typesCategoryGoogleLabel "Γκούγκλαρε">
-<!ENTITY typesCategoryGoogleAccesskey "Γ">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Άλλο">
 <!ENTITY typesCategoryOthersAccesskey "Ά">
 <!ENTITY typesGroupboxLabel "Τύποι">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Το πεδίο ORG μπορεί να περιέχει μια δομημένη τιμή κειμένου που αποτελείται από στοιχεία που χωρίζονται από τον χαρακτήρα ΆΝΩ ΤΕΛΕΊΑ (για παράδειγμα: ΕταιρείαΣας;ΥπηρεσίαΣας;ΤμήμαΣας). Τα παρακάτω πεδία περιγράφουν τις ετικέτες συστατικών της δομής αυτής.">
 
-<!ENTITY listPanelLabel "Αν ο διακομιστής σας δεν υποστηρίζει κατηγορίες (όπως Google, Apple, Zimbra, κ.λπ.), οι λίστες είναι ένας καλός τρόπος για να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου σε ομάδες. Το εικονική κάρτα (vCard) 3,0 δεν υποστηρίζει εγγενώς λίστες, αλλά αυτό μπορεί να επιτευχθεί με προσαρμοσμένα πεδία, οπότε αν θέλετε να χρησιμοποιήσετε λίστες στο εικονική κάρτα (vCard) 3,0, πρέπει να ορίσετε αυτά τα πεδία.">
+<!ENTITY listPanelLabel "Αν ο διακομιστής σας δεν υποστηρίζει κατηγορίες, οι λίστες είναι ένας καλός τρόπος για να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου σε ομάδες. Το εικονική κάρτα (vCard) 3,0 δεν υποστηρίζει εγγενώς λίστες, αλλά αυτό μπορεί να επιτευχθεί με προσαρμοσμένα πεδία, οπότε αν θέλετε να χρησιμοποιήσετε λίστες στο εικονική κάρτα (vCard) 3,0, πρέπει να ορίσετε αυτά τα πεδία.">
 <!ENTITY listGroupboxLabel "Προσαρμοσμένα πεδία για λίστες">
 <!ENTITY kindCustomLabel "Είδος">
 <!ENTITY kindCustomAccesskey "Ε">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Συγχρονίζω">
 <!ENTITY syncWarn "Ο συγχρονισμός προωθεί τις τροποποιήσεις σας σε έναν απομακρυσμένο διακομιστή και τις τροποποιήσεις του διακομιστή σε εσάς.">
-<!ENTITY initialSyncLabel "Εκτελέστε συγχρονισμό κατά την εκκίνηση του Thunderbird">
+<!ENTITY initialSyncLabel "Εκτελέστε συγχρονισμό κατά την εκκίνηση του Icedove-UXP">
 <!ENTITY initialSyncAccesskey "Ε">
 <!ENTITY initialSyncDelayLabel "Αρχική καθυστέρηση συγχρονισμού (1 δευτερόλεπτο)">
 <!ENTITY initialSyncDelayAccesskey "Α">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "ρ">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Εμφάνιση αναδυόμενου παραθύρου όταν η λίστα επετείων είναι κενή">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "μ">
-<!ENTITY remindViaLightningGroupboxLabel "Υπενθύμιση μέσω του Thunderbird Lightning Ημερολόγιο Εκτεκτάσεις">
+<!ENTITY remindViaLightningGroupboxLabel "Υπενθύμιση μέσω του Icedove-UXP Lightning Ημερολόγιο Εκτεκτάσεις">
 <!ENTITY numberOfDaysForWritingLabel "Αριθμός ημερών για την εγγραφή επετείων">
 <!ENTITY numberOfDaysForWritingAccesskey "γ">
 <!ENTITY syncWithLightningOnStartupLabel "Συγχρονισμός με Lightning κατά την εκκίνηση">
diff -ru cardbook1/chrome/locale/en-US/cardbook.properties cardbook2/chrome/locale/en-US/cardbook.properties
--- cardbook1/chrome/locale/en-US/cardbook.properties	2018-07-26 11:23:06.000000000 -0400
+++ cardbook2/chrome/locale/en-US/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=No duplicate contacts have been found.
 
-serverWarningGoogleLabel=Google use is experimental, because Google does not respect vCard standards.
 
 ValidatingLabel=Validating (%S)…
 ValidatingURLFailedLabel=URL is malformed
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Discovering phase 2 request on %2$S …
 synchronizationRequestDiscovery1=%1$S : Discovering phase 1 request on %2$S …
 
-googleAccessTokenOK=%1$S : Google access token request OK, access token : %2$S
-googleRefreshTokenOK=%1$S : Google refresh token request OK, refresh token : %2$S
-googleGetNewRefreshToken=%1$S : Trying to get a new Google refresh token on %2$S …
-googleNewRefreshTokenOK=%1$S : Received an authorization code : %2$S …
-googleRequestAccessToken=%1$S : Google access token request on %2$S …
-googleRequestRefreshToken=%1$S : Google refresh token request on %2$S …
-
-yahooAccessTokenOK=%1$S : Yahoo! access token request OK, access token : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! refresh token request OK, refresh token : %2$S
-yahooGetNewRefreshToken=%1$S : Trying to get a new Yahoo! refresh token on %2$S …
-yahooNewRefreshTokenOK=%1$S : Received an authorization code : %2$S …
-yahooRequestAccessToken=%1$S : Yahoo! access token request on %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! refresh token request on %2$S …
 
 periodicSyncDeleting=%1$S : Deleting periodic synchronization process (id : %2$S)
 periodicSyncSetting=%1$S : Setting periodic synchronization process (interval : %2$S ms, id : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Preference value
 prefWeightTooltip=Preferences may have different values between 1 and 100. Keep it empty for normal use.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Add to this address book
 wdw_cardEditionViewResultTitle=Resulting contact modification
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Edit Contact
 wdw_cardEditionViewContactTitle=View Contact
 wdw_cardEditionViewListTitle=View List
-wdw_cardbookPrintTitleLong=Print Preview of %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Print Preview of %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Print Preview
 
 displayGroupboxLabel=Display Name
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{6}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=New Google token for CardBook
-YAHOONewTokenTitle=New Yahoo! token for CardBook
 
 invalidEmail=%1$S is not a valid e-mail address because it is not of the form user@host.
 appendEmailLabel=Add to list: %1$S
diff -ru cardbook1/chrome/locale/en-US/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/en-US/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/en-US/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/en-US/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Add a new address book">
 
 <!ENTITY welcomePage.wizard.description "Welcome">
-<!ENTITY welcomePage.description "It seems that it is the first time you use CardBook, so we will try to import contacts from Thunderbird's standard address books into CardBook.">
+<!ENTITY welcomePage.description "It seems that it is the first time you use CardBook, so we will try to import contacts from Icedove-UXP's standard address books into CardBook.">
 
 <!ENTITY initialPage.wizard.description "Location for the new address book.">
 <!ENTITY initialPage.description "Address book location:">
 <!ENTITY initialPage.computer.label "Local">
 <!ENTITY initialPage.network.label "Remote">
-<!ENTITY initialPage.standard.label "Import Thunderbird's standard address books">
+<!ENTITY initialPage.standard.label "Import Icedove-UXP's standard address books">
 <!ENTITY initialPage.search.label "Search into existing address books">
 
 <!ENTITY localPage.wizard.description "Type and location of the new local address book.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Browse">
 
 <!ENTITY remotePage.wizard.description "Type and location of the new remote address book.">
-<!ENTITY remotePage.description "What is the type of your remote address book (Caution: Google does NOT conform to vCard standards)?">
+<!ENTITY remotePage.description "What is the type of your remote address book?">
 <!ENTITY remotePage.type.label "Type">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Connection">
-<!ENTITY remotePage.url.description "For a CardDAV type, enter the URL of your remote address book. You may try to use a partial URL (example : http(s)://carddav.example.org). For a Google address book, don't specify this field.">
+<!ENTITY remotePage.url.description "For a CardDAV type, enter the URL of your remote address book. You may try to use a partial URL (example : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Enter the credentials for accessing your address book. For a Google address book, the username should be your Google email.">
+<!ENTITY remotePage.credentials.description "Enter the credentials for accessing your address book.">
 <!ENTITY remotePage.validatebutton.label "Validate">
 
 <!ENTITY locationSearchPage.wizard.description "Definition of the saved search.">
 <!ENTITY locationSearchPage.label "Saved Search">
 
-<!ENTITY googleOauthPage.wizard.description "Google Authentication">
 
 <!ENTITY namePage.wizard.description "Address book properties">
 <!ENTITY namePage.selected.label "Selected">
diff -ru cardbook1/chrome/locale/en-US/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/en-US/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/en-US/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/en-US/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Anniversary">
 <!ENTITY synclistTabLabel "Anniversary Reminders">
 
-<!ENTITY integrationGroupboxLabel "Integration in Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integration in Icedove-UXP">
 <!ENTITY autocompletionLabel "Autocompletion of email addresses">
 <!ENTITY autocompletionAccesskey "o">
-<!ENTITY autocompletionTooltip "Extends the standard autocompletion of contacts in address books of Thunderbird with an autocompletion of contacts in address books of CardBook.">
+<!ENTITY autocompletionTooltip "Extends the standard autocompletion of contacts in address books of Icedove-UXP with an autocompletion of contacts in address books of CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Sort email addresses by popularity">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Propose concatenated emails per contact">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "Unique source for contacts">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "If disabled, this option allows to retrieve contacts in Thunderbird standard address books for the yellow stars, for the email display name and the for the email autocompletion.">
+<!ENTITY exclusiveTooltip "If disabled, this option allows to retrieve contacts in Icedove-UXP standard address books for the yellow stars, for the email display name and the for the email autocompletion.">
 <!ENTITY accountsRestrictionsLabel "Mail Account Restrictions">
 <!ENTITY accountsRestrictionsEnabledLabel "Enabled">
 <!ENTITY accountsRestrictionsMailNameLabel "Mail Account">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Delete">
 <!ENTITY deleteRestrictionAccesskey "D">
 <!ENTITY emailsCollectionLabel "Collect Outgoing Email">
-<!ENTITY emailsCollectionTooltip "Extends the standard outgoing email address collection of Thunderbird. If enabled, email addresses not present in any CardBook address books will be added to the selected address book(s).">
+<!ENTITY emailsCollectionTooltip "Extends the standard outgoing email address collection of Icedove-UXP. If enabled, email addresses not present in any CardBook address books will be added to the selected address book(s).">
 <!ENTITY emailsCollectionEnabledLabel "Enabled">
 <!ENTITY emailsCollectionMailNameLabel "Mail Account">
 <!ENTITY emailsCollectionABNameLabel "Address Book">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Show on Map with:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Open external links:">
-<!ENTITY localizeTargetInLabel "Inside Thunderbird">
+<!ENTITY localizeTargetInLabel "Inside Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Outside Thunderbird">
+<!ENTITY localizeTargetOutLabel "Outside Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Show Name As">
 <!ENTITY showNameAsLFLabel "Family Name Given Name">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "Address book">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "p">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Other">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "Types">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "The field ORG may contain a structured text value consisting of components separated by the SEMICOLON character (for example : yourcompany;yourservice;yourdepartment). The fields below describe the component labels of this structure.">
 
-<!ENTITY listPanelLabel "If your server does not support categories (like Google, Apple, Zimbra, etc…), lists are a good way to send emails to groups. vCard 3.0 do not natively support lists, but this may be achieved with custom fields, so if you want to use lists in vCard 3.0, you have to define these fields.">
+<!ENTITY listPanelLabel "If your server does not support categories, lists are a good way to send emails to groups. vCard 3.0 do not natively support lists, but this may be achieved with custom fields, so if you want to use lists in vCard 3.0, you have to define these fields.">
 <!ENTITY listGroupboxLabel "Custom fields for lists">
 <!ENTITY kindCustomLabel "Kind">
 <!ENTITY kindCustomAccesskey "K">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synchronization">
 <!ENTITY syncWarn "Synchronizing propagates your modifications to a remote server and the server's modifications to you.">
-<!ENTITY initialSyncLabel "Run synchronization at Thunderbird startup">
+<!ENTITY initialSyncLabel "Run synchronization at Icedove-UXP startup">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "Initial synchronization delay (seconds)">
 <!ENTITY initialSyncDelayAccesskey "y">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Show popup window when anniversaries list is empty">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "h">
-<!ENTITY remindViaLightningGroupboxLabel "Remind via Thunderbird Lightning Calendar Extension">
+<!ENTITY remindViaLightningGroupboxLabel "Remind via Icedove-UXP Lightning Calendar Extension">
 <!ENTITY numberOfDaysForWritingLabel "Number of days to write anniversaries">
 <!ENTITY numberOfDaysForWritingAccesskey "w">
 <!ENTITY syncWithLightningOnStartupLabel "Synchronize with Lightning on startup">
diff -ru cardbook1/chrome/locale/es-ES/cardbook.properties cardbook2/chrome/locale/es-ES/cardbook.properties
--- cardbook1/chrome/locale/es-ES/cardbook.properties	2018-07-30 09:07:24.000000000 -0400
+++ cardbook2/chrome/locale/es-ES/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=No se encontró ningún contacto duplicado
 
-serverWarningGoogleLabel=El uso de Google es experimental, porque Google no respeta el estándar vCard.
 
 ValidatingLabel=Validación (%S)…
 ValidatingURLFailedLabel=El formato del URL es incorrecto
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S: Solicitud de descubrimiento de URL fase 2 sobre %2$S…
 synchronizationRequestDiscovery1=%1$S: Solicitud de descubrimiento de URL fase 1 sobre %2$S…
 
-googleAccessTokenOK=%1$S: Solicitud de "access token Google" exítosa, access token: %2$S
-googleRefreshTokenOK=%1$S: Solicitud de "refresh token Google" exítosa, refresh token: %2$S
-googleGetNewRefreshToken=%1$S: Recuperación de un nuevo "refresh token Google" sobre %2$S…
-googleNewRefreshTokenOK=%1$S: Código de autorización recibido: %2$S…
-googleRequestAccessToken=%1$S: Solicitud de "access token Google" sobre %2$S…
-googleRequestRefreshToken=%1$S: Solicitud de "refresh token Google" sobre %2$S…
-
-yahooAccessTokenOK=%1$S: Solicitud de "access token Yahoo!" exítosa, access token: %2$S
-yahooRefreshTokenOK=%1$S: Solicitud de "refresh token Yahoo!" exítosa, refresh token: %2$S
-yahooGetNewRefreshToken=%1$S: Recuperación de un nuevo "refresh token Yahoo!" sobre %2$S…
-yahooNewRefreshTokenOK=%1$S: Código de autorización recibido: %2$S…
-yahooRequestAccessToken=%1$S: Solicitud de "access token Yahoo!" sobre %2$S…
-yahooRequestRefreshToken=%1$S: Solicitud de "refresh token Yahoo!" sobre %2$S…
-
 periodicSyncDeleting=%1$S: Supresión del procesamiento de sincronización periódica (id: %2$S)
 periodicSyncSetting=%1$S: Creación del procesamiento de sincronización periódica (intervalo: %2$S ms, id: %3$S)
 periodicSyncSyncing=%S: Sincronización en razón del procesamiento de sincronización periódica…
@@ -341,10 +326,7 @@
 prefValueLabel=Valor de la preferencia
 prefWeightTooltip=Las preferencias pueden ser diferenciadas usando valores entre el 1 y el 100. Pero para un uso básico, este campo puede quedarse vacío.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Añadir este directorio
 wdw_cardEditionViewResultTitle=Modificar el contacto resultado
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Modificar el contacto
 wdw_cardEditionViewContactTitle=Consultar el contacto
 wdw_cardEditionViewListTitle=Consultar la lista
-wdw_cardbookPrintTitleLong=Previsualización de impresión de %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Previsualización de impresión de %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Previsualización de impresión
 
 displayGroupboxLabel=Nombre mostrado
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nuevo token Google para CardBook
-YAHOONewTokenTitle=Nuevo token Yahoo! para CardBook
 
 invalidEmail=%1$S no es una dirección de correo electrónico válida porque no tiene la forma usuario@dominio.
 appendEmailLabel=Añadir a la lista: %1$S
diff -ru cardbook1/chrome/locale/es-ES/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/es-ES/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/es-ES/wdw_addressbooksAdd.dtd	2018-05-23 11:42:48.000000000 -0400
+++ cardbook2/chrome/locale/es-ES/wdw_addressbooksAdd.dtd	2018-09-14 21:38:38.000000000 -0400
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Navegar">
 
 <!ENTITY remotePage.wizard.description "Tipo y ubicación del nuevo directorio remoto.">
-<!ENTITY remotePage.description "¿Cuál es el tipo de su directorio remoto? : (Cuidado con Google, que no respeta el estándar vCard)">
+<!ENTITY remotePage.description "¿Cuál es el tipo de su directorio remoto?">
 <!ENTITY remotePage.type.label "Tipo">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Conexión">
-<!ENTITY remotePage.url.description "Para un tipo CardDAV, ingrese la URL de su directorio remoto. Puede usar una URL parcial (por ejemplo: http(s)://carddav.example.org). Para un tipo Google, este campo tiene que quedar vacío.">
+<!ENTITY remotePage.url.description "Para un tipo CardDAV, ingrese la URL de su directorio remoto. Puede usar una URL parcial (por ejemplo: http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Ingrese los identificadores de conexión. Para un tipo Google, el usuario tiene que ser la dirección de correo electróico Google.">
+<!ENTITY remotePage.credentials.description "Ingrese los identificadores de conexión.">
 <!ENTITY remotePage.validatebutton.label "Validar">
 
 <!ENTITY locationSearchPage.wizard.description "Definición de la búsqueda.">
 <!ENTITY locationSearchPage.label "Búsqueda avanzada">
 
-<!ENTITY googleOauthPage.wizard.description "Autenticación Google">
 
 <!ENTITY namePage.wizard.description "Propiedades del directorio">
 <!ENTITY namePage.selected.label "Seleccionado">
diff -ru cardbook1/chrome/locale/es-ES/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/es-ES/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/es-ES/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/es-ES/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,7 +9,7 @@
 <!ENTITY birthdaylistTabLabel "Cunpleaños">
 <!ENTITY synclistTabLabel "Recordatorios de los cumpleaños">
 
-<!ENTITY integrationGroupboxLabel "Integración con Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integración con Icedove-UXP">
 <!ENTITY autocompletionLabel "Sugestión de direcciones de correo electrónico realizada por CardBook">
 <!ENTITY autocompletionAccesskey "e">
 <!ENTITY autocompletionTooltip "Remplaza la sugestión de direcciones de correo electrónico estándar por la sugestión de CardBook. Si está activa, se utilizarán las direcciones de correo electrónico de los directorios CardBook y de los correos electrónicos colectados.">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "x">
 <!ENTITY exclusiveLabel "CardBook, única fuente para los contactos">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Si está desactivada, esta opción permite la búsqueda de contactos en los directorios estándar de Thunderbird para las estrellas amarillas, para el nombre mostrado en los correos electrónicos y la sugestión de direcciones de correo.">
+<!ENTITY exclusiveTooltip "Si está desactivada, esta opción permite la búsqueda de contactos en los directorios estándar de Icedove-UXP para las estrellas amarillas, para el nombre mostrado en los correos electrónicos y la sugestión de direcciones de correo.">
 <!ENTITY accountsRestrictionsLabel "Restricciones de acceso para las cuentas de correo electrónico">
 <!ENTITY accountsRestrictionsEnabledLabel "Activo">
 <!ENTITY accountsRestrictionsMailNameLabel "Cuenta de correo electrónico">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Ubicar con:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "S">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Abrir los vínculos externos:">
-<!ENTITY localizeTargetInLabel "En Thunderbird">
+<!ENTITY localizeTargetInLabel "En Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "D">
-<!ENTITY localizeTargetOutLabel "Fuera de Thunderbird">
+<!ENTITY localizeTargetOutLabel "Fuera de Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "H">
 <!ENTITY showNameAsLabel "Mostrar el nombre como">
 <!ENTITY showNameAsLFLabel "Apellidos Nombre">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "L">
 
 <!ENTITY ABtypesGroupboxLabel "Directorio">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "p">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Otros">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "Tipos">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "El campo ORG puede contener un valor estructurado, compuesto de elementos separados por el carácter PUNTO Y COMA (por ejemplo: compañia;servicio;departamento). Los campos siguientes describen las etiquetas de estos elementos.">
 
-<!ENTITY listPanelLabel "Si su servidor no usa las categorías (como Google, Apple, Zimbra, etc…), las listas son una buena manera de enviar correos electrónicos a grupos. vCard 3.0 no toma en cuenta las listas de manera nativa, pero se puede habilitar de toda forma con campos personalizados, entonces para poder utilizar listas en vCard 3.0, tiene que definir estos campos.">
+<!ENTITY listPanelLabel "Si su servidor no usa las categorías, las listas son una buena manera de enviar correos electrónicos a grupos. vCard 3.0 no toma en cuenta las listas de manera nativa, pero se puede habilitar de toda forma con campos personalizados, entonces para poder utilizar listas en vCard 3.0, tiene que definir estos campos.">
 <!ENTITY listGroupboxLabel "Campos personalizados para las listas">
 <!ENTITY kindCustomLabel "Tipo">
 <!ENTITY kindCustomAccesskey "T">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sincronizaciones">
 <!ENTITY syncWarn "Sincronizar es el único método para guardar sus modificaciones en un servidor remoto.">
-<!ENTITY initialSyncLabel "Lanzar una sincronización al iniciar Thunderbird">
+<!ENTITY initialSyncLabel "Lanzar una sincronización al iniciar Icedove-UXP">
 <!ENTITY initialSyncAccesskey "L">
 <!ENTITY initialSyncDelayLabel "Tiempo antes de lanzar las primeras consultas (segundos)">
 <!ENTITY initialSyncDelayAccesskey "v">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "H">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Ver una ventana emergente cuando la lista de cumpleaños esta vacía">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "P">
-<!ENTITY remindViaLightningGroupboxLabel "Recordatorio por la extensión de calendario Lightning de Thunderbird">
+<!ENTITY remindViaLightningGroupboxLabel "Recordatorio por la extensión de calendario Lightning de Icedove-UXP">
 <!ENTITY numberOfDaysForWritingLabel "Número de días para escribir los cumpleaños">
 <!ENTITY numberOfDaysForWritingAccesskey "o">
 <!ENTITY syncWithLightningOnStartupLabel "Sincronizar con Lightning al inicio">
diff -ru cardbook1/chrome/locale/fr/cardbook.properties cardbook2/chrome/locale/fr/cardbook.properties
--- cardbook1/chrome/locale/fr/cardbook.properties	2018-07-27 16:52:44.000000000 -0400
+++ cardbook2/chrome/locale/fr/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Aucun contact dupliqué n'a été trouvé.
 
-serverWarningGoogleLabel=L'utilisation de Google est expérimentale, car Google ne respecte pas le standard vCard.
 
 ValidatingLabel=Validation (%S)…
 ValidatingURLFailedLabel=l'URL est malformée
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Requête de découverte d'URL phase 2 sur %2$S …
 synchronizationRequestDiscovery1=%1$S : Requête de découverte d'URL phase 1 sur %2$S …
 
-googleAccessTokenOK=%1$S : Requête d'access token Google réussie, access token : %2$S
-googleRefreshTokenOK=%1$S : Requête de refresh token Google réussie, refresh token : %2$S
-googleGetNewRefreshToken=%1$S : Récupération d'un nouveau refresh token Google on %2$S …
-googleNewRefreshTokenOK=%1$S : Code d'autorisation reçu : %2$S …
-googleRequestAccessToken=%1$S : Requête d'access token Google sur %2$S …
-googleRequestRefreshToken=%1$S : Requête de refresh token Google sur %2$S …
-
-yahooAccessTokenOK=%1$S : Requête d'access token Yahoo! réussie, access token : %2$S
-yahooRefreshTokenOK=%1$S : Requête de refresh token Yahoo! réussie, refresh token : %2$S
-yahooGetNewRefreshToken=%1$S : Récupération d'un nouveau refresh token Yahoo! on %2$S …
-yahooNewRefreshTokenOK=%1$S : Code d'autorisation reçu : %2$S …
-yahooRequestAccessToken=%1$S : Requête d'access token Yahoo! sur %2$S …
-yahooRequestRefreshToken=%1$S : Requête de refresh token Yahoo! sur %2$S …
-
 periodicSyncDeleting=%1$S : Suppression du traitement de synchronisation périodique (id : %2$S)
 periodicSyncSetting=%1$S : Création du traitement de synchronisation périodique (intervalle : %2$S ms, id : %3$S)
 periodicSyncSyncing=%S : Synchronisation à cause du traitement de synchronisation périodique …
@@ -341,10 +326,7 @@
 prefValueLabel=Valeur de la préference
 prefWeightTooltip=Les préférences peuvent être différenciées par des valeurs allant de 1 à 100. Pour une utilisation courrante, ce champ peut rester vide.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Ajouter à ce carnet d'adresses
 wdw_cardEditionViewResultTitle=Modifier le contact résultat
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Modifier le contact
 wdw_cardEditionViewContactTitle=Consulter le contact
 wdw_cardEditionViewListTitle=Consulter la liste
-wdw_cardbookPrintTitleLong=Aperçu avant impression de %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Aperçu avant impression de %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Aperçu avant impression
 
 displayGroupboxLabel=Nom affiché
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nouveau token Google pour CardBook
-YAHOONewTokenTitle=Nouveau token Yahoo! pour CardBook
 
 invalidEmail=%1$S n’est pas une adresse valide, car elle n’est pas au format utilisateur@domaine.
 appendEmailLabel=Ajouter à la liste : %1$S
diff -ru cardbook1/chrome/locale/fr/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/fr/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/fr/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/fr/wdw_addressbooksAdd.dtd	2018-09-14 21:39:58.000000000 -0400
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Naviguer">
 
 <!ENTITY remotePage.wizard.description "Type et emplacement du nouveau carnet d'adresses distant.">
-<!ENTITY remotePage.description "Quel est le type de votre carnet d'adresses distant ? : (Attention avec Google, qui ne respecte pas le standard vCard)">
+<!ENTITY remotePage.description "Quel est le type de votre carnet d'adresses distant ?">
 <!ENTITY remotePage.type.label "Type">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Connection">
-<!ENTITY remotePage.url.description "Pour un type CardDAV, entrez l'URL de votre carnet d'adresses distant. Vous pouvez utiliser une URL partielle (par exemple : http(s)://carddav.example.org). Pour un type Google, ce champ ne doit pas être rempli.">
+<!ENTITY remotePage.url.description "Pour un type CardDAV, entrez l'URL de votre carnet d'adresses distant. Vous pouvez utiliser une URL partielle (par exemple : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Entrez les identifiants de connection. Pour un type Google, l'utilisateur doit être votre email Google.">
+<!ENTITY remotePage.credentials.description "Entrez les identifiants de connection.">
 <!ENTITY remotePage.validatebutton.label "Valider">
 
 <!ENTITY locationSearchPage.wizard.description "Définition de la recherche.">
 <!ENTITY locationSearchPage.label "Recherche avancée">
 
-<!ENTITY googleOauthPage.wizard.description "Authentification Google">
 
 <!ENTITY namePage.wizard.description "Propriétés du carnet d'adresses">
 <!ENTITY namePage.selected.label "Selectionné">
diff -ru cardbook1/chrome/locale/fr/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/fr/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/fr/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/fr/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,7 +9,7 @@
 <!ENTITY birthdaylistTabLabel "Anniversaires">
 <!ENTITY synclistTabLabel "Rappels des anniversaires">
 
-<!ENTITY integrationGroupboxLabel "Intégration avec Thunderbird">
+<!ENTITY integrationGroupboxLabel "Intégration avec Icedove-UXP">
 <!ENTITY autocompletionLabel "Suggestion d'emails faite par CardBook">
 <!ENTITY autocompletionAccesskey "e">
 <!ENTITY autocompletionTooltip "Remplace la suggestion d'emails standard par celle fournie par CardBook. Si active, les emails vont être récupérés dans les carnets d'adresses CardBook et dans les emails collectés.">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "x">
 <!ENTITY exclusiveLabel "CardBook, unique source pour les contacts">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Si décochée, cette option permet la recherche des contacts dans les carnets d'adresses standards de Thunderbird pour les étoiles jaunes, pour le nom affiché des emails et la suggestion d'emails.">
+<!ENTITY exclusiveTooltip "Si décochée, cette option permet la recherche des contacts dans les carnets d'adresses standards de Icedove-UXP pour les étoiles jaunes, pour le nom affiché des emails et la suggestion d'emails.">
 <!ENTITY accountsRestrictionsLabel "Restrictions d'accès pour les comptes email">
 <!ENTITY accountsRestrictionsEnabledLabel "Actif">
 <!ENTITY accountsRestrictionsMailNameLabel "Compte courrier">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Localiser avec :">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "S">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Ouvrir les liens externes :">
-<!ENTITY localizeTargetInLabel "Dans Thunderbird">
+<!ENTITY localizeTargetInLabel "Dans Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "D">
-<!ENTITY localizeTargetOutLabel "Hors de Thunderbird">
+<!ENTITY localizeTargetOutLabel "Hors de Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "H">
 <!ENTITY showNameAsLabel "Afficher le nom comme">
 <!ENTITY showNameAsLFLabel "Nom de famille Prénom">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "L">
 
 <!ENTITY ABtypesGroupboxLabel "Carnet d'adresses">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "p">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Autres">
 <!ENTITY typesCategoryOthersAccesskey "e">
 <!ENTITY typesGroupboxLabel "Types">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Le champ ORG peut contenir une valeur structurée composée d'éléments séparés par le caractère POINT VIRGULE (par exemple : votresociété;votreservice;votredépartement). Les champs ci-dessous décrivent les labels de ces éléments.">
 
-<!ENTITY listPanelLabel "Si votre serveur n'utilise pas les catégories (comme Google, Apple, Zimbra, etc…), les listes sont un bon moyen d'envoyer des emails à des groupes. vCard 3.0 ne prend pas en charge nativement les listes, mais cela peut quand même être fait en définissant des champs personnalisés, donc si vous voulez utiliser des listes en vCard 3.0, vous devez définir ces champs.">
+<!ENTITY listPanelLabel "Si votre serveur n'utilise pas les catégories, les listes sont un bon moyen d'envoyer des emails à des groupes. vCard 3.0 ne prend pas en charge nativement les listes, mais cela peut quand même être fait en définissant des champs personnalisés, donc si vous voulez utiliser des listes en vCard 3.0, vous devez définir ces champs.">
 <!ENTITY listGroupboxLabel "Champs personnalisés pour les listes">
 <!ENTITY kindCustomLabel "Type">
 <!ENTITY kindCustomAccesskey "T">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synchronisations">
 <!ENTITY syncWarn "Synchroniser est la seule méthode pour sauver vos modifications sur un serveur distant.">
-<!ENTITY initialSyncLabel "Lancer une synchronisation lors du démarrage de Thunderbird">
+<!ENTITY initialSyncLabel "Lancer une synchronisation lors du démarrage de Icedove-UXP">
 <!ENTITY initialSyncAccesskey "L">
 <!ENTITY initialSyncDelayLabel "Delai avant de lancer les premières requêtes (secondes)">
 <!ENTITY initialSyncDelayAccesskey "v">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "H">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Voir une Popup quand la liste d'anniversaires est vide">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "P">
-<!ENTITY remindViaLightningGroupboxLabel "Rappel par l'extension de calendrier Lightning de Thunderbird">
+<!ENTITY remindViaLightningGroupboxLabel "Rappel par l'extension de calendrier Lightning de Icedove-UXP">
 <!ENTITY numberOfDaysForWritingLabel "Nombre de jours pour écrire les anniversaires">
 <!ENTITY numberOfDaysForWritingAccesskey "o">
 <!ENTITY syncWithLightningOnStartupLabel "Synchroniser avec Lightning au démarrage">
diff -ru cardbook1/chrome/locale/hr/cardbook.properties cardbook2/chrome/locale/hr/cardbook.properties
--- cardbook1/chrome/locale/hr/cardbook.properties	2018-07-30 09:27:14.000000000 -0400
+++ cardbook2/chrome/locale/hr/cardbook.properties	2018-09-14 22:16:49.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nisu pronađeni ponovljeni kontakti.
 
-serverWarningGoogleLabel=Googleova upotreba eksperimentalna je jer Google ne poštuje vCard standarde.
 
 ValidatingLabel=Provjera valjanosti (%S)…
 ValidatingURLFailedLabel=URL je neispravan
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Otkrivanje zahtjeva faze 2 na %2$S …
 synchronizationRequestDiscovery1=%1$S : Otkrivanje zahtjeva faze 1 na %2$S …
 
-googleAccessTokenOK=%1$S : Zahtjev za pristup Googleovom pristupnom toku je u redu, pristupni token : %2$S
-googleRefreshTokenOK=%1$S : Googleov zahtjev za osvježavanje tokena je u redu, osvježi token : %2$S
-googleGetNewRefreshToken=%1$S : Pokušavajući dobiti %2$S novi token za osvježavanje Googlea …
-googleNewRefreshTokenOK=%1$S : Primio je kod za autorizaciju : %2$S …
-googleRequestAccessToken=%1$S : Googleov zahtjev za pristupni tok na %2$S …
-googleRequestRefreshToken=%1$S : Google osvježava zahtjev za znak na %2$S …
-
-yahooAccessTokenOK=%1$S : Zahtjev za pristup Yahoo!ovom pristupnom toku je u redu, pristupni token : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo!ov zahtjev za osvježavanje tokena je u redu, osvježi token : %2$S
-yahooGetNewRefreshToken=%1$S : Pokušavajući dobiti %2$S novi token za osvježavanje Yahoo!a …
-yahooNewRefreshTokenOK=%1$S : Primio je kod za autorizaciju : %2$S …
-yahooRequestAccessToken=%1$S : Yahoo!ov zahtjev za pristupni tok na %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! osvježava zahtjev za znak na %2$S …
 
 periodicSyncDeleting=%1$S : Brisanje periodičnog postupka sinkronizacije (iskaznica : %2$S)
 periodicSyncSetting=%1$S : Postavljanje periodičnog postupka sinkronizacije (interval vremena : %2$S ms, iskaznica : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Preferencijalna vrijednost
 prefWeightTooltip=Postavke mogu imati različite vrijednosti između 1 i 100. Za normalnu uporabu, zadržao je prazan.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Dodaj u ovaj adresar
 wdw_cardEditionViewResultTitle=Posljedica izmjene kontakta
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Uredi kontakt
 wdw_cardEditionViewContactTitle=Pogledaj kontakt
 wdw_cardEditionViewListTitle=Prikaži popis
-wdw_cardbookPrintTitleLong=Pregled ispisa %S - Kontakti - Thunderbird
+wdw_cardbookPrintTitleLong=Pregled ispisa %S - Kontakti - Icedove-UXP
 wdw_cardbookPrintTitle=Pregled ispisa
 
 displayGroupboxLabel=Prikaži ime
@@ -478,9 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nova Google oznaka za CardBook"
-YAHOONewTokenTitle=Nova Yahoo! oznaka za CardBook"
-
 invalidEmail=%1$S nije ispravna adresa e-pošte jer nije u obliku korisnik@poslužitelj.
 appendEmailLabel=Dodaj na popis: %1$S
 
diff -ru cardbook1/chrome/locale/hr/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/hr/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/hr/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/hr/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Unesite novi adresar">
 
 <!ENTITY welcomePage.wizard.description "Dobro došli">
-<!ENTITY welcomePage.description "Izgleda da po prvi put koristite CardBook, stoga ćemo pokušati prenijeti kontakte iz standardnog adresara Thunderbirda u CardBook.">
+<!ENTITY welcomePage.description "Izgleda da po prvi put koristite CardBook, stoga ćemo pokušati prenijeti kontakte iz standardnog adresara Icedove-UXPa u CardBook.">
 
 <!ENTITY initialPage.wizard.description "Lokacija za novi adresar">
 <!ENTITY initialPage.description "Je li Vaš adresar mjesni ili daleko? :">
 <!ENTITY initialPage.computer.label "Mjesni">
 <!ENTITY initialPage.network.label "Udaljen">
-<!ENTITY initialPage.standard.label "Prenesi Thunderbirdov standardni adresar.">
+<!ENTITY initialPage.standard.label "Prenesi Icedove-UXPov standardni adresar.">
 <!ENTITY initialPage.search.label "Traži među postojećim adresarima">
 
 <!ENTITY localPage.wizard.description "Vrsta i mjesto novog lokalnog adresara.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Traži">
 
 <!ENTITY remotePage.wizard.description "Vrsta i lokacija novog udaljenog adresara.">
-<!ENTITY remotePage.description "Koje vrste je Vaš udaljeni adresar? : (Caution: Google does NOT conform to vCard standards)">
+<!ENTITY remotePage.description "Koje vrste je Vaš udaljeni adresar?">
 <!ENTITY remotePage.type.label "Vrsta">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Veza">
-<!ENTITY remotePage.url.description "Za vrstu CardDAV, unesite URL za svoj udaljeni adresar. Možete pokušati djelomični URL (na primjer : http(s)://carddav.example.org). za  Googleov adresar, nemojte odrediti ovo polje.">
+<!ENTITY remotePage.url.description "Za vrstu CardDAV, unesite URL za svoj udaljeni adresar. Možete pokušati djelomični URL (na primjer : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Unesite vjerodajnicu kako biste otvorili svoj adresar. Za Googleov adresar, pod ime korisnika treba biti Vaša e-pošta adresa za Google.">
+<!ENTITY remotePage.credentials.description "Unesite vjerodajnicu kako biste otvorili svoj adresar.">
 <!ENTITY remotePage.validatebutton.label "Potvrdi">
 
 <!ENTITY locationSearchPage.wizard.description "Definicija: sačuvano traži.">
 <!ENTITY locationSearchPage.label "Sačuvano Traži">
 
-<!ENTITY googleOauthPage.wizard.description "Googleova ovjera">
 
 <!ENTITY namePage.wizard.description "Svojstva adresara">
 <!ENTITY namePage.selected.label "Odabrano">
diff -ru cardbook1/chrome/locale/hr/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/hr/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/hr/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/hr/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Godišnjica">
 <!ENTITY synclistTabLabel "Podsjetnik o godišnjicama">
 
-<!ENTITY integrationGroupboxLabel "Uključenje Thunderbird-a">
+<!ENTITY integrationGroupboxLabel "Uključenje Icedove-UXP-a">
 <!ENTITY autocompletionLabel "Automatsko okončanje e-pošta adresa">
 <!ENTITY autocompletionAccesskey "o">
-<!ENTITY autocompletionTooltip "Produžava standardno automatsko okončanje kontakata iz adresara iz Thunderbird-a s automatskim okončanjem kontakata iz adresara u Kontakti-u.">
+<!ENTITY autocompletionTooltip "Produžava standardno automatsko okončanje kontakata iz adresara iz Icedove-UXP-a s automatskim okončanjem kontakata iz adresara u Kontakti-u.">
 <!ENTITY autocompleteSortByPopularityLabel "Sortiraj e-pošta adrese prema popularnosti">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Predložite povezane poruke e-pošte po kontaktu">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "Jedinstven izvor za kontakte">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Ako onemogućena ova opcija omogućava povrat kontakata u Thunderbird standardni adresar za žute zvjezdice, za prikaz naziva e-pošta i automatsko okončanje e-pošta.">
+<!ENTITY exclusiveTooltip "Ako onemogućena ova opcija omogućava povrat kontakata u Icedove-UXP standardni adresar za žute zvjezdice, za prikaz naziva e-pošta i automatsko okončanje e-pošta.">
 <!ENTITY accountsRestrictionsLabel "Ograničenja poštanskog računa">
 <!ENTITY accountsRestrictionsEnabledLabel "Omogućen">
 <!ENTITY accountsRestrictionsMailNameLabel "Poštanksi račun">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Izbriši">
 <!ENTITY deleteRestrictionAccesskey "D">
 <!ENTITY emailsCollectionLabel "Pokupi izlaznu e-pošta">
-<!ENTITY emailsCollectionTooltip "Produžava prikupljanje standardnih izlaznih e-pošta adresa u Thunderbird-u. Ako omogućen, e-pošta adrese nisu prisutne ni u jednom adresaru Kontakti-a adresar će biti dodat odabranom adresaru il adresarima.">
+<!ENTITY emailsCollectionTooltip "Produžava prikupljanje standardnih izlaznih e-pošta adresa u Icedove-UXP-u. Ako omogućen, e-pošta adrese nisu prisutne ni u jednom adresaru Kontakti-a adresar će biti dodat odabranom adresaru il adresarima.">
 <!ENTITY emailsCollectionEnabledLabel "Omogućen">
 <!ENTITY emailsCollectionMailNameLabel "Poštanski račun">
 <!ENTITY emailsCollectionABNameLabel "Adresar">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Lociraj s:">
 <!ENTITY localizeEngineOpenStreetMapLabel "Otvori StreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google mape">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing mape">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Otvori vanjske veze:">
-<!ENTITY localizeTargetInLabel "Unutar Thunderbird-a">
+<!ENTITY localizeTargetInLabel "Unutar Icedove-UXP-a">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Izvan Thunderbird-a">
+<!ENTITY localizeTargetOutLabel "Izvan Icedove-UXP-a">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Pokaži imena kao">
 <!ENTITY showNameAsLFLabel "Prezime i ime">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "Adresar">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Drugi">
 <!ENTITY typesCategoryOthersAccesskey "D">
 <!ENTITY typesGroupboxLabel "Vrste">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Polje ORG može imati vrijednost organiziranog teksta sastavljenog od dijelova odvojenih znakom TOČKA SA ZAREZOM(npr. : vaša kompanija;vaša usluga;vaš odjel). Polja niže opisuju dijelove naziva ove strukture.">
 
-<!ENTITY listPanelLabel "Ako vaš poslužitelj ne podržava kategorije  (kao Google, Apple, Zimbra, itd…), dobar način za slanje e-pošta skupinama jest putem liste. vCard 3.0 normalno ne podržava liste, no to se može postići pomoću prilagođenih polja, pa ako se želite koristiti popisima u vCard 3.0, morate definirati ta polja.">
+<!ENTITY listPanelLabel "Ako vaš poslužitelj ne podržava kategorije, dobar način za slanje e-pošta skupinama jest putem liste. vCard 3.0 normalno ne podržava liste, no to se može postići pomoću prilagođenih polja, pa ako se želite koristiti popisima u vCard 3.0, morate definirati ta polja.">
 <!ENTITY listGroupboxLabel "Prilagođena polja za popise">
 <!ENTITY kindCustomLabel "Vrsta">
 <!ENTITY kindCustomAccesskey "K">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sinkronizirati">
 <!ENTITY syncWarn "Sinhroniziranje raznosi vaše preinake udaljenom poslužitelju i poslužiteljeve preinake vama.">
-<!ENTITY initialSyncLabel "Pokreni početnu sinhronizaciju kad počne Thunderbird">
+<!ENTITY initialSyncLabel "Pokreni početnu sinhronizaciju kad počne Icedove-UXP">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "Početno kašnjenje sinkronizacije (sekundi)">
 <!ENTITY initialSyncDelayAccesskey "P">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Pokaži okno popup kad je popis godišnjica prazan">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "h">
-<!ENTITY remindViaLightningGroupboxLabel "Podsjeti preko Thunderbird Lightning Calendar Extension">
+<!ENTITY remindViaLightningGroupboxLabel "Podsjeti preko Icedove-UXP Lightning Calendar Extension">
 <!ENTITY numberOfDaysForWritingLabel "Broj dana do pisanja godišnjica">
 <!ENTITY numberOfDaysForWritingAccesskey "w">
 <!ENTITY syncWithLightningOnStartupLabel "Sinhroniziraj s Lightning kod uključenja">
diff -ru cardbook1/chrome/locale/hu/cardbook.properties cardbook2/chrome/locale/hu/cardbook.properties
--- cardbook1/chrome/locale/hu/cardbook.properties	2018-07-30 09:25:22.000000000 -0400
+++ cardbook2/chrome/locale/hu/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Ismétlődő névjegyek nem található.
 
-serverWarningGoogleLabel=A Google használata kísérleti, mert a Google nem tartja be a vCard szabványokak.
 
 ValidatingLabel=Érvényesítése (%S)…
 ValidatingURLFailedLabel=Webcím formátuma hibás
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : 2. fázis felfedezés felfedezés %2$S …
 synchronizationRequestDiscovery1=%1$S : 1. fázis felfedezés felfedezés %2$S …
 
-googleAccessTokenOK=%1$S : Google hozzáférési token kérelem rendben van, hozzáférési token : %2$S
-googleRefreshTokenOK=%1$S : Google jelsor igénylési frissítse rendben van, frissítse jelsor : %2$S
-googleGetNewRefreshToken=%1$S : Megpróbál egy új Google frissítési jelsor %2$S …
-googleNewRefreshTokenOK=%1$S : Engedélyt kapott kódot : %2$S …
-googleRequestAccessToken=%1$S : Google hozzáférési jelsor kérelmet %2$S …
-googleRequestRefreshToken=%1$S : Google frissítési jelsor kérelmet %2$S …
-
-yahooAccessTokenOK=%1$S : Yahoo! hozzáférési token kérelem rendben van, hozzáférési token : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! jelsor igénylési frissítse rendben van, frissítse jelsor : %2$S
-yahooGetNewRefreshToken=%1$S : Megpróbál egy új Yahoo! frissítési jelsor %2$S …
-yahooNewRefreshTokenOK=%1$S : Engedélyt kapott kódot : %2$S …
-yahooRequestAccessToken=%1$S : Yahoo! hozzáférési jelsor kérelmet %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! frissítési jelsor kérelmet %2$S …
 
 periodicSyncDeleting=%1$S : Időszakos szinkronizációs folyamat törlése (azonosítás : %2$S)
 periodicSyncSetting=%1$S : időszakos szinkronizációs folyamat beállítása (időköz : %2$S ms, azonosítás : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Preferencia érték
 prefWeightTooltip=PREF értékeket 1 és 100 között. Tartotta üres rendes használat.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Névjegytár
 wdw_cardEditionViewResultTitle=Az ebből eredő névjegy módosítás
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Névjegy szerkesztés
 wdw_cardEditionViewContactTitle=Nézet névjegy
 wdw_cardEditionViewListTitle=Nézet lista
-wdw_cardbookPrintTitleLong=%S nyomtatási képe - Névjegyzék - Thunderbird
+wdw_cardbookPrintTitleLong=%S nyomtatási képe - Névjegyzék - Icedove-UXP
 wdw_cardbookPrintTitle=Nyomtatási kép
 
 displayGroupboxLabel=Megjelenítendő név
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{6}} |)({{4}}|)(\n)({{3}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Új Google záloga Névjegyek
-YAHOONewTokenTitle=Új Yahoo! záloga Névjegyek
 
 invalidEmail=%1$S nem érvényes e-mail cím, mert nem felhasználó@gép formában van.
 appendEmailLabel=Listához ad: %1$S
diff -ru cardbook1/chrome/locale/hu/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/hu/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/hu/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/hu/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -8,7 +8,7 @@
 <!ENTITY initialPage.description "Névjegytár mappa típus:">
 <!ENTITY initialPage.computer.label "Helyi">
 <!ENTITY initialPage.network.label "Távoli">
-<!ENTITY initialPage.standard.label "Bemásolni az adataid a Thunderbird címjegyzékről">
+<!ENTITY initialPage.standard.label "Bemásolni az adataid a Icedove-UXP címjegyzékről">
 <!ENTITY initialPage.search.label "Mentett kérése">
 
 <!ENTITY localPage.wizard.description "Helyi névjegytár mappaformátum és tárolási hely.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Tallózás…">
 
 <!ENTITY remotePage.wizard.description "Távoli névjegytár mappaformátum és tárolási hely.">
-<!ENTITY remotePage.description "Válassza ki a távoli névjegytár mappaformátum: (Vigyázat: Google végrehajtása a vCard formátum hibás.)">
+<!ENTITY remotePage.description "Válassza ki a távoli névjegytár mappaformátum">
 <!ENTITY remotePage.type.label "Mappaformátum">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Kapcsolat">
-<!ENTITY remotePage.url.description "CardDAV-re, írjál be a távoli névjegytár mappa webcímet. Megpróbálja használni részleges webcímet (például http(s)://carddav.például.hu). Google névjegytár: hagyja üresen a mezőt.">
+<!ENTITY remotePage.url.description "CardDAV-re, írjál be a távoli névjegytár mappa webcímet. Megpróbálja használni részleges webcímet (például http(s)://carddav.például.hu).">
 <!ENTITY remotePage.url.label "Webcím">
-<!ENTITY remotePage.credentials.description "Írja be a hitelesítő adatok hozzáférését a névjegytár. Google névjegytár: Google e-mailcím a felhasználónév.">
+<!ENTITY remotePage.credentials.description "Írja be a hitelesítő adatok hozzáférését a névjegytár.">
 <!ENTITY remotePage.validatebutton.label "Érvényesít">
 
 <!ENTITY locationSearchPage.wizard.description "Mentett keresés meghatározása.">
 <!ENTITY locationSearchPage.label "Mentett keresés">
 
-<!ENTITY googleOauthPage.wizard.description "Google hitelesítés">
 
 <!ENTITY namePage.wizard.description "Névjegytár mappa tulajdonságok">
 <!ENTITY namePage.selected.label "Kiválasztott">
diff -ru cardbook1/chrome/locale/hu/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/hu/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/hu/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/hu/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Évforduló">
 <!ENTITY synclistTabLabel "Évforduló emlékeztetők">
 
-<!ENTITY integrationGroupboxLabel "Thunderbird integráció">
+<!ENTITY integrationGroupboxLabel "Icedove-UXP integráció">
 <!ENTITY autocompletionLabel "E-mail címek automata kiegészítése">
 <!ENTITY autocompletionAccesskey "k">
-<!ENTITY autocompletionTooltip "Kiterjeszti az alapértelmezett automatikus kiegészítéséhez névjegyzéket a Thunderbird egy automatikus kiegészítéséhez kapcsolatok címjegyzékei CardBook.">
+<!ENTITY autocompletionTooltip "Kiterjeszti az alapértelmezett automatikus kiegészítéséhez névjegyzéket a Icedove-UXP egy automatikus kiegészítéséhez kapcsolatok címjegyzékei CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Rendezze az e-mail címeket népszerűsége szerint">
 <!ENTITY autocompleteSortByPopularityAccesskey "R">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Javasoljuk a kapcsolattartó e-maileket">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "S">
 <!ENTITY exclusiveLabel "Névjegyzék egyedi forrása">
 <!ENTITY exclusiveAccesskey "f">
-<!ENTITY exclusiveTooltip "Ha le van tiltva, ez az opció lehetővé teszi, hogy letölteni kapcsolatok Thunderbird szabvány címjegyzékek a sárga csillag, az e-mail megjelenítési nevét és az e-mail automatikus kiegészítésre.">
+<!ENTITY exclusiveTooltip "Ha le van tiltva, ez az opció lehetővé teszi, hogy letölteni kapcsolatok Icedove-UXP szabvány címjegyzékek a sárga csillag, az e-mail megjelenítési nevét és az e-mail automatikus kiegészítésre.">
 <!ENTITY accountsRestrictionsLabel "Postafiók korlátozások">
 <!ENTITY accountsRestrictionsEnabledLabel "Engedélyezve">
 <!ENTITY accountsRestrictionsMailNameLabel "Postafiók">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Törlés…">
 <!ENTITY deleteRestrictionAccesskey "T">
 <!ENTITY emailsCollectionLabel "Gyűjt kimenő e-mail">
-<!ENTITY emailsCollectionTooltip "Kiterjeszti a Thunderbird szabványos kimenő email cím gyűjteménye. Ha engedélyezve van, e-mail címek nincs jelen semmilyen CardBook címjegyzéket bekerül a kiválasztott névjegytár(ok).">
+<!ENTITY emailsCollectionTooltip "Kiterjeszti a Icedove-UXP szabványos kimenő email cím gyűjteménye. Ha engedélyezve van, e-mail címek nincs jelen semmilyen CardBook címjegyzéket bekerül a kiválasztott névjegytár(ok).">
 <!ENTITY emailsCollectionEnabledLabel "Engedélyezve">
 <!ENTITY emailsCollectionMailNameLabel "Postafiók">
 <!ENTITY emailsCollectionABNameLabel "Névjegytár">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Térkép:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Térkép">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Térképek">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Nyitott külső linkek:">
-<!ENTITY localizeTargetInLabel "Thunderbird belül">
+<!ENTITY localizeTargetInLabel "Icedove-UXP belül">
 <!ENTITY localizeTargetInAccesskey "b">
-<!ENTITY localizeTargetOutLabel "Thunderbird kívül">
+<!ENTITY localizeTargetOutLabel "Icedove-UXP kívül">
 <!ENTITY localizeTargetOutAccesskey "k">
 <!ENTITY showNameAsLabel "Nevek megjelenítése">
 <!ENTITY showNameAsLFLabel "Családnév Keresztnév">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "é">
 
 <!ENTITY ABtypesGroupboxLabel "Névjegytár">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Más">
 <!ENTITY typesCategoryOthersAccesskey "s">
 <!ENTITY typesGroupboxLabel "Típusok">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "A mező ORG tartalmazhat strukturált szöveges érték komponensekből álló amelyeket pontosvessző karaktert (például: cég;szolgáltatás;osztály). Az alábbi mezőket a részegység megnevezésére címkék ezt a struktúrát.">
 
-<!ENTITY listPanelLabel "Ha a kiszolgáló nem támogatja a kategóriákat (például: Google, Apple, Zimbra, stb), listák egy jó módja annak, hogy küldjön e-mailt a csoportoknak. vCard 3.0 nem támogatja natívan listákat, de ez lehet elérni egyéni mezőket, így ha a használni kívánt listákat vCard 3.0, meg kell határozni ezeket a mezőket.">
+<!ENTITY listPanelLabel "Ha a kiszolgáló nem támogatja a kategóriákat, listák egy jó módja annak, hogy küldjön e-mailt a csoportoknak. vCard 3.0 nem támogatja natívan listákat, de ez lehet elérni egyéni mezőket, így ha a használni kívánt listákat vCard 3.0, meg kell határozni ezeket a mezőket.">
 <!ENTITY listGroupboxLabel "Listák egyéni mezők">
 <!ENTITY kindCustomLabel "Fajta">
 <!ENTITY kindCustomAccesskey "F">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Összehangolás">
 <!ENTITY syncWarn "Összehangolás terjed a módosítások egy távoli szerver és a kiszolgáló módosításokat az Ön számára.">
-<!ENTITY initialSyncLabel "Thunderbird indításkor összehangolási futtatása">
+<!ENTITY initialSyncLabel "Icedove-UXP indításkor összehangolási futtatása">
 <!ENTITY initialSyncAccesskey "f">
 <!ENTITY initialSyncDelayLabel "Késlelteti a kezdeti kérelmeket (másodperc)">
 <!ENTITY initialSyncDelayAccesskey "K">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "I">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "A felugró ablakok megjelenítése amikor az évfordulók listája üres">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "ü">
-<!ENTITY remindViaLightningGroupboxLabel "Thunderbird Lightning naptár kiegésztő keresztül emlékeztetés">
+<!ENTITY remindViaLightningGroupboxLabel "Icedove-UXP Lightning naptár kiegésztő keresztül emlékeztetés">
 <!ENTITY numberOfDaysForWritingLabel "Az évfordulók beírása a következő napok intervallumában">
 <!ENTITY numberOfDaysForWritingAccesskey "e">
 <!ENTITY syncWithLightningOnStartupLabel "Összehangolni Lightning indításkor">
diff -ru cardbook1/chrome/locale/id/cardbook.properties cardbook2/chrome/locale/id/cardbook.properties
--- cardbook1/chrome/locale/id/cardbook.properties	2018-07-30 09:27:34.000000000 -0400
+++ cardbook2/chrome/locale/id/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Tidak ada kontak duplikat yang ditemukan.
 
-serverWarningGoogleLabel=Penggunaan Google bersifat eksperimental, karena Google tidak menghormati standar vKartu.
 
 ValidatingLabel=Memvalidasi (%S)…
 ValidatingURLFailedLabel=Alamat URL salah
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Menemukan permintaan fase 2 pada %2$S …
 synchronizationRequestDiscovery1=%1$S : Menemukan permintaan fase 1 pada %2$S …
 
-googleAccessTokenOK=%1$S : Permintaan token akses Google baik, token akses : %2$S
-googleRefreshTokenOK=%1$S : Permintaan token muat ulang Google baik, token muat ulang : %2$S
-googleGetNewRefreshToken=%1$S : Mencoba mendapatkan token muat ulang Google baru pada %2$S …
-googleNewRefreshTokenOK=%1$S : Menerima kode otorisasi : %2$S
-googleRequestAccessToken=%1$S : Permintaan token akses Google pada %2$S
-googleRequestRefreshToken=%1$S : Permintaan token muat ulang Google pada %2$S
-
-yahooAccessTokenOK=%1$S : Permintaan token akses Yahoo! baik, token akses : %2$S
-yahooRefreshTokenOK=%1$S : Permintaan token muat ulang Yahoo! baik, token muat ulang : %2$S
-yahooGetNewRefreshToken=%1$S : Mencoba mendapatkan token muat ulang Yahoo! baru pada %2$S …
-yahooNewRefreshTokenOK=%1$S : Menerima kode otorisasi : %2$S
-yahooRequestAccessToken=%1$S : Permintaan token akses Yahoo! pada %2$S
-yahooRequestRefreshToken=%1$S : Permintaan token muat ulang Yahoo! pada %2$S
 
 periodicSyncDeleting=%1$S : Menghapus proses sinkronisasi secara berkala (identitas : %2$S)
 periodicSyncSetting=%1$S : Menetapkan proses sinkronisasi secara berkala (jarak waktu : %2$S ms, identitas : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Nilai preferensi
 prefWeightTooltip=Preferensi mungkin memiliki nilai yang berbeda antara 1 dan 100. Tetap kosong untuk pemakaian normal.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Tambahkan ke buku alamat ini
 wdw_cardEditionViewResultTitle=Modifikasi kontak yang dihasilkan
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Ubah Kontak
 wdw_cardEditionViewContactTitle=Tampilan Kontak
 wdw_cardEditionViewListTitle=Tampilan Daftar
-wdw_cardbookPrintTitleLong=%S - Pratinjau Cetak - Kontak - Thunderbird
+wdw_cardbookPrintTitleLong=%S - Pratinjau Cetak - Kontak - Icedove-UXP
 wdw_cardbookPrintTitle=Pratinjau Cetak
 
 displayGroupboxLabel=Nama Tampilan
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{5}} |)(\n)({{6}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Token Google Baru untuk Kontak
-YAHOONewTokenTitle=Token Yahoo! Baru untuk Kontak
 
 invalidEmail=%1$S bukan alamat email yang sah karena tidak dalam format user@host.
 appendEmailLabel=Tambahkan ke Daftar: %1$S
diff -ru cardbook1/chrome/locale/id/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/id/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/id/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/id/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Tambahkan buku alamat baru">
 
 <!ENTITY welcomePage.wizard.description "SELAMAT DATANG!">
-<!ENTITY welcomePage.description "Tampaknya ini adalah pertama kalinya Anda menggunakan Kontak, jadi kami akan mencoba mengimpor kontak dari buku alamat standar Thunderbird ke dalam Kontak.">
+<!ENTITY welcomePage.description "Tampaknya ini adalah pertama kalinya Anda menggunakan Kontak, jadi kami akan mencoba mengimpor kontak dari buku alamat standar Icedove-UXP ke dalam Kontak.">
 
 <!ENTITY initialPage.wizard.description "Lokasi untuk buku alamat baru.">
 <!ENTITY initialPage.description "Alamat buku lokasi:">
 <!ENTITY initialPage.computer.label "Lokal">
 <!ENTITY initialPage.network.label "Jauh">
-<!ENTITY initialPage.standard.label "Impor buku alamat standar Thunderbird">
+<!ENTITY initialPage.standard.label "Impor buku alamat standar Icedove-UXP">
 <!ENTITY initialPage.search.label "Cari ke dalam buku alamat yang ada">
 
 <!ENTITY localPage.wizard.description "Jenis dan lokasi dari buku alamat lokal yang baru.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Jelajahi">
 
 <!ENTITY remotePage.wizard.description "Ketik dan lokasi buku alamat jauh yang baru.">
-<!ENTITY remotePage.description "Apa jenis buku alamat jauh Anda (Perhatian: Google TIDAK sesuai dengan standar vKartu)?">
+<!ENTITY remotePage.description "Apa jenis buku alamat jauh Anda?">
 <!ENTITY remotePage.type.label "Jenis">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Koneksi">
-<!ENTITY remotePage.url.description "Untuk tipe CardDAV, masukkan URL buku alamat jauh Anda. Anda dapat mencoba menggunakan sebagian Alamat URL (sebagai contoh: http(s)://carddav.contoh.or.id). Untuk buku alamat Google, jangan tentukan bidang ini.">
+<!ENTITY remotePage.url.description "Untuk tipe CardDAV, masukkan URL buku alamat jauh Anda. Anda dapat mencoba menggunakan sebagian Alamat URL (sebagai contoh: http(s)://carddav.contoh.or.id).">
 <!ENTITY remotePage.url.label "Alamat URL">
-<!ENTITY remotePage.credentials.description "Masukkan kredensial untuk mengakses buku alamat Anda. Untuk buku alamat Google, nama pengguna seharusnya email Google Anda.">
+<!ENTITY remotePage.credentials.description "Masukkan kredensial untuk mengakses buku alamat Anda.">
 <!ENTITY remotePage.validatebutton.label "Mengesahkan">
 
 <!ENTITY locationSearchPage.wizard.description "Definisi pencarian tersimpan.">
 <!ENTITY locationSearchPage.label "Pencarian Tersimpan">
 
-<!ENTITY googleOauthPage.wizard.description "Otentikasi Google">
 
 <!ENTITY namePage.wizard.description "Alamat buku properti">
 <!ENTITY namePage.selected.label "Terpilih">
diff -ru cardbook1/chrome/locale/id/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/id/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/id/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/id/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Ulang Tahun">
 <!ENTITY synclistTabLabel "Peringatan Ulang Tahun">
 
-<!ENTITY integrationGroupboxLabel "Integrasi di Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integrasi di Icedove-UXP">
 <!ENTITY autocompletionLabel "Pelengkapan otomatis alamat email">
 <!ENTITY autocompletionAccesskey "P">
-<!ENTITY autocompletionTooltip "Memperluas pelengkapan otomatis kontak dalam buku alamat Thunderbird dengan pelengkapan otomatis kontak di buku alamat Kontak.">
+<!ENTITY autocompletionTooltip "Memperluas pelengkapan otomatis kontak dalam buku alamat Icedove-UXP dengan pelengkapan otomatis kontak di buku alamat Kontak.">
 <!ENTITY autocompleteSortByPopularityLabel "Urutkan alamat email dengan popularitas">
 <!ENTITY autocompleteSortByPopularityAccesskey "U">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Mengusulkan email menggabungkan setiap kontak">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "t">
 <!ENTITY exclusiveLabel "Sumber unik untuk kontak">
 <!ENTITY exclusiveAccesskey "u">
-<!ENTITY exclusiveTooltip "Jika dinonaktifkan, opsi ini memungkinkan untuk mengambil kontak di buku alamat standar Thunderbird untuk bintang kuning, untuk nama tampilan email dan untuk pelengkapan otomatis email.">
+<!ENTITY exclusiveTooltip "Jika dinonaktifkan, opsi ini memungkinkan untuk mengambil kontak di buku alamat standar Icedove-UXP untuk bintang kuning, untuk nama tampilan email dan untuk pelengkapan otomatis email.">
 <!ENTITY accountsRestrictionsLabel "Pembatasan Akun">
 <!ENTITY accountsRestrictionsEnabledLabel "Diaktifkan">
 <!ENTITY accountsRestrictionsMailNameLabel "Akun">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Hapus">
 <!ENTITY deleteRestrictionAccesskey "H">
 <!ENTITY emailsCollectionLabel "Kumpulkan alamat email keluar">
-<!ENTITY emailsCollectionTooltip "Memperluas koleksi alamat email keluar standar Thunderbird. Jika diaktifkan, alamat email yang tidak ada dalam buku alamat Kontak akan ditambahkan ke buku alamat yang dipilih.">
+<!ENTITY emailsCollectionTooltip "Memperluas koleksi alamat email keluar standar Icedove-UXP. Jika diaktifkan, alamat email yang tidak ada dalam buku alamat Kontak akan ditambahkan ke buku alamat yang dipilih.">
 <!ENTITY emailsCollectionEnabledLabel "Diaktifkan">
 <!ENTITY emailsCollectionMailNameLabel "Akun">
 <!ENTITY emailsCollectionABNameLabel "Buku Alamat">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Cari dengan:">
 <!ENTITY localizeEngineOpenStreetMapLabel "Buka Jalan Peta">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "J">
-<!ENTITY localizeEngineGoogleMapsLabel "Peta Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Peta Binga">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Buka tautan eksternal:">
-<!ENTITY localizeTargetInLabel "Di dalam Thunderbird">
+<!ENTITY localizeTargetInLabel "Di dalam Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "d">
-<!ENTITY localizeTargetOutLabel "Di luar Thunderbird">
+<!ENTITY localizeTargetOutLabel "Di luar Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "l">
 <!ENTITY showNameAsLabel "Tampilkan Nama Sebagai">
 <!ENTITY showNameAsLFLabel "Nama Belakang Nama Depan">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "n">
 
 <!ENTITY ABtypesGroupboxLabel "Buku Alamat">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Lain">
 <!ENTITY typesCategoryOthersAccesskey "i">
 <!ENTITY typesGroupboxLabel "Jenis">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Bidang ORG mungkin berisi nilai teks terstruktur yang terdiri dari komponen yang dipisahkan oleh karakter TITIK KOMA (sebagai contoh: PerusahaanAnda;LayananAnda;DepartemenAnda).Bidang di bawah ini menggambarkan label komponen dari struktur ini.">
 
-<!ENTITY listPanelLabel "Jika server Anda tidak mendukung kategori (sebagai contoh Google, Apple, Zimbra dan sebagainya), daftar adalah cara yang baik untuk mengirim email ke grup. VKartu 3,0 tidak secara native mendukung daftar, namun hal ini dapat dicapai dengan bidang kustom, jadi jika Anda ingin menggunakan daftar di vKartu 3,0, Anda harus menentukan bidang ini.">
+<!ENTITY listPanelLabel "Jika server Anda tidak mendukung kategori, daftar adalah cara yang baik untuk mengirim email ke grup. VKartu 3,0 tidak secara native mendukung daftar, namun hal ini dapat dicapai dengan bidang kustom, jadi jika Anda ingin menggunakan daftar di vKartu 3,0, Anda harus menentukan bidang ini.">
 <!ENTITY listGroupboxLabel "Bidang khusus untuk daftar">
 <!ENTITY kindCustomLabel "Jenis">
 <!ENTITY kindCustomAccesskey "J">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sinkronisasi">
 <!ENTITY syncWarn "Sinkronisasi akan menyebarkan modifikasi Anda ke server jauh dan modifikasi server kepada Anda.">
-<!ENTITY initialSyncLabel "Jalankan sinkronisasi di Thunderbird startup">
+<!ENTITY initialSyncLabel "Jalankan sinkronisasi di Icedove-UXP startup">
 <!ENTITY initialSyncAccesskey "J">
 <!ENTITY initialSyncDelayLabel "Keterlambatan sinkronisasi awal (detik)">
 <!ENTITY initialSyncDelayAccesskey "K">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "a">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Tampilkan jendela popup saat daftar peringatan kosong">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "k">
-<!ENTITY remindViaLightningGroupboxLabel "Ingatkan melalui ekstensi kalender Thunderbird Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Ingatkan melalui ekstensi kalender Icedove-UXP Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Jumlah hari untuk menulis hari peringatan">
 <!ENTITY numberOfDaysForWritingAccesskey "p">
 <!ENTITY syncWithLightningOnStartupLabel "Sinkronkan dengan Lightning saat startup">
diff -ru cardbook1/chrome/locale/it/cardbook.properties cardbook2/chrome/locale/it/cardbook.properties
--- cardbook1/chrome/locale/it/cardbook.properties	2018-07-30 09:26:56.000000000 -0400
+++ cardbook2/chrome/locale/it/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nessun contatto duplicato trovato.
 
-serverWarningGoogleLabel=L'utilizzo di Google è sperimentale, poiché Google non rispetta gli standard vCard.
 
 ValidatingLabel=Validazione (%S)…
 ValidatingURLFailedLabel=URL malformato
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Richiesta fase 2 di discovery su %2$S in corso
 synchronizationRequestDiscovery1=%1$S : Richiesta fase 1 di discovery su %2$S in corso
 
-googleAccessTokenOK=%1$S : Richiesta Token di accesso Google OK, Token di accesso: %2$S
-googleRefreshTokenOK=%1$S : Richiesta di aggiornamento Token di Google OK, Token di aggiornamento: %2$S
-googleGetNewRefreshToken=%1$S : Tentativo di recupero di un nuovo token di aggiornamento Google su %2$S in corso
-googleNewRefreshTokenOK=%1$S : Ricevuto codice di autorizzazione: %2$S …
-googleRequestAccessToken=%1$S : Richiesta di Token di accesso Google su %2$S …
-googleRequestRefreshToken=%1$S : Richiesta di aggiornamento Token Google su %2$S …
-
-yahooAccessTokenOK=%1$S : Richiesta Token di accesso Yahoo! OK, Token di accesso: %2$S
-yahooRefreshTokenOK=%1$S : Richiesta di aggiornamento Token di Yahoo! OK, Token di aggiornamento: %2$S
-yahooGetNewRefreshToken=%1$S : Tentativo di recupero di un nuovo token di aggiornamento Yahoo! su %2$S in corso
-yahooNewRefreshTokenOK=%1$S : Ricevuto codice di autorizzazione: %2$S …
-yahooRequestAccessToken=%1$S : Richiesta di Token di accesso Yahoo! su %2$S …
-yahooRequestRefreshToken=%1$S : Richiesta di aggiornamento Token Yahoo! su %2$S …
 
 periodicSyncDeleting=%1$S : Processo di eliminazione della sincronizzazione periodica (ID: %2$S)
 periodicSyncSetting=%1$S : Processo di impostazione della sincronizzazione periodica (intervallo: %2$S ms, ID: %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Valore di preferenza
 prefWeightTooltip=I preferiti possono avere valori differenti compresi tra 1 e 100. Per un uso normale, lascialo vuoto.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Aggiungi a questa rubrica
 wdw_cardEditionViewResultTitle=Modifica contatto risultante
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Modifica contatto
 wdw_cardEditionViewContactTitle=Consulta contatto
 wdw_cardEditionViewListTitle=Mostra lista
-wdw_cardbookPrintTitleLong=Anteprima di stampa di %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Anteprima di stampa di %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Anteprima di stampa
 
 displayGroupboxLabel=Mostra nome
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}} |)({{5}}|)(\n)({{7}}|)
 
-GOOGLENewTokenTitle=Nuovo Token Google per CardBook
-YAHOONewTokenTitle=Nuovo Token Yahoo! per CardBook
 
 invalidEmail=%1$S non è un indirizzo email valido in quanto non è nella forma utente@server.
 appendEmailLabel=Aggiungi alla lista: %1$S
diff -ru cardbook1/chrome/locale/it/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/it/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/it/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/it/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Aggiungi una nuova rubrica">
 
 <!ENTITY welcomePage.wizard.description "Benvenuto">
-<!ENTITY welcomePage.description "A quanto pare, è la prima volta che utilizzi CardBook, quindi proverò a importare su CardBook i contatti delle tue rubriche standard di Thunderbird.">
+<!ENTITY welcomePage.description "A quanto pare, è la prima volta che utilizzi CardBook, quindi proverò a importare su CardBook i contatti delle tue rubriche standard di Icedove-UXP.">
 
 <!ENTITY initialPage.wizard.description "Percorso per la nuova rubrica.">
 <!ENTITY initialPage.description "La tua rubrica è locale (situata nel tuo computer) o remota?">
 <!ENTITY initialPage.computer.label "Locale">
 <!ENTITY initialPage.network.label "Remota">
-<!ENTITY initialPage.standard.label "Importa le rubriche standard di Thunderbird">
+<!ENTITY initialPage.standard.label "Importa le rubriche standard di Icedove-UXP">
 <!ENTITY initialPage.search.label "Ricerca nelle rubriche esistenti">
 
 <!ENTITY localPage.wizard.description "Tipo e percorso della nuova rubrica locale.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Sfoglia">
 
 <!ENTITY remotePage.wizard.description "Tipo e percorso della nuova rubrica remota.">
-<!ENTITY remotePage.description "Di che tipo è la tua rubrica remota? (Attenzione: Google NON utilizza lo standard vCard)">
+<!ENTITY remotePage.description "Di che tipo è la tua rubrica remota?">
 <!ENTITY remotePage.type.label "Tipo">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Connessione">
-<!ENTITY remotePage.url.description "Per rubriche CardDAV, inserisci l'URL della tua rubrica remota. Puoi provare a utilizzare un URL parziale (esempio: http(s)://carddav.example.org). Per rubriche Google, NON riempire questo campo.">
+<!ENTITY remotePage.url.description "Per rubriche CardDAV, inserisci l'URL della tua rubrica remota. Puoi provare a utilizzare un URL parziale (esempio: http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Inserire le credenziali di accesso alla tua rubrica. Per rubriche Google, il nome utente corrisponde alla tua email su Google.">
+<!ENTITY remotePage.credentials.description "Inserire le credenziali di accesso alla tua rubrica.">
 <!ENTITY remotePage.validatebutton.label "Conferma">
 
 <!ENTITY locationSearchPage.wizard.description "Definizione della ricerca avanzata.">
 <!ENTITY locationSearchPage.label "Ricerca avanzata">
 
-<!ENTITY googleOauthPage.wizard.description "Autenticazione Google">
 
 <!ENTITY namePage.wizard.description "Proprietà della rubrica">
 <!ENTITY namePage.selected.label "Selezionato">
diff -ru cardbook1/chrome/locale/it/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/it/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/it/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/it/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Compleanni">
 <!ENTITY synclistTabLabel "Promemoria compleanni">
 
-<!ENTITY integrationGroupboxLabel "Integrazione su Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integrazione su Icedove-UXP">
 <!ENTITY autocompletionLabel "Autocompletamento degli indirizzi email">
 <!ENTITY autocompletionAccesskey "e">
-<!ENTITY autocompletionTooltip "Sostituisce la funzionalità standard di autocompletamento degli indirizzi nelle rubriche di Thunderbird con l'autocompletamento dei contatti nelle rubriche in CardBook.">
+<!ENTITY autocompletionTooltip "Sostituisce la funzionalità standard di autocompletamento degli indirizzi nelle rubriche di Icedove-UXP con l'autocompletamento dei contatti nelle rubriche in CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Ordinare indirizzi email addresses secondo popolarità">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Proponi email concatenate per contatto">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "t">
 <!ENTITY exclusiveLabel "CardBook come fonte unica dei contatti">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Se disabilitata, questa opzione permette di recuperare i contatti nelle rubriche standard di Thunderbird per le stelline gialle, il nome mostrato nell'email e l'autocompletamento dell'email.">
+<!ENTITY exclusiveTooltip "Se disabilitata, questa opzione permette di recuperare i contatti nelle rubriche standard di Icedove-UXP per le stelline gialle, il nome mostrato nell'email e l'autocompletamento dell'email.">
 <!ENTITY accountsRestrictionsLabel "Restrizioni indirizzo postale">
 <!ENTITY accountsRestrictionsEnabledLabel "Abilitato">
 <!ENTITY accountsRestrictionsMailNameLabel "Account email">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Elimina">
 <!ENTITY deleteRestrictionAccesskey "E">
 <!ENTITY emailsCollectionLabel "Raccogli indirizzi email in uscita">
-<!ENTITY emailsCollectionTooltip "Estende la funzionalità standard di raccolta degli indirizzi email in uscrita di Thunderbird. Se questa funzione è abilitata, gli indirizzi email non presenti in nessuna rubrica di CardBook saranno aggiunti alle rubriche selezionate.">
+<!ENTITY emailsCollectionTooltip "Estende la funzionalità standard di raccolta degli indirizzi email in uscrita di Icedove-UXP. Se questa funzione è abilitata, gli indirizzi email non presenti in nessuna rubrica di CardBook saranno aggiunti alle rubriche selezionate.">
 <!ENTITY emailsCollectionEnabledLabel "Abilitato">
 <!ENTITY emailsCollectionMailNameLabel "Account email">
 <!ENTITY emailsCollectionABNameLabel "Rubrica">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Localizza:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Apri link esterni:">
-<!ENTITY localizeTargetInLabel "dentro Thunderbird">
+<!ENTITY localizeTargetInLabel "dentro Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "fuori Thunderbird">
+<!ENTITY localizeTargetOutLabel "fuori Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Mostra nomi come">
 <!ENTITY showNameAsLFLabel "Cognome Nome">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "Rubrica">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Altro">
 <!ENTITY typesCategoryOthersAccesskey "o">
 <!ENTITY typesGroupboxLabel "Tipi">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Il campo ORG può contenere un valore strutturato composto da elementi separati dal carattere PUNTO E VIRGOLA (esempio: latuaazienda;ituoiservizi;iltuoufficio). I campi qui sotto descrivono le etichette di questi elementi.">
 
-<!ENTITY listPanelLabel "Se il tuo server non permette l'uso di categorie (come Google, Apple, Zimbra, ecc…), le liste rappresentano un buon strumento per inviare email a un gruppo di contatti. vCard 3.0 non permette l'uso di liste in modo nativo, ma è possibile ottenere lo stesso risultato utilizzando i campi personalizzati. Se intendi usare le liste con vCard 3.0, devi impostare tali campi.">
+<!ENTITY listPanelLabel "Se il tuo server non permette l'uso di categorie, le liste rappresentano un buon strumento per inviare email a un gruppo di contatti. vCard 3.0 non permette l'uso di liste in modo nativo, ma è possibile ottenere lo stesso risultato utilizzando i campi personalizzati. Se intendi usare le liste con vCard 3.0, devi impostare tali campi.">
 <!ENTITY listGroupboxLabel "Campi personalizzati per le liste">
 <!ENTITY kindCustomLabel "Tipologia">
 <!ENTITY kindCustomAccesskey "K">
@@ -187,8 +177,8 @@
 <!ENTITY resetListAccesskey "R">
 
 <!ENTITY syncGroupboxLabel "Sincronizzazione">
-<!ENTITY syncWarn "La sincronizzazione invia le modifiche da Thunderbird a un server remoto e viceversa.">
-<!ENTITY initialSyncLabel "Effettua una sincronizzazione all'avvio di Thunderbird">
+<!ENTITY syncWarn "La sincronizzazione invia le modifiche da Icedove-UXP a un server remoto e viceversa.">
+<!ENTITY initialSyncLabel "Effettua una sincronizzazione all'avvio di Icedove-UXP">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "Ritardo per richiesta (secondi)">
 <!ENTITY initialSyncDelayAccesskey "R">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Mostra pop-up quando la lista dei compleanni è vuota">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "h">
-<!ENTITY remindViaLightningGroupboxLabel "Invia promemoria attraverso l'estensione Lightning di Thunderbird">
+<!ENTITY remindViaLightningGroupboxLabel "Invia promemoria attraverso l'estensione Lightning di Icedove-UXP">
 <!ENTITY numberOfDaysForWritingLabel "Numero di giorni per scrivere i compleanni">
 <!ENTITY numberOfDaysForWritingAccesskey "w">
 <!ENTITY syncWithLightningOnStartupLabel "Sincronizza con Lightning all'avvio">
diff -ru cardbook1/chrome/locale/ja/cardbook.properties cardbook2/chrome/locale/ja/cardbook.properties
--- cardbook1/chrome/locale/ja/cardbook.properties	2018-07-30 09:27:58.000000000 -0400
+++ cardbook2/chrome/locale/ja/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=重複した連絡先は見つかりませんでした。
 
-serverWarningGoogleLabel=グーグルは仮想カード標準を尊重していないため、グーグルの使用は実験的です。
 
 ValidatingLabel=検証中〈%S〉…
 ValidatingURLFailedLabel=ユニフォームリソースロケータ「URL」が不正です
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S：%2$Sのフェーズ2リクエストを検出しています…
 synchronizationRequestDiscovery1=%1$S：%2$Sのフェーズ1リクエストを検出しています…
 
-googleAccessTokenOK=%1$S：グーグルのアクセストークン要求確認する、アクセストークン：%2$S
-googleRefreshTokenOK=%1$S：グーグルの更新トークンリクエストが確認されました、リフレッシュ・トークン：%2$S
-googleGetNewRefreshToken=%1$S：%2$Sに新しいグーグル更新トークンを取得しようとしています…
-googleNewRefreshTokenOK=%1$S：承認コードを受け取った：%2$S…
-googleRequestAccessToken=%1$S：%2$Sのグーグルアクセストークンリクエスト…
-googleRequestRefreshToken=%1$S：%2$Sのグーグル更新トークンリクエスト…
-
-yahooAccessTokenOK=%1$S：ヤフーのアクセストークン要求確認する、アクセストークン：%2$S
-yahooRefreshTokenOK=%1$S：ヤフーの更新トークンリクエストが確認されました、リフレッシュ・トークン：%2$S
-yahooGetNewRefreshToken=%1$S：%2$Sに新しいヤフー更新トークンを取得しようとしています…
-yahooNewRefreshTokenOK=%1$S：承認コードを受け取った：%2$S…
-yahooRequestAccessToken=%1$S：%2$Sのヤフーアクセストークンリクエスト…
-yahooRequestRefreshToken=%1$S：%2$Sのヤフー更新トークンリクエスト…
-
 periodicSyncDeleting=%1$S：定期的な同期プロセスの削除〈身元：%2$S〉
 periodicSyncSetting=%1$S：定期的な同期処理の設定〈時間間隔：%2$Sミリ秒、身元：%3$S〉
 periodicSyncSyncing=%S：定期的な同期設定による同期…
@@ -341,10 +326,7 @@
 prefValueLabel=設定値
 prefWeightTooltip=設定は1〜100の異なる値を持つことがあります。通常の使用では空にしておいてください。
 
-impp.skype=スカイプ
 impp.jabber=ジャバー
-impp.googletalk=グーグルトーク
-impp.qq=テンセント
 
 addToAddressbook=このアドレス帳に追加する
 wdw_cardEditionViewResultTitle=結果の連絡先変更
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=編集連絡先
 wdw_cardEditionViewContactTitle=表示連絡先
 wdw_cardEditionViewListTitle=表示リスト
-wdw_cardbookPrintTitleLong=印刷プレビュー・%S・連絡先・Thunderbird
+wdw_cardbookPrintTitleLong=印刷プレビュー・%S・連絡先・Icedove-UXP
 wdw_cardbookPrintTitle=印刷プレビュー
 
 displayGroupboxLabel=表示名
@@ -478,9 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{5}} |)({{6}}|)(\n)({{7}}|)
 
-GOOGLENewTokenTitle=連絡先のための新しいグーグルトークン
-YAHOONewTokenTitle=連絡先のための新しいヤフートークン
-
 invalidEmail=%1$S は user@host 形式になっておらず、有効なメールアドレスではありません。
 appendEmailLabel=リストに追加する：％1
 
diff -ru cardbook1/chrome/locale/ja/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/ja/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/ja/wdw_addressbooksAdd.dtd	2018-07-02 09:57:08.000000000 -0400
+++ cardbook2/chrome/locale/ja/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "新しいアドレス帳を追加する">
 
 <!ENTITY welcomePage.wizard.description "ようこそ">
-<!ENTITY welcomePage.description "連絡先「CardBook」を初めて使用するようですので、Thunderbirdの標準アドレス帳から連絡先を連絡先「CardBook」にインポートしようとします。">
+<!ENTITY welcomePage.description "連絡先「CardBook」を初めて使用するようですので、Icedove-UXPの標準アドレス帳から連絡先を連絡先「CardBook」にインポートしようとします。">
 
 <!ENTITY initialPage.wizard.description "新しいアドレス帳の場所。">
 <!ENTITY initialPage.description "アドレス帳の場所：">
 <!ENTITY initialPage.computer.label "地元">
 <!ENTITY initialPage.network.label "リモート">
-<!ENTITY initialPage.standard.label "Thunderbirdの標準アドレス帳をインポートする">
+<!ENTITY initialPage.standard.label "Icedove-UXPの標準アドレス帳をインポートする">
 <!ENTITY initialPage.search.label "既存のアドレス帳を検索する">
 
 <!ENTITY localPage.wizard.description "新しいローカルアドレス帳のタイプと場所。">
@@ -27,9 +27,6 @@
 <!ENTITY remotePage.description "あなたのリモートアドレス帳の種類は何ですか？〈注意：グーグルは仮想カード「vCard」標準に準拠していません〉">
 <!ENTITY remotePage.type.label "タイプ">
 <!ENTITY remotePage.carddav.label "カード分散オーサリングとバージョン管理「CardDAV」">
-<!ENTITY remotePage.google.label "グーグル">
-<!ENTITY remotePage.apple.label "リンゴ">
-<!ENTITY remotePage.yahoo.label "ヤフー">
 <!ENTITY remotePage.connection.label "接続">
 <!ENTITY remotePage.url.description "カード分散オーサリングとバージョン管理「CardDAV」タイプの場合は、リモートアドレス帳のユニフォームリソースロケータ「URL」を入力します〈例：http〈s〉：//carddav.example.or.jp〉。グーグルアドレス帳の場合は、このフィールドを指定しないでください。">
 <!ENTITY remotePage.url.label "ユニフォームリソースロケータ「URL」">
@@ -39,7 +36,6 @@
 <!ENTITY locationSearchPage.wizard.description "保存された検索の定義。">
 <!ENTITY locationSearchPage.label "検索フオルダー">
 
-<!ENTITY googleOauthPage.wizard.description "グーグル認証">
 
 <!ENTITY namePage.wizard.description "アドレス帳のプロパティ">
 <!ENTITY namePage.selected.label "選択された">
diff -ru cardbook1/chrome/locale/ja/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/ja/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/ja/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/ja/wdw_cardbookConfiguration.dtd	2018-09-14 22:43:57.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "記念日">
 <!ENTITY synclistTabLabel "記念日の思い出">
 
-<!ENTITY integrationGroupboxLabel "Thunderbirdへの統合">
+<!ENTITY integrationGroupboxLabel "Icedove-UXPへの統合">
 <!ENTITY autocompletionLabel "電子メールアドレスのオートコンプリート">
 <!ENTITY autocompletionAccesskey "O">
-<!ENTITY autocompletionTooltip "CardBookのアドレス帳に連絡先の自動補完機能を追加して、Thunderbirdのアドレス帳にある連絡先の標準自動補完機能を拡張します。">
+<!ENTITY autocompletionTooltip "CardBookのアドレス帳に連絡先の自動補完機能を追加して、Icedove-UXPのアドレス帳にある連絡先の標準自動補完機能を拡張します。">
 <!ENTITY autocompleteSortByPopularityLabel "人気度別にメールアドレスを並べ替える">
 <!ENTITY autocompleteSortByPopularityAccesskey "P">
 <!ENTITY autocompleteProposeConcatEmailsLabel "連絡先ごとに連結された電子メールを提案する">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "連絡先の一意のソース">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "このオプションを無効にすると、黄色い星のThunderbird標準アドレス帳、電子メールの表示名、電子メールの自動補完の連絡先を取得できます。">
+<!ENTITY exclusiveTooltip "このオプションを無効にすると、黄色い星のIcedove-UXP標準アドレス帳、電子メールの表示名、電子メールの自動補完の連絡先を取得できます。">
 <!ENTITY accountsRestrictionsLabel "メールアカウントの制限">
 <!ENTITY accountsRestrictionsEnabledLabel "有効">
 <!ENTITY accountsRestrictionsMailNameLabel "メールアカウント">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "削除">
 <!ENTITY deleteRestrictionAccesskey "D">
 <!ENTITY emailsCollectionLabel "送信メールを収集する">
-<!ENTITY emailsCollectionTooltip "Thunderbirdの標準送信メールアドレスコレクションを拡張します。有効にすると、連絡先アドレス帳にない電子メールアドレスが選択されたアドレス帳に追加されます。">
+<!ENTITY emailsCollectionTooltip "Icedove-UXPの標準送信メールアドレスコレクションを拡張します。有効にすると、連絡先アドレス帳にない電子メールアドレスが選択されたアドレス帳に追加されます。">
 <!ENTITY emailsCollectionEnabledLabel "有効">
 <!ENTITY emailsCollectionMailNameLabel "メールアカウント">
 <!ENTITY emailsCollectionABNameLabel "アドレス帳">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "マップで表示する：">
 <!ENTITY localizeEngineOpenStreetMapLabel "オープンストリートマップ「OpenStreetMap」">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "グーグルマップ">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "ビン地図">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "外部リンクを開く：">
-<!ENTITY localizeTargetInLabel "Thunderbirdの内部">
+<!ENTITY localizeTargetInLabel "Icedove-UXPの内部">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Thunderbird以外">
+<!ENTITY localizeTargetOutLabel "Icedove-UXP以外">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "名前を表示する">
 <!ENTITY showNameAsLFLabel "姓名">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "アドレス帳">
-<!ENTITY typesCategoryGoogleLabel "グーグル">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "リンゴ">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "ヤフー">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "その他">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "タイプ">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "同期する">
 <!ENTITY syncWarn "同期は、変更内容をリモートサーバーおよびサーバーの変更内容に反映します。">
-<!ENTITY initialSyncLabel "Thunderbirdの起動時に同期を実行する">
+<!ENTITY initialSyncLabel "Icedove-UXPの起動時に同期を実行する">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "初期同期遅延〈秒〉">
 <!ENTITY initialSyncDelayAccesskey "Y">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "I">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "記念日のリストが空のときにポップアップウィンドウを表示する">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "H">
-<!ENTITY remindViaLightningGroupboxLabel "Thunderbirdライトニング「Lightning」カレンダー拡張機能を思い出させる">
+<!ENTITY remindViaLightningGroupboxLabel "Icedove-UXPライトニング「Lightning」カレンダー拡張機能を思い出させる">
 <!ENTITY numberOfDaysForWritingLabel "記念日を書く日数">
 <!ENTITY numberOfDaysForWritingAccesskey "W">
 <!ENTITY syncWithLightningOnStartupLabel "起動時に雷と同期する">
diff -ru cardbook1/chrome/locale/ko/cardbook.properties cardbook2/chrome/locale/ko/cardbook.properties
--- cardbook1/chrome/locale/ko/cardbook.properties	2018-07-30 09:26:40.000000000 -0400
+++ cardbook2/chrome/locale/ko/cardbook.properties	2018-09-14 21:45:49.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=중복 된 연락처가 없습니다
 
-serverWarningGoogleLabel=구글은 가상 카드 표준을 준수하지 않으므로 실험적입니다
 
 ValidatingLabel=인증중(%S)…
 ValidatingURLFailedLabel=URL 주소가 잘못되었습니다
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S: %2$S에 대한 2 단계 요청 발견 …
 synchronizationRequestDiscovery1=%1$S: %2$S에 대한 1 단계 요청 발견 …
 
-googleAccessTokenOK=%1$S: 구글 액세스 토큰 요청 확인, 액세스 토큰: %2$S
-googleRefreshTokenOK=%1$S: 구글 액세스 토큰 요청 확인, 토큰 새로 고침: %2$S
-googleGetNewRefreshToken=%1$S: %2$S에서 새로운 구글 새로 고침 토큰을 얻으려고합니다 …
-googleNewRefreshTokenOK=%1$S: 승인 코드를 받았습니다: %2$S …
-googleRequestAccessToken=%1$S: %2$S에 대한 구글 액세스 토큰 요청 …
-googleRequestRefreshToken=%1$S: %2$S에 대한 구글 새로 고침 토큰 요청 …
-
-yahooAccessTokenOK=%1$S: 야후! 액세스 토큰 요청 확인, 액세스 토큰: %2$S
-yahooRefreshTokenOK=%1$S: 야후! 액세스 토큰 요청 확인, 토큰 새로 고침: %2$S
-yahooGetNewRefreshToken=%1$S: %2$S에서 새로운 야후! 새로 고침 토큰을 얻으려고합니다 …
-yahooNewRefreshTokenOK=%1$S: 승인 코드를 받았습니다: %2$S …
-yahooRequestAccessToken=%1$S: %2$S에 대한 야후! 액세스 토큰 요청 …
-yahooRequestRefreshToken=%1$S: %2$S에 대한 야후! 새로 고침 토큰 요청 …
-
 periodicSyncDeleting=%1$S: 정기적인 동기화 프로세스 삭제 (신분증: %2$S)
 periodicSyncSetting=%1$S: 주기적 동기화 프로세스 설정 (간격: %2$S 밀리 초, 아이디: %3$S)
 periodicSyncSyncing=%S: 주기적 동기화 설정으로 인한 동기화…
@@ -341,10 +326,7 @@
 prefValueLabel=환경 설정 값
 prefWeightTooltip=환경 설정은 1~100 사이의 다른 값을 가질 수 있습니다. 정상적으로 사용하려면 빈 상태로 두십시오.
 
-impp.skype=스카이프
 impp.jabber=재버
-impp.googletalk=구글톡
-impp.qq=텐센트QQ
 
 addToAddressbook=이 주소록에 추가
 wdw_cardEditionViewResultTitle=결과 연락처 수정
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{6}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=연락처를위한 새로운 구글 토큰
-YAHOONewTokenTitle=연락처를위한 새로운 야후! 토큰
 
 invalidEmail=%1$S은(는) 올바르지 않은 메일 주소 형식 입니다. 메일 주소는 user@host의 형식을 가져야 합니다.
 appendEmailLabel=목록에 추가: %1
diff -ru cardbook1/chrome/locale/ko/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/ko/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/ko/wdw_addressbooksAdd.dtd	2018-07-02 09:46:24.000000000 -0400
+++ cardbook2/chrome/locale/ko/wdw_addressbooksAdd.dtd	2018-09-14 21:45:58.000000000 -0400
@@ -27,9 +27,6 @@
 <!ENTITY remotePage.description "원격 주소록의 유형은 무엇입니까? 주의 : 구글은 가상 카드 표준을 준수하지 않습니다.">
 <!ENTITY remotePage.type.label "종류">
 <!ENTITY remotePage.carddav.label "카드 분산 저작 및 버전 관리">
-<!ENTITY remotePage.google.label "구글">
-<!ENTITY remotePage.apple.label "사과">
-<!ENTITY remotePage.yahoo.label "야후!">
 <!ENTITY remotePage.connection.label "연결">
 <!ENTITY remotePage.url.description "카드 암호 및 버전 관리 (CardDAV) 유형의 경우 원격 주소록의 URL을 입력하십시오. 부분 URL (예: http(s)://carddav.example.or.kr)을 사용해보십시오. 구글 주소록의 경우 이 입력란을 지정하지 마십시오.">
 <!ENTITY remotePage.url.label "URL 주소">
@@ -39,7 +36,6 @@
 <!ENTITY locationSearchPage.wizard.description "저장된 검색의 정의.">
 <!ENTITY locationSearchPage.label "저장된 검색">
 
-<!ENTITY googleOauthPage.wizard.description "구글 인증">
 
 <!ENTITY namePage.wizard.description "주소록 속성">
 <!ENTITY namePage.selected.label "선택됨">
diff -ru cardbook1/chrome/locale/ko/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/ko/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/ko/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/ko/wdw_cardbookConfiguration.dtd	2018-09-14 21:46:08.000000000 -0400
@@ -82,10 +82,6 @@
 <!ENTITY localizeEditingGroupboxLabel "지도에 표시:">
 <!ENTITY localizeEngineOpenStreetMapLabel "열다거리지도">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "구글지도">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "빙지도">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "외부 링크 열기:">
 <!ENTITY localizeTargetInLabel "썬더 버드 내부">
 <!ENTITY localizeTargetInAccesskey "I">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "주소록">
-<!ENTITY typesCategoryGoogleLabel "구글">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "사과">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "야후!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "다른">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "종류">
diff -ru cardbook1/chrome/locale/lt/cardbook.properties cardbook2/chrome/locale/lt/cardbook.properties
--- cardbook1/chrome/locale/lt/cardbook.properties	2018-07-30 09:26:22.000000000 -0400
+++ cardbook2/chrome/locale/lt/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nėra pasikartojančių kontaktų.
 
-serverWarningGoogleLabel=Naudojimasis Google yra eksperimentinis, nes Google nesilaiko vCard standartų.
 
 ValidatingLabel=Patvirtinimas (%S)…
 ValidatingURLFailedLabel=URL yra netinkamai suformatuotas
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : 2 etapo prašymo atradimas %2$S
 synchronizationRequestDiscovery1=%1$S : 1 etapo prašymo atradimas %2$S
 
-googleAccessTokenOK=%1$S : „Google“ prieigos generatoriaus užklausa gera, naudoti prieigos generatorių : %2$S
-googleRefreshTokenOK=%1$S : „Google“ atnaujinimo generatoriaus užklausa gerai, atnaujinti generatorių : %2$S
-googleGetNewRefreshToken=%1$S : Bando gauti naują „Google“ atnaujinimo žetoną į %2$S …
-googleNewRefreshTokenOK=%1$S : Gavo įgaliojimo kodą : %2$S …
-googleRequestAccessToken=%1$S : „Google“ prieigos generatoriaus užklausa %2$S …
-googleRequestRefreshToken=%1$S : „Google“ atnaujinimo generatoriaus užklausa į %2$S …
-
-yahooAccessTokenOK=%1$S : „Yahoo!“ prieigos generatoriaus užklausa gera, naudoti prieigos generatorių : %2$S
-yahooRefreshTokenOK=%1$S : „Yahoo!“ atnaujinimo generatoriaus užklausa gerai, atnaujinti generatorių : %2$S
-yahooGetNewRefreshToken=%1$S : Bando gauti naują „Yahoo!“ atnaujinimo žetoną į %2$S …
-yahooNewRefreshTokenOK=%1$S : Gavo įgaliojimo kodą : %2$S …
-yahooRequestAccessToken=%1$S : „Yahoo!“ prieigos generatoriaus užklausa %2$S …
-yahooRequestRefreshToken=%1$S : „Yahoo!“ atnaujinimo generatoriaus užklausa į %2$S …
 
 periodicSyncDeleting=%1$S : Periodinio sinchronizavimo procesas ištrinamas (identifikacija : %2$S)
 periodicSyncSetting=%1$S : Periodinio sinchronizavimo proceso nustatymas (intervalas : %2$S ms, identifikacija : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Parinkties vertė
 prefWeightTooltip=Parinktys gali skirtis nuo 1 iki 100. Normaliam naudojimui laikyti lauką tuščią.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Įtraukti į šią adresų knygą
 wdw_cardEditionViewResultTitle=Susiję kontaktiniai pakeitimai
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Keisti kontaktą
 wdw_cardEditionViewContactTitle=Rodymas kontaktą
 wdw_cardEditionViewListTitle=Rodymas sąrašą
-wdw_cardbookPrintTitleLong=Spaudinio peržiūra (%S) - Kontaktai - Thunderbird
+wdw_cardbookPrintTitleLong=Spaudinio peržiūra (%S) - Kontaktai - Icedove-UXP
 wdw_cardbookPrintTitle=Spaudinio peržiūra
 
 displayGroupboxLabel=Rodomas vardas
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}} |)({{5}}|)(\n)({{7}}|)
 
-GOOGLENewTokenTitle=Naujas Google žetonas Kontaktams
-YAHOONewTokenTitle=Naujas Yahoo! žetonas Kontaktams
 
 invalidEmail=%1$S yra netinkamas adresas, nes jis neatitinka formos „abonentas@severis“.
 appendEmailLabel=Pridėti į sąrašą: %1$S
diff -ru cardbook1/chrome/locale/lt/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/lt/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/lt/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/lt/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Pridėti naują adresų knygą">
 
 <!ENTITY welcomePage.wizard.description "Sveiki!">
-<!ENTITY welcomePage.description "Atrodo, kad pirmą kartą naudojate Kontaktai“, todėl bandysime importuoti kontaktus iš Thunderbird“ standartinių adresų knygų į Kontaktus“.">
+<!ENTITY welcomePage.description "Atrodo, kad pirmą kartą naudojate Kontaktai“, todėl bandysime importuoti kontaktus iš Icedove-UXP“ standartinių adresų knygų į Kontaktus“.">
 
 <!ENTITY initialPage.wizard.description "Nauja adresų knygos vieta.">
 <!ENTITY initialPage.description "Ar jūsų adresų knyga yra vietinė arba nuotolinė? :">
 <!ENTITY initialPage.computer.label "Vietinę">
 <!ENTITY initialPage.network.label "Nuotolinė">
-<!ENTITY initialPage.standard.label "Importuoti Thunderbird“ standartines adresų knygas">
+<!ENTITY initialPage.standard.label "Importuoti Icedove-UXP“ standartines adresų knygas">
 <!ENTITY initialPage.search.label "Ieškoti naudojant esamas adresų knygas">
 
 <!ENTITY localPage.wizard.description "Naujos vietinės adresų knygos rūšis ir vieta.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Naršyti">
 
 <!ENTITY remotePage.wizard.description "Naujos nuotolinės adresų knygos rūšis ir vieta.">
-<!ENTITY remotePage.description "Koks jūsų nuotolinės adresų knygos tipas? (Atsargiai! Google“ neatitinka vCard“ standartų)">
+<!ENTITY remotePage.description "Koks jūsų nuotolinės adresų knygos tipas?">
 <!ENTITY remotePage.type.label "Tipo">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Ryšys">
-<!ENTITY remotePage.url.description "Įveskite CardDAV“ tipo nuotolinės adresų knygos URL adresą. Galite pabandyti naudoti dalinį URL (pavyzdžiui: http(s)://carddav.example.org). Google“ adresų knygelėje nenurodykite šio lauko.">
+<!ENTITY remotePage.url.description "Įveskite CardDAV“ tipo nuotolinės adresų knygos URL adresą. Galite pabandyti naudoti dalinį URL (pavyzdžiui: http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "Tinklalapis">
-<!ENTITY remotePage.credentials.description "Įveskite prieigos prie savo adresų knygos įgaliojimus. Google“ adresų knygoje naudotojo vardas turėtų būti jūsų Google“ el. pašto adresas.">
+<!ENTITY remotePage.credentials.description "Įveskite prieigos prie savo adresų knygos įgaliojimus.">
 <!ENTITY remotePage.validatebutton.label "Patvirtinti">
 
 <!ENTITY locationSearchPage.wizard.description "Išsaugotas paieškos apibrėžimas">
 <!ENTITY locationSearchPage.label "Įrašyti Paieškos radinius">
 
-<!ENTITY googleOauthPage.wizard.description "„Google“ autentifikavimas">
 
 <!ENTITY namePage.wizard.description "Adreso knygos savybės">
 <!ENTITY namePage.selected.label "Pasirinkta">
diff -ru cardbook1/chrome/locale/lt/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/lt/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/lt/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/lt/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Jubiliejus">
 <!ENTITY synclistTabLabel "Jubiliejaus priminimai">
 
-<!ENTITY integrationGroupboxLabel "Integracija į „Thunderbird“">
+<!ENTITY integrationGroupboxLabel "Integracija į „Icedove-UXP“">
 <!ENTITY autocompletionLabel "Elektroninio pašto adresų automatinis prirašymas">
 <!ENTITY autocompletionAccesskey "E">
-<!ENTITY autocompletionTooltip "Išplečia standartinį adresų knygos „Thunderbird“ automatinį užpildymą, kai „Kontaktų“ adresų knygos adresai automatiškai užbaigiami.">
+<!ENTITY autocompletionTooltip "Išplečia standartinį adresų knygos „Icedove-UXP“ automatinį užpildymą, kai „Kontaktų“ adresų knygos adresai automatiškai užbaigiami.">
 <!ENTITY autocompleteSortByPopularityLabel "Rūšiuoti el. pašto adresus pagal populiarumą">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Siūlome susietus elektroniniai laiškai laiškus vienam adresatui">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "Unikalus kontaktų šaltinis">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Jei ši funkcija išjungta, ši parinktis leidžia iš „Thunderbird“ standartinių adresų knygų gauti kontaktų geltonosioms žvaigždutėms, el. Pašto pavadinimui ir elektroninio pašto automatinio užbaigimo funkcijoms.">
+<!ENTITY exclusiveTooltip "Jei ši funkcija išjungta, ši parinktis leidžia iš „Icedove-UXP“ standartinių adresų knygų gauti kontaktų geltonosioms žvaigždutėms, el. Pašto pavadinimui ir elektroninio pašto automatinio užbaigimo funkcijoms.">
 <!ENTITY accountsRestrictionsLabel "Pranešimų paskyros apribojimai">
 <!ENTITY accountsRestrictionsEnabledLabel "Įjungtas">
 <!ENTITY accountsRestrictionsMailNameLabel "Pranešimų paskyros">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Pašalinti">
 <!ENTITY deleteRestrictionAccesskey "š">
 <!ENTITY emailsCollectionLabel "Surinkti siunčiamas el. pašto žinutes">
-<!ENTITY emailsCollectionTooltip "Išplečia „Thunderbird“ standartinį siunčiamų el. pašto adresų rinkimą. Jei įjungta, el. pašto adresai, kurių nėra Kontaktų adresų knygose, bus įtraukti į pasirinktą adresų knygą(-as).">
+<!ENTITY emailsCollectionTooltip "Išplečia „Icedove-UXP“ standartinį siunčiamų el. pašto adresų rinkimą. Jei įjungta, el. pašto adresai, kurių nėra Kontaktų adresų knygose, bus įtraukti į pasirinktą adresų knygą(-as).">
 <!ENTITY emailsCollectionEnabledLabel "Įjungtas">
 <!ENTITY emailsCollectionMailNameLabel "Pranešimų paskyros">
 <!ENTITY emailsCollectionABNameLabel "Adresų knyga">
@@ -82,12 +82,8 @@
 <!ENTITY localizeEditingGroupboxLabel "Rasti naudojant:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "A">
-<!ENTITY localizeEngineGoogleMapsLabel "„Google“ žemėlapiai">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "„Bing“ žemėlapiai">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Atidaryti išorines sąsajas:">
-<!ENTITY localizeTargetInLabel " „Thunderbird“ programoje">
+<!ENTITY localizeTargetInLabel " „Icedove-UXP“ programoje">
 <!ENTITY localizeTargetInAccesskey "T">
 <!ENTITY localizeTargetOutLabel "Naudojant kitą programą">
 <!ENTITY localizeTargetOutAccesskey "k">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "e">
 
 <!ENTITY ABtypesGroupboxLabel "Adresų knyga">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Kita">
 <!ENTITY typesCategoryOthersAccesskey "K">
 <!ENTITY typesGroupboxLabel "Tipai">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "ORG lauke gali būti struktūruota teksto vertė, susidedanti iš komponentų, atskirtų simboliu KABLIATAŠKIS (pvz., Jūsų įmonė, jūsų paslauga; jūsų skyrius). Toliau pateikti laukai apibūdina šios struktūros komponentų etiketes.">
 
-<!ENTITY listPanelLabel "Jei jūsų serveryje nepalaikomos kategorijos (pvz., „Google“, „Apple“, „Zimbra“ ir kt.), Sąrašai yra geras būdas siųsti el. laiškus grupėms. „vCard 3.0“ iš esmės nepalaiko sąrašų, tačiau tai gali būti padaryta naudojant tinkintus laukus, taigi, jei norite naudoti sąrašus „vCard 3.0“, turite apibrėžti šiuos laukus.">
+<!ENTITY listPanelLabel "Jei jūsų serveryje nepalaikomos kategorijos, Sąrašai yra geras būdas siųsti el. laiškus grupėms. „vCard 3.0“ iš esmės nepalaiko sąrašų, tačiau tai gali būti padaryta naudojant tinkintus laukus, taigi, jei norite naudoti sąrašus „vCard 3.0“, turite apibrėžti šiuos laukus.">
 <!ENTITY listGroupboxLabel "Tinkinti laukai sąrašams">
 <!ENTITY kindCustomLabel "Rūšis">
 <!ENTITY kindCustomAccesskey "R">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sinchronizuoti">
 <!ENTITY syncWarn "Sinchronizavimas skleidžia jūsų pakeitimus nuotoliniame serveryje ir serverio pakeitimus jums.">
-<!ENTITY initialSyncLabel "Paleisti „Thunderbird“ sinchronizavimą kai programa pradeda.">
+<!ENTITY initialSyncLabel "Paleisti „Icedove-UXP“ sinchronizavimą kai programa pradeda.">
 <!ENTITY initialSyncAccesskey "P">
 <!ENTITY initialSyncDelayLabel "Pradinio sinchronizavimo delsimas (sekundės)">
 <!ENTITY initialSyncDelayAccesskey "z">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Rodyti iššokantį langelį, kai jubiliejų sąrašas tuščias">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "š">
-<!ENTITY remindViaLightningGroupboxLabel "Priminti per „Thunderbird Lightning Calendar Extension“ ">
+<!ENTITY remindViaLightningGroupboxLabel "Priminti per „Icedove-UXP Lightning Calendar Extension“ ">
 <!ENTITY numberOfDaysForWritingLabel "Dienų, kuriose reikia rašyti metines, skaičius">
 <!ENTITY numberOfDaysForWritingAccesskey "r">
 <!ENTITY syncWithLightningOnStartupLabel "Programai pradedant, paleisti sinchronizavimas su „Lightning“">
diff -ru cardbook1/chrome/locale/nl/cardbook.properties cardbook2/chrome/locale/nl/cardbook.properties
--- cardbook1/chrome/locale/nl/cardbook.properties	2018-08-27 12:44:56.000000000 -0400
+++ cardbook2/chrome/locale/nl/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Geen dubbele contactpersonen gevonden.
 
-serverWarningGoogleLabel=Gebruik van Google is experimenteel, Google ondersteunt geen vCard-standaards.
 
 ValidatingLabel=Controleren (%S)…
 ValidatingURLFailedLabel=Ongeldige URL
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Zoeken fase 2 opdracht op %2$S …
 synchronizationRequestDiscovery1=%1$S : Zoeken fase 1 opdracht op %2$S …
 
-googleAccessTokenOK=%1$S : Google toegang token verzoek OK, toegang token : %2$S
-googleRefreshTokenOK=%1$S : Google vernieuwing token verzoek OK, vernieuwing token : %2$S
-googleGetNewRefreshToken=%1$S : Google vernieuwing token verkrijgen op %2$S …
-googleNewRefreshTokenOK=%1$S : Authorisatiecode ontvangen: %2$S …
-googleRequestAccessToken=%1$S : Google toegang token verzoek op %2$S …
-googleRequestRefreshToken=%1$S : Google vernieuwing token verzoek op %2$S …
-
-yahooAccessTokenOK=%1$S : Yahoo! toegang token verzoek OK, toegang token : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! vernieuwing token verzoek OK, vernieuwing token : %2$S
-yahooGetNewRefreshToken=%1$S : Yahoo! vernieuwing token verkrijgen op %2$S …
-yahooNewRefreshTokenOK=%1$S : Authorisatiecode ontvangen: %2$S …
-yahooRequestAccessToken=%1$S : Yahoo! toegang token verzoek op %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! vernieuwing token verzoek op %2$S …
 
 periodicSyncDeleting=%1$S : Stoppen periodiek synchronisatieproces (id : %2$S)
 periodicSyncSetting=%1$S : Instellen van periodiek synchronisatieproces (interval : %2$S ms, id : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Voorkeurswaarde
 prefWeightTooltip=De waarden mogen liggen tussen 1 en 100. Bij standaardgebruik leeg laten.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Toevoegen aan dit adresboek
 wdw_cardEditionViewResultTitle=Resulterende contactpersoon wijzigen
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Contact bewerken
 wdw_cardEditionViewContactTitle=Toon contact
 wdw_cardEditionViewListTitle=Toon lijst
-wdw_cardbookPrintTitleLong=Afdrukvoorbeeld van %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Afdrukvoorbeeld van %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Afdrukvoorbeeld
 
 displayGroupboxLabel=Getoonde naam
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}} |)({{5}}|)(\n)({{7}}|)
 
-GOOGLENewTokenTitle=Nieuw Google-token voor CardBook
-YAHOONewTokenTitle=Nieuw Yahoo!-token voor CardBook
 
 invalidEmail=%1$S is geen geldig e-mailadres, omdat het niet de vorm gebruiker@host heeft.
 appendEmailLabel=Toevoegen aan lijst: %1$S
diff -ru cardbook1/chrome/locale/nl/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/nl/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/nl/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/nl/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Adresboek toevoegen">
 
 <!ENTITY welcomePage.wizard.description "Welkom">
-<!ENTITY welcomePage.description "Bij het eerste gebruik van CardBook wordt geprobeerd om de contactpersonen uit het standaard-adresboek van Thunderbird te importeren.">
+<!ENTITY welcomePage.description "Bij het eerste gebruik van CardBook wordt geprobeerd om de contactpersonen uit het standaard-adresboek van Icedove-UXP te importeren.">
 
 <!ENTITY initialPage.wizard.description "Opslag van het nieuwe adresboek">
 <!ENTITY initialPage.description "Staat het nieuwe adresboek lokaal of op internet:">
 <!ENTITY initialPage.computer.label "Lokaal">
 <!ENTITY initialPage.network.label "Op internet">
-<!ENTITY initialPage.standard.label "Importeren standaard-adresboek van Thunderbird">
+<!ENTITY initialPage.standard.label "Importeren standaard-adresboek van Icedove-UXP">
 <!ENTITY initialPage.search.label "Zoeken in bestaande adresboeken">
 
 <!ENTITY localPage.wizard.description "Plaats en type van het lokale adresboek.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Verkenner">
 
 <!ENTITY remotePage.wizard.description "Type en plaats van het nieuwe internet-adresboek.">
-<!ENTITY remotePage.description "Type van het internet-adresboek: (Pas op: Google ondersteunt geen vCard-standaarden.)">
+<!ENTITY remotePage.description "Type van het internet-adresboek">
 <!ENTITY remotePage.type.label "Type">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Verbinding">
 <!ENTITY remotePage.url.description "Bij een CardDAV-type: vul de URL van het internet-adresboek in.">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Toegangscodes voor het internet-adresboek. (Let op: voor Google-adresboek de Google-email invullen.)">
+<!ENTITY remotePage.credentials.description "Toegangscodes voor het internet-adresboek.">
 <!ENTITY remotePage.validatebutton.label "Controleren">
 
 <!ENTITY locationSearchPage.wizard.description "Definitie van geavanceerd zoeken">
 <!ENTITY locationSearchPage.label "Geavanceerd zoeken">
 
-<!ENTITY googleOauthPage.wizard.description "Google-authenticatie">
 
 <!ENTITY namePage.wizard.description "Eigenschappen van adresboek">
 <!ENTITY namePage.selected.label "Geselecteerd">
diff -ru cardbook1/chrome/locale/nl/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/nl/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/nl/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/nl/wdw_cardbookConfiguration.dtd	2018-09-14 22:43:40.000000000 -0400
@@ -9,7 +9,7 @@
 <!ENTITY birthdaylistTabLabel "Geboortedata">
 <!ENTITY synclistTabLabel "Verjaardagsherinneringen">
 
-<!ENTITY integrationGroupboxLabel "Integratie in Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integratie in Icedove-UXP">
 <!ENTITY autocompletionLabel "Auto-aanvullen bij het typen van email adressen">
 <!ENTITY autocompletionAccesskey "h">
 <!ENTITY autocompletionTooltip "Auto-aanvullen bij het typen van email adressen vanuit CardBook.">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "CardBook als enige bron voor contactpersonen">
 <!ENTITY exclusiveAccesskey "e">
-<!ENTITY exclusiveTooltip "Als deze optie ingeschakeld is, dan wordt bij het typen uitsluitend naar email adressen in CardBook gezocht; als de optie uit staat, dan wordt ook in de Thunderbird-boeken gezocht.">
+<!ENTITY exclusiveTooltip "Als deze optie ingeschakeld is, dan wordt bij het typen uitsluitend naar email adressen in CardBook gezocht; als de optie uit staat, dan wordt ook in de Icedove-UXP-boeken gezocht.">
 <!ENTITY accountsRestrictionsLabel "Beperkingen">
 <!ENTITY accountsRestrictionsEnabledLabel "Ingeschakeld">
 <!ENTITY accountsRestrictionsMailNameLabel "Mail account">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Locatie bepalen:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Open externe links:">
-<!ENTITY localizeTargetInLabel "In Thunderbird">
+<!ENTITY localizeTargetInLabel "In Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Buiten Thunderbird">
+<!ENTITY localizeTargetOutLabel "Buiten Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Naam tonen als">
 <!ENTITY showNameAsLFLabel "Achternaam Roepnaam">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "R">
 
 <!ENTITY ABtypesGroupboxLabel "Adresboek">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Overig">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "Verschillende types gegevens">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "De rubriek ORG kan bestaan uit tekst, gescheiden door puntkomma's. Bijvoorbeeld: bedrijfsnaam;dienstnaam;afdelingsnaam. De rubrieken hieronder beschrijven de namen van de onderdelen daarvan.">
 
-<!ENTITY listPanelLabel "Als de server geen categorieën ondersteunt (zoals Google, Apple, Zimbra, etc…), dan zijn lijsten een goede manier om emails aan groepen contactpersonen te versturen. (In geval van vCard 3.0 werkt dit alleen met eigen rubrieken.)">
+<!ENTITY listPanelLabel "Als de server geen categorieën ondersteunt, dan zijn lijsten een goede manier om emails aan groepen contactpersonen te versturen. (In geval van vCard 3.0 werkt dit alleen met eigen rubrieken.)">
 <!ENTITY listGroupboxLabel "Eigen rubrieken voor lijsten">
 <!ENTITY kindCustomLabel "Soort">
 <!ENTITY kindCustomAccesskey "S">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Voorrang">
 <!ENTITY syncWarn "Synchroniseren werkt de wijzigingen in CardBook bij naar de server en de wijzigingen op de server naar CardBook.">
-<!ENTITY initialSyncLabel "Automatische synchronisatie bij iedere start van Thunderbird">
+<!ENTITY initialSyncLabel "Automatische synchronisatie bij iedere start van Icedove-UXP">
 <!ENTITY initialSyncAccesskey "A">
 <!ENTITY initialSyncDelayLabel "Wachttijd voor eerste communicatie met server (in seconden)">
 <!ENTITY initialSyncDelayAccesskey "W">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "o">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Toon popup-scherm als verjaardagenlijst leeg is">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "l">
-<!ENTITY remindViaLightningGroupboxLabel "Verjaardagsherinneringen via de kalender van Thunderbird's add on Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Verjaardagsherinneringen via de kalender van Icedove-UXP's add on Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Aantal dagen voor het vastleggen van verjaardagen">
 <!ENTITY numberOfDaysForWritingAccesskey "n">
 <!ENTITY syncWithLightningOnStartupLabel "Synchroniseren met Lightning bij opstarten">
diff -ru cardbook1/chrome/locale/pl/cardbook.properties cardbook2/chrome/locale/pl/cardbook.properties
--- cardbook1/chrome/locale/pl/cardbook.properties	2018-08-31 09:10:12.000000000 -0400
+++ cardbook2/chrome/locale/pl/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nie znaleziono powielonych wizytówek.
 
-serverWarningGoogleLabel=Używanie Google jest w fazie testów (Google nie przestrzega standardów vCard).
 
 ValidatingLabel=Trwa weryfikacja (%S)…
 ValidatingURLFailedLabel=Adres URL jest nieprawidłowy
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Wykrywanie żądania faza 2 na %2$S…
 synchronizationRequestDiscovery1=%1$S : Wykrywanie żądania faza 1 na %2$S…
 
-googleAccessTokenOK=%1$S : Token dostępu Google otrzymany, token dostępu: %2$S
-googleRefreshTokenOK=%1$S : Odświeżony token Google otrzymany, odświeżony token: %2$S
-googleGetNewRefreshToken=%1$S : Próbuję uzyskać nowy odświeżony token Google od %2$S…
-googleNewRefreshTokenOK=%1$S : Otrzymany kod autoryzacyjny: %2$S …
-googleRequestAccessToken=%1$S : Zapytanie o token dostępu Google od %2$S…
-googleRequestRefreshToken=%1$S : Zapytanie o odświeżony token Google od %2$S…
-
-yahooAccessTokenOK=%1$S : Token dostępu Yahoo! otrzymany, token dostępu: %2$S
-yahooRefreshTokenOK=%1$S : Odświeżony token Yahoo! otrzymany, odświeżony token: %2$S
-yahooGetNewRefreshToken=%1$S : Próbuję uzyskać nowy odświeżony token Yahoo! od %2$S…
-yahooNewRefreshTokenOK=%1$S : Otrzymany kod autoryzacyjny: %2$S …
-yahooRequestAccessToken=%1$S : Zapytanie o token dostępu Yahoo! od %2$S…
-yahooRequestRefreshToken=%1$S : Zapytanie o odświeżony token Yahoo! od %2$S…
 
 periodicSyncDeleting=%1$S : Usuwanie procesu okresowej synchronizacji (id: %2$S)
 periodicSyncSetting=%1$S : Ustawianie procesu okresowej synchronizacji (interwał: %2$S ms, id: %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Podstawowy
 prefWeightTooltip=To ustawienie może mieć wartość od 1 do 100. W przypadku normalnego użytkowania, pozostaw to pole puste.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Dodaj do tej książki adresowej
 wdw_cardEditionViewResultTitle=Wynik modyfikacji wizytówki
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Modyfikacja wizytówki
 wdw_cardEditionViewContactTitle=Podgląd wizytówki
 wdw_cardEditionViewListTitle=Podgląd listy
-wdw_cardbookPrintTitleLong=Podgląd wydruku %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Podgląd wydruku %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Podgląd wydruku
 
 displayGroupboxLabel=Wyświetlana nazwa
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nowy token Google dla CardBook
-YAHOONewTokenTitle=Nowy token Yahoo! dla CardBook
 
 invalidEmail=%1$S nie jest poprawnym adresem e-mail. Adres e-mail powinien mieć budowę użytkownik@domena.
 appendEmailLabel=Dodaj do listy: %1$S
diff -ru cardbook1/chrome/locale/pl/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/pl/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/pl/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/pl/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Dodaj nową książkę adresową">
 
 <!ENTITY welcomePage.wizard.description "Witaj">
-<!ENTITY welcomePage.description "Wygląda na to, że używasz CardBook po raz pierwszy; spróbujemy zaimportować do CardBook wizytówki z książek adresowych Thunderbirda.">
+<!ENTITY welcomePage.description "Wygląda na to, że używasz CardBook po raz pierwszy; spróbujemy zaimportować do CardBook wizytówki z książek adresowych Icedove-UXPa.">
 
 <!ENTITY initialPage.wizard.description "Położenie nowej książki adresowej.">
 <!ENTITY initialPage.description "Czy książka adresowa jest lokalna czy zdalna?">
 <!ENTITY initialPage.computer.label "Lokalna">
 <!ENTITY initialPage.network.label "Zdalna">
-<!ENTITY initialPage.standard.label "Zaimportuj książki adresowe Thunderbirda">
+<!ENTITY initialPage.standard.label "Zaimportuj książki adresowe Icedove-UXPa">
 <!ENTITY initialPage.search.label "Wyszukaj w istniejących książkach adresowych">
 
 <!ENTITY localPage.wizard.description "Rodzaj i położenie nowej lokalnej książki adresowej.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Przeglądaj">
 
 <!ENTITY remotePage.wizard.description "Rodzaj i położenie nowej zdalnej książki adresowej.">
-<!ENTITY remotePage.description "Jakiego rodzaju jest książka adresowa? (Uwaga: Google NIE przestrzega standardów vCard)">
+<!ENTITY remotePage.description "Jakiego rodzaju jest książka adresowa?">
 <!ENTITY remotePage.type.label "Typ">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Połączenie">
-<!ENTITY remotePage.url.description "Dla CardDAV, wpisz URL zdalnej książki adresowej. Możesz spróbować wpisać częściowy URL (np. http(s)://carddav.example.org). Jeśli masz książkę adresową Google, nic tu nie wpisuj.">
+<!ENTITY remotePage.url.description "Dla CardDAV, wpisz URL zdalnej książki adresowej. Możesz spróbować wpisać częściowy URL (np. http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Wpisz dane logowania do książki adresowej. Jeśli masz książkę adresową Google, nazwa użytkownika to Twój adres e-mail Google.">
+<!ENTITY remotePage.credentials.description "Wpisz dane logowania do książki adresowej.">
 <!ENTITY remotePage.validatebutton.label "Sprawdź">
 
 <!ENTITY locationSearchPage.wizard.description "Definicja wyszukiwania zaawansowanego.">
 <!ENTITY locationSearchPage.label "Wyszukiwanie zaawansowane">
 
-<!ENTITY googleOauthPage.wizard.description "Uwierzytelnie Google">
 
 <!ENTITY namePage.wizard.description "Właściwości książki adresowej">
 <!ENTITY namePage.selected.label "Wybrana">
diff -ru cardbook1/chrome/locale/pl/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/pl/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/pl/wdw_cardbookConfiguration.dtd	2018-08-31 09:08:04.000000000 -0400
+++ cardbook2/chrome/locale/pl/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Urodziny">
 <!ENTITY synclistTabLabel "Przypomnienia o urodzinach">
 
-<!ENTITY integrationGroupboxLabel "Integracja z Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integracja z Icedove-UXP">
 <!ENTITY autocompletionLabel "Automatyczne uzupełnianie adresów e-mail">
 <!ENTITY autocompletionAccesskey "A">
-<!ENTITY autocompletionTooltip "Rozszerza automatyczne uzupełnianie adresów z wizytówek we wbudowanych książkach adresowych Thunderbirda o automatyczne uzupełnianie adresów z wizytówek w książkach adresowych CardBook.">
+<!ENTITY autocompletionTooltip "Rozszerza automatyczne uzupełnianie adresów z wizytówek we wbudowanych książkach adresowych Icedove-UXPa o automatyczne uzupełnianie adresów z wizytówek w książkach adresowych CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Sortuj adresy e-mail według popularności">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Proponuj wszystkie e-maile z wizytówki w jednym ciągu">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "K">
 <!ENTITY exclusiveLabel "Wyłączne źródło wizytówek">
 <!ENTITY exclusiveAccesskey "W">
-<!ENTITY exclusiveTooltip "Wyłącz, aby pobierać adresy z wizytówek we wbudowanych książkach adresowych Thunderbirda do żółtych gwiazdek, wyświetlanych nazw i autouzupełniania adresów e-mail.">
+<!ENTITY exclusiveTooltip "Wyłącz, aby pobierać adresy z wizytówek we wbudowanych książkach adresowych Icedove-UXPa do żółtych gwiazdek, wyświetlanych nazw i autouzupełniania adresów e-mail.">
 <!ENTITY accountsRestrictionsLabel "Ograniczenia kont pocztowych">
 <!ENTITY accountsRestrictionsEnabledLabel "Włączone">
 <!ENTITY accountsRestrictionsMailNameLabel "Konto pocztowe">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Usuń">
 <!ENTITY deleteRestrictionAccesskey "U">
 <!ENTITY emailsCollectionLabel "Zbieraj adresy z poczty wychodzącej">
-<!ENTITY emailsCollectionTooltip "Rozszerza zbieranie adresów e-mail Thunderbirda. Włącz, aby adresy e-mail, których nie ma w żadnych książkach adresowych CardBook, były dodawane do wybranej książki lub książek adresowych.">
+<!ENTITY emailsCollectionTooltip "Rozszerza zbieranie adresów e-mail Icedove-UXPa. Włącz, aby adresy e-mail, których nie ma w żadnych książkach adresowych CardBook, były dodawane do wybranej książki lub książek adresowych.">
 <!ENTITY emailsCollectionEnabledLabel "Włączone">
 <!ENTITY emailsCollectionMailNameLabel "Konto pocztowe">
 <!ENTITY emailsCollectionABNameLabel "Książka adresowa">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Lokalizuj przy pomocy:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Mapy Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Mapy Bing">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Otwieraj zewnętrzne linki:">
-<!ENTITY localizeTargetInLabel "W Thunderbirdzie">
+<!ENTITY localizeTargetInLabel "W Icedove-UXPzie">
 <!ENTITY localizeTargetInAccesskey "T">
-<!ENTITY localizeTargetOutLabel "Poza Thunderbirdem">
+<!ENTITY localizeTargetOutLabel "Poza Icedove-UXPem">
 <!ENTITY localizeTargetOutAccesskey "H">
 <!ENTITY showNameAsLabel "Pokazuj nazwę jako">
 <!ENTITY showNameAsLFLabel "Nazwisko Imię">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "o">
 
 <!ENTITY ABtypesGroupboxLabel "Książka adresowa">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Inne">
 <!ENTITY typesCategoryOthersAccesskey "n">
 <!ENTITY typesGroupboxLabel "Typy">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Pole Organizacja może zawierać strukturę wartości tekstowych składającą się z elementów oddzielonych ŚREDNIKIEM (na przykład: twojafirma;twojausługa;twójdział). Pola poniżej opisują etykiety elementów tej struktury.">
 
-<!ENTITY listPanelLabel "Jeśli Twój serwer nie obsługuje kategorii (Google, Apple, Zimbra, itd…), listy są dobrym sposobem na wysyłanie e-maili do grup odbiorców. vCard 3.0 nie obsługuje natywnie list, ale można je zastąpić własnymi polami, więc jeśli chcesz używać list w vCard 3.0, musisz zdefiniować te pola.">
+<!ENTITY listPanelLabel "Jeśli Twój serwer nie obsługuje kategorii, listy są dobrym sposobem na wysyłanie e-maili do grup odbiorców. vCard 3.0 nie obsługuje natywnie list, ale można je zastąpić własnymi polami, więc jeśli chcesz używać list w vCard 3.0, musisz zdefiniować te pola.">
 <!ENTITY listGroupboxLabel "Własne pola dla list">
 <!ENTITY kindCustomLabel "Rodzaj">
 <!ENTITY kindCustomAccesskey "R">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synchronizacja">
 <!ENTITY syncWarn "Synchronizacja wysyła Twoje zmiany do zdalnego serwera, a zmiany na serwerze do Ciebie.">
-<!ENTITY initialSyncLabel "Wykonaj początkową synchronizację przy uruchomieniu Thunderbirda">
+<!ENTITY initialSyncLabel "Wykonaj początkową synchronizację przy uruchomieniu Icedove-UXPa">
 <!ENTITY initialSyncAccesskey "W">
 <!ENTITY initialSyncDelayLabel "Opóźnij wykonanie pierwszych zapytań (sekundy)">
 <!ENTITY initialSyncDelayAccesskey "O">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "O">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Pokaż wyskakujące okienko, gdy lista urodzin jest pusta">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "w">
-<!ENTITY remindViaLightningGroupboxLabel "Przypominaj za pomocą Lightning, dodatku kalendarzowego do Thunderbird">
+<!ENTITY remindViaLightningGroupboxLabel "Przypominaj za pomocą Lightning, dodatku kalendarzowego do Icedove-UXP">
 <!ENTITY numberOfDaysForWritingLabel "Ilość dni, w których zapisywać urodziny">
 <!ENTITY numberOfDaysForWritingAccesskey "d">
 <!ENTITY syncWithLightningOnStartupLabel "Synchronizuj z Lightning przy starcie">
diff -ru cardbook1/chrome/locale/pt-BR/cardbook.properties cardbook2/chrome/locale/pt-BR/cardbook.properties
--- cardbook1/chrome/locale/pt-BR/cardbook.properties	2018-09-03 08:28:20.000000000 -0400
+++ cardbook2/chrome/locale/pt-BR/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nenhum contato duplicado foi encontrado
 
-serverWarningGoogleLabel=O uso do Google é experimental porque o Google não respeita os standards de vCard.
 
 ValidatingLabel=Validando (%S)…
 ValidatingURLFailedLabel=URL mal formado
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S :  Procurando fase 2 pedida no %2$S …
 synchronizationRequestDiscovery1=%1$S :  Procurando fase 1 pedida no %2$S …
 
-googleAccessTokenOK=%1$S : Pedido de acesso ao Token do Google OK, token : %2$S
-googleRefreshTokenOK=%1$S : Pedido de update ao Token do Google OK, update token : %2$S
-googleGetNewRefreshToken=%1$S : Tentando novo update ao Token do Google ( %2$S) …
-googleNewRefreshTokenOK=%1$S : Recebendo nova autorização : %2$S …
-googleRequestAccessToken=%1$S : É necessário Token do Google em %2$S …
-googleRequestRefreshToken=%1$S : É necessário update ao Token do Google em %2$S …
-
-yahooAccessTokenOK=%1$S : Pedido de acesso ao Token do Yahoo! OK, token : %2$S
-yahooRefreshTokenOK=%1$S : Pedido de update ao Token do Yahoo! OK, update token : %2$S
-yahooGetNewRefreshToken=%1$S : A tentar novo update ao Token do Yahoo! ( %2$S) …
-yahooNewRefreshTokenOK=%1$S : Recebendo nova autorização : %2$S …
-yahooRequestAccessToken=%1$S : É necessário Token do Yahoo! em %2$S …
-yahooRequestRefreshToken=%1$S : É necessário update ao Token do Yahoo! em %2$S …
-
 periodicSyncDeleting=%1$S : Eliminar processo de sincronização periodica (id : %2$S)
 periodicSyncSetting=%1$S : Configurar processo de sincronização periodico (intervalo : %2$S ms, id : %3$S)
 periodicSyncSyncing=%S : Sincronizando por sincronização periodica …
@@ -341,10 +326,7 @@
 prefValueLabel=Valor da preferencia
 prefWeightTooltip=As preferencias podem conter valores entre 1 e 100. Para uso normal, deixar vazio.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Adicionr a essa agenda
 wdw_cardEditionViewResultTitle=Resultado da modificação do contato
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Editar contato
 wdw_cardEditionViewContactTitle=Consulta contato
 wdw_cardEditionViewListTitle=Visualizar lista
-wdw_cardbookPrintTitleLong=Pré-visualização de %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Pré-visualização de %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Pré-visualização
 
 displayGroupboxLabel=Nome de apresentação
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{6}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Novo token do Google para CardBook
-YAHOONewTokenTitle=Novo token do Yahoo! para CardBook
 
 invalidEmail=%1$S não é um endereço de e-mail válido pois não está no formato utilizador@servidor.
 appendEmailLabel=Adicionar à lista: %1$S
diff -ru cardbook1/chrome/locale/pt-BR/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/pt-BR/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/pt-BR/wdw_addressbooksAdd.dtd	2018-08-31 16:03:46.000000000 -0400
+++ cardbook2/chrome/locale/pt-BR/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Adicionar nova agenda">
 
 <!ENTITY welcomePage.wizard.description "Benvindo">
-<!ENTITY welcomePage.description "Parece ser a primeira vez que utiliza o CardBook, vamos tentar importar os atuais contatos do Thunderbird para o CardBook.">
+<!ENTITY welcomePage.description "Parece ser a primeira vez que utiliza o CardBook, vamos tentar importar os atuais contatos do Icedove-UXP para o CardBook.">
 
 <!ENTITY initialPage.wizard.description "Localização da nova agenda.">
 <!ENTITY initialPage.description "Localização da agenda:">
 <!ENTITY initialPage.computer.label "Local">
 <!ENTITY initialPage.network.label "Remota">
-<!ENTITY initialPage.standard.label "Importar agendas do Thunderbird">
+<!ENTITY initialPage.standard.label "Importar agendas do Icedove-UXP">
 <!ENTITY initialPage.search.label "Procurar em agendas existentes">
 
 <!ENTITY localPage.wizard.description "Tipo e localização de nova agenda local.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "navegue">
 
 <!ENTITY remotePage.wizard.description "Tipo e localização da nova agenda remota.">
-<!ENTITY remotePage.description "Qual o tipo de agenda remota? (Atenção: o Google Contacts não utiliza o padrão vCard)">
+<!ENTITY remotePage.description "Qual o tipo de agenda remota?">
 <!ENTITY remotePage.type.label "Tipo">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Conexão">
-<!ENTITY remotePage.url.description "Para CardDAV, insira o URL da agenda remota. Use um URL do tipo (ex: http(s)://carddav.example.org). Para agenda do Google, não coloque nada neste campo.">
+<!ENTITY remotePage.url.description "Para CardDAV, insira o URL da agenda remota. Use um URL do tipo (ex: http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Coloque as credenciais de acesso à agenda. Para a agenda da Google, o ‘nome de usário’ deve ser o seu email Google.">
+<!ENTITY remotePage.credentials.description "Coloque as credenciais de acesso à agenda.">
 <!ENTITY remotePage.validatebutton.label "Validar">
 
 <!ENTITY locationSearchPage.wizard.description "Definição da busca avançada.">
 <!ENTITY locationSearchPage.label "Busca avançada">
 
-<!ENTITY googleOauthPage.wizard.description "Autenticação Google">
 
 <!ENTITY namePage.wizard.description "Propriedades da agenda">
 <!ENTITY namePage.selected.label "Selecionado">
diff -ru cardbook1/chrome/locale/pt-BR/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/pt-BR/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/pt-BR/wdw_cardbookConfiguration.dtd	2018-09-03 08:28:44.000000000 -0400
+++ cardbook2/chrome/locale/pt-BR/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Aniversário">
 <!ENTITY synclistTabLabel "Lembretes de aniversário">
 
-<!ENTITY integrationGroupboxLabel "Integração com Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integração com Icedove-UXP">
 <!ENTITY autocompletionLabel "Usar o autocompletar do CardBook">
 <!ENTITY autocompletionAccesskey "o">
-<!ENTITY autocompletionTooltip "Extender o auto-completar do Thunderbird incluíndo o do CardBook.">
+<!ENTITY autocompletionTooltip "Extender o auto-completar do Icedove-UXP incluíndo o do CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Organizar email por popularidade">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Propor emails contatenados por contato">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "CardBook como fonte unica de contatos">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Se não selecionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Thunderbird.">
+<!ENTITY exclusiveTooltip "Se não selecionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Icedove-UXP.">
 <!ENTITY accountsRestrictionsLabel "Restrições da conta de email">
 <!ENTITY accountsRestrictionsEnabledLabel "Ativo">
 <!ENTITY accountsRestrictionsMailNameLabel "Conta de email">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Apagar">
 <!ENTITY deleteRestrictionAccesskey "g">
 <!ENTITY emailsCollectionLabel "Endereços recolhidos de emails enviados">
-<!ENTITY emailsCollectionTooltip "Melhorar a coleção de emails do Thunderbird. Quando ativo, se o email não estiver presente em nenhuma agenda, será adicionado à agenda selecionada.">
+<!ENTITY emailsCollectionTooltip "Melhorar a coleção de emails do Icedove-UXP. Quando ativo, se o email não estiver presente em nenhuma agenda, será adicionado à agenda selecionada.">
 <!ENTITY emailsCollectionEnabledLabel "Ativo">
 <!ENTITY emailsCollectionMailNameLabel "Conta de email">
 <!ENTITY emailsCollectionABNameLabel "Agenda">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Localizar:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Abrir links externos:">
-<!ENTITY localizeTargetInLabel "Dentro do Thunderbird">
+<!ENTITY localizeTargetInLabel "Dentro do Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "D">
-<!ENTITY localizeTargetOutLabel "Fora do Thunderbird">
+<!ENTITY localizeTargetOutLabel "Fora do Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "F">
 <!ENTITY showNameAsLabel "Mostrar nome como">
 <!ENTITY showNameAsLFLabel "Sobrenome Nome">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "V">
 
 <!ENTITY ABtypesGroupboxLabel "Agenda">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "p">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Outro">
 <!ENTITY typesCategoryOthersAccesskey "t">
 <!ENTITY typesGroupboxLabel "Tipos">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "O campo ORG pode conter texto composto por componentes separado por ponto-e-virgula (por exemplo: companhia;serviço;departamento). Os campos abaixo mostram os nomes da nova estrutura.">
 
-<!ENTITY listPanelLabel "Se o servidor não suportar categorias (tal como Google, Apple, Zimbra …), as listas são a melhor forma de enviar email para grupos de pessoas. vCard 3.0 não suporta nativamente listas mas pode ser conseguido com campos adicionais.">
+<!ENTITY listPanelLabel "Se o servidor não suportar categorias, as listas são a melhor forma de enviar email para grupos de pessoas. vCard 3.0 não suporta nativamente listas mas pode ser conseguido com campos adicionais.">
 <!ENTITY listGroupboxLabel "Campos customizaveis para listas">
 <!ENTITY kindCustomLabel "Tipo">
 <!ENTITY kindCustomAccesskey "K">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sincronização ">
 <!ENTITY syncWarn "A sincronização vai propagar as modificações para o servidor remoto e as modificações do servidor remoto para local.">
-<!ENTITY initialSyncLabel "Iniciar a sincronização quando abrir o Thunderbird">
+<!ENTITY initialSyncLabel "Iniciar a sincronização quando abrir o Icedove-UXP">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "Atraso no pedido do primeiro acesso (segundos)">
 <!ENTITY initialSyncDelayAccesskey "y">
@@ -196,7 +186,7 @@
 <!ENTITY solveConflictsLocalLabel "Preferir a alteração local">
 <!ENTITY solveConflictsLocalAccesskey "L">
 <!ENTITY solveConflictsRemoteLabel "Preferir a alteração remota">
-<!ENTITY solveConflictsRemoteAccesskey "Se não selecionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Thunderbird.">
+<!ENTITY solveConflictsRemoteAccesskey "Se não selecionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Icedove-UXP.">
 <!ENTITY solveConflictsUserLabel "Perguntar ao usuário">
 <!ENTITY solveConflictsUserAccesskey "A">
 <!ENTITY maxModifsPushedLabel "Número máximo de modificações por sincronização">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "I">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Mostrar quando a lista de aniversários está vazia">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "q">
-<!ENTITY remindViaLightningGroupboxLabel "Lembrete via Thunderbird Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Lembrete via Icedove-UXP Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Número de dias para escrever aniversários">
 <!ENTITY numberOfDaysForWritingAccesskey "w">
 <!ENTITY syncWithLightningOnStartupLabel "Sincronizar com Lightning na abertura">
diff -ru cardbook1/chrome/locale/pt-PT/cardbook.properties cardbook2/chrome/locale/pt-PT/cardbook.properties
--- cardbook1/chrome/locale/pt-PT/cardbook.properties	2018-08-27 14:47:20.000000000 -0400
+++ cardbook2/chrome/locale/pt-PT/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Não existem contactos duplicados.
 
-serverWarningGoogleLabel=O uso do Google é experimental porque o Google não respeita os standards de vCard.
 
 ValidatingLabel=A Validar (%S)…
 ValidatingURLFailedLabel=URL mal formado
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : A procurar fase 2 pedida no %2$S …
 synchronizationRequestDiscovery1=%1$S : A procurar fase 1 pedida no %2$S …
 
-googleAccessTokenOK=%1$S : Pedido de acesso ao Token do Google OK, a ceder ao token : %2$S
-googleRefreshTokenOK=%1$S : Pedido de update ao Token do Google OK, update token : %2$S
-googleGetNewRefreshToken=%1$S : A tentar novo update ao Token do Google ( %2$S) …
-googleNewRefreshTokenOK=%1$S : A receber nova autorização : %2$S …
-googleRequestAccessToken=%1$S : É necessário Token do Google em %2$S …
-googleRequestRefreshToken=%1$S : É necessário update ao Token do Google em %2$S …
-
-yahooAccessTokenOK=%1$S : Pedido de acesso ao Token do Yahoo! OK, a ceder ao token : %2$S
-yahooRefreshTokenOK=%1$S : Pedido de update ao Token do Yahoo! OK, update token : %2$S
-yahooGetNewRefreshToken=%1$S : A tentar novo update ao Token do Yahoo! ( %2$S) …
-yahooNewRefreshTokenOK=%1$S : A receber nova autorização : %2$S …
-yahooRequestAccessToken=%1$S : É necessário Token do Yahoo! em %2$S …
-yahooRequestRefreshToken=%1$S : É necessário update ao Token do Yahoo! em %2$S …
-
 periodicSyncDeleting=%1$S : Apagar processo de sincronização periodico (id : %2$S)
 periodicSyncSetting=%1$S : Configurar processo de sincronização periodico (intervalo : %2$S ms, id : %3$S)
 periodicSyncSyncing=%S : Sincronizar sincronização periodico …
@@ -341,10 +326,7 @@
 prefValueLabel=Valor da preferencia
 prefWeightTooltip=As preferencias deverão conter valores entre 1 e 100. para uso normal, deixar vazio.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Adicionar à agenda
 wdw_cardEditionViewResultTitle=Resultado da modificação do contacto
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Editar contacto
 wdw_cardEditionViewContactTitle=Consulta contacto
 wdw_cardEditionViewListTitle=Consulta Lista
-wdw_cardbookPrintTitleLong=Pré-visualização de %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Pré-visualização de %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Pré-visualização
 
 displayGroupboxLabel=Nome de apresentação
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Novo token do Google para CardBook
-YAHOONewTokenTitle=Novo token do Yahoo! para CardBook
 
 invalidEmail=%1$S não é um endereço de e-mail válido pois não está no formato utilizador@servidor.
 appendEmailLabel=Adicionar a lista: %1$S
diff -ru cardbook1/chrome/locale/pt-PT/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/pt-PT/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/pt-PT/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/pt-PT/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Adicionar nova agenda">
 
 <!ENTITY welcomePage.wizard.description "Benvindo">
-<!ENTITY welcomePage.description "Parece ser a primeira vez que utiliza o CardBook, vamos tentar importar os actuais contactos do Thunderbird para o CardBook.">
+<!ENTITY welcomePage.description "Parece ser a primeira vez que utiliza o CardBook, vamos tentar importar os actuais contactos do Icedove-UXP para o CardBook.">
 
 <!ENTITY initialPage.wizard.description "Localização de nova agenda.">
 <!ENTITY initialPage.description "A agenda é local ou remota?">
 <!ENTITY initialPage.computer.label "Local">
 <!ENTITY initialPage.network.label "Remota">
-<!ENTITY initialPage.standard.label "Importar agendas do Thunderbird">
+<!ENTITY initialPage.standard.label "Importar agendas do Icedove-UXP">
 <!ENTITY initialPage.search.label "Procurar em agendas existentes">
 
 <!ENTITY localPage.wizard.description "Tipo e localização de nova agenda local.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "navegue">
 
 <!ENTITY remotePage.wizard.description "Tipo e localização de nova agenda remota.">
-<!ENTITY remotePage.description "Qual o tipo de agenda remota? (Atenção: a aplicação Google Contacts não utiliza standards de vCard)">
+<!ENTITY remotePage.description "Qual o tipo de agenda remota?">
 <!ENTITY remotePage.type.label "Tipo">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Ligação">
-<!ENTITY remotePage.url.description "Para CardDAV, insira o URL da agenda remota. Deve tentar usar um URL deste tipo (ex: http(s)://carddav.example.org). Para agenda do Google, não coloque nada neste campo.">
+<!ENTITY remotePage.url.description "Para CardDAV, insira o URL da agenda remota. Deve tentar usar um URL deste tipo (ex: http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Coloque as credenciais de acesso à agenda. Para a agenda da Google, o username deverá ser o seu email Google.">
+<!ENTITY remotePage.credentials.description "Coloque as credenciais de acesso à agenda.">
 <!ENTITY remotePage.validatebutton.label "Validar">
 
 <!ENTITY locationSearchPage.wizard.description "Definição da pesquisa avançada.">
 <!ENTITY locationSearchPage.label "Procura avançada">
 
-<!ENTITY googleOauthPage.wizard.description "Autenticação Google">
 
 <!ENTITY namePage.wizard.description "Propriedades da agenda">
 <!ENTITY namePage.selected.label "Seleccionado">
diff -ru cardbook1/chrome/locale/pt-PT/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/pt-PT/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/pt-PT/wdw_cardbookConfiguration.dtd	2018-08-27 14:47:42.000000000 -0400
+++ cardbook2/chrome/locale/pt-PT/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,7 +9,7 @@
 <!ENTITY birthdaylistTabLabel "Aniversário">
 <!ENTITY synclistTabLabel "Lembrete de Aniversário">
 
-<!ENTITY integrationGroupboxLabel "Integração com Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integração com Icedove-UXP">
 <!ENTITY autocompletionLabel "Usar o autocomplete do CardBook">
 <!ENTITY autocompletionAccesskey "o">
 <!ENTITY autocompletionTooltip "Trocar o normal autocomplete pelo do carbook. Quando activado, os email serão provenientes do repositorio do cardbook ou os emails recolhidos.">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "T">
 <!ENTITY exclusiveLabel "CardBook como fonte unica de contactos">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Se não seleccionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Thunderbird.">
+<!ENTITY exclusiveTooltip "Se não seleccionado, a opção pertmite que sejam utilizados contactos das agendas do próprio Icedove-UXP.">
 <!ENTITY accountsRestrictionsLabel "Restrições da conta de email">
 <!ENTITY accountsRestrictionsEnabledLabel "Activo">
 <!ENTITY accountsRestrictionsMailNameLabel "Conta de email">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Apagar">
 <!ENTITY deleteRestrictionAccesskey "g">
 <!ENTITY emailsCollectionLabel "Endereços recolhidos de emails enviados">
-<!ENTITY emailsCollectionTooltip "Melhorar a colecção de emails do Thunderbird. Quando activo, se o email não estiver presente em nenhuma agenda, será adicionado à agenda seleccionada.">
+<!ENTITY emailsCollectionTooltip "Melhorar a colecção de emails do Icedove-UXP. Quando activo, se o email não estiver presente em nenhuma agenda, será adicionado à agenda seleccionada.">
 <!ENTITY emailsCollectionEnabledLabel "Activo">
 <!ENTITY emailsCollectionMailNameLabel "Conta de email">
 <!ENTITY emailsCollectionABNameLabel "Agenda">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Localizar:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Abrir links externos:">
-<!ENTITY localizeTargetInLabel "Dentro do Thunderbird">
+<!ENTITY localizeTargetInLabel "Dentro do Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "D">
-<!ENTITY localizeTargetOutLabel "Fora do Thunderbird">
+<!ENTITY localizeTargetOutLabel "Fora do Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "F">
 <!ENTITY showNameAsLabel "Mostrar nome como">
 <!ENTITY showNameAsLFLabel "Nome Apelido">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "Q">
 
 <!ENTITY ABtypesGroupboxLabel "Agenda">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Otutros">
 <!ENTITY typesCategoryOthersAccesskey "O">
 <!ENTITY typesGroupboxLabel "Tipos">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "O campo ORG pode conter texto composto por componentes separado por ponto-e-virgula (por exemplo: companhia;serviço;departamento). Os campos abaixo mostram os nomes da nova estrutura.">
 
-<!ENTITY listPanelLabel "Se o servidor não suportar categorias (tal como Google, Apple, Zimbra …), as listas são a melhor forma de enviar email para grupos de pessoas. vCard 3.0 não suporta nativamente listas mas pode ser conseguido com campos adicionais.">
+<!ENTITY listPanelLabel "Se o servidor não suportar categorias, as listas são a melhor forma de enviar email para grupos de pessoas. vCard 3.0 não suporta nativamente listas mas pode ser conseguido com campos adicionais.">
 <!ENTITY listGroupboxLabel "Campos customizaveis para listas">
 <!ENTITY kindCustomLabel "Tipo">
 <!ENTITY kindCustomAccesskey "K">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sinc.">
 <!ENTITY syncWarn "A Sincronização vai propagar as modificações para o servidor remoto e as modificações do servidor remoto para local.">
-<!ENTITY initialSyncLabel "Correr a sincronização inicial no arranque do Thunderbird">
+<!ENTITY initialSyncLabel "Correr a sincronização inicial no arranque do Icedove-UXP">
 <!ENTITY initialSyncAccesskey "C">
 <!ENTITY initialSyncDelayLabel "Atraso ao pedir o primeiro acesso? (segundos)">
 <!ENTITY initialSyncDelayAccesskey "D">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "h">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Mostrar quando a lista de aniversário está vazia">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "q">
-<!ENTITY remindViaLightningGroupboxLabel "Lembrete via Thunderbird Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Lembrete via Icedove-UXP Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Numeor de dias para escrever aniversários">
 <!ENTITY numberOfDaysForWritingAccesskey "e">
 <!ENTITY syncWithLightningOnStartupLabel "Sinc. com Lightning no arranque">
diff -ru cardbook1/chrome/locale/ro/cardbook.properties cardbook2/chrome/locale/ro/cardbook.properties
--- cardbook1/chrome/locale/ro/cardbook.properties	2018-07-26 11:30:38.000000000 -0400
+++ cardbook2/chrome/locale/ro/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Nu au fost găsite contacte duplicate.
 
-serverWarningGoogleLabel=Utilizarea Google este experimentală, deoarece Google nu respectă standardele vCard.
 
 ValidatingLabel=Se validează (%S)…
 ValidatingURLFailedLabel=Adresa URL este incorectă
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Solicitare de descoperire faza 2 pe %2$S …
 synchronizationRequestDiscovery1=%1$S : Solicitare de descoperire faza 1 pe %2$S …
 
-googleAccessTokenOK=%1$S : Solicitarea jetonului de acces Google este ok, jeton de acces : %2$S
-googleRefreshTokenOK=%1$S : Solicitarea jetonului de înnoire Google este ok, jeton de înnoire : %2$S
-googleGetNewRefreshToken=%1$S : Încerc să obțin un jeton de înnoire Google nou pe %2$S …
-googleNewRefreshTokenOK=%1$S : Am primit un cod de autorizare : %2$S …
-googleRequestAccessToken=%1$S : Solicitare jeton de acces Google pe %2$S …
-googleRequestRefreshToken=%1$S : Solicitare jeton de innoire Google pe %2$S …
-
-yahooAccessTokenOK=%1$S : Solicitarea jetonului de acces Yahoo! este ok, jeton de acces : %2$S
-yahooRefreshTokenOK=%1$S : Solicitarea jetonului de innoire Yahoo! este ok, jeton de înnoire : %2$S
-yahooGetNewRefreshToken=%1$S : Încerc să obțin un jeton de înnoire Yahoo! pe %2$S …
-yahooNewRefreshTokenOK=%1$S : Am primit un cod de autorizare : %2$S …
-yahooRequestAccessToken=%1$S : Solicitare jeton de acces Yahoo! pe %2$S …
-yahooRequestRefreshToken=%1$S : Solicitare jeton de innoire Yahoo! pe %2$S …
-
 periodicSyncDeleting=%1$S : Ștergere proces periodic de sincronizare (identificare : %2$S)
 periodicSyncSetting=%1$S : Setare proces de sincronizare periodică (interval : %2$S ms, identificare : %3$S)
 periodicSyncSyncing=%S : Sincronizare datorată sincronizării periodice …
@@ -341,10 +326,7 @@
 prefValueLabel=Valoare de preferință
 prefWeightTooltip=Valorile de preferință pot avea valori diferite între 1 și 100. Păstrați-l gol pentru o utilizare normală.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Adaugă în această agendă
 wdw_cardEditionViewResultTitle=Rezultatul modificării contactului
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Editează contactul
 wdw_cardEditionViewContactTitle=Vizualizează contactul
 wdw_cardEditionViewListTitle=Vizualizează lista
-wdw_cardbookPrintTitleLong=%S - Previzualizare tipărire - Contacte - Thunderbird
+wdw_cardbookPrintTitleLong=%S - Previzualizare tipărire - Contacte - Icedove-UXP
 wdw_cardbookPrintTitle=Previzualizează tipărirea
 
 displayGroupboxLabel=Nume afișat
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Jeton Google nou pentru CardBook
-YAHOONewTokenTitle=Jeton Yahoo! nou pentru CardBook
 
 invalidEmail=%1$S nu este o adresă de email validă deoarece nu are forma utilizator@gazda.
 appendEmailLabel=Adaugă la listă: %1$S
diff -ru cardbook1/chrome/locale/ro/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/ro/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/ro/wdw_addressbooksAdd.dtd	2018-06-29 01:36:40.000000000 -0400
+++ cardbook2/chrome/locale/ro/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Adăugă o agendă nouă">
 
 <!ENTITY welcomePage.wizard.description "Bine ai venit!">
-<!ENTITY welcomePage.description "Se pare că este prima dată când utilizezi CardBook, așa că vom încerca să importăm contactele din agenda standard Thunderbird în CardBook.">
+<!ENTITY welcomePage.description "Se pare că este prima dată când utilizezi CardBook, așa că vom încerca să importăm contactele din agenda standard Icedove-UXP în CardBook.">
 
 <!ENTITY initialPage.wizard.description "Locația pentru agenda nouă.">
 <!ENTITY initialPage.description "Locație agendă nouă">
 <!ENTITY initialPage.computer.label "Locală">
 <!ENTITY initialPage.network.label "La distanță">
-<!ENTITY initialPage.standard.label "Importă agendele standard din Thunderbird">
+<!ENTITY initialPage.standard.label "Importă agendele standard din Icedove-UXP">
 <!ENTITY initialPage.search.label "Căută în agendele existente">
 
 <!ENTITY localPage.wizard.description "Tipul și locația agendei locale nouă.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Răsfoiește">
 
 <!ENTITY remotePage.wizard.description "Tipul și locația agendei la distanță nouă.">
-<!ENTITY remotePage.description "Care este tipul agendei la distanță? (Atenție: Google nu se conformează standardului vCard)">
+<!ENTITY remotePage.description "Care este tipul agendei la distanță?">
 <!ENTITY remotePage.type.label "Tip">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Conexiune">
-<!ENTITY remotePage.url.description "Pentru agenda de tip CardDAV, introdu adresa URL a agendei la distanță. Poți încerca să utilizezi o adresă URL parțială (de exemplu : http(s)://carddav.exemplu.org). Pentru o agendă Google, nu introduce acest câmp.">
+<!ENTITY remotePage.url.description "Pentru agenda de tip CardDAV, introdu adresa URL a agendei la distanță. Poți încerca să utilizezi o adresă URL parțială (de exemplu : http(s)://carddav.exemplu.org).">
 <!ENTITY remotePage.url.label "Adresa URL">
-<!ENTITY remotePage.credentials.description "Introdu acreditările pentru accesarea agendei tale. Pentru o agendă Google, numele de utilizator ar trebui să fie adresa de email Google.">
+<!ENTITY remotePage.credentials.description "Introdu acreditările pentru accesarea agendei tale.">
 <!ENTITY remotePage.validatebutton.label "Validează">
 
 <!ENTITY locationSearchPage.wizard.description "Definirea căutării salvate">
 <!ENTITY locationSearchPage.label "Căutare salvată">
 
-<!ENTITY googleOauthPage.wizard.description "Autentificare Google">
 
 <!ENTITY namePage.wizard.description "Proprietăți agendă">
 <!ENTITY namePage.selected.label "Selectat">
diff -ru cardbook1/chrome/locale/ro/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/ro/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/ro/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/ro/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Aniversare">
 <!ENTITY synclistTabLabel "Memento aniversare">
 
-<!ENTITY integrationGroupboxLabel "Integrare în Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integrare în Icedove-UXP">
 <!ENTITY autocompletionLabel "Completare automată a adreselor de email">
 <!ENTITY autocompletionAccesskey "o">
-<!ENTITY autocompletionTooltip "Extinde completarea automată standard a contactelor din agendele Thunderbird cu o completare automată a contactelor din agendele CardBook.">
+<!ENTITY autocompletionTooltip "Extinde completarea automată standard a contactelor din agendele Icedove-UXP cu o completare automată a contactelor din agendele CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Sortează adresele de email după popularitate">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Sugerează email-uri concatenate pentru fiecare contact">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "t">
 <!ENTITY exclusiveLabel "Sursă unică pentru contacte">
 <!ENTITY exclusiveAccesskey "u">
-<!ENTITY exclusiveTooltip "Dacă este dezactivată, această opțiune permite preluarea contactelor în agenda standard Thunderbird pentru stelele galbene, pentru afișarea numelui afisat al email-ului și pentru completarea automată a adresei de email.">
+<!ENTITY exclusiveTooltip "Dacă este dezactivată, această opțiune permite preluarea contactelor în agenda standard Icedove-UXP pentru stelele galbene, pentru afișarea numelui afisat al email-ului și pentru completarea automată a adresei de email.">
 <!ENTITY accountsRestrictionsLabel "Restricții cont de email">
 <!ENTITY accountsRestrictionsEnabledLabel "Activat">
 <!ENTITY accountsRestrictionsMailNameLabel "Cont de email">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Şterge">
 <!ENTITY deleteRestrictionAccesskey "g">
 <!ENTITY emailsCollectionLabel "Colectare adrese de email la expediere">
-<!ENTITY emailsCollectionTooltip "Extinde colectarea Thunderbird standard a adreselor de email. Dacă această opțiune este activată, adresele de email care nu sunt prezente în agenda CardBook vor fi adăugate în agendele selectate.">
+<!ENTITY emailsCollectionTooltip "Extinde colectarea Icedove-UXP standard a adreselor de email. Dacă această opțiune este activată, adresele de email care nu sunt prezente în agenda CardBook vor fi adăugate în agendele selectate.">
 <!ENTITY emailsCollectionEnabledLabel "Activat">
 <!ENTITY emailsCollectionMailNameLabel "Cont de email">
 <!ENTITY emailsCollectionABNameLabel "Agendă">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Afișează pe harta cu:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Hărți Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Hărți Bing">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Deschide legăturile externe:">
-<!ENTITY localizeTargetInLabel "În interiorul Thunderbird-lui">
+<!ENTITY localizeTargetInLabel "În interiorul Icedove-UXP-lui">
 <!ENTITY localizeTargetInAccesskey "i">
-<!ENTITY localizeTargetOutLabel "În exteriorul Thunderbird-lui">
+<!ENTITY localizeTargetOutLabel "În exteriorul Icedove-UXP-lui">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Afișează numele ca">
 <!ENTITY showNameAsLFLabel "Nume de familie Prenume">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "v">
 
 <!ENTITY ABtypesGroupboxLabel "Agendă">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Alte">
 <!ENTITY typesCategoryOthersAccesskey "l">
 <!ENTITY typesGroupboxLabel "Tipuri">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Câmpul ORG poate conține o valoare de text structurată care constă din componente separate prin caracterul PUNCT ŞI VIRGULĂ (de exemplu: companiaDvs;serviciulDvs;departamentulDvs). Câmpurile de mai jos descriu etichetele componente ale acestei structuri.">
 
-<!ENTITY listPanelLabel "Dacă serverul tău nu acceptă categorii (cum ar fi Google, Apple, Zimbra, etc…), listele sunt o modalitate bună de a trimite email-uri către grupuri. VCard 3.0 nu suportă liste în mod nativ, dar acest lucru poate fi realizat cu ajutorul câmpurilor personalizate, deci dacă dorești să utilizezi liste în vCard 3.0, trebuie să definești aceste câmpuri.">
+<!ENTITY listPanelLabel "Dacă serverul tău nu acceptă categorii, listele sunt o modalitate bună de a trimite email-uri către grupuri. VCard 3.0 nu suportă liste în mod nativ, dar acest lucru poate fi realizat cu ajutorul câmpurilor personalizate, deci dacă dorești să utilizezi liste în vCard 3.0, trebuie să definești aceste câmpuri.">
 <!ENTITY listGroupboxLabel "Câmpuri personalizate pentru liste">
 <!ENTITY kindCustomLabel "Tip">
 <!ENTITY kindCustomAccesskey "T">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sincronizare">
 <!ENTITY syncWarn "Sincronizarea propagă modificările tale către un server la distanță și modificările de pe server către tine.">
-<!ENTITY initialSyncLabel "Rulează sincronizarea la pornirea Thunderbird">
+<!ENTITY initialSyncLabel "Rulează sincronizarea la pornirea Icedove-UXP">
 <!ENTITY initialSyncAccesskey "R">
 <!ENTITY initialSyncDelayLabel "Întârzierea inițială a sincronizării (secunde)">
 <!ENTITY initialSyncDelayAccesskey "z">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Afișează pop-up atunci când lista aniversărilor este goală">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "g">
-<!ENTITY remindViaLightningGroupboxLabel "Reamintire prin extensia Thunderbird Lightning Calendar">
+<!ENTITY remindViaLightningGroupboxLabel "Reamintire prin extensia Icedove-UXP Lightning Calendar">
 <!ENTITY numberOfDaysForWritingLabel "Numărul de zile pentru a scrie aniversări">
 <!ENTITY numberOfDaysForWritingAccesskey "s">
 <!ENTITY syncWithLightningOnStartupLabel "Sincronizează cu Lightning la pornire">
diff -ru cardbook1/chrome/locale/ru/cardbook.properties cardbook2/chrome/locale/ru/cardbook.properties
--- cardbook1/chrome/locale/ru/cardbook.properties	2018-07-30 09:10:02.000000000 -0400
+++ cardbook2/chrome/locale/ru/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Дублирющихся контактов не найдено.
 
-serverWarningGoogleLabel=Использование Google в экспериментальной стадии, т.к. Google не руководствуется стандартами vCard.
 
 ValidatingLabel=Проверка (%S)…
 ValidatingURLFailedLabel=URL не верен
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Этап обнаружения 2 запрос %2$S…
 synchronizationRequestDiscovery1=%1$S : Этап обнаружения 1 запрос %2$S…
 
-googleAccessTokenOK=%1$S : Запрос получения токена доступа к Google выполнен успешно, токен доступа : %2$S
-googleRefreshTokenOK=%1$S : Запрос обновления токена доступа к Google выполнен успешно, токен доступа : %2$S
-googleGetNewRefreshToken=%1$S : Выполняется попытка получить новый токен Google для обновления %2$S…
-googleNewRefreshTokenOK=%1$S : Получен код авторизации : %2$S…
-googleRequestAccessToken=%1$S : Запрос токена доступа к Google %2$S…
-googleRequestRefreshToken=%1$S : Запрос токена обновления Google %2$S…
-
-yahooAccessTokenOK=%1$S : Запрос получения токена доступа к Yahoo! выполнен успешно, токен доступа : %2$S
-yahooRefreshTokenOK=%1$S : Запрос обновления токена доступа к Yahoo! выполнен успешно, токен доступа : %2$S
-yahooGetNewRefreshToken=%1$S : Выполняется попытка получить новый токен Yahoo! для обновления %2$S…
-yahooNewRefreshTokenOK=%1$S : Получен код авторизации : %2$S…
-yahooRequestAccessToken=%1$S : Запрос токена доступа к Yahoo! %2$S…
-yahooRequestRefreshToken=%1$S : Запрос токена обновления Yahoo! %2$S…
 
 periodicSyncDeleting=%1$S : Удаляется процесс синхронизации по таймеру (id : %2$S)
 periodicSyncSetting=%1$S : Установка процесса синхронизации по таймеру (интервал : %2$S ms, id : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Значение приоритета
 prefWeightTooltip=Значение приоритета может варьироваться от 1 до 100. Но, как правило, его следует оставить пустым.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Добавить в эту адресную книгу
 wdw_cardEditionViewResultTitle=Итоговое изменение контакта
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Изменить контакт
 wdw_cardEditionViewContactTitle=Просмотр существующего контакта
 wdw_cardEditionViewListTitle=Просмотр списка
-wdw_cardbookPrintTitleLong=Предварительный просмотр печати - %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Предварительный просмотр печати - %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Предварительный просмотр печати
 
 displayGroupboxLabel=Отображаемое имя
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{4}}\n|)({{5}}\n|)({{7}}\n|)({{6}})
 
-GOOGLENewTokenTitle=Новый токен Google для CardBook
-YAHOONewTokenTitle=Новый токен Yahoo! для CardBook
 
 invalidEmail=%1$S не является адресом электронной почты, так как он написан не в форме пользователь@сервер.
 appendEmailLabel=Добавить в список: %1$S
diff -ru cardbook1/chrome/locale/ru/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/ru/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/ru/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/ru/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Добавьте новую адресную книгу">
 
 <!ENTITY welcomePage.wizard.description "Добро пожаловать">
-<!ENTITY welcomePage.description "Похоже что CardBook запущен впервые. Будет произведена попытка импортировать контакты из стандартной адресной книги Thunderbird в CardBook.">
+<!ENTITY welcomePage.description "Похоже что CardBook запущен впервые. Будет произведена попытка импортировать контакты из стандартной адресной книги Icedove-UXP в CardBook.">
 
 <!ENTITY initialPage.wizard.description "Расположение новой адресной книги.">
 <!ENTITY initialPage.description "Ваша адресная книга локальная или удалённая? :">
 <!ENTITY initialPage.computer.label "Локальная">
 <!ENTITY initialPage.network.label "Удалённая">
-<!ENTITY initialPage.standard.label "Импортировать стандартные адресные книги из Thunderbird">
+<!ENTITY initialPage.standard.label "Импортировать стандартные адресные книги из Icedove-UXP">
 <!ENTITY initialPage.search.label "Искать в существующих адресных книгах">
 
 <!ENTITY localPage.wizard.description "Тип и расположение новой адресной книги.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Просмотреть">
 
 <!ENTITY remotePage.wizard.description "Тип и расположение новой удалённой адресной книги.">
-<!ENTITY remotePage.description "Какой тип вашей удалённой адресной книги? : (Внимание: Google НЕ соблюдает стандарт vCard)">
+<!ENTITY remotePage.description "Какой тип вашей удалённой адресной книги?">
 <!ENTITY remotePage.type.label "Тип">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Соединиться">
-<!ENTITY remotePage.url.description "Для типа CardDAV введите URL удалённой адресной книги. Можно попробовать использовать часть URL (например : http(s)://carddav.example.org). Для адресной книги Google, оставьте поле пустым.">
+<!ENTITY remotePage.url.description "Для типа CardDAV введите URL удалённой адресной книги. Можно попробовать использовать часть URL (например : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Введите реквизиты доступа для подключения к адресной книге. Для адресной книги Google именем пользователя является адрес email на серверах Google.">
+<!ENTITY remotePage.credentials.description "Введите реквизиты доступа для подключения к адресной книге.">
 <!ENTITY remotePage.validatebutton.label "Проверить">
 
 <!ENTITY locationSearchPage.wizard.description "Параметры расширенного поиска">
 <!ENTITY locationSearchPage.label "Расширенный поиск">
 
-<!ENTITY googleOauthPage.wizard.description "Аутентификация Google">
 
 <!ENTITY namePage.wizard.description "Свойства адресной книги">
 <!ENTITY namePage.selected.label "Отмеченное">
diff -ru cardbook1/chrome/locale/ru/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/ru/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/ru/wdw_cardbookConfiguration.dtd	2018-07-30 09:10:24.000000000 -0400
+++ cardbook2/chrome/locale/ru/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Дни рождения">
 <!ENTITY synclistTabLabel "Напоминания о днях рождения">
 
-<!ENTITY integrationGroupboxLabel "Интеграция в Thunderbird">
+<!ENTITY integrationGroupboxLabel "Интеграция в Icedove-UXP">
 <!ENTITY autocompletionLabel "Автозавершение адресов эл. почты">
 <!ENTITY autocompletionAccesskey "А">
-<!ENTITY autocompletionTooltip "Расширяет стандартное автоматическое завершение ввода для контактов из адресной книги Thunderbird добавлением контактов из CardBook.">
+<!ENTITY autocompletionTooltip "Расширяет стандартное автоматическое завершение ввода для контактов из адресной книги Icedove-UXP добавлением контактов из CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Сортировка адресов эл. почты по популярности">
 <!ENTITY autocompleteSortByPopularityAccesskey "п">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Предлагать объединённые адреса эл.почты">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "Т">
 <!ENTITY exclusiveLabel "Единственный источник контактов">
 <!ENTITY exclusiveAccesskey "Е">
-<!ENTITY exclusiveTooltip "Отключение этой настройки позволяет Thunderbird запрашивать контакты из стандартной адресной книги для жёлтых звёздочек, отображаемого имени в сообщениях и автозавершения адресов email.">
+<!ENTITY exclusiveTooltip "Отключение этой настройки позволяет Icedove-UXP запрашивать контакты из стандартной адресной книги для жёлтых звёздочек, отображаемого имени в сообщениях и автозавершения адресов email.">
 <!ENTITY accountsRestrictionsLabel "Ограничения для учётных записей">
 <!ENTITY accountsRestrictionsEnabledLabel "Включено">
 <!ENTITY accountsRestrictionsMailNameLabel "Почтовый аккаунт">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Удалить">
 <!ENTITY deleteRestrictionAccesskey "У">
 <!ENTITY emailsCollectionLabel "Сохранять адреса из исходящей почты">
-<!ENTITY emailsCollectionTooltip "Дополняет стандартный для Thunderbird сбор адресов получателей из исходящий сообщений. При включении, адреса email, не присутствующие ни в одной из адресных книг, будут добавлены в выбранную адресную книгу (книги).">
+<!ENTITY emailsCollectionTooltip "Дополняет стандартный для Icedove-UXP сбор адресов получателей из исходящий сообщений. При включении, адреса email, не присутствующие ни в одной из адресных книг, будут добавлены в выбранную адресную книгу (книги).">
 <!ENTITY emailsCollectionEnabledLabel "Включено">
 <!ENTITY emailsCollectionMailNameLabel "Почтовый аккаунт">
 <!ENTITY emailsCollectionABNameLabel "Адресная книга">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Использовать для показа местополжения:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Карты Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Карты Bing">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Открывать внешние ссылки:">
-<!ENTITY localizeTargetInLabel "Внутри Thunderbird">
+<!ENTITY localizeTargetInLabel "Внутри Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "у">
-<!ENTITY localizeTargetOutLabel "Вне Thunderbird">
+<!ENTITY localizeTargetOutLabel "Вне Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "е">
 <!ENTITY showNameAsLabel "Показывать имя как">
 <!ENTITY showNameAsLFLabel "Фамилия Имя">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "з">
 
 <!ENTITY ABtypesGroupboxLabel "Адресная книга">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Другое">
 <!ENTITY typesCategoryOthersAccesskey "Д">
 <!ENTITY typesGroupboxLabel "Типы">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Поле ORG может содержать структурированное текстовое значение, состоящее из компонентов, разделённых символом «;» (например: компания;служба;отделение). Поля ниже описывают метки компонентов этой этой структуры.">
 
-<!ENTITY listPanelLabel "Если ваш сервер не поддерживает категории (как, например, Google, Apple, Zimbra, и т.д.…), то списки — это хороший способ для отправки email группам получателей. Протокол vCard версии 3.0 не поддерживает списки, но этого можно добиться используя пользовательские поля. Поэтому, для использования списков в vCard версии 3.0, необходимо определить эти поля.">
+<!ENTITY listPanelLabel "Если ваш сервер не поддерживает категории, то списки — это хороший способ для отправки email группам получателей. Протокол vCard версии 3.0 не поддерживает списки, но этого можно добиться используя пользовательские поля. Поэтому, для использования списков в vCard версии 3.0, необходимо определить эти поля.">
 <!ENTITY listGroupboxLabel "Пользовательские поля для списков">
 <!ENTITY kindCustomLabel "Тип">
 <!ENTITY kindCustomAccesskey "Т">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Синхронизация">
 <!ENTITY syncWarn "Синхронизация переносит локальные изменения на удалённый сервер и изменения с сервера на диск.">
-<!ENTITY initialSyncLabel "Выполнять синхронизацию при запуске Thunderbird">
+<!ENTITY initialSyncLabel "Выполнять синхронизацию при запуске Icedove-UXP">
 <!ENTITY initialSyncAccesskey "з">
 <!ENTITY initialSyncDelayLabel "Задержка перед выполнением первого запроса (сек.)">
 <!ENTITY initialSyncDelayAccesskey "З">
diff -ru cardbook1/chrome/locale/sl/cardbook.properties cardbook2/chrome/locale/sl/cardbook.properties
--- cardbook1/chrome/locale/sl/cardbook.properties	2018-07-27 17:35:58.000000000 -0400
+++ cardbook2/chrome/locale/sl/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Podvojenih stikov ni bilo najdenih.
 
-serverWarningGoogleLabel=Uporaba Googla je preskusna, ker Google ne spoštuje standarda vCard.
 
 ValidatingLabel=Preverjanje veljavnosti (%S) …
 ValidatingURLFailedLabel=URL je napačno oblikovan
@@ -145,20 +144,6 @@
 synchronizationRequestDiscovery2=%1$S: odkrivanje 2. koraka zahteve na %2$S …
 synchronizationRequestDiscovery1=%1$S: odkrivanje 1. koraka zahteve na %2$S …
 
-googleAccessTokenOK=%1$S: zahteva za žeton dostopa Google je v redu, žeton dostopa: %2$S
-googleRefreshTokenOK=%1$S: zahteva za žeton osvežitve Google je v redu, žeton dostopa: %2$S
-googleGetNewRefreshToken=%1$S: poskušanje dobivanja novega žetona osvežitve Google na %2$S …
-googleNewRefreshTokenOK=%1$S: prejeta overitvena koda: %2$S …
-googleRequestAccessToken=%1$S: zahteva za žeton dostopa Google na %2$S …
-googleRequestRefreshToken=%1$S: zahteva za žeton osvežitve Google na %2$S …
-
-yahooAccessTokenOK=%1$S: zahteva za žeton dostopa Yahoo! je v redu, žeton dostopa: %2$S
-yahooRefreshTokenOK=%1$S: zahteva za žeton osvežitve Yahoo! je v redu, žeton dostopa: %2$S
-yahooGetNewRefreshToken=%1$S: poskušanje dobivanja novega žetona osvežitve Yahoo! na %2$S …
-yahooNewRefreshTokenOK=%1$S: prejeta overitvena koda: %2$S …
-yahooRequestAccessToken=%1$S: zahteva za žeton dostopa Yahoo! na %2$S …
-yahooRequestRefreshToken=%1$S: zahteva za žeton osvežitve Yahoo! na %2$S …
-
 periodicSyncDeleting=%1$S: Brisanje potopka občasne sinhonizacije (id: %2$S)
 periodicSyncSetting=%1$S: Nastavljanje potopka občasne sinhonizacije (razmik: %2$S ms, id: %3$S)
 periodicSyncSyncing=%S: Sinhroniziranje zaradi občasne sinhronizacije …
@@ -341,10 +326,7 @@
 prefValueLabel=Vrednost nastavitve
 prefWeightTooltip=Nastavitve imajo lahko različne vrednosti med 1 in 100. Za običajno uporabo pustite prazno.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Dodaj v ta imenik
 wdw_cardEditionViewResultTitle=Nastala sprememba stika
@@ -357,7 +339,7 @@
 wdw_cardEditionAddLineTitle=Uredi stik
 wdw_cardEditionViewContactTitle=Pokaži stik
 wdw_cardEditionViewListTitle=Pokaži seznam
-wdw_cardbookPrintTitleLong=Predogled tiskanja za %S - CardBook - Thunderbird
+wdw_cardbookPrintTitleLong=Predogled tiskanja za %S - CardBook - Icedove-UXP
 wdw_cardbookPrintTitle=Predogled tiskanja
 
 displayGroupboxLabel=Prikazano ime
@@ -478,8 +460,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Nov Googlov žeton za CardBook
-YAHOONewTokenTitle=Nov Yahoo! žeton za CardBook
 
 invalidEmail=%1$S ni veljaven e-poštni naslov, ker ni oblike uporabnik@gostitelj.
 appendEmailLabel=Dodaj na seznam: %1$S
diff -ru cardbook1/chrome/locale/sl/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/sl/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/sl/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/sl/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Dodaj nov imenik">
 
 <!ENTITY welcomePage.wizard.description "Dobrodošli">
-<!ENTITY welcomePage.description "Videti je, da prvič uporabljate CardBook. Stike bomo poskusili uvoziti iz Thunderbirdovih običajnih imenikov v CardBook.">
+<!ENTITY welcomePage.description "Videti je, da prvič uporabljate CardBook. Stike bomo poskusili uvoziti iz Icedove-UXPovih običajnih imenikov v CardBook.">
 
 <!ENTITY initialPage.wizard.description "Mesto novega imenika.">
 <!ENTITY initialPage.description "Ali je vaš imenik shranjen krajevno ali oddaljeno?">
 <!ENTITY initialPage.computer.label "Krajevno">
 <!ENTITY initialPage.network.label "Oddaljeno">
-<!ENTITY initialPage.standard.label "Uvozi Thunderbirdove običajne imenike">
+<!ENTITY initialPage.standard.label "Uvozi Icedove-UXPove običajne imenike">
 <!ENTITY initialPage.search.label "Išči v obstoječih imenikih">
 
 <!ENTITY localPage.wizard.description "Vrsta in mesto novega krajevnega imenika.">
@@ -24,12 +24,9 @@
 <!ENTITY localPage.uributton.label "Brskaj">
 
 <!ENTITY remotePage.wizard.description "Type and location of the new remote address book.">
-<!ENTITY remotePage.description "Katere vrste je vaš oddaljeni imenik (pozor: Google NE podpira standardov vCard)?">
+<!ENTITY remotePage.description "Katere vrste je vaš oddaljeni imenik?">
 <!ENTITY remotePage.type.label "Vrsta">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Povezava">
 <!ENTITY remotePage.url.description "Če želite uporabljati vrsto CardDAV, vnesite URL oddaljenega imenika. Lahko uporabite delni URL (npr.: http(s)://carddav.example.org). Če želite uporabljati Googlov imenik, pustite to polje prazno.">
 <!ENTITY remotePage.url.label "URL">
@@ -39,7 +36,6 @@
 <!ENTITY locationSearchPage.wizard.description "Določilo naprednega iskanja.">
 <!ENTITY locationSearchPage.label "Napredno iskanje">
 
-<!ENTITY googleOauthPage.wizard.description "Overitev Google">
 
 <!ENTITY namePage.wizard.description "Lastnosti imenika">
 <!ENTITY namePage.selected.label "Izbrano">
diff -ru cardbook1/chrome/locale/sl/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/sl/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/sl/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/sl/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Obletnice">
 <!ENTITY synclistTabLabel "Opomniki o obletnicah">
 
-<!ENTITY integrationGroupboxLabel "Vgradnja v Thunderbird">
+<!ENTITY integrationGroupboxLabel "Vgradnja v Icedove-UXP">
 <!ENTITY autocompletionLabel "Samodokončevanje e-poštnih naslovov">
 <!ENTITY autocompletionAccesskey "S">
-<!ENTITY autocompletionTooltip "Razširi običajno samodokončevanje stikov iz Thunderbirdovih imenikov s samodokončevanjem stikov iz CardBookovih imenikov.">
+<!ENTITY autocompletionTooltip "Razširi običajno samodokončevanje stikov iz Icedove-UXPovih imenikov s samodokončevanjem stikov iz CardBookovih imenikov.">
 <!ENTITY autocompleteSortByPopularityLabel "Razvrsti e-poštne naslove po priljubljenosti">
 <!ENTITY autocompleteSortByPopularityAccesskey "R">
 <!ENTITY autocompleteProposeConcatEmailsLabel "??Propose concatenated emails per contact??">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "b">
 <!ENTITY exclusiveLabel "Edinstven vir za stike">
 <!ENTITY exclusiveAccesskey "E">
-<!ENTITY exclusiveTooltip "Če je omogočena, ta možnost omogoča pridobivanje stikov iz Thunderbirdovih imenikov za rumene zvezdice, prikazano ime in samodokončevanje e-pošte.">
+<!ENTITY exclusiveTooltip "Če je omogočena, ta možnost omogoča pridobivanje stikov iz Icedove-UXPovih imenikov za rumene zvezdice, prikazano ime in samodokončevanje e-pošte.">
 <!ENTITY accountsRestrictionsLabel "Omejitve poštnega računa">
 <!ENTITY accountsRestrictionsEnabledLabel "Omogočeno">
 <!ENTITY accountsRestrictionsMailNameLabel "Poštni račun">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Izbriši">
 <!ENTITY deleteRestrictionAccesskey "b">
 <!ENTITY emailsCollectionLabel "Zberi odhodno pošto">
-<!ENTITY emailsCollectionTooltip "Razširi običajno Thunderbirdovo zbiranje odhodnih e-poštih naslovovThunderbird. Če je omogočeno, bodo e-poštni naslovi, ki niso prisotni v nobenem CardBookovem imeniku, dodani v izbrani/-e imenik/-e.">
+<!ENTITY emailsCollectionTooltip "Razširi običajno Icedove-UXPovo zbiranje odhodnih e-poštih naslovovIcedove-UXP. Če je omogočeno, bodo e-poštni naslovi, ki niso prisotni v nobenem CardBookovem imeniku, dodani v izbrani/-e imenik/-e.">
 <!ENTITY emailsCollectionEnabledLabel "Omogočeno">
 <!ENTITY emailsCollectionMailNameLabel "Poštni račun">
 <!ENTITY emailsCollectionABNameLabel "Imenik">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Za iskanje uporabi:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Zemljevide">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Zemljevide">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Zunanje povezave odpri:">
-<!ENTITY localizeTargetInLabel "V Thunderbirdu">
+<!ENTITY localizeTargetInLabel "V Icedove-UXPu">
 <!ENTITY localizeTargetInAccesskey "V">
-<!ENTITY localizeTargetOutLabel "Zunaj Thunderbirda">
+<!ENTITY localizeTargetOutLabel "Zunaj Icedove-UXPa">
 <!ENTITY localizeTargetOutAccesskey "Z">
 <!ENTITY showNameAsLabel "Prikaži ime kot">
 <!ENTITY showNameAsLFLabel "Priimek Ime">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "z">
 
 <!ENTITY ABtypesGroupboxLabel "Imenik">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Drugo">
 <!ENTITY typesCategoryOthersAccesskey "D">
 <!ENTITY typesGroupboxLabel "Vrste">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Polje ORG lahko vsebuje besedilno vrednost z zgradbo, ki je sestavljena iz delov, ločenih s PODPIČJEM (npr.: podjetje;storitev;oddelek). Spodnja polja opisujejo oznake delov te zgradbe.">
 
-<!ENTITY listPanelLabel "Če vaš strežnik ne podpira kategorij (kot npr. Google, Apple, Zimbra itd. …), lahko za pošiljanje e-pošte skupinam uporabite sezname. vCard 3.0 izvirno ne podpra seznamov, vendar lahko to dosežete s polji po meri. Če želite s standardom vCard 3.0 uporabiti sezname, morate ta polja določiti.">
+<!ENTITY listPanelLabel "Če vaš strežnik ne podpira kategorij, lahko za pošiljanje e-pošte skupinam uporabite sezname. vCard 3.0 izvirno ne podpra seznamov, vendar lahko to dosežete s polji po meri. Če želite s standardom vCard 3.0 uporabiti sezname, morate ta polja določiti.">
 <!ENTITY listGroupboxLabel "Polja po meri za sezname">
 <!ENTITY kindCustomLabel "Vrsta">
 <!ENTITY kindCustomAccesskey "V">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Sinh.">
 <!ENTITY syncWarn "Sinhronizacija prenese vaše spremembe na oddaljeni strežnik in spremembe na strežniku k vam.">
-<!ENTITY initialSyncLabel "Zaženi začetno sinhronizacijo ob zagonu Thunderbirda">
+<!ENTITY initialSyncLabel "Zaženi začetno sinhronizacijo ob zagonu Icedove-UXPa">
 <!ENTITY initialSyncAccesskey "Z">
 <!ENTITY initialSyncDelayLabel "??Delay for running first requests (seconds)??">
 <!ENTITY initialSyncDelayAccesskey "??D??">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "k">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Prikaži pojavno okno, kadar je seznam obletnic prazen">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "P">
-<!ENTITY remindViaLightningGroupboxLabel "Opomni preko Thunderbirdove koledarske razširitve Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Opomni preko Icedove-UXPove koledarske razširitve Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Št. dni za pisanje obletnic">
 <!ENTITY numberOfDaysForWritingAccesskey "a">
 <!ENTITY syncWithLightningOnStartupLabel "Sinhroniziraj z Lightningom ob zagonu">
diff -ru cardbook1/chrome/locale/sv-SE/cardbook.properties cardbook2/chrome/locale/sv-SE/cardbook.properties
--- cardbook1/chrome/locale/sv-SE/cardbook.properties	2018-07-27 16:56:18.000000000 -0400
+++ cardbook2/chrome/locale/sv-SE/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Inga dubbletter av kontakter har hitats.
 
-serverWarningGoogleLabel=Google funktionerna är experimentela, eftersom Google inte stödjer vCard standarden korrekt.
 
 ValidatingLabel=Validerar (%S)…
 ValidatingURLFailedLabel=Webbadress är felformaterad
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Upptäck fas 2 begäran på %2$S …
 synchronizationRequestDiscovery1=%1$S : Upptäck fas 1 begäran på %2$S …
 
-googleAccessTokenOK=%1$S : Googles access token-förfrågan okej, access token : %2$S
-googleRefreshTokenOK=%1$S : Google uppdatera tokenförfrågan okej, uppdatera token : %2$S
-googleGetNewRefreshToken=%1$S : Försöker att få en ny Google-uppdateringstoken på %2$S …
-googleNewRefreshTokenOK=%1$S : Mottagde en behörighetskod : %2$S …
-googleRequestAccessToken=%1$S : Googles access token-förfrågan på %2$S …
-googleRequestRefreshToken=%1$S : Google uppdatera token-förfrågan på %2$S …
-
-yahooAccessTokenOK=%1$S : Yahoo!s access token-förfrågan okej, access token : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! uppdatera tokenförfrågan okej, uppdatera token : %2$S
-yahooGetNewRefreshToken=%1$S : Försöker att få en ny Yahoo!-uppdateringstoken på %2$S …
-yahooNewRefreshTokenOK=%1$S : Mottagde en behörighetskod : %2$S …
-yahooRequestAccessToken=%1$S : Yahoo!s access token-förfrågan på %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! uppdatera token-förfrågan på %2$S …
 
 periodicSyncDeleting=%1$S : Radera periodisk synkroniseringsprocess (identifiering : %2$S)
 periodicSyncSetting=%1$S : Ställ in periodisk synkroniseringsprocess (intervall : %2$S ms, identifiering : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Preferensvärde
 prefWeightTooltip=Inställningar kan ha olika värden mellan 1 och 100. För normal användning, behöll den tom.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Lägg till i den här adressboken
 wdw_cardEditionViewResultTitle=Resultatändring av kontakt
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Redigera kontakt
 wdw_cardEditionViewContactTitle=Visa kontakt
 wdw_cardEditionViewListTitle=Visa lista
-wdw_cardbookPrintTitleLong=Förhandsgranska %S - Kontakter - Thunderbird
+wdw_cardbookPrintTitleLong=Förhandsgranska %S - Kontakter - Icedove-UXP
 wdw_cardbookPrintTitle=Förhandsgranska
 
 displayGroupboxLabel=Visningsnamn
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{6}} |)({{4}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Ny Google token för CardBook
-YAHOONewTokenTitle=Ny Yahoo! token för CardBook
 
 invalidEmail=%1$S är inte en giltig e-postadress eftersom den inte har formen användare@värd.
 appendEmailLabel=Lägg till i lista: %1$S
diff -ru cardbook1/chrome/locale/sv-SE/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/sv-SE/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/sv-SE/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/sv-SE/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Lägg till ny adressbok">
 
 <!ENTITY welcomePage.wizard.description "Välkommen">
-<!ENTITY welcomePage.description "Det ser ut som om det är första gången du startat CardBook, Så vi kommer att försöka importera dina kontakter från Thunderbird's standard adressböcker till CardBook.">
+<!ENTITY welcomePage.description "Det ser ut som om det är första gången du startat CardBook, Så vi kommer att försöka importera dina kontakter från Icedove-UXP's standard adressböcker till CardBook.">
 
 <!ENTITY initialPage.wizard.description "Plats för ny adressbok.">
 <!ENTITY initialPage.description "Är adressboken lokal eller online ? :">
 <!ENTITY initialPage.computer.label "Lokal">
 <!ENTITY initialPage.network.label "Online">
-<!ENTITY initialPage.standard.label "Importera Thunderbird's standard adressböcker">
+<!ENTITY initialPage.standard.label "Importera Icedove-UXP's standard adressböcker">
 <!ENTITY initialPage.search.label "Söker i befintliga adressböcker">
 
 <!ENTITY localPage.wizard.description "Typ och plats för din nya lokala adressbok.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Bläddra">
 
 <!ENTITY remotePage.wizard.description "Typ och plats för din nya online adressbok.">
-<!ENTITY remotePage.description "Vad är det för typ av online adressbok ? : (Varning: Google följer inte standarden för vCard)">
+<!ENTITY remotePage.description "Vad är det för typ av online adressbok?">
 <!ENTITY remotePage.type.label "Typ">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Anslutning">
-<!ENTITY remotePage.url.description "För CardDAV, ange URL'en till din online adressbok. Du kan prova att ange en del av URL'n (t.ex : http(s)://carddav.example.org). Lämna tomt om du ansluter till en Google adressbok.">
+<!ENTITY remotePage.url.description "För CardDAV, ange URL'en till din online adressbok. Du kan prova att ange en del av URL'n (t.ex : http(s)://carddav.example.org).">
 <!ENTITY remotePage.url.label "URL">
-<!ENTITY remotePage.credentials.description "Ange dina inloggningsuppgifter för adressboken. För en Google adressbok, ange din Google mejladress.">
+<!ENTITY remotePage.credentials.description "Ange dina inloggningsuppgifter för adressboken.">
 <!ENTITY remotePage.validatebutton.label "Validera/Testa">
 
 <!ENTITY locationSearchPage.wizard.description "Definition av den sparade sökningen.">
 <!ENTITY locationSearchPage.label "Sparad sökning">
 
-<!ENTITY googleOauthPage.wizard.description "Google Autentisering">
 
 <!ENTITY namePage.wizard.description "Adressboks inställningar">
 <!ENTITY namePage.selected.label "Välj">
diff -ru cardbook1/chrome/locale/sv-SE/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/sv-SE/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/sv-SE/wdw_cardbookConfiguration.dtd	2018-07-27 16:45:18.000000000 -0400
+++ cardbook2/chrome/locale/sv-SE/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,7 +9,7 @@
 <!ENTITY birthdaylistTabLabel "Födelsedag">
 <!ENTITY synclistTabLabel "Födelsedags påminnelse">
 
-<!ENTITY integrationGroupboxLabel "Integration i Thunderbird">
+<!ENTITY integrationGroupboxLabel "Integration i Icedove-UXP">
 <!ENTITY autocompletionLabel "Autofyll meljadress">
 <!ENTITY autocompletionAccesskey "A">
 <!ENTITY autocompletionTooltip "Utöka Autofyll kontaker från andra adressböcker än Kontakter.">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "x">
 <!ENTITY exclusiveLabel "Unik källa för kontakter">
 <!ENTITY exclusiveAccesskey "U">
-<!ENTITY exclusiveTooltip "Om den här är inaktiverad, så hämtas kontakter från Thunderbird standard adressböcker för de gula stjärnorna, visningsnamn och autoifyllnad av mejladresser">
+<!ENTITY exclusiveTooltip "Om den här är inaktiverad, så hämtas kontakter från Icedove-UXP standard adressböcker för de gula stjärnorna, visningsnamn och autoifyllnad av mejladresser">
 <!ENTITY accountsRestrictionsLabel "Mejlkonto restriktioner">
 <!ENTITY accountsRestrictionsEnabledLabel "Aktiverad">
 <!ENTITY accountsRestrictionsMailNameLabel "Mejlkonto">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Ta bort">
 <!ENTITY deleteRestrictionAccesskey "T">
 <!ENTITY emailsCollectionLabel "Spara utgående mejladress">
-<!ENTITY emailsCollectionTooltip "Utökar funktionen att samla in mejadresser på utgående mejl i Thunderbird. När aktiverad, sparar mejladress som inte redan finns i någon Kontakter adressbok, till valda adressböcker.">
+<!ENTITY emailsCollectionTooltip "Utökar funktionen att samla in mejadresser på utgående mejl i Icedove-UXP. När aktiverad, sparar mejladress som inte redan finns i någon Kontakter adressbok, till valda adressböcker.">
 <!ENTITY emailsCollectionEnabledLabel "Aktiverad">
 <!ENTITY emailsCollectionMailNameLabel "Mejlkonto">
 <!ENTITY emailsCollectionABNameLabel "Adressbok">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Hitta med:">
 <!ENTITY localizeEngineOpenStreetMapLabel "OpenStreetMap">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "O">
-<!ENTITY localizeEngineGoogleMapsLabel "Google Maps">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bing Maps">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Öppna externa länkar:">
-<!ENTITY localizeTargetInLabel "I Thunderbird">
+<!ENTITY localizeTargetInLabel "I Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "I">
-<!ENTITY localizeTargetOutLabel "Utanför Thunderbird">
+<!ENTITY localizeTargetOutLabel "Utanför Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "U">
 <!ENTITY showNameAsLabel "Visa namn som">
 <!ENTITY showNameAsLFLabel "Efternamn Förnamn">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "N">
 
 <!ENTITY ABtypesGroupboxLabel "Adressbok">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Annat">
 <!ENTITY typesCategoryOthersAccesskey "n">
 <!ENTITY typesGroupboxLabel "Typer">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Fältet ORG kan innehålla en strukturerad organisation separerad med ett semikolon (till exempel: dittbolag;dintjänst;dinavdelning). Fälten nedan beskriver de olika märkningarna.">
 
-<!ENTITY listPanelLabel "Om din server inte har stöd för grupper (som t.exe Google, Apple, Zimbra, etc…), Så kan listor vara ett bra sätt att skicka mejl till gupper. vCard 3.0 har inte som standard stöd för Listor, men det kan åstadkommas med custom fields, så om du vill använda listor med vCard 3.0, behöver du definiera de gär värdena">
+<!ENTITY listPanelLabel "Om din server inte har stöd för grupper, Så kan listor vara ett bra sätt att skicka mejl till gupper. vCard 3.0 har inte som standard stöd för Listor, men det kan åstadkommas med custom fields, så om du vill använda listor med vCard 3.0, behöver du definiera de gär värdena">
 <!ENTITY listGroupboxLabel "Anpassade fält för listor">
 <!ENTITY kindCustomLabel "Sortera">
 <!ENTITY kindCustomAccesskey "S">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Synk.">
 <!ENTITY syncWarn "Synkronisering överför dina ändringar till servern, och tvärt om">
-<!ENTITY initialSyncLabel "Kör ssynkronisering när Thunderbird startar">
+<!ENTITY initialSyncLabel "Kör ssynkronisering när Icedove-UXP startar">
 <!ENTITY initialSyncAccesskey "K">
 <!ENTITY initialSyncDelayLabel "Inledande synkroniseringsfördröjning (andra)">
 <!ENTITY initialSyncDelayAccesskey "y">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Visa popup-fönster när födelsedagslistan är tomt">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "a">
-<!ENTITY remindViaLightningGroupboxLabel "Påminn dig via Thunderbird Lightning-kalendertillägget">
+<!ENTITY remindViaLightningGroupboxLabel "Påminn dig via Icedove-UXP Lightning-kalendertillägget">
 <!ENTITY numberOfDaysForWritingLabel "Antal dagar att skriva årsdagar">
 <!ENTITY numberOfDaysForWritingAccesskey "v">
 <!ENTITY syncWithLightningOnStartupLabel "Synkronisera med Lightning vid uppstart">
diff -ru cardbook1/chrome/locale/uk/cardbook.properties cardbook2/chrome/locale/uk/cardbook.properties
--- cardbook1/chrome/locale/uk/cardbook.properties	2018-07-30 09:25:40.000000000 -0400
+++ cardbook2/chrome/locale/uk/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Дублікати контактів не знайдено.
 
-serverWarningGoogleLabel=Використання Гугл «Google» є експериментальним, оскільки Гугл не дотримується стандартів Особиста картка «vCard».
 
 ValidatingLabel=Підтвердження (%S)…
 ValidatingURLFailedLabel=Уніфікований покажчик інформаційного ресурсу «URL» неправильно
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Виявлення запит фази 2 на %2$S …
 synchronizationRequestDiscovery1=%1$S :Виявлення запиту фази 1 на %2$S …
 
-googleAccessTokenOK=%1$S : Запит маркер доступу до Гугл Гаразд, маркер доступу : %2$S
-googleRefreshTokenOK=%1$S : Запит оновити токен до Гугл Гаразд, оновити токен : %2$S
-googleGetNewRefreshToken=%1$S : Спроба отримати новий токен для оновлення Гугл на %2$S …
-googleNewRefreshTokenOK=%1$S : Отримано код авторизації : %2$S …
-googleRequestAccessToken=%1$S : Запит токенів доступу Гугл на %2$S …
-googleRequestRefreshToken=%1$S : Гугл оновлює запит токена на %2$S …
-
-yahooAccessTokenOK=%1$S : Запит маркер доступу до Yahoo! Гаразд, маркер доступу : %2$S
-yahooRefreshTokenOK=%1$S : Запит оновити токен до Yahoo! Гаразд, оновити токен : %2$S
-yahooGetNewRefreshToken=%1$S : Спроба отримати новий токен для оновлення Yahoo! на %2$S …
-yahooNewRefreshTokenOK=%1$S : Отримано код авторизації : %2$S …
-yahooRequestAccessToken=%1$S : Запит токенів доступу Yahoo! на %2$S …
-yahooRequestRefreshToken=%1$S : Yahoo! оновлює запит токена на %2$S …
 
 periodicSyncDeleting=%1$S : Видалення періодичного процесу синхронізації (ідентифікатор : %2$S)
 periodicSyncSetting=%1$S : Налаштування періодичного процесу синхронізації (проміжок часу : %2$S мілісекунди, ідентифікатор : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Переважне значення
 prefWeightTooltip=Параметри можуть мати різні значення від 1 до 100. Зберігати його порожнім для нормального використання.
 
-impp.skype=Skype
 impp.jabber=Джаббер
-impp.googletalk=Гугл Обговорення
-impp.qq=Десятьцент
 
 addToAddressbook=Додати до цієї адресної книги
 wdw_cardEditionViewResultTitle=Результати модифікації контактів
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Змінити контакт
 wdw_cardEditionViewContactTitle=Переглянути контакт
 wdw_cardEditionViewListTitle=Переглянути список
-wdw_cardbookPrintTitleLong=Попередній перегляд %1$S - Контакти - Thunderbird
+wdw_cardbookPrintTitleLong=Попередній перегляд %1$S - Контакти - Icedove-UXP
 wdw_cardbookPrintTitle=Попередній перегляд
 
 displayGroupboxLabel=Відображуване ім’я
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{6}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Новий токен Гугл для Контакти
-YAHOONewTokenTitle=Новий токен Yahoo! для Контакти
 
 invalidEmail=%1$S не є дійсною електронною адресою, оскільки вона не є формою користувач@хост.
 appendEmailLabel=Додати до списку: %1$S
diff -ru cardbook1/chrome/locale/uk/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/uk/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/uk/wdw_addressbooksAdd.dtd	2018-07-11 14:25:30.000000000 -0400
+++ cardbook2/chrome/locale/uk/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Додайте нову адресну книгу">
 
 <!ENTITY welcomePage.wizard.description "Вітаємо">
-<!ENTITY welcomePage.description "Схоже, що вперше ви використовуєте Контакти, тому ми спробуємо імпортувати контакти з стандартних адресних книг Thunderbird на Контакти.">
+<!ENTITY welcomePage.description "Схоже, що вперше ви використовуєте Контакти, тому ми спробуємо імпортувати контакти з стандартних адресних книг Icedove-UXP на Контакти.">
 
 <!ENTITY initialPage.wizard.description "Розташування нової адресної книги.">
 <!ENTITY initialPage.description "Розташування адресної книги:">
 <!ENTITY initialPage.computer.label "Локальне">
 <!ENTITY initialPage.network.label "Віддалене">
-<!ENTITY initialPage.standard.label "Імпорт стандартних адресних книг Thunderbird">
+<!ENTITY initialPage.standard.label "Імпорт стандартних адресних книг Icedove-UXP">
 <!ENTITY initialPage.search.label "Пошук в існуючих адресних книгах">
 
 <!ENTITY localPage.wizard.description "Тип і місце розташування нової локальної адресної книги.">
@@ -24,12 +24,9 @@
 <!ENTITY localPage.uributton.label "Вибрати">
 
 <!ENTITY remotePage.wizard.description "Тип і розташування нової віддаленої адресної книги.">
-<!ENTITY remotePage.description "Який тип вашої віддаленої адресної книги? (Увага: Гугл НЕ відповідає стандартам Особиста картка «vCard»)">
+<!ENTITY remotePage.description "Який тип вашої віддаленої адресної книги?">
 <!ENTITY remotePage.type.label "Тип">
 <!ENTITY remotePage.carddav.label "КартаDAV «CardDAV»">
-<!ENTITY remotePage.google.label "Гугл">
-<!ENTITY remotePage.apple.label "Яблучний">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "З’єднання">
 <!ENTITY remotePage.url.description "Для типу КартаDAV «CardDAV» введіть URL-адресу вашої віддаленої адресної книги. Ви можете спробувати використовувати часткову URL-адресу (Приклад: http(s)://carddav.example.org.uk). Для адресної книги Гугл не вказуйте це поле.">
 <!ENTITY remotePage.url.label "Уніфікований покажчик інформаційного ресурсу «URL»">
@@ -39,7 +36,6 @@
 <!ENTITY locationSearchPage.wizard.description "Віртуальну теку  визначень">
 <!ENTITY locationSearchPage.label "Віртуальну теку">
 
-<!ENTITY googleOauthPage.wizard.description "Аутентифікація Гугл">
 
 <!ENTITY namePage.wizard.description "Властивості адресної книги">
 <!ENTITY namePage.selected.label "Вибрано">
diff -ru cardbook1/chrome/locale/uk/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/uk/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/uk/wdw_cardbookConfiguration.dtd	2018-07-30 09:25:56.000000000 -0400
+++ cardbook2/chrome/locale/uk/wdw_cardbookConfiguration.dtd	2018-09-14 22:43:23.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Річниця">
 <!ENTITY synclistTabLabel "Ювілейне нагадування">
 
-<!ENTITY integrationGroupboxLabel "Інтеграція в Thunderbird">
+<!ENTITY integrationGroupboxLabel "Інтеграція в Icedove-UXP">
 <!ENTITY autocompletionLabel "Автозаповнення електронних адрес">
 <!ENTITY autocompletionAccesskey "А">
-<!ENTITY autocompletionTooltip "Розширює стандартне автоматичне доповнення контактів в адресних книгах Thunderbird при автоматичному заповненні контактів в адресних книгах CardBook.">
+<!ENTITY autocompletionTooltip "Розширює стандартне автоматичне доповнення контактів в адресних книгах Icedove-UXP при автоматичному заповненні контактів в адресних книгах CardBook.">
 <!ENTITY autocompleteSortByPopularityLabel "Сортувати адреси електронної пошти за популярністю">
 <!ENTITY autocompleteSortByPopularityAccesskey "п">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Пропонуйте об'єднані електронні листи на контакт">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "т">
 <!ENTITY exclusiveLabel "Унікальне джерело для контактів">
 <!ENTITY exclusiveAccesskey "У">
-<!ENTITY exclusiveTooltip "Якщо цей параметр вимкнено, цей параметр дає змогу завантажувати контакти в стандартні адресні книги Thunderbird для жовтих зірок, для відображення імені електронної пошти та автоматичного завершення електронної пошти.">
+<!ENTITY exclusiveTooltip "Якщо цей параметр вимкнено, цей параметр дає змогу завантажувати контакти в стандартні адресні книги Icedove-UXP для жовтих зірок, для відображення імені електронної пошти та автоматичного завершення електронної пошти.">
 <!ENTITY accountsRestrictionsLabel "Обмеження поштової скриньки">
 <!ENTITY accountsRestrictionsEnabledLabel "Увімкнено">
 <!ENTITY accountsRestrictionsMailNameLabel "Пошта рахунок">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Видалити">
 <!ENTITY deleteRestrictionAccesskey "В">
 <!ENTITY emailsCollectionLabel "Зберіть вихідний електронний лист">
-<!ENTITY emailsCollectionTooltip "Розширює стандартну колекцію вихідних електронних адрес Thunderbird. Якщо цей параметр увімкнено, адреси електронної пошти, що відсутні в адресній книзі CardBook, будуть додані до вибраної адресної книги.">
+<!ENTITY emailsCollectionTooltip "Розширює стандартну колекцію вихідних електронних адрес Icedove-UXP. Якщо цей параметр увімкнено, адреси електронної пошти, що відсутні в адресній книзі CardBook, будуть додані до вибраної адресної книги.">
 <!ENTITY emailsCollectionEnabledLabel "Увімкнено">
 <!ENTITY emailsCollectionMailNameLabel "Пошта рахунок">
 <!ENTITY emailsCollectionABNameLabel "Адресна книга">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Показати на карті з:">
 <!ENTITY localizeEngineOpenStreetMapLabel "Карти Відкритий Вулиця">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "В">
-<!ENTITY localizeEngineGoogleMapsLabel "Карти Гугл">
-<!ENTITY localizeEngineGoogleMapsAccesskey "Г">
-<!ENTITY localizeEngineBingMapsLabel "Карти Бінг">
-<!ENTITY localizeEngineBingMapsAccesskey "Б">
 <!ENTITY localizeTargetLabel "Відкриті зовнішні посилання:">
-<!ENTITY localizeTargetInLabel "Всередині Thunderbird">
+<!ENTITY localizeTargetInLabel "Всередині Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "В">
-<!ENTITY localizeTargetOutLabel "За межами Thunderbird">
+<!ENTITY localizeTargetOutLabel "За межами Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "м">
 <!ENTITY showNameAsLabel "Показувати ім’я як">
 <!ENTITY showNameAsLFLabel "Прізвище Ім'я">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "М">
 
 <!ENTITY ABtypesGroupboxLabel "Адресна книга">
-<!ENTITY typesCategoryGoogleLabel "Гугл">
-<!ENTITY typesCategoryGoogleAccesskey "Г">
-<!ENTITY typesCategoryAppleLabel "Яблучний">
-<!ENTITY typesCategoryAppleAccesskey "Я">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Інше">
 <!ENTITY typesCategoryOthersAccesskey "І">
 <!ENTITY typesGroupboxLabel "Типи">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Синхронізація">
 <!ENTITY syncWarn "Синхронізація розповсюджує вашу модифікацію на віддалений сервер та модифікації сервера для вас.">
-<!ENTITY initialSyncLabel "Запустити синхронізацію при запуску Thunderbird">
+<!ENTITY initialSyncLabel "Запустити синхронізацію при запуску Icedove-UXP">
 <!ENTITY initialSyncAccesskey "З">
 <!ENTITY initialSyncDelayLabel "Початкова затримка синхронізації (секунд)">
 <!ENTITY initialSyncDelayAccesskey "а">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "В">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Показати спливаюче вікно, коли список ювілеїв порожній">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "о">
-<!ENTITY remindViaLightningGroupboxLabel "Нагадайте про розширення календаря Thunderbird Lightning">
+<!ENTITY remindViaLightningGroupboxLabel "Нагадайте про розширення календаря Icedove-UXP Lightning">
 <!ENTITY numberOfDaysForWritingLabel "Кількість днів, щоб писати ювілеї">
 <!ENTITY numberOfDaysForWritingAccesskey "п">
 <!ENTITY syncWithLightningOnStartupLabel "Синхронізувати з Lightning при запуску">
diff -ru cardbook1/chrome/locale/vi/cardbook.properties cardbook2/chrome/locale/vi/cardbook.properties
--- cardbook1/chrome/locale/vi/cardbook.properties	2018-07-30 09:25:00.000000000 -0400
+++ cardbook2/chrome/locale/vi/cardbook.properties	2018-09-14 22:02:31.000000000 -0400
@@ -35,7 +35,6 @@
 
 noContactsDuplicated=Không tìm thấy địa chỉ liên hệ trùng lặp.
 
-serverWarningGoogleLabel=Google sử dụng là thử nghiệm, bởi vì Google không tôn trọng các chuẩn Thẻ Ảo.
 
 ValidatingLabel=Xác nhận (%S)…
 ValidatingURLFailedLabel=Địa chỉ URL không đúng định dạng
@@ -145,19 +144,6 @@
 synchronizationRequestDiscovery2=%1$S : Khám phá yêu cầu pha 2 trên %2$S …
 synchronizationRequestDiscovery1=%1$S : Khám phá yêu cầu pha 1 trên %2$S …
 
-googleAccessTokenOK=%1$S : Google truy cập thẻ yêu cầu được, truy cập thẻ : %2$S
-googleRefreshTokenOK=%1$S : Google tải lại mã thông báo yêu cầu được, tải lại mã thông báo : %2$S
-googleGetNewRefreshToken=%1$S : đang cố gắng có được một cái mới Google tải lại mã thông báo %2$S …
-googleNewRefreshTokenOK=%1$S : Đã nhận được mã ủy quyền : %2$S
-googleRequestAccessToken=%1$S : Google truy cập thẻ yêu cầu %2$S
-googleRequestRefreshToken=%1$S : Google tải lại mã thông báo %2$S
-
-yahooAccessTokenOK=%1$S : Yahoo! truy cập thẻ yêu cầu được, truy cập thẻ : %2$S
-yahooRefreshTokenOK=%1$S : Yahoo! tải lại mã thông báo yêu cầu được, tải lại mã thông báo : %2$S
-yahooGetNewRefreshToken=%1$S : đang cố gắng có được một cái mới Yahoo! tải lại mã thông báo %2$S …
-yahooNewRefreshTokenOK=%1$S : Đã nhận được mã ủy quyền : %2$S
-yahooRequestAccessToken=%1$S : Yahoo! truy cập thẻ yêu cầu %2$S
-yahooRequestRefreshToken=%1$S : Yahoo! tải lại mã thông báo %2$S
 
 periodicSyncDeleting=%1$S : Xóa quá trình đồng bộ hóa định kỳ (danh tính : %2$S)
 periodicSyncSetting=%1$S : Thiết lập quá trình đồng bộ hóa định kỳ (khoảng thời gian : %2$S ms, danh tính : %3$S)
@@ -341,10 +327,7 @@
 prefValueLabel=Giá trị ưu đãi
 prefWeightTooltip=Tùy chọn có thể có các giá trị khác nhau giữa 1 và 100. Giữ nó trống rỗng để sử dụng bình thường.
 
-impp.skype=Skype
 impp.jabber=Jabber
-impp.googletalk=Google Talk
-impp.qq=Tencent QQ
 
 addToAddressbook=Thêm vào sổ địa chỉ này
 wdw_cardEditionViewResultTitle=Thay đổi liên hệ kết quả
@@ -357,7 +340,7 @@
 wdw_cardEditionAddLineTitle=Chỉnh sửa Danh bạ
 wdw_cardEditionViewContactTitle=Xem liên hệ
 wdw_cardEditionViewListTitle=Danh sách xem
-wdw_cardbookPrintTitleLong=%S - Xem trước Bản in - Danh bạ - Thunderbird
+wdw_cardbookPrintTitleLong=%S - Xem trước Bản in - Danh bạ - Icedove-UXP
 wdw_cardbookPrintTitle=Xem trước Bản in
 
 displayGroupboxLabel=Hiển thị
@@ -478,8 +461,6 @@
 
 addressFormatFormula=({{3}}\n|)({{1}}\n|)({{4}} |)({{6}}|)(\n)({{5}}\n|)({{7}}|)
 
-GOOGLENewTokenTitle=Mã thông báo Google mới cho Danh bạ
-YAHOONewTokenTitle=Mã thông báo Yahoo! mới cho Danh bạ
 
 invalidEmail=%1$S không phải là một địa chỉ email hợp lệ vì nó không có dạng ngườidùng@tênmiền.
 appendEmailLabel=Thêm vào danh sách: %1$S
diff -ru cardbook1/chrome/locale/vi/wdw_addressbooksAdd.dtd cardbook2/chrome/locale/vi/wdw_addressbooksAdd.dtd
--- cardbook1/chrome/locale/vi/wdw_addressbooksAdd.dtd	2018-05-02 17:04:52.000000000 -0400
+++ cardbook2/chrome/locale/vi/wdw_addressbooksAdd.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -2,13 +2,13 @@
 <!ENTITY wizard.label "Thêm sổ địa chỉ mới">
 
 <!ENTITY welcomePage.wizard.description "Chào mừng!">
-<!ENTITY welcomePage.description "Có vẻ như đây là lần đầu tiên bạn sử dụng Danh bạ, vì vậy chúng tôi sẽ cố gắng nhập địa chỉ liên lạc từ sổ địa chỉ chuẩn của Thunderbird vào Danh bạ.">
+<!ENTITY welcomePage.description "Có vẻ như đây là lần đầu tiên bạn sử dụng Danh bạ, vì vậy chúng tôi sẽ cố gắng nhập địa chỉ liên lạc từ sổ địa chỉ chuẩn của Icedove-UXP vào Danh bạ.">
 
 <!ENTITY initialPage.wizard.description "Vị trí của sổ địa chỉ mới.">
 <!ENTITY initialPage.description "Vị trí của sổ địa chỉ:">
 <!ENTITY initialPage.computer.label "Gần">
 <!ENTITY initialPage.network.label "Xa">
-<!ENTITY initialPage.standard.label "Nhập các sổ địa chỉ chuẩn Thunderbird">
+<!ENTITY initialPage.standard.label "Nhập các sổ địa chỉ chuẩn Icedove-UXP">
 <!ENTITY initialPage.search.label "Tìm kiếm trong sổ địa chỉ hiện có">
 
 <!ENTITY localPage.wizard.description "Nhập và vị trí của sổ địa chỉ địa phương mới.">
@@ -24,22 +24,18 @@
 <!ENTITY localPage.uributton.label "Duyệtn">
 
 <!ENTITY remotePage.wizard.description "Loại và vị trí của sổ địa chỉ mới từ xa.">
-<!ENTITY remotePage.description "Loại sổ địa chỉ từ xa của bạn là gì (Chú ý: Google KHÔNG tuân thủ các tiêu chuẩn vCard)?">
+<!ENTITY remotePage.description "Loại sổ địa chỉ từ xa của bạn là gì?">
 <!ENTITY remotePage.type.label "Loại">
 <!ENTITY remotePage.carddav.label "CardDAV">
-<!ENTITY remotePage.google.label "Google">
-<!ENTITY remotePage.apple.label "Apple">
-<!ENTITY remotePage.yahoo.label "Yahoo!">
 <!ENTITY remotePage.connection.label "Kết nối">
-<!ENTITY remotePage.url.description "Đối với loại CardDAV, nhập Địa chỉ URL của sổ địa chỉ từ xa của bạn. Bạn có thể thử sử dụng một phần Địa chỉ URL (ví dụ: http(s)://carddav.thídụ.org.vn). Đối với sổ địa chỉ của Google, không chỉ định trường này.">
+<!ENTITY remotePage.url.description "Đối với loại CardDAV, nhập Địa chỉ URL của sổ địa chỉ từ xa của bạn. Bạn có thể thử sử dụng một phần Địa chỉ URL (ví dụ: http(s)://carddav.thídụ.org.vn).">
 <!ENTITY remotePage.url.label "Địa chỉ URL">
-<!ENTITY remotePage.credentials.description "Nhập thông tin đăng nhập để truy cập sổ địa chỉ của bạn. Đối với sổ địa chỉ Google, tên người dùng phải là email Google của bạn.">
+<!ENTITY remotePage.credentials.description "Nhập thông tin đăng nhập để truy cập sổ địa chỉ của bạn.">
 <!ENTITY remotePage.validatebutton.label "Xác thực">
 
 <!ENTITY locationSearchPage.wizard.description "Tìm kiếm Được lưu Định nghĩa.">
 <!ENTITY locationSearchPage.label "Tìm kiếm Được lưu">
 
-<!ENTITY googleOauthPage.wizard.description "Xác thực của Google">
 
 <!ENTITY namePage.wizard.description "Thuộc tính của sổ địa chỉ">
 <!ENTITY namePage.selected.label "Đã chọn">
diff -ru cardbook1/chrome/locale/vi/wdw_cardbookConfiguration.dtd cardbook2/chrome/locale/vi/wdw_cardbookConfiguration.dtd
--- cardbook1/chrome/locale/vi/wdw_cardbookConfiguration.dtd	2018-07-26 11:01:42.000000000 -0400
+++ cardbook2/chrome/locale/vi/wdw_cardbookConfiguration.dtd	2018-09-14 22:02:31.000000000 -0400
@@ -9,10 +9,10 @@
 <!ENTITY birthdaylistTabLabel "Ngày kỷ niệm">
 <!ENTITY synclistTabLabel "Nhắc nhở">
 
-<!ENTITY integrationGroupboxLabel "Tích hợp trong Thunderbird">
+<!ENTITY integrationGroupboxLabel "Tích hợp trong Icedove-UXP">
 <!ENTITY autocompletionLabel "Tự động điền địa chỉ email">
 <!ENTITY autocompletionAccesskey "T">
-<!ENTITY autocompletionTooltip "Mở rộng tự động hoàn thành tự động các địa chỉ liên lạc trong sổ địa chỉ của Thunderbird với một tự động hoàn thành các địa chỉ liên lạc trong sổ địa chỉ của Danh bạ.">
+<!ENTITY autocompletionTooltip "Mở rộng tự động hoàn thành tự động các địa chỉ liên lạc trong sổ địa chỉ của Icedove-UXP với một tự động hoàn thành các địa chỉ liên lạc trong sổ địa chỉ của Danh bạ.">
 <!ENTITY autocompleteSortByPopularityLabel "Sắp xếp các địa chỉ email theo mức độ phổ biến">
 <!ENTITY autocompleteSortByPopularityAccesskey "p">
 <!ENTITY autocompleteProposeConcatEmailsLabel "Đề xuất các email ghép mỗi địa chỉ liên hệ">
@@ -34,7 +34,7 @@
 <!ENTITY useColorTextAccesskey "V">
 <!ENTITY exclusiveLabel "Nguồn duy nhất cho địa chỉ liên hệ">
 <!ENTITY exclusiveAccesskey "d">
-<!ENTITY exclusiveTooltip "Nếu bị vô hiệu hóa, tùy chọn này cho phép lấy địa chỉ liên lạc trong sổ địa chỉ chuẩn Thunderbird cho các ngôi sao màu vàng, cho tên hiển thị email và cho tự động hoàn thành email.">
+<!ENTITY exclusiveTooltip "Nếu bị vô hiệu hóa, tùy chọn này cho phép lấy địa chỉ liên lạc trong sổ địa chỉ chuẩn Icedove-UXP cho các ngôi sao màu vàng, cho tên hiển thị email và cho tự động hoàn thành email.">
 <!ENTITY accountsRestrictionsLabel "Hạn chế Tài khoản Thư">
 <!ENTITY accountsRestrictionsEnabledLabel "Bật">
 <!ENTITY accountsRestrictionsMailNameLabel "Tài khoản Thư">
@@ -48,7 +48,7 @@
 <!ENTITY deleteRestrictionLabel "Xóa">
 <!ENTITY deleteRestrictionAccesskey "X">
 <!ENTITY emailsCollectionLabel "Thu thập Email đi">
-<!ENTITY emailsCollectionTooltip "Mở rộng bộ sưu tập địa chỉ email đi tiêu chuẩn của Thunderbird. Nếu được kích hoạt, địa chỉ email không có trong sổ địa chỉ của Danh bạ sẽ được thêm vào sổ địa chỉ đã chọn.">
+<!ENTITY emailsCollectionTooltip "Mở rộng bộ sưu tập địa chỉ email đi tiêu chuẩn của Icedove-UXP. Nếu được kích hoạt, địa chỉ email không có trong sổ địa chỉ của Danh bạ sẽ được thêm vào sổ địa chỉ đã chọn.">
 <!ENTITY emailsCollectionEnabledLabel "Bật">
 <!ENTITY emailsCollectionMailNameLabel "Tài khoản Thư">
 <!ENTITY emailsCollectionABNameLabel "Sổ Địa Chỉ">
@@ -82,14 +82,10 @@
 <!ENTITY localizeEditingGroupboxLabel "Hiển thị trên bản đồ với:">
 <!ENTITY localizeEngineOpenStreetMapLabel "MởĐườngĐồ">
 <!ENTITY localizeEngineOpenStreetMapAccesskey "M">
-<!ENTITY localizeEngineGoogleMapsLabel "Bản đồ Google">
-<!ENTITY localizeEngineGoogleMapsAccesskey "G">
-<!ENTITY localizeEngineBingMapsLabel "Bản đồ Bing">
-<!ENTITY localizeEngineBingMapsAccesskey "B">
 <!ENTITY localizeTargetLabel "Mở liên kết ngoài:">
-<!ENTITY localizeTargetInLabel "Bên trong Thunderbird">
+<!ENTITY localizeTargetInLabel "Bên trong Icedove-UXP">
 <!ENTITY localizeTargetInAccesskey "t">
-<!ENTITY localizeTargetOutLabel "Bên ngoài Thunderbird">
+<!ENTITY localizeTargetOutLabel "Bên ngoài Icedove-UXP">
 <!ENTITY localizeTargetOutAccesskey "n">
 <!ENTITY showNameAsLabel "Hiển thị tên dưới dạng">
 <!ENTITY showNameAsLFLabel "Họ Tên">
@@ -117,12 +113,6 @@
 <!ENTITY preferenceValueAccesskey "g">
 
 <!ENTITY ABtypesGroupboxLabel "Sổ Địa Chỉ">
-<!ENTITY typesCategoryGoogleLabel "Google">
-<!ENTITY typesCategoryGoogleAccesskey "G">
-<!ENTITY typesCategoryAppleLabel "Apple">
-<!ENTITY typesCategoryAppleAccesskey "A">
-<!ENTITY typesCategoryYahooLabel "Yahoo!">
-<!ENTITY typesCategoryYahooAccesskey "Y">
 <!ENTITY typesCategoryOthersLabel "Khác">
 <!ENTITY typesCategoryOthersAccesskey "K">
 <!ENTITY typesGroupboxLabel "Loại">
@@ -177,7 +167,7 @@
 
 <!ENTITY orgWarn "Lĩnh vực tổ chức có thể chứa giá trị văn bản có cấu trúc bao gồm các thành phần được cách nhau bởi dấu chấm phẩy (ví dụ: công;vụ;phận). Các trường bên dưới mô tả nhãn thành phần của cấu trúc này.">
 
-<!ENTITY listPanelLabel "Nếu máy chủ của bạn không hỗ trợ các loại (ví dụ Google, Apple, Zimbra, vân vân), danh sách là một cách hay để gửi email đến các nhóm. Thẻ Ảo 3,0 không hỗ trợ danh sách, nhưng điều này có thể đạt được với các lĩnh vực tùy chỉnh, vì vậy nếu bạn muốn sử dụng các danh sách trong Thẻ Ảo 3,0, bạn phải xác định các trường này.">
+<!ENTITY listPanelLabel "Nếu máy chủ của bạn không hỗ trợ các loại, danh sách là một cách hay để gửi email đến các nhóm. Thẻ Ảo 3,0 không hỗ trợ danh sách, nhưng điều này có thể đạt được với các lĩnh vực tùy chỉnh, vì vậy nếu bạn muốn sử dụng các danh sách trong Thẻ Ảo 3,0, bạn phải xác định các trường này.">
 <!ENTITY listGroupboxLabel "Trường tùy chỉnh cho danh sách">
 <!ENTITY kindCustomLabel "Loại">
 <!ENTITY kindCustomAccesskey "L">
@@ -188,7 +178,7 @@
 
 <!ENTITY syncGroupboxLabel "Đồng bộ hóa">
 <!ENTITY syncWarn "Đồng bộ hoá truyền tải các sửa đổi của bạn tới một máy chủ từ xa và các sửa đổi của máy chủ cho bạn.">
-<!ENTITY initialSyncLabel "Chạy đồng bộ hóa khi khởi động Thunderbird">
+<!ENTITY initialSyncLabel "Chạy đồng bộ hóa khi khởi động Icedove-UXP">
 <!ENTITY initialSyncAccesskey "C">
 <!ENTITY initialSyncDelayLabel "Ban đầu Đồng bộ hóa Sự chậm trễ (giây)">
 <!ENTITY initialSyncDelayAccesskey "S">
@@ -256,7 +246,7 @@
 <!ENTITY periodicPopupTimeAccesskey "i">
 <!ENTITY showPopupEvenIfNoBirthdayLabel "Hiển thị cửa sổ bật lên khi danh sách kỷ niệm rỗng">
 <!ENTITY showPopupEvenIfNoBirthdayAccesskey "h">
-<!ENTITY remindViaLightningGroupboxLabel "Nhắc nhở qua Thunderbird Lightning Lịch Phần mở rộng">
+<!ENTITY remindViaLightningGroupboxLabel "Nhắc nhở qua Icedove-UXP Lightning Lịch Phần mở rộng">
 <!ENTITY numberOfDaysForWritingLabel "Số ngày ghi ngày kỷ niệm">
 <!ENTITY numberOfDaysForWritingAccesskey "h">
 <!ENTITY syncWithLightningOnStartupLabel "Đồng bộ với Lightning khi khởi động">
diff -ru cardbook1/install.rdf cardbook2/install.rdf
--- cardbook1/install.rdf	2018-09-03 09:21:40.000000000 -0400
+++ cardbook2/install.rdf	2018-09-14 22:01:38.000000000 -0400
@@ -63,7 +63,7 @@
 		<em:optionsURL>chrome://cardbook/content/configuration/wdw_cardbookConfiguration.xul</em:optionsURL>
 		<em:iconURL>chrome://cardbook/skin/cardbook_32_32.png</em:iconURL>
 
-		<!-- Target Application - Thunderbird -->
+		<!-- Target Application - FossaMail -->
 		<em:targetApplication>
 			<Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
@@ -71,6 +71,15 @@
 				<em:maxVersion>60.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
+		
+		<!-- Target Application - Icedove-UXP -->
+		<em:targetApplication>
+			<Description>
+				<em:id>{3aa07e56-beb0-47a0-b0cb-c735edd25419}</em:id>
+				<em:minVersion>44.0</em:minVersion>
+				<em:maxVersion>52.*</em:maxVersion>
+			</Description>
+		</em:targetApplication>
 
 		<em:localized>
 			<Description>