From 854985e12445e2e9e0931e7a1af40f48b171dcb9 Mon Sep 17 00:00:00 2001 From: Luc Charland Date: Tue, 9 Oct 2012 11:29:35 -0400 Subject: [PATCH] Fixed bug #1477 Add decision in subject header --- .../Localizable.strings | 3 +-- .../Catalan.lproj/Localizable.strings | 1 - .../Czech.lproj/Localizable.strings | 3 +-- .../Danish.lproj/Localizable.strings | 3 +-- .../Dutch.lproj/Localizable.strings | 1 - .../English.lproj/Localizable.strings | 5 ++++- .../French.lproj/Localizable.strings | 1 - .../German.lproj/Localizable.strings | 1 - .../Hungarian.lproj/Localizable.strings | 1 - .../Icelandic.lproj/Localizable.strings | 3 +-- .../Italian.lproj/Localizable.strings | 3 +-- .../NorwegianBokmal.lproj/Localizable.strings | 3 +-- .../NorwegianNynorsk.lproj/Localizable.strings | 3 +-- .../Polish.lproj/Localizable.strings | 3 +-- .../Russian.lproj/Localizable.strings | 1 - SoObjects/Appointments/SOGoAptMailICalReply.m | 17 +++++++++++++++-- .../SpanishArgentina.lproj/Localizable.strings | 1 - .../SpanishSpain.lproj/Localizable.strings | 1 - .../Swedish.lproj/Localizable.strings | 3 +-- .../Ukrainian.lproj/Localizable.strings | 3 +-- .../Welsh.lproj/Localizable.strings | 3 +-- 21 files changed, 30 insertions(+), 33 deletions(-) diff --git a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings index a8ee4351d..c1792439f 100644 --- a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings +++ b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Tarefa Confidencial)"; = "Por favor, aceitar ou recusar as alterações."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Resposta a Evento de Convite: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}foi aceitado seu convite ao evento."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Tarefa Confidencial)"; = "%{Attendee} %{SentByText}foi ainda não decidiu seu convite ao evento."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultâneas (%{NumberOfSimultaneousBookings}) alcançadas para o recurso \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultâneas (%{NumberOfSimultaneousBookings}) alcançadas para o recurso \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Catalan.lproj/Localizable.strings b/SoObjects/Appointments/Catalan.lproj/Localizable.strings index b3a64d881..36a945d56 100644 --- a/SoObjects/Appointments/Catalan.lproj/Localizable.strings +++ b/SoObjects/Appointments/Catalan.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Tasca confidencial)"; = "Si us plau, accepteu o rebutgeu aquests canvis."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Resposta a la invitació a l'esdeveniment: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}ha acceptat la invitació a l'esdeveniment."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/Czech.lproj/Localizable.strings b/SoObjects/Appointments/Czech.lproj/Localizable.strings index 9053f8dab..119549eca 100644 --- a/SoObjects/Appointments/Czech.lproj/Localizable.strings +++ b/SoObjects/Appointments/Czech.lproj/Localizable.strings @@ -56,7 +56,6 @@ vtodo_class2 = "(Skrytý úkol)"; = "Prosím přijměte nebo odmítněte tyto změny."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Odpověď na pozvánku k události: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}přijal/a Vaši pozvánku."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -67,4 +66,4 @@ vtodo_class2 = "(Skrytý úkol)"; = "%{Attendee} %{SentByText}dosud o Vaší pozvánce k události nerozhodl/a."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Byl dosažen maximální počet současných rezervací\n(%{NumberOfSimultaneousBookings}) pro zdroj \"%{Cn} %{SystemEmail}\". Konfliktní událost je \"%{EventTitle}\" a začíná %{StartDate}."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Byl dosažen maximální počet současných rezervací\n(%{NumberOfSimultaneousBookings}) pro zdroj \"%{Cn} %{SystemEmail}\". Konfliktní událost je \"%{EventTitle}\" a začíná %{StartDate}."; diff --git a/SoObjects/Appointments/Danish.lproj/Localizable.strings b/SoObjects/Appointments/Danish.lproj/Localizable.strings index 534da4cc1..164a6a47a 100644 --- a/SoObjects/Appointments/Danish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Danish.lproj/Localizable.strings @@ -59,7 +59,6 @@ Description: %{Description}"; = "Venligst acceptér eller afvis disse ændringer."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Svar på invitation: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText} har accepteret din begivenhedsinvitation."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -70,4 +69,4 @@ Description: %{Description}"; = "%{Attendee} %{SentByText} har endnu ikke taget stilling til din begivenhedsinvitation."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximalt antal samtidige bookings (%{NumberOfSimultaneousBookings}) er nået for \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximalt antal samtidige bookings (%{NumberOfSimultaneousBookings}) er nået for \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings index ba84c6a2d..3e1b1dea0 100644 --- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings +++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Vertrouwelijke taak)"; = "Accepteer deze wijzigingen of wijs ze af."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Antwoord voor de uitnodiging: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}heeft uw uitnodiging voor de gebeurtenis geaccepteerd."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings index 75f6d88bd..ba3b942f1 100644 --- a/SoObjects/Appointments/English.lproj/Localizable.strings +++ b/SoObjects/Appointments/English.lproj/Localizable.strings @@ -48,7 +48,10 @@ vtodo_class2 = "(Confidential task)"; = "Please accept or decline those changes."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Reply to invitation: \"%{Summary}\""; +"Accepted invitation: \"%{Summary}\"" = "Accepted invitation: \"%{Summary}\""; +"Declined invitation: \"%{Summary}\"" = "Declined invitation: \"%{Summary}\""; +"Delegated invitation: \"%{Summary}\"" = "Delegated invitation: \"%{Summary}\""; +"Not yet decided on invitation: \"%{Summary}\"" = "Not yet decided on invitation: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}has accepted your event invitation."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings index 77efcf795..313bd0962 100644 --- a/SoObjects/Appointments/French.lproj/Localizable.strings +++ b/SoObjects/Appointments/French.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Tâche confidentielle)"; = "Veuillez reconfirmer ou annuler votre présence."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Réponse à l'invitation : « %{Summary} »"; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}a accepté votre invitation."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings index c0dcdd941..fa7df9cc2 100644 --- a/SoObjects/Appointments/German.lproj/Localizable.strings +++ b/SoObjects/Appointments/German.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; = "Bitte akzeptieren Sie diese Änderung oder lehnen Sie ab."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Antwort auf Termineinladung: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText} hat Ihre Termineinladung akzeptiert."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings index 204c56f63..9111c5bfc 100644 --- a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Bizalmas feladat)"; = "Kérem fogadja el vagy utasítsa vissza a változásokat."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Válasz a meghívásra: %{Summary}"; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}elfogadta a meghívását."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings index 11c32b634..5b6a20af2 100644 --- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings +++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)"; = "Þessar breytingar þarf að samþykkja eða hafna."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Svara boði: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}hefur samþykkt boð þitt á viðburð."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)"; = "%{Attendee} %{SentByText}hefur ekki enn tekið ákvörðun varðandi boð þitt."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Hámarksfjöldi samtímabókana (%{NumberOfSimultaneousBookings}) hefur verið náð varðandi aðfangið \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Hámarksfjöldi samtímabókana (%{NumberOfSimultaneousBookings}) hefur verið náð varðandi aðfangið \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings index 7d31461f6..8903c354b 100644 --- a/SoObjects/Appointments/Italian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Attività confidenziale)"; = "Prego accettare o rifiutare questi cambiamenti"; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Risposta all'invito: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}ha accettato il tuo invito al evento."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Attività confidenziale)"; = "%{Attendee} %{SentByText}non ha ancora deciso riguardo il tuo invito all'evento."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Numero massimo di prenotazioni simultanee (%{NumberOfSimultaneousBookings}) raggiunto per la risorsa \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Numero massimo di prenotazioni simultanee (%{NumberOfSimultaneousBookings}) raggiunto per la risorsa \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings index 231d63899..4ba121e56 100644 --- a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings +++ b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings @@ -56,7 +56,6 @@ vtodo_class2 = "(Konfidensiell oppgave)"; = "Vennligst godta eller avvis endringene."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Svar til invitasjonen: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText} har godtatt invitasjonen."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -67,4 +66,4 @@ vtodo_class2 = "(Konfidensiell oppgave)"; = "%{Attendee} %{SentByText} had ends ikke var på invitasjonen."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maksimalt antall samtidige bookinger (%{NumberOfSimultaneousBookings}) er nåd for ressurs \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maksimalt antall samtidige bookinger (%{NumberOfSimultaneousBookings}) er nåd for ressurs \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings index aee20395d..6fbb599a6 100644 --- a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings +++ b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Konfidensiell oppgave)"; = "Please accept or decline those changes."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Reply to invitation: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}has accepted your event invitation."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Konfidensiell oppgave)"; = "%{Attendee} %{SentByText}has not yet decided upon your event invitation."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Polish.lproj/Localizable.strings b/SoObjects/Appointments/Polish.lproj/Localizable.strings index 3e078d6f7..3b89c1d4f 100644 --- a/SoObjects/Appointments/Polish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Polish.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Zadanie poufne)"; = "Zaakceptuj lub odrzuć te zmiany."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Odpowiedź na zaproszenie: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}zaakceptował(a) twoje zaproszenie na wydarzenie."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Zadanie poufne)"; = "%{Attendee} %{SentByText}jeszcze nie zdecydował(a) o obecności na twoim wydarzeniu."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Russian.lproj/Localizable.strings b/SoObjects/Appointments/Russian.lproj/Localizable.strings index 3d4f963ba..ec30c6c7c 100644 --- a/SoObjects/Appointments/Russian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Russian.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Конфиденциальная задача)"; = "Пожалуйста подтвердите или отмените эти изменения."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Ответ на приглашение: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}согласился участвовать в запланированном мероприятии."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index 23ad4a964..e540c1d04 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/SoObjects/Appointments/SOGoAptMailICalReply.m @@ -96,12 +96,25 @@ - (NSString *) getSubject { NSString *subjectFormat; + NSString *partStat; if (!values) [self setupValues]; - subjectFormat = [self labelForKey: @"Reply to invitation: \"%{Summary}\"" - inContext: context]; + partStat = [[attendee partStat] lowercaseString]; + + if ([partStat isEqualToString: @"accepted"]) + subjectFormat = [self labelForKey: @"Accepted invitation: \"%{Summary}\"" + inContext: context]; + else if ([partStat isEqualToString: @"declined"]) + subjectFormat = [self labelForKey: @"Declined invitation: \"%{Summary}\"" + inContext: context]; + else if ([partStat isEqualToString: @"delegated"]) + subjectFormat = [self labelForKey: @"Delegated invitation: \"%{Summary}\"" + inContext: context]; + else + subjectFormat = [self labelForKey: @"Not yet decided on invitation: \"%{Summary}\"" + inContext: context]; return [values keysWithFormat: subjectFormat]; } diff --git a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings index 20ab6387d..199dfb9ac 100644 --- a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings +++ b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Tarea confidencial)"; = "Por favor, acepte o rechace estos cambios."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Respuesta a la invitación del evento: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}ha aceptado su invitación al evento."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings index 860b22ea5..073b12798 100644 --- a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings +++ b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings @@ -48,7 +48,6 @@ vtodo_class2 = "(Tarea confidencial)"; = "Por favor, acepta o rechaza estos cambios."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Respuesta a la invitación del evento: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}ha aceptado su invitación al evento."; "%{Attendee} %{SentByText}has declined your event invitation." diff --git a/SoObjects/Appointments/Swedish.lproj/Localizable.strings b/SoObjects/Appointments/Swedish.lproj/Localizable.strings index 69d46ce56..de76dca55 100644 --- a/SoObjects/Appointments/Swedish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Swedish.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Konfidentiell uppgift)"; = "Acceptera eller avböj dessa ändringar."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Svara inbjudan: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}har accepterat din mötesinbjudan."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Konfidentiell uppgift)"; = "%{Attendee} %{SentByText}har inte än bestämt sig om din mötesinbjudan."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings index 42c3e62e2..f56b5a28e 100644 --- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings @@ -56,7 +56,6 @@ vtodo_class2 = "(Конфіденційне завдання)"; = "Будь ласка, прийміть або відхіліть ці зміни."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Відповідь на запрошення: \"%{Summary}\""; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText} прийняв Ваше запрошення на участь у події."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -67,4 +66,4 @@ vtodo_class2 = "(Конфіденційне завдання)"; = "%{Attendee} %{SentByText} поки не визначився з участю в події."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Максимальне число одночасного резервування (%{NumberOfSimultaneousBookings}) для ресурсу досягло \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Максимальне число одночасного резервування (%{NumberOfSimultaneousBookings}) для ресурсу досягло \"%{Cn} %{SystemEmail}\"."; diff --git a/SoObjects/Appointments/Welsh.lproj/Localizable.strings b/SoObjects/Appointments/Welsh.lproj/Localizable.strings index 2acbea8c1..924e04f9a 100644 --- a/SoObjects/Appointments/Welsh.lproj/Localizable.strings +++ b/SoObjects/Appointments/Welsh.lproj/Localizable.strings @@ -51,7 +51,6 @@ vtodo_class2 = "(Tasg gyfrinachol)"; = "Please accept or decline those changes."; /* Reply */ -"Reply to invitation: \"%{Summary}\"" = "Ymateb i wahoddiad: %{Summary}"; "%{Attendee} %{SentByText}has accepted your event invitation." = "%{Attendee} %{SentByText}wedi derbyn."; "%{Attendee} %{SentByText}has declined your event invitation." @@ -62,4 +61,4 @@ vtodo_class2 = "(Tasg gyfrinachol)"; = "%{Attendee} %{SentByText}heb benderfynu ar eich gwahoddiad eto."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";