[Pkg-mozext-commits] [gcontactsync] 09/10: Refresh patch
David Prévot
taffit at moszumanska.debian.org
Fri Jun 19 16:29:44 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 42db2923c197efe0788ae3a24e1b67a81f999b7a
Author: David Prévot <david at tilapin.org>
Date: Fri Jun 19 12:18:10 2015 -0400
Refresh patch
Git-Dch: Ignore
---
.../0001-Rename-Thunderbird-to-Icedove.patch | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
index bc3ad68..c128b9a 100644
--- a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
+++ b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
@@ -14,10 +14,10 @@ Last-Update: 2014-09-18
3 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/content/Sync.js b/content/Sync.js
-index 00f75a4..63ad280 100644
+index 3e8b278..cb119d0 100644
--- a/content/Sync.js
+++ b/content/Sync.js
-@@ -604,7 +604,7 @@ com.gContactSync.Sync = {
+@@ -613,7 +613,7 @@ com.gContactSync.Sync = {
requestDeletePermission: function Sync_requestDeletePermission(aNumTB, aNumGoogle) {
var warning = com.gContactSync.StringBundle.getStr("confirmDelete1") +
" '" + com.gContactSync.Sync.mCurrentAb.getName() + "'" +
@@ -26,7 +26,7 @@ index 00f75a4..63ad280 100644
"\nGoogle: " + aNumGoogle +
"\n" + com.gContactSync.StringBundle.getStr("confirmDelete2");
com.gContactSync.LOGGER.LOG("Requesting permission to delete " +
-@@ -919,7 +919,7 @@ com.gContactSync.Sync = {
+@@ -973,7 +973,7 @@ com.gContactSync.Sync = {
// If write-only is on then ignore the name change
if (ab.mPrefs.writeOnly != "true")
list.setName(title);
@@ -35,7 +35,7 @@ index 00f75a4..63ad280 100644
}
else if (ab.mPrefs.readOnly == "true") {
com.gContactSync.LOGGER.LOG(" - The mailing list's name has changed. " +
-@@ -943,7 +943,7 @@ com.gContactSync.Sync = {
+@@ -997,7 +997,7 @@ com.gContactSync.Sync = {
// synchronization and reset the AB
if (group.isSystemGroup()) {
noCatch = true; // don't catch this error
@@ -44,7 +44,7 @@ index 00f75a4..63ad280 100644
var restartStr = com.gContactSync.StringBundle.getStr("pleaseRestart");
if (com.gContactSync.confirm(com.gContactSync.StringBundle.getStr("resetConfirm"))) {
ab.reset();
-@@ -952,7 +952,7 @@ com.gContactSync.Sync = {
+@@ -1006,7 +1006,7 @@ com.gContactSync.Sync = {
com.gContactSync.Preferences.setSyncPref("needRestart", true);
}
// Throw an error to stop the sync
@@ -53,7 +53,7 @@ index 00f75a4..63ad280 100644
}
else {
com.gContactSync.Sync.mGroupsToDelete.push(group);
-@@ -1019,7 +1019,7 @@ com.gContactSync.Sync = {
+@@ -1073,7 +1073,7 @@ com.gContactSync.Sync = {
com.gContactSync.LOGGER.VERBOSE_LOG(" * Write-only mode was enabled so no action will be taken");
}
else {
@@ -63,7 +63,7 @@ index 00f75a4..63ad280 100644
}
}
diff --git a/content/SyncWorker.js b/content/SyncWorker.js
-index f225209..63b07cb 100644
+index ac02e51..56b8b73 100644
--- a/content/SyncWorker.js
+++ b/content/SyncWorker.js
@@ -43,9 +43,9 @@ function SyncWorker(aData) {
@@ -122,7 +122,7 @@ index f225209..63b07cb 100644
aData.mCurrentSummary.mLocal.mIgnored++;
}
diff --git a/locale/en-US/gcontactsync.properties b/locale/en-US/gcontactsync.properties
-index df02d59..d937909 100644
+index c7cc742..73e434e 100644
--- a/locale/en-US/gcontactsync.properties
+++ b/locale/en-US/gcontactsync.properties
@@ -1,5 +1,5 @@
@@ -132,7 +132,7 @@ index df02d59..d937909 100644
# Fake e-mail addresses will appear as <dummy1><some numbers and letters>
# @nowhere.invalid, such as nobodyc9012de at nowhere.invalid
-@@ -37,8 +37,7 @@ emailAlreadyExists=An account with this e-mail address already exists. Select t
+@@ -38,8 +38,7 @@ emailAlreadyExists=An account with this e-mail address already exists. Select t
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.
@@ -142,7 +142,7 @@ index df02d59..d937909 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:
-@@ -135,7 +134,7 @@ getMapTooltip=Display a map of this address on the Web
+@@ -136,7 +135,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.
@@ -151,7 +151,7 @@ index df02d59..d937909 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.
-@@ -194,11 +193,11 @@ gcMenu=Google Contacts online
+@@ -195,11 +194,11 @@ gcMenu=Google Contacts online
gcMenuKey=C
# Preferences
@@ -167,7 +167,7 @@ index df02d59..d937909 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.
-@@ -236,19 +235,19 @@ noAccount=None
+@@ -237,19 +236,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.
@@ -193,7 +193,7 @@ index df02d59..d937909 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)
-@@ -268,8 +267,8 @@ deleteCancel=Synchronization is now disabled for this address book. When you ar
+@@ -269,8 +268,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