diff --git a/ChangeLog b/ChangeLog index dbe010e16..aef19faa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-06-23 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoObject.m ([SOGoObject -labelForKey:key]): + enhanced method to request the user language, his/her browser + languages and the system language as fallback. + + * UI/Contacts/UIxContactsListViewContainer.m + ([-currentContactFolderName]): no longer interprets the name of + the personal folder, since the default name is now localized at + creation time. + 2008-06-20 Wolfgang Sourdeau * UI/Scheduler/UIxCalendarProperties.m ([UIxCalendarProperties -calendarSyncTag]) diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings new file mode 100644 index 000000000..4fb99a8f7 --- /dev/null +++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Persoonlijke agenda"; diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings new file mode 100644 index 000000000..95feda9fd --- /dev/null +++ b/SoObjects/Appointments/English.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Personal Calendar"; diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings new file mode 100644 index 000000000..11b333c2a --- /dev/null +++ b/SoObjects/Appointments/French.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Agenda personnel"; diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 332bb75c1..c66531087 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -34,6 +34,10 @@ Appointments_RESOURCE_FILES += \ Version \ product.plist \ +Appointments_LANGUAGES = Dutch English French German Italian Spanish + +Appointments_LOCALIZED_RESOURCE_FILES = Localizable.strings + Appointments_COMPONENTS += \ SOGoAptMailDutchInvitation.wo \ SOGoAptMailDutchICalReply.wo \ diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings new file mode 100644 index 000000000..dd09f0415 --- /dev/null +++ b/SoObjects/Appointments/German.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Persönlicher Kalender"; diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings new file mode 100644 index 000000000..003f167f8 --- /dev/null +++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Calendario personale"; diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m index dbb0277eb..46d68b6d0 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolders.m +++ b/SoObjects/Appointments/SOGoAppointmentFolders.m @@ -41,7 +41,7 @@ - (NSString *) defaultFolderName { - return @"Personal calendar"; + return [self labelForKey: @"Personal Calendar"]; } // /* CalDAV support */ diff --git a/SoObjects/Appointments/Spanish.lproj/Localizable.strings b/SoObjects/Appointments/Spanish.lproj/Localizable.strings new file mode 100644 index 000000000..9c2aabbc3 --- /dev/null +++ b/SoObjects/Appointments/Spanish.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Calendar" = "Calendario personal"; diff --git a/SoObjects/Contacts/Dutch.lproj/Localizable.strings b/SoObjects/Contacts/Dutch.lproj/Localizable.strings new file mode 100644 index 000000000..cabe56b2f --- /dev/null +++ b/SoObjects/Contacts/Dutch.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Persoonlijk adresboek"; diff --git a/SoObjects/Contacts/English.lproj/Localizable.strings b/SoObjects/Contacts/English.lproj/Localizable.strings new file mode 100644 index 000000000..56404b013 --- /dev/null +++ b/SoObjects/Contacts/English.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Personal Address Book"; diff --git a/SoObjects/Contacts/French.lproj/Localizable.strings b/SoObjects/Contacts/French.lproj/Localizable.strings new file mode 100644 index 000000000..af4d87c3a --- /dev/null +++ b/SoObjects/Contacts/French.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Carnet d'adresses personnel"; diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile index b452a4176..f27089f48 100644 --- a/SoObjects/Contacts/GNUmakefile +++ b/SoObjects/Contacts/GNUmakefile @@ -21,6 +21,10 @@ Contacts_RESOURCE_FILES += \ Version \ product.plist \ +Contacts_LANGUAGES = Dutch English French German Italian Spanish + +Contacts_LOCALIZED_RESOURCE_FILES = Localizable.strings + ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ diff --git a/SoObjects/Contacts/German.lproj/Localizable.strings b/SoObjects/Contacts/German.lproj/Localizable.strings new file mode 100644 index 000000000..14a0a8a67 --- /dev/null +++ b/SoObjects/Contacts/German.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Persönliches Addressbuch"; diff --git a/SoObjects/Contacts/Italian.lproj/Localizable.strings b/SoObjects/Contacts/Italian.lproj/Localizable.strings new file mode 100644 index 000000000..c0dbee96f --- /dev/null +++ b/SoObjects/Contacts/Italian.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Rubrica personale"; diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m index 0a92eca67..3354a691a 100644 --- a/SoObjects/Contacts/SOGoContactFolders.m +++ b/SoObjects/Contacts/SOGoContactFolders.m @@ -71,7 +71,7 @@ - (NSString *) defaultFolderName { - return @"Personal Address Book"; + return [self labelForKey: @"Personal Address Book"]; } @end diff --git a/SoObjects/Contacts/Spanish.lproj/Localizable.strings b/SoObjects/Contacts/Spanish.lproj/Localizable.strings new file mode 100644 index 000000000..0c1a73e45 --- /dev/null +++ b/SoObjects/Contacts/Spanish.lproj/Localizable.strings @@ -0,0 +1 @@ +"Personal Address Book" = "Libreta personal de direcciones"; diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index b3314e80f..585051683 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -1179,31 +1179,57 @@ static NSDictionary *reportMap = nil; return nil; } +- (NSArray *) _languagesForLabels +{ + NSMutableArray *languages; + NSArray *browserLanguages; + NSString *language; + NSUserDefaults *ud; + + languages = [NSMutableArray array]; + + language = [[context activeUser] language]; + [languages addObject: language]; + browserLanguages = [[context request] browserLanguages]; + [languages addObjectsFromArray: browserLanguages]; + ud = [NSUserDefaults standardUserDefaults]; + language = [ud stringForKey: @"SOGoDefaultLanguage"]; + if (language) + [languages addObject: language]; + [languages addObject: @"English"]; + + return languages; +} + - (NSString *) labelForKey: (NSString *) key { - NSString *userLanguage, *label; + NSString *language, *label; NSArray *paths; + NSEnumerator *languages; NSBundle *bundle; NSDictionary *strings; + label = nil; + bundle = [NSBundle bundleForClass: [self class]]; if (!bundle) bundle = [NSBundle mainBundle]; + languages = [[self _languagesForLabels] objectEnumerator]; - userLanguage = [[context activeUser] language]; - paths = [bundle pathsForResourcesOfType: @"strings" - inDirectory: [NSString stringWithFormat: @"%@.lproj", - userLanguage] - forLocalization: userLanguage]; - if ([paths count] > 0) + while (!label && (language = [languages nextObject])) { - strings = [NSDictionary - dictionaryFromStringsFile: [paths objectAtIndex: 0]]; - label = [strings objectForKey: key]; - if (!label) - label = key; + paths = [bundle pathsForResourcesOfType: @"strings" + inDirectory: [NSString stringWithFormat: @"%@.lproj", + language] + forLocalization: language]; + if ([paths count] > 0) + { + strings = [NSDictionary + dictionaryFromStringsFile: [paths objectAtIndex: 0]]; + label = [strings objectForKey: key]; + } } - else + if (!label) label = key; return label; diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index af6929f63..a72ddc0b9 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -328,6 +328,7 @@ static SoSecurityManager *sm = nil; { id obj; + NSLog (@"default name: '%@'", [self defaultFolderName]); /* first check attributes directly bound to the application */ obj = [super lookupName: name inContext: lookupContext acquire: NO]; if (!obj) diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings index 503667d4a..3fe2638c4 100644 --- a/UI/Contacts/Dutch.lproj/Localizable.strings +++ b/UI/Contacts/Dutch.lproj/Localizable.strings @@ -40,9 +40,6 @@ "new" = "Nieuw"; "Preferred Phone" = "Voorkeurstelefoon"; -/* Folders */ -"Personal Address Book" = "Persoonlijk adresboek"; - "htmlMailFormat_UNKNOWN" = "Onbekend"; "htmlMailFormat_FALSE" = "Platte tekst"; "htmlMailFormat_TRUE" = "HTML"; diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 0b2871c35..0ec4a7408 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -33,9 +33,6 @@ "new" = "new"; "Preferred Phone" = "Preferred Phone"; -/* Folders */ -"Personal Address Book" = "Personal Address Book"; - /* Tooltips */ "Create a new address book card" = "Create a new address book card"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index 82f612d25..157703669 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -40,9 +40,6 @@ "new" = "Nouveau"; "Preferred Phone" = "Numéro préféré"; -/* Folders */ -"Personal Address Book" = "Carnet d'adresses personnel"; - /* Tooltips */ "Create a new address book card" = "Créer une nouvelle fiche"; diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings index d366fe5bf..e18daf81e 100644 --- a/UI/Contacts/German.lproj/Localizable.strings +++ b/UI/Contacts/German.lproj/Localizable.strings @@ -40,9 +40,6 @@ "new" = "Neu"; "Preferred Phone" = "Bevorzugt"; -/* Folders */ -"Personal Address Book" = "Persönliches Addressbuch"; - "htmlMailFormat_UNKNOWN" = "Unbekannt"; "htmlMailFormat_FALSE" = "Reintext"; "htmlMailFormat_TRUE" = "HTML"; diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings index d7c2d4851..3d52578bf 100644 --- a/UI/Contacts/Italian.lproj/Localizable.strings +++ b/UI/Contacts/Italian.lproj/Localizable.strings @@ -1,163 +1,160 @@ -/* this file is in UTF-8 format! */ - -"Contact" = "Contatto"; -"Address" = "Indirizzo"; -"Other" = "Altro"; - -"Name" = "Nome"; -"Internet" = "Email"; -"Phones" = "Numeri di telefono"; -"Home" = "Personale"; -"Work" = "Lavoro"; - -"Address Books" = "Rubrica"; - -"Addressbook" = "Rubrica"; -"Addresses" = "Indirizzi"; -"Update" = "Aggiorna"; -"Cancel" = "Anulla"; -"Common" = "Comuni"; -"Contact editor" = "Editor dei contatti"; -"Contact viewer" = "Visulizzatore dei contatti"; -"Email" = "Email"; -"Screen Name" = "Nome Instant Messeger"; -"Extended" = "Nome completo"; -"Fax" = "Fax"; -"Firstname" = "Nome"; -"Home" = "Casa"; -"HomePhone" = "Telefono casa"; -"Lastname" = "Cognome"; -"Location" = "Località"; -"MobilePhone" = "Cellulare"; -"Name" = "Nome"; -"OfficePhone" = "Telefono ufficio"; -"Organization" = "Società"; -"Work Phone" = "Telefono di lavoro"; -"Phone" = "Telefono"; -"Phones" = "Telefoni"; -"Postal" = "CAP"; -"Save" = "Salva"; -"URL" = "Pagina Web"; -"Unit" = "Unità"; -"delete" = "cancella"; -"edit" = "modifica"; -"invalidemailwarn" = "L'indirizzo email specificato non è valido"; -"new" = "new"; -"Preferred Phone" = "Telefono lavoro"; - -/* Folders */ -"Personal Address Book" = "Rubrica personale"; - -/* Tooltips */ - -"Create a new address book card" = "Crea un nuovo contatto"; -"Create a new list" = "Crea una nuova lista"; -"Edit the selected card" = "Modifica il contatto selezionato"; -"Send a mail message" = "Invia un'email"; -"Delete selected card or address book" = "Cancella il contatto selezionato"; - -"htmlMailFormat_UNKNOWN" = "Sconosciuto"; -"htmlMailFormat_FALSE" = "Testo normale"; -"htmlMailFormat_TRUE" = "HTML"; - -"Name or Email" = "Nome o indirizzo Email"; -"Personal Addressbook" = "Rubrica personale"; -"Search in Addressbook" = "Cerca nella rubrica"; - -"New Card" = "Nuovo contatto"; -"New List" = "Nuova lista"; -"Modify" = "Modifica"; -"Sharing..." = "Condividi..."; -"Write" = "Scrivi"; -"Delete" = "Cancella"; -"Instant Message" = "Messaggio istantaneo"; -"Add..." = "Aggiungi..."; -"Remove" = "Rimuovi"; - -"Preferred" = "Predefinito"; -"Card for %@" = "Biglietto da visita di %@"; -"Display:" = "Nome visualizzato:"; -"Display Name:" = "Nome visualizzato:"; -"Email:" = "Email:"; -"Additional Email:" = "Email aggiuntiva:"; - -"Phone Number:" = "Numero di telefono:"; -"Prefers to receive messages formatted as:" -= "Formato preferito per i messaggi di posta:"; -"Screen Name:" = "Nome Instant Messenger:"; - -"Firstname:" = "Nome:"; -"Lastname:" = "Cognome:"; -"First:" = "Nome:"; -"Last:" = "Cognome"; -"Nickname:" = "Soprannome:"; - -"Telephone" = "Telefono"; -"Work:" = "Lavoro:"; -"Home:" = "Casa:"; -"Fax:" = "Fax:"; -"Mobile:" = "Cellulare:"; -"Pager:" = "Cerca Persone:"; - -"Title:" = "Titolo:"; -"Service:" = "Service:"; -"Company:" = "Società:"; -"Street Address:" = "Indirizzo:"; -"Address:" = "Indirizzo:"; -"City:" = "Città:"; -"State_Province:" = "Provincia:"; -"ZIP_Postal Code:" = "CAP:"; -"Country:" = "Nazione:"; -"Web:" = "Pagina Web:"; -"Web Page:" = "Pagina Web:"; -"Department:" = "Reparto:"; -"Organization:" = "Società:"; -"Work" = "Lavoro"; -"Other Infos" = "Altre informazioni"; - -"Note:" = "Note:"; -"Timezone:" = "Fuso orario:"; -"Birthday:" = "Data di Nascita:"; -"Freebusy URL:" = "Freebusy URL:"; - -"Add as..." = "Aggiungi come..."; -"Recipient" = "Destinatario"; -"Carbon Copy" = "Copia Carbone"; -"Blind Carbon Copy" = "Copia Carbone Nascosta"; - -"New Addressbook..." = "Nuova rubrica..."; -"Subscribe to an Addressbook..." = "Sottoscrivi una rubrica..."; -"Remove the selected Addressbook" = "Rimuovi la rubrica selezionata"; - -"Name of the Address Book" = "Nome della rubrica"; -"Are you sure you want to delete the selected address book?" -= "Sei sicuro di voler cancellare la rubrica selezionata?"; - -"Address Book Name" = "Nome della Rubrica"; - -"You cannot subscribe to a folder that you own!" -= "Non puoi sottoscrivere una cartella di cui sei proprietario!"; -"Unable to subscribe to that folder!" -= "Non puoi sottoscrivere la cartella!"; - -"Default Roles" = "Permessi predefiniti"; -"User rights for:" = "Permessi per:"; - -"This person can add cards to this addressbook." -= "Questa persona può aggiungere contatti a questa rubrica."; -"This person can edit the cards of this addressbook." -= "Questa persona può modificare i contatti di questa rubrica."; -"This person can list the content of this addressbook." -= "Questa persona può visualizzare i contenuti di questa rubrica."; -"This person can read the cards of this addressbook." -= "Questa persona può leggere i contatti di questa rubrica."; -"This person can erase cards from this addressbook." -= "Questa persona può eliminare contatti da questa rubrica."; - -"The selected contact has no email address." -= "Il contatto selezionato non dispone di indirizzo email."; - -"You cannot delete the selected contact(s)" -= "Non puoi eliminare il contatto selezionato."; - -"Please select a contact." = "Per favore seleziona un contatto."; +/* this file is in UTF-8 format! */ + +"Contact" = "Contatto"; +"Address" = "Indirizzo"; +"Other" = "Altro"; + +"Name" = "Nome"; +"Internet" = "Email"; +"Phones" = "Numeri di telefono"; +"Home" = "Personale"; +"Work" = "Lavoro"; + +"Address Books" = "Rubrica"; + +"Addressbook" = "Rubrica"; +"Addresses" = "Indirizzi"; +"Update" = "Aggiorna"; +"Cancel" = "Anulla"; +"Common" = "Comuni"; +"Contact editor" = "Editor dei contatti"; +"Contact viewer" = "Visulizzatore dei contatti"; +"Email" = "Email"; +"Screen Name" = "Nome Instant Messeger"; +"Extended" = "Nome completo"; +"Fax" = "Fax"; +"Firstname" = "Nome"; +"Home" = "Casa"; +"HomePhone" = "Telefono casa"; +"Lastname" = "Cognome"; +"Location" = "Località"; +"MobilePhone" = "Cellulare"; +"Name" = "Nome"; +"OfficePhone" = "Telefono ufficio"; +"Organization" = "Società"; +"Work Phone" = "Telefono di lavoro"; +"Phone" = "Telefono"; +"Phones" = "Telefoni"; +"Postal" = "CAP"; +"Save" = "Salva"; +"URL" = "Pagina Web"; +"Unit" = "Unità"; +"delete" = "cancella"; +"edit" = "modifica"; +"invalidemailwarn" = "L'indirizzo email specificato non è valido"; +"new" = "new"; +"Preferred Phone" = "Telefono lavoro"; + +/* Tooltips */ + +"Create a new address book card" = "Crea un nuovo contatto"; +"Create a new list" = "Crea una nuova lista"; +"Edit the selected card" = "Modifica il contatto selezionato"; +"Send a mail message" = "Invia un'email"; +"Delete selected card or address book" = "Cancella il contatto selezionato"; + +"htmlMailFormat_UNKNOWN" = "Sconosciuto"; +"htmlMailFormat_FALSE" = "Testo normale"; +"htmlMailFormat_TRUE" = "HTML"; + +"Name or Email" = "Nome o indirizzo Email"; +"Personal Addressbook" = "Rubrica personale"; +"Search in Addressbook" = "Cerca nella rubrica"; + +"New Card" = "Nuovo contatto"; +"New List" = "Nuova lista"; +"Modify" = "Modifica"; +"Sharing..." = "Condividi..."; +"Write" = "Scrivi"; +"Delete" = "Cancella"; +"Instant Message" = "Messaggio istantaneo"; +"Add..." = "Aggiungi..."; +"Remove" = "Rimuovi"; + +"Preferred" = "Predefinito"; +"Card for %@" = "Biglietto da visita di %@"; +"Display:" = "Nome visualizzato:"; +"Display Name:" = "Nome visualizzato:"; +"Email:" = "Email:"; +"Additional Email:" = "Email aggiuntiva:"; + +"Phone Number:" = "Numero di telefono:"; +"Prefers to receive messages formatted as:" += "Formato preferito per i messaggi di posta:"; +"Screen Name:" = "Nome Instant Messenger:"; + +"Firstname:" = "Nome:"; +"Lastname:" = "Cognome:"; +"First:" = "Nome:"; +"Last:" = "Cognome"; +"Nickname:" = "Soprannome:"; + +"Telephone" = "Telefono"; +"Work:" = "Lavoro:"; +"Home:" = "Casa:"; +"Fax:" = "Fax:"; +"Mobile:" = "Cellulare:"; +"Pager:" = "Cerca Persone:"; + +"Title:" = "Titolo:"; +"Service:" = "Service:"; +"Company:" = "Società:"; +"Street Address:" = "Indirizzo:"; +"Address:" = "Indirizzo:"; +"City:" = "Città:"; +"State_Province:" = "Provincia:"; +"ZIP_Postal Code:" = "CAP:"; +"Country:" = "Nazione:"; +"Web:" = "Pagina Web:"; +"Web Page:" = "Pagina Web:"; +"Department:" = "Reparto:"; +"Organization:" = "Società:"; +"Work" = "Lavoro"; +"Other Infos" = "Altre informazioni"; + +"Note:" = "Note:"; +"Timezone:" = "Fuso orario:"; +"Birthday:" = "Data di Nascita:"; +"Freebusy URL:" = "Freebusy URL:"; + +"Add as..." = "Aggiungi come..."; +"Recipient" = "Destinatario"; +"Carbon Copy" = "Copia Carbone"; +"Blind Carbon Copy" = "Copia Carbone Nascosta"; + +"New Addressbook..." = "Nuova rubrica..."; +"Subscribe to an Addressbook..." = "Sottoscrivi una rubrica..."; +"Remove the selected Addressbook" = "Rimuovi la rubrica selezionata"; + +"Name of the Address Book" = "Nome della rubrica"; +"Are you sure you want to delete the selected address book?" += "Sei sicuro di voler cancellare la rubrica selezionata?"; + +"Address Book Name" = "Nome della Rubrica"; + +"You cannot subscribe to a folder that you own!" += "Non puoi sottoscrivere una cartella di cui sei proprietario!"; +"Unable to subscribe to that folder!" += "Non puoi sottoscrivere la cartella!"; + +"Default Roles" = "Permessi predefiniti"; +"User rights for:" = "Permessi per:"; + +"This person can add cards to this addressbook." += "Questa persona può aggiungere contatti a questa rubrica."; +"This person can edit the cards of this addressbook." += "Questa persona può modificare i contatti di questa rubrica."; +"This person can list the content of this addressbook." += "Questa persona può visualizzare i contenuti di questa rubrica."; +"This person can read the cards of this addressbook." += "Questa persona può leggere i contatti di questa rubrica."; +"This person can erase cards from this addressbook." += "Questa persona può eliminare contatti da questa rubrica."; + +"The selected contact has no email address." += "Il contatto selezionato non dispone di indirizzo email."; + +"You cannot delete the selected contact(s)" += "Non puoi eliminare il contatto selezionato."; + +"Please select a contact." = "Per favore seleziona un contatto."; diff --git a/UI/Contacts/Spanish.lproj/Localizable.strings b/UI/Contacts/Spanish.lproj/Localizable.strings index e6294c396..54482ecec 100644 --- a/UI/Contacts/Spanish.lproj/Localizable.strings +++ b/UI/Contacts/Spanish.lproj/Localizable.strings @@ -42,9 +42,6 @@ "new" = "nuevo"; "Preferred Phone" = "Teléfono preferido"; -/* Folders */ -"Personal Address Book" = "Libreta personal de direcciones"; - /* Tooltips */ "Create a new address book card" = "Añadir un nuevo contacto"; diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m index 724ff867b..b2bad09a6 100644 --- a/UI/Contacts/UIxContactsListViewContainer.m +++ b/UI/Contacts/UIxContactsListViewContainer.m @@ -116,14 +116,7 @@ - (NSString *) currentContactFolderName { - NSString *folderName, *defaultFolderName; - - folderName = [currentFolder displayName]; - defaultFolderName = [[currentFolder container] defaultFolderName]; - if ([folderName isEqualToString: folderName]) - folderName = [self labelForKey: folderName]; - - return folderName; + return [currentFolder displayName]; } - (NSString *) currentContactFolderOwner