amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-07 12:57:14 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_11' (head dd98907b2d09b3cd66d8a6ef15da440b85e98478)

Browse Source 
to branch 'ca.inverse.sogo' (head 7671984f4de4c2e75f994c09f3c03934090088b2)

Monotone-Parent: 7671984f4de4c2e75f994c09f3c03934090088b2
Monotone-Parent: dd98907b2d09b3cd66d8a6ef15da440b85e98478
Monotone-Revision: b0847062df5606c06fbb9461db56bce7d76a8332

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-05T15:21:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2011-12-05 15:21:32 +00:00
2 parents e2a4a1b2a6 182f442a4d
commit f751790d86
27 files changed
+441 -271
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/Appointments/German.lproj/Localizable.strings
+20 -12
View File
@@ -9,10 +9,10 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
/* Receipts */
"Title:" = "Titel:";
"Start:" = "Start:";
"Start:" = "Beginn:";
"End:" = "Ende:";
"Receipt: users invited to a meeting" = "Empfangsbestätigung: Benutzer zu einem Termin eingeladen";
"Receipt: users invited to a meeting" = "Empfangsbestätigung: Benutzer zum Termin eingeladen";
"You have invited the following attendees(s):" = "Sie haben folgende Teilnehmer eingeladen:";
"... to attend the following event:" = "... um an folgendem Termin teilzunehmen:";
@@ -25,7 +25,7 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
"... from the following event:" = "... von folgendem Termin:";
/* IMIP messages */
"startDate_label" = "Start:";
"startDate_label" = "Beginn:";
"endDate_label" = "Ende:";
"due_label" = "Fällig:";
"location_label" = "Ort:";
@@ -35,12 +35,20 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
/* Invitation */
"Event Invitation: \"%{Summary}\"" = "Termin Einladung: \"%{Summary}\"";
"(sent by %{SentBy}) " = "(gesendet von %{SentBy}) ";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}hat Sie eingeladen zu %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} hat Sie eingeladen zu %{Summary}.
Beginn: %{StartDate} um %{StartTime}
Ende: %{EndDate} um %{EndTime}
Beschreibung: %{Description}";
/* Deletion */
"Event Cancelled: \"%{Summary}\"" = "Termin abgesagt: \"%{Summary}\"";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
= "%{Organizer} %{SentByText}hat diesen Termin abgesagt: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
= "%{Organizer} %{SentByText} hat diesen Termin abgesagt: %{Summary}.
Beginn: %{StartDate} um %{StartTime}
Ende: %{EndDate} um %{EndTime}
Beschreibung: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
@@ -51,15 +59,15 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
= "Bitte akzeptieren oder lehnen Sie diese Änderungen ab.";
/* Reply */
"Reply to invitation: \"%{Summary}\"" = "Antwort Termineinladung: %{Summary}";
"Reply to invitation: \"%{Summary}\"" = "Antwort auf Termineinladung: %{Summary}";
"%{Attendee} %{SentByText}has accepted your event invitation."
= "%{Attendee} %{SentByText}hat Ihre Termineinladung akzeptiert.";
= "%{Attendee} %{SentByText} hat Ihre Termineinladung akzeptiert.";
"%{Attendee} %{SentByText}has declined your event invitation."
= "%{Attendee} %{SentByText}hat Ihre Termineinladung abgelehnt.";
= "%{Attendee} %{SentByText} hat Ihre Termineinladung abgelehnt.";
"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
= "%{Attendee} %{SentByText}hat die Einladung delegiert an %{Delegate}.";
= "%{Attendee} %{SentByText} hat die Einladung delegiert an %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}hat noch nicht über Ihre Termineinladung entschieden.";
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximale Zahl simultaner Buchungen (%{NumberOfSimultaneousBookings}) erreicht für Ressource \"%{Cn} %{SystemEmail}\".";
= "%{Attendee} %{SentByText} hat noch nicht über Ihre Termineinladung entschieden.";
/* Resources */
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximale Zahl gleichzeitiger Buchungen (%{NumberOfSimultaneousBookings}) erreicht für Ressource \"%{Cn} %{SystemEmail}\".";
SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
+15 -7
View File
@@ -33,14 +33,22 @@ vtodo_class2 = "(Tarea confidencial)";
"comment_label" = "Comentario:";
/* Invitation */
"Invitacion a un Evento: \"%{Summary}\"" = "Invitación a un Evento: \"%{Summary}\"";
"Event Invitation: \"%{Summary}\"" = "Invitación al evento: ";
"(sent by %{SentBy}) " = "(enviado por %{SentBy}) ";
"%{Organizer} %{SentByText}le ha invitado a %{Summary}.\n\nInicio: %{StartDate} a %{StartTime}\nFin: %{EndDate} a %{EndTime}\nDescripción: %{Description}" = "%{Organizer} %{SentByText}ha sido invitado a %{Summary}.\n\nStart: %{StartDate} a las %{StartTime}\nEnd: %{EndDate} las %{EndTime}\nDescripción: %{Description}";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}lo ha invitado %{Summary}.
Comienzo: %{StartDate} a las %{StartTime}
Finalización: %{EndDate} a las %{EndTime}
Descripción: %{Description}";
/* Deletion */
"Evento Cancelado: \"%{Summary}\"" = "Evento Cancelado: \"%{Summary}\"";
"%{Organizer} %{SentByText}ha cancelado este evento: %{Summary}.\n\nInicio: %{StartDate} a %{StartTime}\nFin: %{EndDate} a %{EndTime}\nDescripción: %{Description}"
= "%{Organizer} %{SentByText}ha cancelado éste evento: %{Summary}.\n\nInicio: %{StartDate} a las %{StartTime}\nEnd: %{EndDate} a %{EndTime}\nDescripción: %{Description}";
"Event Cancelled: \"%{Summary}\"" = "Evento cancelado: \"%{Summary}\"";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
= "%{Organizer} %{SentByText}ha cancelado este evento: %{Summary}.
Comienzo: %{StartDate} a las %{StartTime}
Finalización: %{EndDate} a las %{EndTime}
Descripción: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
@@ -61,5 +69,5 @@ vtodo_class2 = "(Tarea confidencial)";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}no ha tomado tadavia una decision sobre esta cita.";
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultáneas (%{NumberOfSimultaneousBookings}) alcanzado para recurso \"%{Cn} %{SystemEmail}\".";
/* Resources */
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultáneas (%{NumberOfSimultaneousBookings}) alcanzado para recurso \"%{Cn} %{SystemEmail}\".";
SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
+15 -7
View File
@@ -33,14 +33,22 @@ vtodo_class2 = "(Tarea confidencial)";
"comment_label" = "Comentario:";
/* Invitation */
"Invitacion a un Evento: \"%{Summary}\"" = "Invitación a un Evento: \"%{Summary}\"";
"Event Invitation: \"%{Summary}\"" = "Invitación al evento: \"% {Summary}\"";
"(sent by %{SentBy}) " = "(enviado por %{SentBy}) ";
"%{Organizer} %{SentByText}le ha invitado a %{Summary}.\n\nInicio: %{StartDate} a %{StartTime}\nFin: %{EndDate} a %{EndTime}\nDescripción: %{Description}" = "%{Organizer} %{SentByText}ha sido invitado a %{Summary}.\n\nStart: %{StartDate} a las %{StartTime}\nEnd: %{EndDate} las %{EndTime}\nDescripción: %{Description}";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}le ha invitado a %{Summary}.
Inicio: %{StartDate} a las %{StartTime}
Fin: %{EndDate} a las %{EndTime}
Descripción: %{Description}";
/* Deletion */
"Evento Cancelado: \"%{Summary}\"" = "Evento Cancelado: \"%{Summary}\"";
"%{Organizer} %{SentByText}ha cancelado este evento: %{Summary}.\n\nInicio: %{StartDate} a %{StartTime}\nFin: %{EndDate} a %{EndTime}\nDescripción: %{Description}"
= "%{Organizer} %{SentByText}ha cancelado éste evento: %{Summary}.\n\nInicio: %{StartDate} a las %{StartTime}\nEnd: %{EndDate} a %{EndTime}\nDescripción: %{Description}";
"Event Cancelled: \"%{Summary}\"" = "Evento Cancelado: \"% {Summary}\"";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
= "%{Organizer} %{SentByText} ha cancelado este evento: %{Summary}.
Inicio: %{StartDate} a las %{StartTime}
Fin:%{EndDate} a las {EndTime}
Descripción: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
@@ -61,5 +69,5 @@ vtodo_class2 = "(Tarea confidencial)";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}no ha tomado tadavia una decision sobre esta cita.";
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultáneas (%{NumberOfSimultaneousBookings}) alcanzado para recurso \"%{Cn} %{SystemEmail}\".";
/* Resources */
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Número máximo de reservas simultáneas (%{NumberOfSimultaneousBookings}) alcanzado para recurso \"%{Cn} %{SystemEmail}\".";
SoObjects/Appointments/iCalEvent+SOGo.m
+6 -5
View File
@@ -68,8 +68,8 @@
{
NSMutableDictionary *row;
NSCalendarDate *startDate, *endDate, *nextAlarmDate;
NSArray *attendees;
NSString *uid, *title, *location, *status, *category;
NSArray *attendees, *categories;
NSString *uid, *title, *location, *status;
NSNumber *sequence;
id organizer;
id participants, partmails;
@@ -257,9 +257,10 @@
else
[row setObject: [NSNumber numberWithInt: 0] forKey: @"c_nextalarm"];
category = [self categories];
if ([category length] > 0)
[row setObject: category forKey: @"c_category"];
categories = [self categories];
if ([categories count] > 0)
[row setObject: [categories componentsJoinedByString: @","]
forKey: @"c_category"];
return row;
}
SoObjects/Appointments/iCalToDo+SOGo.m
+6 -5
View File
@@ -45,8 +45,8 @@
{
NSMutableDictionary *row;
NSCalendarDate *startDate, *dueDate, *nextAlarmDate;
NSArray *attendees;
NSString *uid, *title, *location, *status, *category;
NSArray *attendees, *categories;
NSString *uid, *title, *location, *status;
NSNumber *sequence;
id organizer, date;
id participants, partmails;
@@ -201,9 +201,10 @@
else
[row setObject: [NSNumber numberWithInt: 0] forKey: @"c_nextalarm"];
category = [self categories];
if ([category length] > 0)
[row setObject: category forKey: @"c_category"];
categories = [self categories];
if ([categories count] > 0)
[row setObject: [categories componentsJoinedByString: @","]
forKey: @"c_category"];
return row;
}