[Pkg-mozext-commits] [gcontactsync] 09/11: Refresh patch
David Prévot
taffit at moszumanska.debian.org
Tue Mar 24 22:41:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository gcontactsync.
commit 445e8588cc6fc303eaab07c07c2aebaa67686389
Author: David Prévot <david at tilapin.org>
Date: Tue Mar 24 18:07:07 2015 -0400
Refresh patch
Git-Dch: Ignore
---
.../0001-Rename-Thunderbird-to-Icedove.patch | 145 +++++++++++----------
1 file changed, 75 insertions(+), 70 deletions(-)
diff --git a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
index bc1a423..2c2931e 100644
--- a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
+++ b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
@@ -8,70 +8,16 @@ Content-Transfer-Encoding: 8bit
Reviewed-by: David Prévot
Last-Update: 2014-09-18
---
- content/Sync.js | 24 ++++++++++++------------
+ content/Sync.js | 10 +++++-----
+ content/SyncWorker.js | 14 +++++++-------
locale/en-US/gcontactsync.properties | 31 +++++++++++++++----------------
- 2 files changed, 27 insertions(+), 28 deletions(-)
+ 3 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/content/Sync.js b/content/Sync.js
-index 109363b..36091b8 100644
+index 00f75a4..63ad280 100644
--- a/content/Sync.js
+++ b/content/Sync.js
-@@ -449,9 +449,9 @@ com.gContactSync.Sync = {
- // get the strings outside of the loop so they are only found once
- found = " * Found a match, last modified:",
- bothChanged = " * Conflict detected: the contact has been updated in " +
-- "both Google and Thunderbird",
-+ "both Google and Icedove",
- bothGoogle = " - The Google contact will be updated",
-- bothTB = " - The Thunderbird contact will be updated",
-+ bothTB = " - The Icedove contact will be updated",
- gContacts = {};
- // Step 1: get all contacts from Google into GContact objects in an object
- // keyed by ID.
-@@ -547,7 +547,7 @@ com.gContactSync.Sync = {
- com.gContactSync.LOGGER.LOG(found +
- "\n - Google: " + gCardDate +
- " (" + new Date(gCardDate) + ")" +
-- "\n - Thunderbird: " + (tbCardDate * 1000) +
-+ "\n - Icedove: " + (tbCardDate * 1000) +
- " (" + new Date(tbCardDate * 1000) + ")");
- com.gContactSync.LOGGER.VERBOSE_LOG(" * Google ID: " + id);
- // If there is a conflict, looks at the updateGoogleInConflicts
-@@ -573,13 +573,13 @@ com.gContactSync.Sync = {
- // if the contact from Google is newer update the TB card
- else if (gCardDate > lastSync) {
- com.gContactSync.LOGGER.LOG(" * The contact from Google is newer...Updating the" +
-- " contact from Thunderbird");
-+ " contact from Icedove");
- this.mCurrentSummary.mLocal.mUpdated++;
- com.gContactSync.ContactConverter.makeCard(gContact, tbContact);
- }
- // if the TB card is newer update Google
- else if (tbCardDate > lastSync / 1000) {
-- com.gContactSync.LOGGER.LOG(" * The contact from Thunderbird is newer...Updating the" +
-+ com.gContactSync.LOGGER.LOG(" * The contact from Icedove is newer...Updating the" +
- " contact from Google");
- var toUpdate = {};
- toUpdate.gContact = gContact;
-@@ -626,7 +626,7 @@ com.gContactSync.Sync = {
- com.gContactSync.LOGGER.LOG(gContact.getName() + " - " + gCardDate +
- "\n" + id);
- if (gCardDate > lastSync || isNaN(lastSync)) {
-- com.gContactSync.LOGGER.LOG(" * The contact is new and will be added to Thunderbird");
-+ com.gContactSync.LOGGER.LOG(" * The contact is new and will be added to Icedove");
- this.mCurrentSummary.mLocal.mAdded++;
- var newCard = ab.newContact();
- com.gContactSync.ContactConverter.makeCard(gContact, newCard);
-@@ -637,7 +637,7 @@ com.gContactSync.Sync = {
- com.gContactSync.Sync.mContactsToDelete.push(gContact);
- }
- else {
-- com.gContactSync.LOGGER.LOG (" * The contact was deleted in Thunderbird. " +
-+ com.gContactSync.LOGGER.LOG (" * The contact was deleted in Icedove. " +
- "Ignoring since read-only mode is on.");
- this.mCurrentSummary.mLocal.mIgnored++;
- }
-@@ -682,7 +682,7 @@ com.gContactSync.Sync = {
+@@ -604,7 +604,7 @@ com.gContactSync.Sync = {
requestDeletePermission: function Sync_requestDeletePermission(aNumTB, aNumGoogle) {
var warning = com.gContactSync.StringBundle.getStr("confirmDelete1") +
" '" + com.gContactSync.Sync.mCurrentAb.getName() + "'" +
@@ -80,7 +26,7 @@ index 109363b..36091b8 100644
"\nGoogle: " + aNumGoogle +
"\n" + com.gContactSync.StringBundle.getStr("confirmDelete2");
com.gContactSync.LOGGER.LOG("Requesting permission to delete " +
-@@ -962,7 +962,7 @@ com.gContactSync.Sync = {
+@@ -919,7 +919,7 @@ com.gContactSync.Sync = {
// If write-only is on then ignore the name change
if (ab.mPrefs.writeOnly != "true")
list.setName(title);
@@ -89,7 +35,7 @@ index 109363b..36091b8 100644
}
else if (ab.mPrefs.readOnly == "true") {
com.gContactSync.LOGGER.LOG(" - The mailing list's name has changed. " +
-@@ -986,7 +986,7 @@ com.gContactSync.Sync = {
+@@ -943,7 +943,7 @@ com.gContactSync.Sync = {
// synchronization and reset the AB
if (group.isSystemGroup()) {
noCatch = true; // don't catch this error
@@ -98,16 +44,16 @@ index 109363b..36091b8 100644
var restartStr = com.gContactSync.StringBundle.getStr("pleaseRestart");
if (com.gContactSync.confirm(com.gContactSync.StringBundle.getStr("resetConfirm"))) {
ab.reset();
-@@ -995,7 +995,7 @@ com.gContactSync.Sync = {
+@@ -952,7 +952,7 @@ com.gContactSync.Sync = {
com.gContactSync.Preferences.setSyncPref("needRestart", true);
}
// Throw an error to stop the sync
- throw "A system group was deleted from Thunderbird";
-+ throw "A system group was deleted from Icedove";
++ throw "A system group was deleted from Icedove";
}
else {
com.gContactSync.Sync.mGroupsToDelete.push(group);
-@@ -1062,7 +1062,7 @@ com.gContactSync.Sync = {
+@@ -1019,7 +1019,7 @@ com.gContactSync.Sync = {
com.gContactSync.LOGGER.VERBOSE_LOG(" * Write-only mode was enabled so no action will be taken");
}
else {
@@ -116,8 +62,67 @@ index 109363b..36091b8 100644
list.remove();
}
}
+diff --git a/content/SyncWorker.js b/content/SyncWorker.js
+index 50629af..380ce55 100644
+--- a/content/SyncWorker.js
++++ b/content/SyncWorker.js
+@@ -43,9 +43,9 @@ function SyncWorker(aData) {
+
+ var found = " * Found a match, last modified:",
+ bothChanged = " * Conflict detected: the contact has been updated in " +
+- "both Google and Thunderbird",
++ "both Google and Icedove",
+ bothGoogle = " - The Google contact will be updated",
+- bothTB = " - The Thunderbird contact will be updated";
++ bothTB = " - The Icedove contact will be updated";
+
+ var cardsToDelete = [],
+ contactsToDelete = [],
+@@ -79,7 +79,7 @@ function SyncWorker(aData) {
+ log(found +
+ "\n - Google: " + gCardDate +
+ " (" + new Date(gCardDate) + ")" +
+- "\n - Thunderbird: " + (tbContact.lastModified * 1000) +
++ "\n - Icedove: " + (tbContact.lastModified * 1000) +
+ " (" + new Date(tbContact.lastModified * 1000) + ")");
+ // If there is a conflict, looks at the updateGoogleInConflicts
+ // preference and updates Google if it's true, or Thunderbird if false
+@@ -100,13 +100,13 @@ function SyncWorker(aData) {
+ }
+ // if the contact from Google is newer update the TB card
+ else if (gCardDate > aData.mLastSync) {
+- log(" * The contact from Google is newer...Updating the contact from Thunderbird");
++ log(" * The contact from Google is newer...Updating the contact from Icedove");
+ aData.mCurrentSummary.mLocal.mUpdated++;
+ postMessage({mType: "updateTBCard", mTBCardIndex: i});
+ }
+ // if the TB card is newer update Google
+ else if (tbContact.lastModified > aData.mLastSync / 1000) {
+- log(" * The contact from Thunderbird is newer...Updating the contact from Google");
++ log(" * The contact from Icedove is newer...Updating the contact from Google");
+ aData.mCurrentSummary.mRemote.mUpdated++;
+ contactsToUpdate.push(i);
+ }
+@@ -146,7 +146,7 @@ function SyncWorker(aData) {
+ var gCardDate = aData.mWriteOnly ? 1 : gContact.lastModified;
+ log(gContact.name + " - " + gCardDate + "\n" + id);
+ if (gCardDate > aData.mLastSync || isNaN(aData.mLastSync)) {
+- log(" * The contact is new and will be added to Thunderbird");
++ log(" * The contact is new and will be added to Icedove");
+ postMessage({mType: "newTBContact", mID: id});
+ aData.mCurrentSummary.mLocal.mAdded++;
+ }
+@@ -156,7 +156,7 @@ function SyncWorker(aData) {
+ contactsToDelete.push(id);
+ }
+ else {
+- log (" * The contact was deleted in Thunderbird. " +
++ log (" * The contact was deleted in Icedove. " +
+ "Ignoring since read-only mode is on.");
+ aData.mCurrentSummary.mLocal.mIgnored++;
+ }
diff --git a/locale/en-US/gcontactsync.properties b/locale/en-US/gcontactsync.properties
-index 0a4d73d..41eeac9 100644
+index 7b84606..8adee77 100644
--- a/locale/en-US/gcontactsync.properties
+++ b/locale/en-US/gcontactsync.properties
@@ -1,5 +1,5 @@
@@ -127,7 +132,7 @@ index 0a4d73d..41eeac9 100644
# Fake e-mail addresses will appear as <dummy1><some numbers and letters>
# @nowhere.invalid, such as nobodyc9012de at nowhere.invalid
-@@ -35,8 +35,7 @@ invalidEmail=Please enter your full e-mail address, not just your username.
+@@ -36,8 +36,7 @@ invalidEmail=Please enter your full e-mail address, not just your username.
loggingDisabled=Logging is disabled. Go in the Preferences and enable logging if you want to view the log file.
tokenExpired=Login expired.
tokenExpiredMsg=Your authentication token from Google has expired. Please click OK then enter your credentials to get a new token and Synchronize your contacts.
@@ -137,7 +142,7 @@ index 0a4d73d..41eeac9 100644
err503Short=Server returned a 503 (Service Unavailable) error.
err503=gContactSync received a 503 (Service Unavailable) error from the server. Please try again later.\nDetails:
-@@ -133,7 +132,7 @@ getMapTooltip=Display a map of this address on the Web
+@@ -134,7 +133,7 @@ getMapTooltip=Display a map of this address on the Web
removeLogin=Are you sure you want to remove your authentication token? You will have to login next time you open the Address Book if the extension is enabled.
initialSetup=Performing initial setup
removeLoginFailure=Unable to remove the authentication token.\nThis probably means that there is no token to remove.
@@ -146,7 +151,7 @@ index 0a4d73d..41eeac9 100644
abNameTitle=Address Book name for
abName=What is the name of the address book you would like to synchronize this account's contacts with?
abExists=This address book already exists.\nNOTE: If you already synchronized this address book with another synchronization add-on or imported your Gmail contacts you should click Cancel and choose a new address book.\nYou cannot sync an address book with more than one account.\nAre you sure you want to continue? Click Cancel to choose a different name.
-@@ -192,11 +191,11 @@ gcMenu=Google Contacts online
+@@ -193,11 +192,11 @@ gcMenu=Google Contacts online
gcMenuKey=C
# Preferences
@@ -162,7 +167,7 @@ index 0a4d73d..41eeac9 100644
resetConfirm=One or more of your mailing lists has broken. This can happen if you drag and drop several contacts into mailing lists, or sometimes if you have contacts without e-mail addresses.\nCertain groups in Gmail (My Contacts, Coworkers, Family, and Friends) cannot be deleted or renamed, either.\nClick OK to reset the addresss book or Cancel to do it later.\nVisit the forum if you have any questions.
# Confirm dialog for a manual reset
resetConfirm2=Resetting an address book will permanently remove all contacts and mailing lists from that address book, but will not remove your synchronization settings. Contacts and groups will be pulled from Google back into the address book during the next synchronization.\nClick OK to reset the address book or Cancel to stop.\nVisit the forum if you have any questions.
-@@ -234,19 +233,19 @@ noAccount=None
+@@ -235,19 +234,19 @@ noAccount=None
noABSelected=Please select an address book first.
deleteAB=Are you sure you want to completely delete this address book and all of its contacts?
newABPrompt=Enter the name of the new address book. If an address book or LDAP Directory with the name you choose already exists gContactSync will not make a new address book with that name.
@@ -188,7 +193,7 @@ index 0a4d73d..41eeac9 100644
#LOCALIZATION NOTE: '%d' will be replaced with the number of old/unused preferences that were deleted
finishedPrefClean=gContactSync has finished cleaning %d unused preference(s).
#LOCALIZATION NOTE: '%d' will be replaced with the number of old/unused contact photos that were deleted (from deleted address books)
-@@ -266,8 +265,8 @@ deleteCancel=Synchronization is now disabled for this address book. When you ar
+@@ -267,8 +266,8 @@ deleteCancel=Synchronization is now disabled for this address book. When you ar
# These next are for a summary of changes after synchronizing each account/address book
countSummaryFor=Summary for
countOverallSummary=Synchronization Summary
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git
More information about the Pkg-mozext-commits
mailing list