Merge branch 'Alinto:master' into master

UI/Scheduler/Danish.lproj/Localizable.strings

@@ -4,33 +4,43 @@
 "Create a new event" = "Opret en ny begivenhed";
 "Create a new task" = "Opret en ny opgave";
 "Edit this event or task" = "Rediger denne begivenhed eller opgave";
+"Print the current calendar view" = "Udskriv den aktuelle kalendervisning";
 "Delete this event or task" = "Slet denne begivenhed eller opgave";
 "Go to today" = "Gå til i dag";
 "Switch to day view" = "Skift til dagsvisning";
 "Switch to week view" = "Skift til ugevisning";
 "Switch to month view" = "Skift til månedsvisning";
+"Switch to multi-columns day view" = "Skift til dagsvisning med flere kolonner";
 "Reload all calendars" = "Genindlæs alle kalendere";
+
 /* Tabs */
 "Date" = "Dato";
 "Calendars" = "Kalendere";
+"No events for selected criteria" = "Ingen begivenheder for udvalgte kriterier";
+"No tasks for selected criteria" = "Ingen opgaver for udvalgte kriterier";
+
 /* Day */
 "DayOfTheMonth" = "Dag i måneden";
 "dayLabelFormat" = "%m/%d/%Y";
 "today" = "I dag";
 "Previous Day" = "Forrige dag";
 "Next Day" = "Næste dag";
+
 /* Week */
 "Week" = "Uge";
 "this week" = "Denne uge";
 "Week %d" = "Uge%d";
 "Previous Week" = "Forrige uge";
 "Next Week" = "Næste uge";
+
 /* Month */
 "this month" = "Denne måned";
 "Previous Month" = "Forrige måned";
 "Next Month" = "Næste måned";
+
 /* Year */
 "this year" = "I år";
+
 /* Menu */
 "Calendar" = "Kalender";
 "Contacts" = "Kontakter";
@@ -53,11 +63,20 @@
 "A total of %{0} events were imported in the calendar." = "I alt %{0} begivenheder blev importeret i kalenderen.";
 "Compose E-Mail to All Attendees" = "Skriv besked til alle deltagere";
 "Compose E-Mail to Undecided Attendees" = "Skriv besked til ikke ubestemte deltagere";
+
+/* Relative dates */
+"Yesterday" = "I går";
+"Today" = "I dag";
+"Tomorrow" = "I morgen";
+"Last %@" = "Sidste %@";
+
 /* Folders */
 "Personal calendar" = "Personlig kalender";
+
 /* Misc */
 "OpenGroupware.org" = "OpenGroupware.org";
 "Forbidden" = "Forbudt";
+
 /* acls */
 "Access rights to" = "Adgangsrettigheder til";
 "For user" = "For bruger";
@@ -80,12 +99,15 @@
 = "Denne person kan oprette emner i min kalender.";
 "This person can erase objects from my calendar."
 = "Denne person kan slette emner fra min kalender.";
+
 /* Button Titles */
 "Subscribe to a Calendar..." = "Abonnér på en kalender ...";
 "Remove the selected Calendar" = "Fjern den valgte kalender";
+"New calendar" = "Ny kalender";
 "Name of the Calendar" = "Navn på Kalender";
 "new" = "Ny";
-"printview" = "Udskriftsvisning";
+"Print view" = "Udskriftsvisning";
+"Print" = "Udskriv";
 "edit" = "Redigér";
 "delete" = "Slet";
 "proposal" = "Forslag";
@@ -95,8 +117,11 @@
 "Attach" = "Vedhæft";
 "Update" = "Opdatér";
 "Cancel" = "Annullér";
+"Reset" = "Nustil";
+"Save" = "Gem";
 "show_rejected_apts" = "Vis afviste aftaler";
 "hide_rejected_apts" = "Skjul afviste aftaler";
+
 /* Schedule */
 "Schedule" = "Planlæg";
 "No appointments found" = "Ingen fundne aftaler";
@@ -109,6 +134,22 @@
 "more attendees" = "Flere deltagere";
 "Hide already accepted and rejected appointments" = "Skjul allerede accepterede og afviste aftaler";
 "Show already accepted and rejected appointments" = "Vis allerede accepterede og afviste aftaler";
+
+/* Print view */
+"LIST" = "Liste";
+"Print Settings" = "Udskriftsindstillinger";
+"Title" = "Titel";
+"Layout" = "Opsætning";
+"What to Print" = "Hvad skal udskrives";
+"Options" = "Indstillinger";
+"Tasks with no due date" = "Opgaver uden forfaldsdato";
+"Display working hours only" = "Vis kun arbejdstimer";
+"Completed tasks" = "Udførte opgaver ";
+"Display events and tasks colors" = "Vis farvemarkeret begivenheder og opgaver ";
+"Borders" = "Grænser";
+"Backgrounds" = "Baggrunde";
+"Page Format" = "Sideformat";
+
 /* Appointments */
 "Appointment viewer" = "Aftale viser";
 "Appointment editor" = "Aftale editor";
@@ -117,12 +158,12 @@
 "Start" = "Start";
 "End" = "Slut";
 "Due Date" = "Forfaldsdato";
-"Title" = "Titel";
 "Name" = "Navn";
 "Email" = "E-mail";
 "Status" = "Status";
 "% complete" = "% Færdig";
 "Location" = "Sted";
+"Add a category" = "Tilføj en kategori";
 "Priority" = "Prioritet";
 "Privacy" = "Beskyttelse af personlige oplysninger";
 "Cycle" = "Cyklus";
@@ -140,19 +181,25 @@
 "Reminder" = "Påmindelse";
 "General" = "Generelt";
 "Reply" = "Svar";
+"Created by" = "Oprettet af";
+"You are invited to participate" = "Du er inviteret til at deltage";
 "Target" = "Mål";
 "attributes" = "attributter";
 "attendees" = "deltagere";
 "delegated from" = "delegeret fra";
+
 /* checkbox title */
 "is private" = "er privat";
+
 /* classification */
 "Public" = "Offentlig";
 "Private" = "Privat";
+
 /* text used in overviews and tooltips */
 "empty title" = "Tom titel";
 "private appointment" = "Privat aaftale";
 "Change..." = "Skift ...";
+
 /* Appointments (participation state) */
 "partStat_NEEDS-ACTION" = "Jeg vil bekræfte senere";
 "partStat_ACCEPTED" = "Jeg vil deltage";
@@ -160,10 +207,12 @@
 "partStat_TENTATIVE" = "Jeg vil måske deltage";
 "partStat_DELEGATED" = "Jeg uddelegerer";
 "partStat_OTHER" = "Andre";
+
 /* Appointments (error messages) */
 "Conflicts found!" = "Konflikter fundet!";
 "Invalid iCal data!" = "Ugyldig iCal data!";
 "Could not create iCal data!" = "Kunne ikke oprette iCal data!";
+
 /* Searching */
 "view_all" = "Alle";
 "view_today" = "I dag";
@@ -171,23 +220,35 @@
 "view_next14" = "Næste 14 dage";
 "view_next31" = "Næste 31 dage";
 "view_thismonth" = "Denne måned";
+"view_thisyear" = "Dette år";
+"view_last7" = "Sidste 7 dage";
+"view_last14" = "Sidste 14 dage";
+"view_last31" = "Sidste 31 dage";
+"view_lastmonth" = "Sidste måned";
+"view_lastyear" = "Sidste år ";
 "view_future" = "Alle fremtidige begivenheder";
 "view_selectedday" = "Valgte dag";
+"view_not_started" = "Ikke påbegyndte opgaver";
+"view_overdue" = "Forfaldne opgaver";
+"view_incomplete" = "Ikke udførte opgaver";
 "View" = "Vis";
-"Title or Description" = "Titel eller Beskrivelse";
+"Title, category or location" = "Titel, kategori eller placering";
+"Entire content" = "Hele indholdet";
 "Search" = "Søg";
 "Search attendees" = "Søg deltagere";
 "Search resources" = "Søg ressourcer";
 "Search appointments" = "Søg aftaler";
 "All day Event" = "Heldags arrangement";
 "check for conflicts" = "Kontrollér for konflikter";
-"Browse URL" = "Gennemse URL";
+"URL" = "URL";
 "newAttendee" = "Tilføj deltager";
+
 /* calendar modes */
 "Overview" = "Oversigt";
 "Chart" = "Top";
 "List" = "Liste";
 "Columns" = "Kolonner";
+
 /* Priorities */
 "prio_0" = "Ikke specificeret";
 "prio_1" = "Høj";
@@ -199,6 +260,7 @@
 "prio_7" = "Lav";
 "prio_8" = "Lav";
 "prio_9" = "Lav";
+
 /* access classes (privacy) */
 "PUBLIC_vevent" = "Offentlig begivenhed";
 "CONFIDENTIAL_vevent" = "Hemmelig begivenhed";
@@ -206,6 +268,7 @@
 "PUBLIC_vtodo" = "Offentlig opgave";
 "CONFIDENTIAL_vtodo" = "Hemmelig opgave";
 "PRIVATE_vtodo" = "Privat opgave";
+
 /* status type */
 "status_" = "Ikke specificeret";
 "status_NOT-SPECIFIED" = "Ikke specificeret";
@@ -215,6 +278,16 @@
 "status_NEEDS-ACTION" = "Kræver handling";
 "status_IN-PROCESS" = "I gang";
 "status_COMPLETED" = "Afsluttet den";
+
+/* Priority level */
+"low" = "Lav";
+
+/* Priority level */
+"normal" = "Normal";
+
+/* Priority level */
+"high" = "Høj";
+
 /* Cycles */
 "cycle_once" = "cycle_once";
 "cycle_daily" = "cycle_daily";
@@ -229,6 +302,7 @@
 "Recurrence pattern" = "Gentagelsesmønster";
 "Range of recurrence" = "Gentagelsesinterval";
 "Daily" = "Dagligt";
+"Multi-Columns" = "Multikolonner";
 "Weekly" = "Ugentligt";
 "Monthly" = "Månedligt";
 "Yearly" = "Årligt";
@@ -237,20 +311,30 @@
 "Week(s)" = "Uge(r)";
 "On" = "den";
 "Month(s)" = "Måned (er)";
+
+/* [Event recurrence editor] Ex: _The_ first Sunday */
 "The" = "Den";
 "Recur on day(s)" = "Gentages på dag(e)";
 "Year(s)" = "År";
+
+/* [Event recurrence editor] Ex: Every first Sunday _of_ April */
 "cycle_of" = "af";
 "No end date" = "Ingen slutdato";
 "Create" = "Opret";
 "appointment(s)" = "aftale(r)";
 "Repeat until" = "Gentag indtil";
+"End Repeat" = "Stop gentag";
+"Never" = "Aldrig";
+"After" = "Efter";
+"On Date" = "På dato";
+"times" = "Tiden";
 "First" = "Første";
 "Second" = "Anden";
 "Third" = "Tredje";
 "Fourth" = "Fjerde";
 "Fift" = "Femte";
 "Last" = "Sidste";
+
 /* Appointment categories */
 "category_none" = "Ingen";
 "category_labels" = "Jubilæum, fødselsdag, forretning, kald, klienter, konkurrence, kunde, favoritter, opfølgning, gaver, helligdage, idéer, møde, problemer, diverse, personlig, projekter, offentlig helligdag, status, Leverandører, Rejser, Ferie";
@@ -263,6 +347,7 @@
 "repeat_YEARLY" = "Årligt";
 "repeat_CUSTOM" = "Tilpasset ...";
 "reminder_NONE" = "Ingen påmindelse";
+"reminder_0" = "På tidspunktet for begivenheden";
 "reminder_5_MINUTES_BEFORE" = "5 minutter før";
 "reminder_10_MINUTES_BEFORE" = "10 minutter før";
 "reminder_15_MINUTES_BEFORE" = "15 minutter før";
@@ -279,6 +364,7 @@
 "reminder_MINUTES" = "Minutter";
 "reminder_HOURS" = "Timer";
 "reminder_DAYS" = "Dage";
+"reminder_WEEKS" = "Uger";
 "reminder_BEFORE" = "Før";
 "reminder_AFTER" = "Efter";
 "reminder_START" = "Begivenheden starter";
@@ -294,20 +380,40 @@
 "zoom_100" = "100%";
 "zoom_50" = "50%";
 "zoom_25" = "25%";
+
+/* Arial label for reminder units */
+"Reminder units" = "Påmindelsesenheder";
+
+/* Aria label for reminder time position (after or before) */
+"Reminder position" = "Påmindelsesposition";
+
+/* Aria label for reminder relation with event (start or end) */
+"Reminder relation" = "Påmindelsesforhold";
+
 /* transparency */
 "Show Time as Free" = "Vis tidspunkt som ledig";
+
+/* email notifications */
+"Send Appointment Notifications" = "Send aftalenotifikationer";
+"From" = "Fra";
+"To" = "Til";
+
 /* validation errors */
 validate_notitle           = "Ingen titel er indtastet, vil du fortsætte?";
 validate_invalid_startdate = "Forkert startdato!";
 validate_invalid_enddate   = "Forkert slutdato!";
 validate_endbeforestart    = "Indtastet slutdato ligger før startdato.";
+validate_untilbeforeend    = "Gentagelsen skal slutte efter den første forekomst.";
+
 "Events" = "Opgaver";
 "Tasks" = "Opgaver";
 "Show completed tasks" = "Vis udførte opgaver";
+
 /* tabs */
 "Task" = "Opgave";
 "Event" = "Begivenhed";
 "Recurrence" = "Gentagelse";
+
 /* toolbar */
 "New Event" = "Ny begivenhed";
 "New Task" = "Ny opgave";
@@ -318,7 +424,11 @@ validate_endbeforestart    = "Indtastet slutdato ligger før startdato.";
 "Week View" = "Ugevisning";
 "Month View" = "Månedsvisning";
 "Reload" = "Opdatér";
+
+/* Number of selected components in events or tasks list */
+"selected" = "Valgte";
 "eventPartStatModificationError" = "Din deltagelsesstatus kunne ikke ændres.";
+
 /* menu */
 "New Event..." = "Ny begivenhed ...";
 "New Task..." = "Ny opgave ...";
@@ -334,19 +444,53 @@ validate_endbeforestart    = "Indtastet slutdato ligger før startdato.";
 = "Du kan ikke fjerne eller afmelde din personlige kalender.";
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "Er du sikker på du vil slette kalenderen \"%{0}\"?";
-/* Legend */
+"Are you sure you want to delete the selected components?"
+= "Er du sikker på, at du vil slette de valgte elementer?";
+
+/* Participation role */
+"Role" = "Rolle";
+
+/* Participant role: participation is required */
 "Participant" = "Deltager";
+
+/* Participant role: participation is required */
+"req-participant" = "Deltager";
+
+/* Participant role: participation is optional */
 "Optional Participant" = "Valgfri deltager";
+
+/* Participant role: participation is optional */
+"opt-participant" = "Valgfri deltager";
+
+/* Participant role: participant is copied for information purposes only */
 "Non Participant" = "Deltager ikke";
+
+/* Participant role: participant is copied for information purposes only */
+"non-participant" = "Deltager ikke";
+
+/* Participant role: participant is chair of the calendar entity */
 "Chair" = "Sæde";
+
+/* Participant role: participant is chair of the calendar entity */
+"chair" = "Formand";
+
+/* Participant status: needs action */
 "Needs action" = "Kræver handling";
+
+/* Participant status: event accepted */
 "Accepted" = "Accepteret";
+
+/* Participant status: event declined */
 "Declined" = "Afvist";
+
+/* Participant status: tentatively accepted */
 "Tentative" = "Tentativ";
+
 "Free" = "Ledig";
 "Busy" = "Optaget";
 "Maybe busy" = "Måske optaget";
 "No free-busy information" = "Ingen ledig/optaget information ";
+
 /* FreeBusy panel buttons and labels */
 "Suggest time slot" = "Foreslå tidsinterval";
 "Zoom" = "Zoom";
@@ -360,11 +504,18 @@ validate_endbeforestart    = "Indtastet slutdato ligger før startdato.";
 "and" = "og";
 "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
 = "En tidskonflikt med en eller flere deltagere. \nBehold de aktuelle indstillinger alligevel?";
-/* apt list */
+"Would you like to remove them and send the invitation to the remaining attendees?"
+= "Vil du fjerne dem og sende invitationen til de resterende deltagere?";
+
+/* events list */
+"Due" = "På grund";
 "(Private Event)" = "(Privat begivenhed)";
 vevent_class0 = "(Offentlig begivenhed)";
 vevent_class1 = "(Privat begivenhed)";
 vevent_class2 = "(Hemmelig begivenhed)";
+
+/* tasks list */
+"Descending Order" = "Faldende rækkefølge";
 vtodo_class0 = "(Offentlig opgave)";
 vtodo_class1 = "(Privat opgave)";
 vtodo_class2 = "(Hemmelig opgave)";
@@ -374,12 +525,17 @@ vtodo_class2 = "(Hemmelig opgave)";
 "editRepeatingItem" = "Det element, du redigerer, er et gentaget element. Ønsker du at redigere alle forekomster af det eller kun dette ene tilfælde?";
 "button_thisOccurrenceOnly" = "Kun denne forekomst";
 "button_allOccurrences" = "Alle forekomster";
+"Edit This Occurrence" = "Rediger denne begivenhed";
+"Edit All Occurrences" = "Rediger alle begivenheder";
+"Update This Occurrence" = "Opdater denne begivenhed";
+"Update All Occurrences" = "Opdater alle begivenheder";
+
 /* Properties dialog */
 "Color" = "Farve";
 "Include in free-busy" = "Medtag i ledig-optaget";
 "Synchronization" = "Synkronisering";
 "Synchronize" = "Synkronisér";
-"Tag:" = "Mærke";
+"Tag" = "Mærke";
 "Display" = "Display";
 "Show alarms" = "Vis alarmer";
 "Show tasks" = "Vis opgaver";
@@ -387,11 +543,23 @@ vtodo_class2 = "(Hemmelig opgave)";
 "Receive a mail when I modify my calendar" = "Modtag en mail, når jeg ændrer min kalender";
 "Receive a mail when someone else modifies my calendar" = "Modtag en mail, når andre ændrer min kalender";
 "When I modify my calendar, send a mail to" = "Når jeg ændrer min kalender, så send en mail til";
+"Email Address" = "Emailadresser";
+"Export" = "Eksportér";
+
+
+/* Show only the calendar for which the menu is displayed */
+"Show Only This Calendar" = "Vis kun denne kalender";
+
+
+/* Show all calendar (personal, subscriptions and web) */
+"Show All Calendars" = "Vis alle kalendere";
+
 "Links to this Calendar" = "Links til denne kalender";
 "Authenticated User Access" = "Godkendt brugeradgang";
 "CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Angiv venligst en numerisk værdi i feltet Dag(e) skal være større end eller lig med 1.";
 "weekFieldInvalid" = "Angiv venligst en numerisk værdi i feltet. Uge(r) skal være større end eller lig med 1.";
@@ -408,15 +576,80 @@ vtodo_class2 = "(Hemmelig opgave)";
 "tagWasRemoved" = "Hvis du fjerner denne kalender fra synkronisering, skal du genindlæse data på din mobile enhed.\nFortsæt?";
 "DestinationCalendarError" = "Kilde og destination kalendere er de samme. Prøv at kopiere til en anden kalender.";
 "EventCopyError" = "Kopieringen mislykkedes. Prøv at kopiér til en anden kalender.";
+"Please select at least one calendar" = "Vælg venligst mindst en kalender";
 "Open Task..." = "Åbn opgave ...";
 "Mark Completed" = "Markér afsluttet";
 "Delete Task" = "Slet opgave";
 "Delete Event" = "Slet begivenhed";
 "Copy event to my calendar" = "Kopiér begivenhed til min kalender";
 "View Raw Source" = "Vis kilde";
+"Move To" = "Flyt til";
+"Copy To" = "Kopier til";
+"Subscriptions" = "Abonnementer";
+"Subscribe to a shared calendar" = "Abonnér på en delt kalender";
 "Subscribe to a web calendar..." = "Abonnér på en online kalender ...";
 "URL of the Calendar" = "Kalenderens URL";
 "Web Calendar" = "Online kalender";
+"Web Calendars" = "Online kalendere";
 "Reload on login" = "Genindlæs ved login";
 "Invalid number." = "Ugyldigt nummer.";
 "Please identify yourself to %{0}" = "Identificer dig selv til %{0}";
+"quantity" = "Antal";
+"Current view" = "Nuværende visning";
+"Selected events and tasks" = "Valgte begivenheder og opgaver";
+"Custom date range" = "Tilpasset datointerval";
+"Select starting date" = "Vælg startdato";
+"Select ending date" = "Vælg slutdato";
+"Delegated to" = "Uddelegeret til";
+"Keep sending me updates" = "Fortsæt med at sende mig opdateringer";
+"OK" = "OK";
+"Confidential" = "Hemmelig";
+"Enable" = "Aktivér";
+"Filter" = "Filter";
+"Sort" = "Sortér";
+"Back" = "Tilbage";
+"Day" = "Dag";
+"Month" = "Måned";
+"New Appointment" = "Ny aftale";
+"filters" = "Filtre";
+"Today" = "I dag";
+"More options" = "Flere indstillinger";
+"Delete This Occurrence" = "Slet denne begivenhed";
+"Delete All Occurrences" = "Slet alle begivenheder";
+"Add Recurrence Date" = "Tilføj gentagelsesdato";
+"Add From" = "Tilføj fra";
+"Add Due" = "Tilføj forfald";
+"Import" = "Importer";
+"Rename" = "Omdøb";
+"Import Calendar" = "Importer kalender";
+"Select an ICS file." = "Vælg en ICS fil";
+
+/* Notification when user subscribes to a calendar */
+"Successfully subscribed to calendar" = "Tilmeldte sig kalenderen";
+
+/* Aria label for color chip button to select and unselect an event or task */
+"Toggle item" = "Skift element";
+
+/* Aria label for scope of search on events or tasks */
+"Search scope" = "Søgeomfang";
+
+/* Hotkey to create an event */
+"hotkey_create_event" = "e";
+
+/* Hotkey to create a task */
+"hotkey_create_task" = "t";
+
+/* Hotkey to go to today */
+"hotkey_today" = "n";
+
+/* Hotkey to switch to day view */
+"hotkey_dayview" = "d";
+
+/* Hotkey to switch to week view */
+"hotkey_weekview" = "w";
+
+/* Hotkey to switch to month view */
+"hotkey_monthview" = "m";
+
+/* Hotkey to switch to multicolumn day view */
+"hotkey_multicolumndayview" = "c";

UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings

@@ -12,29 +12,35 @@
 "Switch to month view" = "Endre til månedsvisning";
 "Switch to multi-columns day view" = "Bytt til multikolonne dags visning";
 "Reload all calendars" = "Last på nytt alle kalendre";
+
 /* Tabs */
 "Date" = "Dato";
 "Calendars" = "Kalendere";
 "No events for selected criteria" = "Ingen ";
 "No tasks for selected criteria" = "Ingen oppgaver for det valgte kriteriet";
+
 /* Day */
 "DayOfTheMonth" = "Dag i måneden";
 "dayLabelFormat" = "%Y-%m-%d";
 "today" = "Idag";
 "Previous Day" = "Forrige dag";
 "Next Day" = "Neste dag";
+
 /* Week */
 "Week" = "Uke";
 "this week" = "denne uken";
 "Week %d" = "Uke %d";
 "Previous Week" = "Forrige uke";
 "Next Week" = "Neste uke";
+
 /* Month */
 "this month" = "denne måneden";
 "Previous Month" = "Forrige måned";
 "Next Month" = "Neste måned";
+
 /* Year */
 "this year" = "dette år";
+
 /* Menu */
 "Calendar" = "Kalender";
 "Contacts" = "Kontakter";
@@ -57,11 +63,20 @@
 "A total of %{0} events were imported in the calendar." = "Totalt %{0} hendelser ble importert til kalenderen.";
 "Compose E-Mail to All Attendees" = "Skriv en e-post til alle deltakere";
 "Compose E-Mail to Undecided Attendees" = "Skriv en e-post til alle deltakere som ikke har svart";
+
+/* Relative dates */
+"Yesterday" = "I går";
+"Today" = "I dag";
+"Tomorrow" = "I morgen";
+"Last %@" = "Siste %@";
+
 /* Folders */
 "Personal calendar" = "Personlig kalender";
+
 /* Misc */
 "OpenGroupware.org" = "OpenGroupware.org";
 "Forbidden" = "Forbudt";
+
 /* acls */
 "Access rights to" = "Tilgangsrettigheter til";
 "For user" = "For bruker";
@@ -84,6 +99,7 @@
 = "Personen kan opprette objekter i min kalender.";
 "This person can erase objects from my calendar."
 = "Personen kan fjerne objekter i min kalender.";
+
 /* Button Titles */
 "Subscribe to a Calendar..." = "Abonnere på en kalender...";
 "Remove the selected Calendar" = "Slett markert kalender";
@@ -91,6 +107,7 @@
 "Name of the Calendar" = "Navn på kalenderen";
 "new" = "Ny";
 "Print view" = "Forhåndsvisning";
+"Print" = "Skriv ut";
 "edit" = "Endre";
 "delete" = "Slett";
 "proposal" = "Foreslå";
@@ -104,6 +121,7 @@
 "Save" = "Lagre";
 "show_rejected_apts" = "Vis avbrutte møter";
 "hide_rejected_apts" = "Skjul avbrutte møter";
+
 /* Schedule */
 "Schedule" = "Planlegg";
 "No appointments found" = "Ingen avtaler funnet";
@@ -116,6 +134,7 @@
 "more attendees" = "Flere deltagere";
 "Hide already accepted and rejected appointments" = "Skjul allerede aksepterte og avviste avtaler";
 "Show already accepted and rejected appointments" = "Vis aksepterte og avviste avtaler";
+
 /* Print view */
 "LIST" = "Liste";
 "Print Settings" = "Utskrift instillinger";
@@ -129,6 +148,8 @@
 "Display events and tasks colors" = "Vis hendelsers og oppgavers farger";
 "Borders" = "Grenser";
 "Backgrounds" = "Bakgrunner";
+"Page Format" = "Sideformat";
+
 /* Appointments */
 "Appointment viewer" = "Avtaleviser";
 "Appointment editor" = "Avtaleredigerer";
@@ -166,15 +187,19 @@
 "attributes" = "attributter";
 "attendees" = "deltakere";
 "delegated from" = "delegert fra";
+
 /* checkbox title */
 "is private" = "er privat";
+
 /* classification */
 "Public" = "Felles";
 "Private" = "Privat";
+
 /* text used in overviews and tooltips */
 "empty title" = "Ingen tittel";
 "private appointment" = "Privat møte";
 "Change..." = "Endre...";
+
 /* Appointments (participation state) */
 "partStat_NEEDS-ACTION" = "Jeg vil bekrefte senere";
 "partStat_ACCEPTED" = "Jeg vil delta";
@@ -182,10 +207,12 @@
 "partStat_TENTATIVE" = "Jeg kommer kanskje";
 "partStat_DELEGATED" = "Jeg delegerer";
 "partStat_OTHER" = "Annet";
+
 /* Appointments (error messages) */
 "Conflicts found!" = "Konflikter funnet!";
 "Invalid iCal data!" = "Ugyldig iCal-data!";
 "Could not create iCal data!" = "Kunne ikke opprette iCal-data!";
+
 /* Searching */
 "view_all" = "Alle";
 "view_today" = "I dag";
@@ -193,6 +220,12 @@
 "view_next14" = "Neste 14 dager";
 "view_next31" = "Neste 31 dager";
 "view_thismonth" = "Denne måneden";
+"view_thisyear" = "I år";
+"view_last7" = "Siste 7 dager";
+"view_last14" = "Siste 14 dager";
+"view_last31" = "Siste 31 dager";
+"view_lastmonth" = "Forrige måned";
+"view_lastyear" = "i fjor";
 "view_future" = "Alle fremtidige hendelser";
 "view_selectedday" = "Valgt dag";
 "view_not_started" = "Oppgaver som ikke er startet";
@@ -209,11 +242,13 @@
 "check for conflicts" = "Kontroller konflikter";
 "URL" = "URL";
 "newAttendee" = "Legg til deltakere";
+
 /* calendar modes */
 "Overview" = "Oversikt";
 "Chart" = "Diagram";
 "List" = "Liste";
 "Columns" = "Kolonner";
+
 /* Priorities */
 "prio_0" = "Ikke spesifisert";
 "prio_1" = "Høy";
@@ -225,6 +260,7 @@
 "prio_7" = "Lav";
 "prio_8" = "Lav";
 "prio_9" = "Lav";
+
 /* access classes (privacy) */
 "PUBLIC_vevent" = "Felles hendelse";
 "CONFIDENTIAL_vevent" = "Konfidensiell hendelse";
@@ -232,6 +268,7 @@
 "PUBLIC_vtodo" = "Felles oppgave";
 "CONFIDENTIAL_vtodo" = "Konfidensiell oppgave";
 "PRIVATE_vtodo" = "Privat oppgave";
+
 /* status type */
 "status_" = "Ikke angitt";
 "status_NOT-SPECIFIED" = "Ikke spesifisert";
@@ -241,6 +278,16 @@
 "status_NEEDS-ACTION" = "Trenger handling";
 "status_IN-PROCESS" = "Pågående";
 "status_COMPLETED" = "Utført";
+
+/* Priority level */
+"low" = "lav";
+
+/* Priority level */
+"normal" = "normal";
+
+/* Priority level */
+"high" = "høy";
+
 /* Cycles */
 "cycle_once" = "en gang";
 "cycle_daily" = "hver dag";
@@ -264,10 +311,12 @@
 "Week(s)" = "Uke(r)";
 "On" = "På";
 "Month(s)" = "Måned(er)";
+
 /* [Event recurrence editor] Ex: _The_ first Sunday */
 "The" = " Den";
 "Recur on day(s)" = "Gjentas på dag(er)";
 "Year(s)" = "År";
+
 /* [Event recurrence editor] Ex: Every first Sunday _of_ April */
 "cycle_of" = "av";
 "No end date" = "Ingen sluttdato";
@@ -285,6 +334,7 @@
 "Fourth" = "Fjerde";
 "Fift" = "Femte";
 "Last" = "Siste";
+
 /* Appointment categories */
 "category_none" = "Ingen";
 "category_labels" = "Arbeid,Diverse,Favoritter,Fødselsdager,Helgdager,Idéer,Konkurranser,Kunder,Ledighet,Leverandører,Oppfølging,Personlig,Presenter,Prosjekt,Møter,Reiser,Status,Telefonsamtaler,Ærend";
@@ -297,6 +347,7 @@
 "repeat_YEARLY" = "Hvert år";
 "repeat_CUSTOM" = "Valgfri...";
 "reminder_NONE" = "Ingen påminnelse";
+"reminder_0" = "På tidspunktet for hendelsen";
 "reminder_5_MINUTES_BEFORE" = "5 minutter før";
 "reminder_10_MINUTES_BEFORE" = "10 minutter før";
 "reminder_15_MINUTES_BEFORE" = "15 minutter før";
@@ -329,24 +380,40 @@
 "zoom_100" = "100%";
 "zoom_50" = "50%";
 "zoom_25" = "25%";
+
+/* Arial label for reminder units */
+"Reminder units" = "Påminnelsesenheter";
+
+/* Aria label for reminder time position (after or before) */
+"Reminder position" = "Påminnelsesposisjon ";
+
+/* Aria label for reminder relation with event (start or end) */
+"Reminder relation" = "Påminnelsesforhold";
+
 /* transparency */
 "Show Time as Free" = "Vis tid som ledig";
+
 /* email notifications */
 "Send Appointment Notifications" = "Send avtale varslinger";
 "From" = "Fra";
 "To" = "Til";
+
 /* validation errors */
 validate_notitle           = "Ingen tittel er angitt, fortsette?";
 validate_invalid_startdate = "Feil startdato!";
 validate_invalid_enddate   = "Feil sluttdato!";
 validate_endbeforestart    = "Angitt sluttdato inntreffer før angitt startdato.";
+validate_untilbeforeend    = "Gjentakelsen må avsluttes etter den første hendelsen";
+
 "Events" = "Hendelser";
 "Tasks" = "Oppgaver";
 "Show completed tasks" = "Vis utførte oppgave";
+
 /* tabs */
 "Task" = "Oppgave";
 "Event" = "Hendelse";
 "Recurrence" = "Regelmessighet";
+
 /* toolbar */
 "New Event" = "Ny hendelse";
 "New Task" = "Ny oppgave";
@@ -357,9 +424,11 @@ validate_endbeforestart    = "Angitt sluttdato inntreffer før angitt startdato.
 "Week View" = "Ukesvisning";
 "Month View" = "Månedsvisning";
 "Reload" = "Last på nytt";
+
 /* Number of selected components in events or tasks list */
 "selected" = "valgt";
 "eventPartStatModificationError" = "Din deltakerstatus kunne ikke endres.";
+
 /* menu */
 "New Event..." = "Ny hendelse...";
 "New Task..." = "Ny oppgave...";
@@ -375,19 +444,53 @@ validate_endbeforestart    = "Angitt sluttdato inntreffer før angitt startdato.
 = "Du kan ikke slette eller avbryte abonnement på en personlig kalender.";
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "Er du sikker på at du vil slette kalenderen \"%{0}\"?";
-/* Legend */
+"Are you sure you want to delete the selected components?"
+= "Er du sikker på at du vil slette de markerte komponentene? ";
+
+/* Participation role */
+"Role" = "Rolle";
+
+/* Participant role: participation is required */
 "Participant" = "Deltakelse kreves";
+
+/* Participant role: participation is required */
+"req-participant" = "Deltaker";
+
+/* Participant role: participation is optional */
 "Optional Participant" = "Deltakelse valgfritt";
+
+/* Participant role: participation is optional */
+"opt-participant" = "Valgfri deltaker ";
+
+/* Participant role: participant is copied for information purposes only */
 "Non Participant" = "Ingen deltakelse";
+
+/* Participant role: participant is copied for information purposes only */
+"non-participant" = "Ingen deltaker ";
+
+/* Participant role: participant is chair of the calendar entity */
 "Chair" = "Stol";
+
+/* Participant role: participant is chair of the calendar entity */
+"chair" = "Stol";
+
+/* Participant status: needs action */
 "Needs action" = "Trenger handling";
+
+/* Participant status: event accepted */
 "Accepted" = "Akseptert";
+
+/* Participant status: event declined */
 "Declined" = "Avvist";
+
+/* Participant status: tentatively accepted */
 "Tentative" = "Foreløpig";
+
 "Free" = "Ledig";
 "Busy" = "Opptatt";
 "Maybe busy" = "Kanskje opptatt";
 "No free-busy information" = "Ingen ledig/opptatt-informasjon";
+
 /* FreeBusy panel buttons and labels */
 "Suggest time slot" = "Foreslå tid";
 "Zoom" = "Forstørr";
@@ -401,12 +504,16 @@ validate_endbeforestart    = "Angitt sluttdato inntreffer før angitt startdato.
 "and" = "og";
 "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
 = "En tidskonflikt eksisterer med en eller flere deltakere.\nVil du likevel beholde de nåværende innstillingene?";
+"Would you like to remove them and send the invitation to the remaining attendees?"
+= "Vil du fjerne dem og sende invitasjonen til de gjenværende deltakerne? ";
+
 /* events list */
 "Due" = "Frist";
 "(Private Event)" = "(Privat hendelse)";
 vevent_class0 = "(Offentlig hendelse)";
 vevent_class1 = "(Privat hendelse)";
 vevent_class2 = "(Konfidensiell hendelse)";
+
 /* tasks list */
 "Descending Order" = "Synkende rekkefølge";
 vtodo_class0 = "(Offentlig oppgave)";
@@ -422,6 +529,7 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "Edit All Occurrences" = "Rediger alle forekomster";
 "Update This Occurrence" = "Oppdater denne forekomsten";
 "Update All Occurrences" = "Oppdater alle forekomster";
+
 /* Properties dialog */
 "Color" = "Farge";
 "Include in free-busy" = "Inkluder i fritt opptatt";
@@ -438,17 +546,20 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "Email Address" = "Epost addresse";
 "Export" = "Eksporter";
 
-/* Show only the calendar for which the menu is displayed */ 
-"Show Only This Calendar" = "Show Only This Calendar";
+
+/* Show only the calendar for which the menu is displayed */
+"Show Only This Calendar" = "Vis kun denne kalenderen";
+
 
 /* Show all calendar (personal, subscriptions and web) */
-"Show All Calendars" = "Show All Calendars";
+"Show All Calendars" = "Vis alle kalendere";
 
 "Links to this Calendar" = "Linker til denne kalenderen";
 "Authenticated User Access" = "Autentisert brukertilgang";
 "CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Angi en numerisk verdi i dagsfeltet større enn eller lik 1.";
 "weekFieldInvalid" = "Angi en numerisk verdi i ukefeltet større enn eller lik 1.";
@@ -472,8 +583,10 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "Delete Event" = "Slett hendelse";
 "Copy event to my calendar" = "Kopier hendelse til min kalender";
 "View Raw Source" = "Vis kilde";
+"Move To" = "Flytt til";
+"Copy To" = "Kopier til";
 "Subscriptions" = "Abonnementer";
-"Subscribe to a shared folder" = "Abonner på en delt mappe";
+"Subscribe to a shared calendar" = "Abonnere på en delt kalender";
 "Subscribe to a web calendar..." = "Abonnere på en internett-kalender...";
 "URL of the Calendar" = "URL til kalenderen";
 "Web Calendar" = "Internett-kalender";
@@ -503,6 +616,7 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "More options" = "Flere alternativer";
 "Delete This Occurrence" = "Slett denne forekomsten";
 "Delete All Occurrences" = "Slett alle forekomster";
+"Add Recurrence Date" = "Legg til gjentaksdato ";
 "Add From" = "Legg til avsender";
 "Add Due" = "Legg til frist";
 "Import" = "Importer";
@@ -517,4 +631,25 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "Toggle item" = "Toggle item";
 
 /* Aria label for scope of search on events or tasks */
-"Search scope" = "Search scope";
+"Search scope" = "Search scope";
+
+/* Hotkey to create an event */
+"hotkey_create_event" = "e";
+
+/* Hotkey to create a task */
+"hotkey_create_task" = "t";
+
+/* Hotkey to go to today */
+"hotkey_today" = "n";
+
+/* Hotkey to switch to day view */
+"hotkey_dayview" = "d";
+
+/* Hotkey to switch to week view */
+"hotkey_weekview" = "w";
+
+/* Hotkey to switch to month view */
+"hotkey_monthview" = "m";
+
+/* Hotkey to switch to multicolumn day view */
+"hotkey_multicolumndayview" = "c";

UI/Scheduler/Serbian.lproj/Localizable.strings

@@ -221,6 +221,11 @@
 "view_next31" = "Наредних 31 дан";
 "view_thismonth" = "Овог месеца";
 "view_thisyear" = "Ове године";
+"view_last7" = "Последњих 7 дана";
+"view_last14" = "Последњих 14 дана";
+"view_last31" = "Последњих 31 дан";
+"view_lastmonth" = "Прошли месец";
+"view_lastyear" = "Прошле године";
 "view_future" = "Сви будући догађаји";
 "view_selectedday" = "Изабрани дан";
 "view_not_started" = "Нема започетих задатака";
@@ -499,6 +504,8 @@ validate_untilbeforeend    = "Понављање се мора завршити
 "and" = "и";
 "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
 = "Конфликт времена постоји са једним или више учесника.\nДа ли желите да задржите тренутна подешавања у сваком случају?";
+"Would you like to remove them and send the invitation to the remaining attendees?"
+= "Да ли желите да их уклоните и пошаљете позив преосталим учесницима?";
 
 /* events list */
 "Due" = "Рок";
@@ -579,7 +586,7 @@ vtodo_class2 = "(Поверљиви задатак)";
 "Move To" = "Премести у";
 "Copy To" = "Копирај у";
 "Subscriptions" = "Претплате";
-"Subscribe to a shared folder" = "Претплати се на дељени директоријум";
+"Subscribe to a shared calendar" = "Претплати се на дељени календар";
 "Subscribe to a web calendar..." = "Претплати се на веб календар...";
 "URL of the Calendar" = "Линк ка календару";
 "Web Calendar" = "Веб календар";

UI/Scheduler/UIxCalMainView.m

@@ -32,6 +32,7 @@
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
 #import <Appointments/SOGoAppointmentFolders.h>
 
@@ -361,6 +362,20 @@
   return repeatFrequencies;
 }
 
+- (BOOL) isCalendarSharingEnabled {
+  BOOL result;
+  SOGoSystemDefaults *sd;
+
+  result = YES;
+  sd = [SOGoSystemDefaults sharedSystemDefaults];
+  if (nil != [sd disableSharing] 
+    && NSNotFound != [[sd disableSharing] indexOfObject: kDisableSharingCalendar]) {
+      result = NO;
+  }
+
+  return result;
+}
+
 @end
 
 /* Component Viewer, parent class of Appointment Viewer and Task Viewer */

UI/Scheduler/UIxCalendarSelector.m

@@ -182,7 +182,7 @@ _intValueFromHex (NSString *hexString)
           fActiveTasks = [folder activeTasks];
 
           [calendar setObject: folderName forKey: @"id"];
-          [calendar setObject: fDisplayName forKey: @"name"];
+          [calendar setObject: [fDisplayName stringWithoutHTMLInjection: YES] forKey: @"name"];
           [calendar setObject: [folder calendarColor] forKey: @"color"];
           isActive = [NSNumber numberWithBool: [folder isActive]];
           [calendar setObject: isActive forKey: @"active"];