amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-25 08:23:28 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_12' (head 2b438d60e3231cf7f4811dadaf9a91a62885d15b)

Browse Source 
to branch 'ca.inverse.sogo' (head 2a5d61f1ed60b9d00203fc41d7b5af818e00391f)

Monotone-Parent: 2a5d61f1ed60b9d00203fc41d7b5af818e00391f
Monotone-Parent: 2b438d60e3231cf7f4811dadaf9a91a62885d15b
Monotone-Revision: 96f11391475b0d4e71002f19f89309839d039b36

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-07T14:12:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-02-07 14:12:46 +00:00
parent b27f0de9a9 1c77687067
commit a79036fbf9
65 changed files with 883 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
+27 -27
View File
@@ -8,47 +8,47 @@ vtodo_class1 = "(Tarefa Privada)";
vtodo_class2 = "(Tarefa Confidencial)";
/* Receipts */
"Title:" = "Title:";
"Start:" = "Start:";
"End:" = "End:";
"Title:" = "Título:";
"Start:" = "Início:";
"End:" = "Fim:";
"Receipt: users invited to a meeting" = "Receipt: users invited to a meeting";
"You have invited the following attendees(s):" = "You have invited the following attendees(s):";
"... to attend the following event:" = "... to attend the following event:";
"Receipt: users invited to a meeting" = "Recepção: usuários convidados para uma reunião";
"You have invited the following attendees(s):" = "Você convidou o(s) seguinte(s) participante(s):";
"... to attend the following event:" = ".. para participar do seguinte evento:";
"Receipt: invitation updated" = "Receipt: invitation updated";
"The following attendees(s):" = "The following attendees(s):";
"... have been notified of the changes to the following event:" = "... have been notified of the changes to the following event:";
"Receipt: invitation updated" = "Recepção: Convite atualizado";
"The following attendees(s):" = "O(s) seguinte(s) participante(s):";
"... have been notified of the changes to the following event:" = "... foi notificado das alterações do seguinte evento:";
"Receipt: attendees removed from an event" = "Receipt: attendees removed from an event";
"You have removed the following attendees(s):" = "You have removed the following attendees(s):";
"... from the following event:" = "... from the following event:";
"Receipt: attendees removed from an event" = "Recepção: participantes removidos de um evento";
"You have removed the following attendees(s):" = "Você removeu o(s) seguinte(s) participante(s): ";
"... from the following event:" = "... do seguinte evento:";
/* IMIP messages */
"startDate_label" = "Start:";
"endDate_label" = "End:";
"due_label" = "Due Date:";
"location_label" = "Location:";
"summary_label" = "Summary:";
"comment_label" = "Comment:";
"startDate_label" = "Início:";
"endDate_label" = "Fim:";
"due_label" = "Data de Vencimento:";
"location_label" = "Local:";
"summary_label" = "Resumo:";
"comment_label" = "Comentário:";
/* Invitation */
"Event Invitation: \"%{Summary}\"" = "Event Invitation: \"%{Summary}\"";
"Event Invitation: \"%{Summary}\"" = "Convite do Evento: \"%{Summary}\"";
"(sent by %{SentBy}) " = "(enviado por %{SentBy}) ";
"%{Organizer} %{SentByText}has invited you to %{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}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} convidou você para %{Summary}.\n\nInício: %{StartDate} as %{StartTime}\nFim: %{EndDate} as %{EndTime}\nDescrição: %{Description}";
/* Deletion */
"Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
"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}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
= "%{Organizer} %{SentByText} cancelou este evento: %{Summary}.\n\nInício: %{StartDate} as %{StartTime}\nFim: %{EndDate} as %{EndTime}\nDescrição: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
= "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed";
= "O Compromisso \"%{Summary}\" de %{OldStartDate} as %{OldStartTime} mudou";
"The following parameters have changed in the \"%{Summary}\" meeting:"
= "The following parameters have changed in the \"%{Summary}\" meeting:";
= "Os seguintes parâmetros mudaram na reunião \"%{Summary}\" :\n\n";
"Please accept or decline those changes."
= "Please accept or decline those changes.";
= "Por favor, aceitar ou recusar as alterações.";
/* Reply */
"Reply to invitation: \"%{Summary}\"" = "Resposta a Evento de Convite: \"%{Summary}\"";
@@ -57,9 +57,9 @@ vtodo_class2 = "(Tarefa Confidencial)";
"%{Attendee} %{SentByText}has declined your event invitation."
= "%{Attendee} %{SentByText}foi declinado seu convite ao evento.";
"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
= "%{Attendee} %{SentByText} delegou o convite para %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}foi ainda não decidiu seu convite ao evento.";
/* Resources */
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
"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}\".";
SoObjects/Appointments/German.lproj/Localizable.strings
+6 -14
View File
@@ -27,36 +27,28 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
/* IMIP messages */
"startDate_label" = "Beginn:";
"endDate_label" = "Ende:";
"due_label" = "Fällig:";
"due_label" = "Fälligkeit:";
"location_label" = "Ort:";
"summary_label" = "Zusammenfassung:";
"comment_label" = "Kommentar:";
/* Invitation */
"Event Invitation: \"%{Summary}\"" = "Termin Einladung: \"%{Summary}\"";
"Event Invitation: \"%{Summary}\"" = "Termineinladung: \"%{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}.
Beginn: %{StartDate} um %{StartTime}
Ende: %{EndDate} um %{EndTime}
Beschreibung: %{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}.\n\nBeginn: %{StartDate} um %{StartTime}\nEnde: %{EndDate} um %{EndTime}\nBeschreibung: %{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}.
Beginn: %{StartDate} um %{StartTime}
Ende: %{EndDate} um %{EndTime}
Beschreibung: %{Description}";
= "%{Organizer} %{SentByText} hat diesen Termin abgesagt: %{Summary}.\n\nBeginn: %{StartDate} um %{StartTime}\nEnde: %{EndDate} um %{EndTime}\nBeschreibung: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
= "Der Termin \"%{Summary}\" für den %{OldStartDate} um %{OldStartTime} hat sich geändert";
"The following parameters have changed in the \"%{Summary}\" meeting:"
= "Folgende Parameter haben sich im Termin \"%{Summary}\" geändert:";
= "Folgendes wurde am Termin \"%{Summary}\" geändert:";
"Please accept or decline those changes."
= "Bitte akzeptieren oder lehnen Sie diese Änderungen ab.";
= "Bitte akzeptieren Sie diese Änderung oder lehnen Sie ab.";
/* Reply */
"Reply to invitation: \"%{Summary}\"" = "Antwort auf Termineinladung: %{Summary}";
SoObjects/Appointments/Italian.lproj/Localizable.strings
+2 -2
View File
@@ -27,7 +27,7 @@ vtodo_class2 = "(Attività confidenziale)";
/* IMIP messages */
"startDate_label" = "Inizio:";
"endDate_label" = "Fine:";
"due_label" = "Due Date:";
"due_label" = "Scadenza:";
"location_label" = "Luogo:";
"summary_label" = "Summario:";
"comment_label" = "Commento:";
@@ -62,4 +62,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}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Numero massimo di prenotazioni simultanee (%{NumberOfSimultaneousBookings}) raggiunto per la risorsa \"%{Cn} %{SystemEmail}\".";
SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
+24 -19
View File
@@ -26,40 +26,45 @@ vtodo_class2 = "(Konfidensiell oppgave)";
/* IMIP messages */
"startDate_label" = "Start:";
"endDate_label" = "End:";
"due_label" = "Due Date:";
"location_label" = "Location:";
"summary_label" = "Summary:";
"comment_label" = "Comment:";
"endDate_label" = "Slutt:";
"due_label" = "Forfallsdato:";
"location_label" = "Sted:";
"summary_label" = "Sammendrag:";
"comment_label" = "Kommentar:";
/* Invitation */
"Event Invitation: \"%{Summary}\"" = "Event Invitation: \"%{Summary}\"";
"(sent by %{SentBy}) " = "(sent by %{SentBy}) ";
"%{Organizer} %{SentByText}has invited you to %{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}";
"Event Invitation: \"%{Summary}\"" = "Hendelseinvitasjon: \"%{Summary}\"";
"(sent by %{SentBy}) " = "(sendt av %{SentBy})";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "";
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.\n\nStart: %{StartDate} %{StartTime}\nSlutt: %{EndDate} %{EndTime}\nBeskrivelse: %{Description}";
/* Deletion */
"Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
"Event Cancelled: \"%{Summary}\"" = "Hendelse avlyst: \"%{Summary}\"";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
= "";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
= "%{Organizer} %{SentByText} har avlyst : %{Summary}.\n\nStart: %{StartDate} %{StartTime}\nEnd: %{EndDate} %{EndTime}\nBeskrivelse: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
= "";
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
= "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed";
= "Avtalen \"%{Summary}\" for %{OldStartDate} klokken %{OldStartTime} er endret.";
"The following parameters have changed in the \"%{Summary}\" meeting:"
= "The following parameters have changed in the \"%{Summary}\" meeting:";
= "Følgende parametre er endret for \"%{Summary}\" møtet:";
"Please accept or decline those changes."
= "Please accept or decline those changes.";
= "Vennligst godta eller avvis endringene.";
/* Reply */
"Reply to invitation: \"%{Summary}\"" = "Reply to invitation: \"%{Summary}\"";
"Reply to invitation: \"%{Summary}\"" = "Svar til invitasjonen: \"%{Summary}\"";
"%{Attendee} %{SentByText}has accepted your event invitation."
= "%{Attendee} %{SentByText}has accepted your event invitation.";
= "%{Attendee} %{SentByText} har godtatt invitasjonen.";
"%{Attendee} %{SentByText}has declined your event invitation."
= "%{Attendee} %{SentByText}has declined your event invitation.";
= "%{Attendee} %{SentByText} har avvist invitasjonen.";
"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
= "%{Attendee} %{SentByText} har delegert invitasjonen til %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}has not yet decided upon your event invitation.";
= "%{Attendee} %{SentByText} had ends ikke var på invitasjonen.";
/* Resources */
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maksimalt antall samtidige bookinger (%{NumberOfSimultaneousBookings}) er nåd for ressurs \"%{Cn} %{SystemEmail}\".";
SoObjects/SOGo/LDAPSource.m
+1 -1
View File
@@ -766,7 +766,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
[qs appendString: searchFormat];
}
if ([_filter length])
if (_filter && [_filter length])
[qs appendFormat: @" AND %@", _filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
SoObjects/SOGo/SOGoGCSFolder.m
+2 -2
View File
@@ -110,8 +110,8 @@ static NSArray *childRecordFields = nil;
withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"read", @"DAV:")]; */
[aclManager registerDAVPermission: davElement (@"write", @"DAV:")
abstract: YES
withEquivalent: nil
abstract: NO
withEquivalent: SoPerm_AddDocumentsImagesAndFiles
asChildOf: davElement (@"all", @"DAV:")];
[aclManager registerDAVPermission: davElement (@"bind", @"DAV:")
abstract: NO