diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index a28b29b3b..9dd3cdd81 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1505,7 +1505,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir color = [[self calendarColor] uppercaseString]; - return [NSString stringWithFormat: @"%@FF", color]; + return color; +// return [NSString stringWithFormat: @"%@FF", color]; } - (NSException *) setDavCalendarColor: (NSString *) newColor @@ -2238,6 +2239,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir login = [[context activeUser] login]; if ([login isEqualToString: [self ownerInContext: self]]) { + [colType addObject: [NSArray arrayWithObjects: @"schedule-calendar", + XMLNS_CALDAV, nil]]; [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox", XMLNS_CALDAV, nil]]; [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox", diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m index b884782ab..1fb428e9d 100644 --- a/SoObjects/SOGo/SOGoContentObject.m +++ b/SoObjects/SOGo/SOGoContentObject.m @@ -373,9 +373,18 @@ - (id) davEntityTag { - return [NSString stringWithFormat: @"\"gcs%.8d\"", version]; + NSString *etag; + + etag = [NSString stringWithFormat: @"\"gcs%.8d\"", version]; + + return [SOGoWebDAVValue valueForObject: etag attributes: nil];; } +// - (id) davEntityTag +// { +// return [NSString stringWithFormat: @"\"gcs%.8d\"", version]; +// } + /* WebDAV */ - (NSString *) davCreationDate { diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index 3c88913fb..914ba80e2 100755 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -6,7 +6,7 @@ "Create a new task" = "Criar uma nova tarefa"; "Edit this event or task" = "Editar este evento ou tarefa"; "Delete this event or task" = "Apagar este evento ou tarefa"; -"Go to today" = "Ir para Hoje"; +"Go to today" = "Vai para hoje"; "Switch to day view" = "Visualizar Dia"; "Switch to week view" = "Visualizar Semana"; "Switch to month view" = "Visualizar Mês"; @@ -355,28 +355,8 @@ /* Appointment categories */ -"category_NONE" = "Nenhum"; -"category_ANNIVERSARY" = "Aniversário"; -"category_BIRTHDAY" = "Nascimento"; -"category_BUSINESS" = "Negócios"; -"category_CALLS" = "Chamadas"; -"category_CLIENTS" = "Clientes"; -"category_COMPETITION" = "Competição"; -"category_CUSTOMER" = "Cliente"; -"category_FAVORITES" = "Favoritos"; -"category_FOLLOW UP" = "Continuação"; -"category_GIFTS" = "Presentes"; -"category_HOLIDAYS" = "Feriados"; -"category_IDEAS" = "Ideias"; -"category_ISSUES" = "Edições"; -"category_MISCELLANEOUS" = "Variedades"; -"category_PERSONAL" = "Pessoal"; -"category_PROJECTS" = "Projetos"; -"category_PUBLIC HOLIDAY" = "Feriado Nacional"; -"category_STATUS" = "Status"; -"category_SUPPLIERS" = "Fornecedores"; -"category_TRAVEL" = "Viagem"; -"category_VACATION" = "Férias"; +"category_none" = "Nenhum"; +"category_labels" = "Aniversário,Negócios,Ligações,Concorrência,Cliente,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Problemas,Miscelânea,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias"; "repeat_NEVER" = "Sem repetição"; "repeat_DAILY" = "Diariamente"; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index bdd2f7839..fa7e66bf3 100755 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -6,7 +6,7 @@ "Create a new task" = "Vytvořit nový úkol"; "Edit this event or task" = "Upravit tuto událost nebo úkol"; "Delete this event or task" = "Smazat tuto událost nebo úkol"; -"Go to today" = "Jít na dnešek"; +"Go to today" = "Přejde na dnešní den"; "Switch to day view" = "Přepnout na denní zobrazení"; "Switch to week view" = "Přepnout na týdenní zobrazení"; "Switch to month view" = "Přepnout na měsíční zobrazení"; @@ -355,28 +355,8 @@ /* Appointment categories */ -"category_NONE" = "Žádný"; -"category_ANNIVERSARY" = "Výročí"; -"category_BIRTHDAY" = "Narozeniny"; -"category_BUSINESS" = "Pracovní"; -"category_CALLS" = "Volání"; -"category_CLIENTS" = "Klietni"; -"category_COMPETITION" = "Soutěž"; -"category_CUSTOMER" = "Zákazník"; -"category_FAVORITES" = "Oblíbené"; -"category_FOLLOW UP" = "Následující"; -"category_GIFTS" = "Dárky"; -"category_HOLIDAYS" = "Prázdniny"; -"category_IDEAS" = "Nápady"; -"category_ISSUES" = "Problémy"; -"category_MISCELLANEOUS" = "Ostatní"; -"category_PERSONAL" = "Osobní"; -"category_PROJECTS" = "Projekty"; -"category_PUBLIC HOLIDAY" = "Státní svátek"; -"category_STATUS" = "Status"; -"category_SUPPLIERS" = "Dodavatelé"; -"category_TRAVEL" = "Cestování"; -"category_VACATION" = "Dovolená"; +"category_none" = "Žádný"; +"category_labels" = "Výročí,Narozeniny,Obchod,Hovory,Klienti,Soutěže,Zákazník,Oblíbené,Sledování,Dárky,Volno,Nápady,Problémy,Různé,Osobní,Projekty,Veřejné prázdniny,Stav,Dodavatelé,Cesta,Dovolená"; "repeat_NEVER" = "Neopakuje se"; "repeat_DAILY" = "Denně"; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index a1eca9448..2ae966a6e 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -1,5 +1,17 @@ /* this file is in UTF-8 format! */ +/* Tooltips */ + +"Create a new event" = "Create a new event"; +"Create a new task" = "Create a new task"; +"Edit this event or task" = "Edit this event or task"; +"Delete this event or task" = "Delete this event or task"; +"Go to today" = "Naar vandaag gaan"; +"Switch to day view" = "Switch to day view"; +"Switch to week view" = "Switch to week view"; +"Switch to month view" = "Switch to month view"; +"Reload all calendars" = "Reload all calendars"; + /* Day */ "Sunday" = "Zondag"; @@ -337,28 +349,8 @@ /* Appointment categories */ -"category_NONE" = "Geen categorie"; -"category_ANNIVERSARY" = "Jubileum"; -"category_BIRTHDAY" = "Verjaardag"; -"category_BUSINESS" = "Bedrijfsmatig"; -"category_CALLS" = "Telefoongesprekken"; -"category_CLIENTS" = "Cliënten"; -"category_COMPETITION" = "Competitie"; -"category_CUSTOMER" = "Klant"; -"category_FAVORITES" = "Favorieten"; -"category_FOLLOW UP" = "Opvolgen"; -"category_GIFTS" = "Geschenken"; -"category_HOLIDAYS" = "Vakanties"; -"category_IDEAS" = "Ideën"; -"category_ISSUES" = "Uitdagingen"; -"category_MISCELLANEOUS" = "Anderen"; -"category_PERSONAL" = "Persoonlijk"; -"category_PROJECTS" = "Projecten"; -"category_PUBLIC HOLIDAY" = "Feestdagen"; -"category_STATUS" = "Status"; -"category_SUPPLIERS" = "Leverancier"; -"category_TRAVEL" = "Reizen"; -"category_VACATION" = "Op vakantie"; +"category_none" = "Geen categorie"; +"category_labels" = "Cliënten,Concurrentie,Diversen,Favorieten,Giften,Ideeën,Klant,Kwesties,Leveranciers,Nationale feestdag,Persoonlijk,Projecten,Reizen,Status,Telefoongesprekken,Trouwdag,Vakantie,Verjaardag,Vervolggesprek,Vrije dagen,Zaken"; "repeat_NEVER" = "herhaalt zich niet"; "repeat_DAILY" = "dagelijks"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 7b308b498..93000761d 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -355,28 +355,8 @@ /* Appointment categories */ -"category_NONE" = "None"; -"category_ANNIVERSARY" = "Anniversary"; -"category_BIRTHDAY" = "Birthday"; -"category_BUSINESS" = "Business"; -"category_CALLS" = "Calls"; -"category_CLIENTS" = "Clients"; -"category_COMPETITION" = "Competition"; -"category_CUSTOMER" = "Customer"; -"category_FAVORITES" = "Favorites"; -"category_FOLLOW UP" = "Follow up"; -"category_GIFTS" = "Gifts"; -"category_HOLIDAYS" = "Holidays"; -"category_IDEAS" = "Ideas"; -"category_ISSUES" = "Issues"; -"category_MISCELLANEOUS" = "Miscellaneous"; -"category_PERSONAL" = "Personal"; -"category_PROJECTS" = "Projects"; -"category_PUBLIC HOLIDAY" = "Public Holiday"; -"category_STATUS" = "Status"; -"category_SUPPLIERS" = "Suppliers"; -"category_TRAVEL" = "Travel"; -"category_VACATION" = "Vacation"; +"category_none" = "None"; +"category_labels" = "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation"; "repeat_NEVER" = "Does not repeat"; "repeat_DAILY" = "Daily"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 6ac9305ef..3b7e3de63 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -6,10 +6,10 @@ "Create a new task" = "Créer une nouvelle tâche"; "Edit this event or task" = "Modifier l'événement ou la tâche sélectionnée"; "Delete this event or task" = "Supprimer l'événement ou la tâche sélectionnée"; -"Go to today" = "Aller à la journée d'aujourd'hui"; -"Switch to day view" = "Passer à la vue par jour"; -"Switch to week view" = "Passer à la vue par semaine"; -"Switch to month view" = "Passer à la vue par mois"; +"Go to today" = "Revenir à la date d'aujourd'hui"; +"Switch to day view" = "Afficher la journée"; +"Switch to week view" = "Afficher la semaine"; +"Switch to month view" = "Afficher le mois"; "Reload all calendars" = "Actualiser tous les agendas"; /* Tabs */ @@ -188,14 +188,14 @@ "Appointment proposal" = "Proposition de rendez-vous"; "Appointment on" = "Rendez-vous le"; "Start:" = "Début :"; -"End:" = "Fin :"; -"Due Date:" = "Échéance :"; +"End:" = "Au :"; +"Due Date:" = "Fin prévue :"; "Title:" = "Titre :"; "Calendar:" = "Agenda :"; "Name" = "Nom"; "Email" = "Email"; "Status:" = "Statut :"; -"% complete" = "% complété"; +"% complete" = "% d'achèvement"; "Location:" = "Lieu :"; "Priority:" = "Priorité"; "Privacy" = "Confidentialité"; @@ -210,7 +210,7 @@ "Description:" = "Description :"; "Document:" = "Document :"; "Category:" = "Catégorie :"; -"Repeat:" = "Répéter :"; +"Repeat:" = "Répétition :"; "Reminder:" = "Rappel :"; "Target:" = "Destination :"; @@ -245,14 +245,14 @@ /* Searching */ -"view_all" = "Tous"; -"view_today" = "Aujourd'hui"; -"view_next7" = "Les 7 prochains jours"; -"view_next14" = "Les 14 prochains jours"; -"view_next31" = "Les 31 prochains jours"; -"view_thismonth" = "Ce mois-ci"; -"view_future" = "Tous à venir"; -"view_selectedday" = "Le jour sélectionné"; +"view_all" = "Tous les événements"; +"view_today" = "Événements du jour"; +"view_next7" = "Événements des 7 prochains jours"; +"view_next14" = "Événements des 14 prochains jours"; +"view_next31" = "Événements des 31 prochains jours"; +"view_thismonth" = "Événements du mois en cours"; +"view_future" = "Tous les événements futurs"; +"view_selectedday" = "Jour courant"; "View:" = "Voir :"; "Title or Description" = "Le titre ou la description"; @@ -353,28 +353,8 @@ /* Appointment categories */ -"category_NONE" = "Aucune"; -"category_ANNIVERSARY" = "Anniversaire"; -"category_BIRTHDAY" = "Anniversaire (de nais.)"; -"category_BUSINESS" = "Business"; -"category_CALLS" = "Appels"; -"category_CLIENTS" = "Clients"; -"category_COMPETITION" = "Compétition"; -"category_CUSTOMER" = "Client"; -"category_FAVORITES" = "Favoris"; -"category_FOLLOW UP" = "Suivi"; -"category_GIFTS" = "Cadeaux"; -"category_HOLIDAYS" = "Vacances"; -"category_IDEAS" = "Idées"; -"category_ISSUES" = "Problèmes"; -"category_MISCELLANEOUS" = "Divers"; -"category_PERSONAL" = "Personnel"; -"category_PROJECTS" = "Projets"; -"category_PUBLIC HOLIDAY" = "Public Holiday"; -"category_STATUS" = "Statut"; -"category_SUPPLIERS" = "Fournisseurs"; -"category_TRAVEL" = "Voyage"; -"category_VACATION" = "Absence"; +"category_none" = "Aucune"; +"category_labels" = "Anniversaire,Affaire,Appels,Clients,Compétitions,Congrès,Consommation,Préférés,Suivis,Cadeaux,Congés,Idées,Problèmes,Divers,Personnel,Projets,Jour férié,Réunion,Fournisseurs,Voyages,Professionnel"; "repeat_NEVER" = "Jamais"; "repeat_DAILY" = "Quotidienne"; @@ -439,9 +419,9 @@ validate_endbeforestart = "La date de fin est avant la date de début."; "Edit" = "Éditer"; "Delete" = "Effacer"; "Go to Today" = "Aujourd'hui"; -"Day View" = "Par jour"; -"Week View" = "Par semaine"; -"Month View" = "Par mois"; +"Day View" = "Journée"; +"Week View" = "Semaine"; +"Month View" = "Mois"; "Reload" = "Actualiser"; "eventPartStatModificationError" = "Votre état de participation à l'événement n'a pas pu être modifié."; diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index 73a897d60..c2f321611 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -352,28 +352,8 @@ /* Appointment categories */ -"category_NONE" = "Keine"; -"category_ANNIVERSARY" = "Jubiläum"; -"category_BIRTHDAY" = "Geburtstag"; -"category_BUSINESS" = "Geschäftlich"; -"category_CALLS" = "Anrufe"; -"category_CLIENTS" = "Kunden"; -"category_COMPETITION" = "Konkurrenz"; -"category_CUSTOMER" = "Auftraggeber"; -"category_FAVORITES" = "Favoriten"; -"category_FOLLOW UP" = "Kurzfristig"; -"category_GIFTS" = "Geschenke"; -"category_HOLIDAYS" = "Urlaub"; -"category_IDEAS" = "Ideen"; -"category_ISSUES" = "Probleme"; -"category_MISCELLANEOUS" = "Andere"; -"category_PERSONAL" = "Persönlich"; -"category_PROJECTS" = "Projekte"; -"category_PUBLIC HOLIDAY" = "Feiertage"; -"category_STATUS" = "Zustand"; -"category_SUPPLIERS" = "Lieferanten"; -"category_TRAVEL" = "Reisen"; -"category_VACATION" = "Ferien"; +"category_none" = "Keine"; +"category_labels" = "Jubiläum,Geburtstag,Geschäft,Anrufe,Klienten,Konkurrenz,Kunde,Favoriten,Nachgehen,Geschenke,Ferien,Ideen,Fragen,Verschiedenes,Persönlich,Projekte,Feiertag,Status,Lieferanten,Reise,Urlaub"; "repeat_NEVER" = "wiederholt sich nicht"; "repeat_DAILY" = "täglich"; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index 8754ebffb..8bc278d29 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -6,7 +6,7 @@ "Create a new task" = "Crea una nuova attività"; "Edit this event or task" = "Modifica questo evento o attività"; "Delete this event or task" = "Cancella questo evento o attività"; -"Go to today" = "Oggi"; +"Go to today" = "Vai a Oggi"; "Switch to day view" = "Giorno"; "Switch to week view" = "Settimana"; "Switch to month view" = "Mese"; @@ -355,28 +355,8 @@ /* Appointment categories */ -"category_NONE" = "Nessuna"; -"category_ANNIVERSARY" = "Anniversario"; -"category_BIRTHDAY" = "Compleanno"; -"category_BUSINESS" = "Lavoro"; -"category_CALLS" = "Chiamare"; -"category_CLIENTS" = "Clienti"; -"category_COMPETITION" = "Gara"; -"category_CUSTOMER" = "Cliente"; -"category_FAVORITES" = "Preferiti"; -"category_FOLLOW UP" = "Supplementari"; -"category_GIFTS" = "Regali"; -"category_HOLIDAYS" = "Vacanze"; -"category_IDEAS" = "Idee"; -"category_ISSUES" = "Inconvegnenti"; -"category_MISCELLANEOUS" = "Varie"; -"category_PERSONAL" = "Personale"; -"category_PROJECTS" = "Progetto"; -"category_PUBLIC HOLIDAY" = "Festività"; -"category_STATUS" = "Stato"; -"category_SUPPLIERS" = "Fornitore"; -"category_TRAVEL" = "Viaggio"; -"category_VACATION" = "Ferie"; +"category_none" = "Nessuna"; +"category_labels" = "Anniversari,Compleanni,Lavoro,Chiamate,Clienti,Competizioni,Compratori,Preferiti,Incontri,Regali,Vacanze,Idee,Problemi,Varie,Personale,Progetti,Giorno festivo,Stato,Fornitori,Viaggio,Chiusura"; "repeat_NEVER" = "Non si ripete"; "repeat_DAILY" = "Quotidianamente"; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index ef1e6f5fb..b8a2275fc 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -354,28 +354,8 @@ /* Appointment categories */ -"category_NONE" = "None"; -"category_ANNIVERSARY" = "Anniversary"; -"category_BIRTHDAY" = "Birthday"; -"category_BUSINESS" = "Business"; -"category_CALLS" = "Calls"; -"category_CLIENTS" = "Clients"; -"category_COMPETITION" = "Competition"; -"category_CUSTOMER" = "Customer"; -"category_FAVORITES" = "Favorites"; -"category_FOLLOW UP" = "Follow up"; -"category_GIFTS" = "Gifts"; -"category_HOLIDAYS" = "Holidays"; -"category_IDEAS" = "Ideas"; -"category_ISSUES" = "Issues"; -"category_MISCELLANEOUS" = "Miscellaneous"; -"category_PERSONAL" = "Personal"; -"category_PROJECTS" = "Projects"; -"category_PUBLIC HOLIDAY" = "Public Holiday"; -"category_STATUS" = "Status"; -"category_SUPPLIERS" = "Suppliers"; -"category_TRAVEL" = "Travel"; -"category_VACATION" = "Vacation"; +"category_none" = "None"; +"category_labels" = "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation"; "repeat_NEVER" = "Does not repeat"; "repeat_DAILY" = "Daily"; diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings index 6e3155ac5..89e16b7f4 100644 --- a/UI/Scheduler/Spanish.lproj/Localizable.strings +++ b/UI/Scheduler/Spanish.lproj/Localizable.strings @@ -359,28 +359,8 @@ /* Appointment categories */ -"category_NONE" = "Ninguna"; -"category_ANNIVERSARY" = "Aniversario"; -"category_BIRTHDAY" = "Cumpleaños"; -"category_BUSINESS" = "Negocios"; -"category_CALLS" = "Llamadas"; -"category_CLIENTS" = "Clientes"; -"category_COMPETITION" = "Competencia"; -"category_CUSTOMER" = "Cliente importante"; -"category_FAVORITES" = "Favoritos"; -"category_FOLLOW UP" = "Seguimiento"; -"category_GIFTS" = "Regalos"; -"category_HOLIDAYS" = "Vacaciones"; -"category_IDEAS" = "Ideas"; -"category_ISSUES" = "Problemas"; -"category_MISCELLANEOUS" = "Miscelánea"; -"category_PERSONAL" = "Personal"; -"category_PROJECTS" = "Proyectos"; -"category_PUBLIC HOLIDAY" = "Festivos"; -"category_STATUS" = "Estado"; -"category_SUPPLIERS" = "Proveedores"; -"category_TRAVEL" = "Viajes"; -"category_VACATION" = "Vacation"; +"category_none" = "Ninguna"; +"category_labels" = "Aniversario,Cumpleaños,Negocios,Llamadas,Clientes,Competición,Trabajo,Favoritos,Seguimiento,Regalos,Fiestas,Ideas,Asuntos,Varios,Personal,Proyectos,Vacaciones públicas,Estado,Proveedores,Viajes,Vacaciones"; "repeat_NEVER" = "sin repetición"; "repeat_DAILY" = "diariamente"; diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar index 8aabe8a32..65618f42a 100644 --- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar +++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar @@ -10,17 +10,7 @@ image = "new-task.png"; onclick = "return newEvent(this, 'task');"; image = "new-task.png"; - tooltip = "Create a new task"; }, - { link = "edit"; - label="Edit"; - onclick = "return editEvent(this);"; - image = "edit.png"; - tooltip = "Edit this event or task"; }, - { link = "delete"; - label="Delete"; - onclick = "return deleteEvent(this);"; - image = "tb-mail-delete-flat-24x24.png"; - tooltip = "Delete this event or task"; } ), + tooltip = "Create a new task"; } ), ( { link = "today"; label="Go to Today"; onclick = "return gotoToday();"; @@ -47,6 +37,11 @@ onclick = "return onMonthOverview();"; image = "month-view.png"; tooltip = "Switch to month view"; } ), + ( { link = "delete"; + label="Delete"; + onclick = "return deleteEvent(this);"; + image = "tb-mail-delete-flat-24x24.png"; + tooltip = "Delete this event or task"; } ), ( { link = "#"; label = "Reload"; onclick = "return onCalendarReload();"; diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m index b1000175a..8bfdfbd75 100644 --- a/UI/Scheduler/UIxCalFilterPanel.m +++ b/UI/Scheduler/UIxCalFilterPanel.m @@ -36,7 +36,7 @@ static NSArray *filters = nil; + (void) initialize { static NSString *quals[] - = {@"view_today", @"view_all", @"view_next7", @"view_next14", + = {@"view_all", @"view_today", @"view_next7", @"view_next14", @"view_next31", @"view_thismonth", @"view_future", @"view_selectedday" }; diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 524b74f52..3cd13a8f1 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -804,54 +804,18 @@ iRANGE(2); - (NSArray *) categoryList { - static NSArray *categoryItems = nil; NSMutableArray *categoryList; - unsigned int count, max; - NSString *categoryItem, *newCategoryItem; + NSArray *categoryLabels; - if (!categoryItems) - { - categoryItems = [NSArray arrayWithObjects: @"ANNIVERSARY", - @"BIRTHDAY", - @"BUSINESS", - @"CALLS", - @"CLIENTS", - @"COMPETITION", - @"CUSTOMER", - @"FAVORITES", - @"FOLLOW UP", - @"GIFTS", - @"HOLIDAYS", - @"IDEAS", - @"ISSUES", - @"MISCELLANEOUS", - @"PERSONAL", - @"PROJECTS", - @"PUBLIC HOLIDAY", - @"STATUS", - @"SUPPLIERS", - @"TRAVEL", - @"VACATION", - nil]; - [categoryItems retain]; - } + categoryLabels = [[self labelForKey: @"category_labels"] + componentsSeparatedByString: @","]; + categoryList + = [NSMutableArray arrayWithCapacity: [categoryLabels count] + 1]; + if ([category length] && ![categoryLabels containsObject: category]) + [categoryList addObject: category]; + [categoryList addObjectsFromArray: categoryLabels]; - max = [categoryItems count]; - categoryList = [NSMutableArray arrayWithCapacity: max + 1]; - - for (count = 0; count < max; count++) - { - categoryItem = [categoryItems objectAtIndex: count]; - newCategoryItem - = [self labelForKey: [NSString stringWithFormat: @"category_%@", - categoryItem]]; - [categoryList addObject: newCategoryItem]; - } - if ([categories count]) - [categoryList addObjectsFromArray: categories]; - - return [[categoryList uniqueObjects] - sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)]; + return categoryList; } - (void) setCategories: (NSArray *) _categories diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index 0daceba1b..7e0e25832 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -354,28 +354,8 @@ /* Appointment categories */ -"category_NONE" = "Dim"; -"category_ANNIVERSARY" = "Penblwydd"; -"category_BIRTHDAY" = "Penblwydd"; -"category_BUSINESS" = "Busnes"; -"category_CALLS" = "Galwadau"; -"category_CLIENTS" = "Clientau"; -"category_COMPETITION" = "Cystadleuaeth"; -"category_CUSTOMER" = "Cwsmer"; -"category_FAVORITES" = "Ffefrynnau"; -"category_FOLLOW UP" = "Dilyn lan"; -"category_GIFTS" = "Anrhegion"; -"category_HOLIDAYS" = "Gwyliau"; -"category_IDEAS" = "Syniadau"; -"category_ISSUES" = "Canlyniadau"; -"category_MISCELLANEOUS" = "Amrywiol"; -"category_PERSONAL" = "Personol"; -"category_PROJECTS" = "Projectau"; -"category_PUBLIC HOLIDAY" = "Gwyliau Cyhoeddus"; -"category_STATUS" = "Statws"; -"category_SUPPLIERS" = "Cyflenwyr"; -"category_TRAVEL" = "Teithio"; -"category_VACATION" = "Gwyliau"; +"category_none" = "Dim"; +"category_labels" = "Amrywiol,Anrhegion,Busnes,Canlyniadau,Clientau,Cwsmer,Cyflenwyr,Cystadleuaeth,Dilyn lan,Ffefrynnau,Galwadau,Gwyliau,Gwyliau Cyhoeddus,Penblwydd,Personol,Projectau,Statws,Syniadau,Teithio"; "repeat_NEVER" = "Ddim yn ailadrodd"; "repeat_DAILY" = "Dyddiol"; diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox index 39df92a9b..22a16eb71 100644 --- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox +++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox @@ -42,7 +42,7 @@ />