Skip to content

Commit a5af5da

Browse files
committed
Merge branch 'master' of https://github.com/inverse-inc/sogo
2 parents c0e8eb6 + 4be2ddb commit a5af5da

File tree

42 files changed

+365
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+365
-184
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Enchancements
1313
- better iOS invitations handling regarding part state (#2852)
1414
- fixed Mac OS X Calendar delegation issue (#2837)
1515
- converted ODT documentation to AsciiDoc format
16+
- updated Czech, Dutch, Finnish, French, German, Hungarian, Norwegian (Bokmal), Polish, Russian, and
17+
Spanish (Spain) translations
1618

1719
Bug fixes
1820
- fixed sending mails to multiple recipients over AS

SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,40 +28,40 @@ vtodo_class2 = "(Konfidensiell oppgave)";
2828
/* Invitation */
2929
"Event Invitation: \"%{Summary}\"" = "Hendelseinvitasjon: \"%{Summary}\"";
3030
"(sent by %{SentBy}) " = "(sendt av %{SentBy})";
31-
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.⏎ ⏎ Start: %{StartDate}⏎ Slutt: %{EndDate}⏎ Beskrivelse: %{Description}";
31+
"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.\n\nStart: %{StartDate}\nSlutt: %{EndDate}\nBeskrivelse: %{Description}";
3232
"%{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} klokken %{StartTime}\nSlutt: %{EndDate} klokken %{EndTime}\nBeskrivelse: %{Description}";
3333

3434
/* Deletion */
3535
"Event Cancelled: \"%{Summary}\"" = "Hendelse avlyst: \"%{Summary}\"";
3636
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
37-
= "%{Organizer} %{SentByText} har avlyst hendelsen: %{Summary}.⏎ ⏎ Start: %{StartDate}⏎ Slutt: %{EndDate}⏎ Beskrivelse: %{Description}";
37+
= "%{Organizer} %{SentByText} har avlyst hendelsen: %{Summary}.\n\nStart: %{StartDate}\nSlutt: %{EndDate}\nBeskrivelse: %{Description}";
3838
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
3939
= "%{Organizer} %{SentByText} har avlyst : %{Summary}.\n\nStart: %{StartDate} klokken %{StartTime}\nEnd: %{EndDate} klokken %{EndTime}\nBeskrivelse: %{Description}";
4040

4141
/* Update */
4242
"The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
43-
= "Avtalen \"%{Summary}\", %{OldStartDate} er endret";
43+
= "Avtalen \"%{Summary}\", %{OldStartDate} har endret seg";
4444
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
45-
= "Avtalen \"%{Summary}\" for %{OldStartDate} klokken %{OldStartTime} er endret.";
45+
= "Avtalen \"%{Summary}\" for %{OldStartDate} klokken %{OldStartTime} har endret seg";
4646
"The following parameters have changed in the \"%{Summary}\" meeting:"
47-
= "Følgende parametre er endret for \"%{Summary}\"-møtet:";
47+
= "Følgende parametre har endret seg for \"%{Summary}\" møtet:";
4848
"Please accept or decline those changes."
4949
= "Vennligst godta eller avvis endringene.";
5050

5151
/* Reply */
5252
"Accepted invitation: \"%{Summary}\"" = "Aksepterte invitasjonen: \"%{Summary}\"";
5353
"Declined invitation: \"%{Summary}\"" = "Avviste invitasjonen: \"%{Summary}\"";
5454
"Delegated invitation: \"%{Summary}\"" = "Delegerte invitasjonen: \"%{Summary}\"";
55-
"Not yet decided on invitation: \"%{Summary}\"" = "Fortsatt ikke svart på invitasjonen: \"%{Summary}";
55+
"Not yet decided on invitation: \"%{Summary}\"" = "Har enda ikke svart på invitasjonen: \"%{Summary}";
5656
"%{Attendee} %{SentByText}has accepted your event invitation."
57-
= "%{Attendee} %{SentByText} har godtatt invitasjonen.";
57+
= "%{Attendee} %{SentByText} har godtatt invitasjonen din.";
5858
"%{Attendee} %{SentByText}has declined your event invitation."
59-
= "%{Attendee} %{SentByText} har avvist invitasjonen.";
59+
= "%{Attendee} %{SentByText} har avvist invitasjonen din.";
6060
"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
6161
= "%{Attendee} %{SentByText} har delegert invitasjonen til %{Delegate}.";
6262
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
63-
= "%{Attendee} %{SentByText} har ikke svart på invitasjonen.";
63+
= "%{Attendee} %{SentByText} har enda ikke svart på invitasjonen din.";
6464

6565
/* Resources */
66-
"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Kan ikke tilgang til ressurs: \"%{Cn} %{SystemEmail}\"";
67-
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Maksimum antall samtidige reservasjoner (%{NumberOfSimultaneousBookings}) er nådd for ressursen \"%{Cn} %{SystemEmail}\". Kolliderende hendelse er \"%{EventTitle}\", som starter %{StartDate}.";
66+
"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Har ikke tilgang til ressurs: \"%{Cn} %{SystemEmail}\"";
67+
"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Maksimum antall samtidige reservasjoner (%{NumberOfSimultaneousBookings}) er nådd for ressursen \"%{Cn} %{SystemEmail}\". Den kolliderende hendelsen er \"%{EventTitle}\", og starter %{StartDate}.";

SoObjects/Appointments/Russian.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"Inviting the following persons is prohibited:" = "Приглашение следующих лиц запрещено:";
12
"Personal Calendar" = "Персональный календарь";
23
vevent_class0 = "(Публичное событие)";
34
vevent_class1 = "(Личное событие)";

UI/AdministrationUI/NorwegianBokmal.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
"ACLs_title" = "Håndtering av adgangsrettigheter for brukermapper";
1313

1414
/* Modules descriptions */
15-
"ACLs_description" = "<p>Administrasjonsmodulen for adgangsrettigheter muliggjør endring av adgangsrettigheter for brukerens kalendre og adressebøker.</p><p>For å endre adgangsrettigheter for en brukermappe, skriv brukernavnet i søkefeltet oppe i vinduet og dobbelklikk på ønskede mappe.</p>";
15+
"ACLs_description" = "<p>Administrasjonsmodulen for adgangsrettigheter muliggjør endring av adgangsrettigheter for brukerens kalendre og adressebøker.</p><p>For å endre adgangsrettigheter for en bruker sin mappe, skriv brukernavnet i søkefeltet i toppen vinduet og dobbelklikk på den ønskede mappen.</p>";

UI/Common/Czech.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 minut";
8989
"45 minutes" = "45 minut";
9090
"1 hour" = "1 hodinu";
91-
91+
"1 day" = "1 den";
9292

9393
/* common buttons */
9494
"OK" = "OK";

UI/Common/Dutch.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 minuten";
8989
"45 minutes" = "45 minuten";
9090
"1 hour" = "1 uur";
91-
91+
"1 day" = "1 dag";
9292

9393
/* common buttons */
9494
"OK" = "OK";

UI/Common/Finnish.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 minuuttia";
8989
"45 minutes" = "45 minuuttia";
9090
"1 hour" = "1 tunti";
91-
91+
"1 day" = "1 päivä";
9292

9393
/* common buttons */
9494
"OK" = "OK";

UI/Common/French.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 minutes";
8989
"45 minutes" = "45 minutes";
9090
"1 hour" = "1 heure";
91-
91+
"1 day" = "1 jour";
9292

9393
/* common buttons */
9494
"OK" = "OK";

UI/Common/German.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 Minuten";
8989
"45 minutes" = "45 Minuten";
9090
"1 hour" = "1 Stunde";
91-
91+
"1 day" = "1 Tag";
9292

9393
/* common buttons */
9494
"OK" = "OK";

UI/Common/Hungarian.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"30 minutes" = "30 perc";
8989
"45 minutes" = "45 perc";
9090
"1 hour" = "1 óra";
91-
91+
"1 day" = "1 nap";
9292

9393
/* common buttons */
9494
"OK" = "Ok";

0 commit comments

Comments
 (0)