See ChangeLog

Monotone-Parent: c66c023a1a42d53c473a7338a49a9b456d889ed9
Monotone-Revision: 62137d02651888053a8bd415f6e6f5aa79e44cf4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-28T17:48:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2009-10-28 17:48:22 +00:00
1 parent 837f13a0c3
commit 2e0d488f3e
52 files changed
+461 -379

No files matched your search

@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
+4 -6
View File
@@ -178,13 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Exportovat";
"Import Cards" = "Importovat kontakty";
"Select LDIF or vCard file..." = "Zvolte LDIF nebo vCard soubor...";
"Select a vCard or LDIF file." = "Zvolte LDIF nebo vCard soubor.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "Při importu došlo k chybě.";
"Imported contacts:" = "Importováno kontaktů:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
+4 -5
View File
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select LDIF or vCard file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
+4 -5
View File
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Ajouter";
"Lists can't be moved or copied." = "Les listes ne peuvent pas être déplacées ou copiées.";
"Export" = "Exporter";
"Import Cards" = "Importer des contacts";
"Select LDIF or vCard file..." = "Sélectionner un fichier. LDIF ou vCard..";
"Select a vCard or LDIF file." = "Sélectionner un fichier. LDIF ou vCard.";
"Upload" = "Ajouter";
"Import" = "Import";
"OK" = "OK";
"Done" = "Terminer";
"An error occured while importing contacts." = "Une erreur s'est produite lors de l'importation.";
"Imported contacts:" = "Contacts importés:";
"No card was imported." = "Aucun contact n'a été importé.";
"A total of %{0} cards were imported in the addressbook." = "Un total de %{0} contacts ont été importés dans le carnet.";
+4 -5
View File
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
@@ -181,9 +181,9 @@
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file."" = "Select LDIF or vCard file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
@@ -166,9 +166,9 @@
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
@@ -178,12 +178,11 @@
"Contacts" = "Contacts";
"Add" = "Add";
"Lists can't be moved or copied." = "Lists can't be moved or copied.";
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
+32 -36
View File
@@ -90,57 +90,53 @@
- (void) setReferencesValue: (NSString *) value
{
NSData *data;
NSDictionary *references;
NSArray *values, *initialReferences;
NSString *error, *currentReference;
NSPropertyListFormat format;
NSDictionary *values;
NSArray *references, *initialReferences;
NSString *currentReference;
int i, count;
NGVCardReference *cardReference;
SOGoContactGCSFolder *folder;
references = [value componentsSeparatedByString: @","];
if ([references count])
{
folder = [[self clientObject] container];
data = [value dataUsingEncoding: NSUTF8StringEncoding];
references = [NSPropertyListSerialization propertyListFromData: data
mutabilityOption: NSPropertyListImmutable
format: &format
errorDescription: &error];
if(!references)
{
NSLog(error);
[error release];
}
else
{
// Remove from list
// Remove from the list the cards that were deleted
initialReferences = [list cardReferences];
count = [initialReferences count];
for (i = 0; i < count; i++)
{
cardReference = [initialReferences objectAtIndex: i];
if (![[references allKeys] containsObject: [cardReference reference]])
if (![references containsObject: [cardReference reference]])
[list deleteCardReference: cardReference];
}
// Add new objects
initialReferences = [list cardReferences];
count = [[references allKeys] count];
// Add new cards
count = [references count];
for (i = 0; i < count; i++)
{
currentReference = [[references allKeys] objectAtIndex: i];
currentReference = [references objectAtIndex: i];
if (![self cardReferences: initialReferences
contain: currentReference])
{
NSLog (@"Adding a new cardRef");
values = [references objectForKey: currentReference];
cardReference = [NGVCardReference elementWithTag: @"card"];
[cardReference setFn: [values objectAtIndex: 0]];
[cardReference setEmail: [values objectAtIndex: 1]];
[cardReference setReference: currentReference];
[list addCardReference: cardReference];
}
}
}
// Search contact
values = [folder lookupContactWithName: currentReference];
if (values)
{
cardReference = [NGVCardReference elementWithTag: @"card"];
[cardReference setFn: [values objectForKey: @"c_cn"]];
[cardReference setEmail: [values objectForKey: @"c_mail"]];
[cardReference setReference: currentReference];
[list addCardReference: cardReference];
}
}
}
}
}
- (BOOL) cardReferences: (NSArray *) references
contain: (NSString *) ref
+4 -4
View File
@@ -165,9 +165,9 @@
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select LDIF or vCard file..." = "Select LDIF or vCard file...";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Import" = "Import";
"OK" = "OK";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"Imported contacts:" = "Imported contacts:";
"No card was imported." = "No card was imported.";
"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";