Hello community, here is the log from the commit of package calendarsupport for openSUSE:Factory checked in at 2018-03-20 21:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calendarsupport (Old) and /work/SRC/openSUSE:Factory/.calendarsupport.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calendarsupport" Tue Mar 20 21:36:03 2018 rev:24 rq:585499 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/calendarsupport/calendarsupport.changes 2018-02-12 09:58:38.793333576 +0100 +++ /work/SRC/openSUSE:Factory/.calendarsupport.new/calendarsupport.changes 2018-03-20 21:36:05.578100737 +0100 @@ -1,0 +2,10 @@ +Thu Mar 08 23:51:00 CET 2018 - lbeltr...@kde.org + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * None + +------------------------------------------------------------------- Old: ---- calendarsupport-17.12.2.tar.xz New: ---- calendarsupport-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calendarsupport.spec ++++++ --- /var/tmp/diff_new_pack.cwgwjq/_old 2018-03-20 21:36:06.350072950 +0100 +++ /var/tmp/diff_new_pack.cwgwjq/_new 2018-03-20 21:36:06.354072806 +0100 @@ -20,13 +20,13 @@ %define lname libKF5CalendarSupport5 Name: calendarsupport -Version: 17.12.2 +Version: 17.12.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE PIM calendaring support library -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/KDE Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz @@ -66,7 +66,7 @@ %package -n %{lname} Summary: Library for handling calendaring in PIM applications -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries Requires: %{name} @@ -75,7 +75,7 @@ %package devel Summary: Development package for the KDEPIM Calendarsupport library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: akonadi-calendar-devel >= %{_kapp_version} ++++++ calendarsupport-17.12.2.tar.xz -> calendarsupport-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calendarsupport-17.12.2/CMakeLists.txt new/calendarsupport-17.12.3/CMakeLists.txt --- old/calendarsupport-17.12.2/CMakeLists.txt 2018-02-06 01:43:27.000000000 +0100 +++ new/calendarsupport-17.12.3/CMakeLists.txt 2018-03-06 01:31:28.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.2") +set(PIM_VERSION "5.7.3") project(calendarsupport VERSION ${PIM_VERSION}) @@ -26,18 +26,18 @@ set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION}) -set(AKONADI_MIMELIB_VERSION "5.7.2") -set(KDEPIM_LIB_VERSION "5.7.2") +set(AKONADI_MIMELIB_VERSION "5.7.3") +set(KDEPIM_LIB_VERSION "5.7.3") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.7.2") -set(CALENDARUTILS_LIB_VERSION "5.7.2") -set(KCALENDARCORE_LIB_VERSION "5.7.2") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.2") -set(KHOLIDAYS_LIB_VERSION "5.7.2") -set(AKONADICALENDAR_LIB_VERSION "5.7.2") -set(PIMCOMMON_LIB_VERSION "5.7.2") -set(AKONADI_VERSION "5.7.2") -set(KIMAP_LIB_VERSION "5.7.2") +set(KMIME_LIB_VERSION "5.7.3") +set(CALENDARUTILS_LIB_VERSION "5.7.3") +set(KCALENDARCORE_LIB_VERSION "5.7.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.3") +set(KHOLIDAYS_LIB_VERSION "5.7.3") +set(AKONADICALENDAR_LIB_VERSION "5.7.3") +set(PIMCOMMON_LIB_VERSION "5.7.3") +set(AKONADI_VERSION "5.7.3") +set(KIMAP_LIB_VERSION "5.7.3") find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools PrintSupport) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calendarsupport-17.12.2/po/nb/calendarsupport.po new/calendarsupport-17.12.3/po/nb/calendarsupport.po --- old/calendarsupport-17.12.2/po/nb/calendarsupport.po 2018-02-06 01:43:26.000000000 +0100 +++ new/calendarsupport-17.12.3/po/nb/calendarsupport.po 2018-03-06 01:31:27.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-08-31 03:04+0200\n" +"POT-Creation-Date: 2017-10-07 03:34+0200\n" "PO-Revision-Date: 2015-02-07 19:03+0100\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -19,19 +19,19 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: archivedialog.cpp:61 +#: archivedialog.cpp:59 #, kde-format msgctxt "@title:window" msgid "Archive/Delete Past Events and To-dos" msgstr "Arkiver/Slett gamle hendelser og gjøremål" -#: archivedialog.cpp:69 +#: archivedialog.cpp:67 #, kde-format msgctxt "@action:button" msgid "&Archive" msgstr "&Arkiver" -#: archivedialog.cpp:82 +#: archivedialog.cpp:80 #, kde-kuit-format msgctxt "@info:whatsthis" msgid "" @@ -44,7 +44,7 @@ "elementene bli lagt til de eksisterende. (<link url=\"#\">Hvordan " "gjenopprette</link>)" -#: archivedialog.cpp:88 +#: archivedialog.cpp:86 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -56,19 +56,19 @@ "kan se inn i et arkiv ved å åpne det på samme måte som for enhver annen " "kalender. Det lagres ikke i et spesialformat, men som vCalendar." -#: archivedialog.cpp:106 +#: archivedialog.cpp:105 #, kde-format msgctxt "@option:radio" msgid "Archive now items older than:" msgstr "Arkiver nå elementer eldre enn:" -#: archivedialog.cpp:110 +#: archivedialog.cpp:109 #, kde-format msgctxt "@info:tooltip" msgid "Enable one time archiving or purging of older items" msgstr "Slå på engangs-arkivering eller utrensing av eldre elementer" -#: archivedialog.cpp:113 +#: archivedialog.cpp:112 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -80,13 +80,13 @@ "arkivert eller renset ut. Elementene blir arkivert hvis valget«Bare slett» " "ikke er satt, ellers blir de slettet og ikke lagret." -#: archivedialog.cpp:123 +#: archivedialog.cpp:122 #, kde-format msgctxt "@info:tooltip" msgid "Set the one time archiving cut-off date" msgstr "Oppgi dato for engangs-arkivering" -#: archivedialog.cpp:126 +#: archivedialog.cpp:125 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -98,19 +98,19 @@ "eldre blir lagret og slettet, de som er nyere (og elementer som er på " "datoen) vil bli tatt vare på." -#: archivedialog.cpp:139 +#: archivedialog.cpp:138 #, kde-format msgctxt "@option:radio" msgid "Automaticall&y archive items older than:" msgstr "Arkiver automatisk &elementer eldre enn:" -#: archivedialog.cpp:143 +#: archivedialog.cpp:142 #, kde-format msgctxt "@info:tooltip" msgid "Enable automatic archiving or purging of older items" msgstr "Slå på automatisk arkivering eller sletting av eldre elementer" -#: archivedialog.cpp:146 +#: archivedialog.cpp:145 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -122,13 +122,13 @@ "hendelser og gjøremål skal arkiveres. Det betyr at du ikke trenger å bruke " "denne dialogboksen igjen, bortsett fra når du vil endre innstillingene." -#: archivedialog.cpp:161 +#: archivedialog.cpp:160 #, kde-format msgctxt "@info:tooltip" msgid "Set the archival age in days, weeks or months" msgstr "Oppgi arkiveringsalder i dager, uker eller måneder" -#: archivedialog.cpp:164 +#: archivedialog.cpp:163 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -138,37 +138,37 @@ "Alderen på hendelser og gjøremål som skal arkiveres. Alle eldre elementer " "blir lagret og slettet, de som er nyere vil bli tatt vare på." -#: archivedialog.cpp:171 +#: archivedialog.cpp:170 #, kde-format msgctxt "@info:tooltip" msgid "Set the units for the automatic archive age" msgstr "Oppgi alder-enheter for automatisk arkivering" -#: archivedialog.cpp:174 +#: archivedialog.cpp:173 #, kde-format msgctxt "@info:whatsthis" msgid "Select the time units (days, weeks or months) for automatic archiving." msgstr "Velg tidsenhet (dager, uker eller måneder) for automatisk arkivering." -#: archivedialog.cpp:177 +#: archivedialog.cpp:176 #, kde-format msgctxt "@item:inlistbox expires in daily units" msgid "Day(s)" msgstr "dag(er)" -#: archivedialog.cpp:179 +#: archivedialog.cpp:178 #, kde-format msgctxt "@item:inlistbox expiration in weekly units" msgid "Week(s)" msgstr "uke(r)" -#: archivedialog.cpp:181 +#: archivedialog.cpp:180 #, kde-format msgctxt "@item:inlistbox expiration in monthly units" msgid "Month(s)" msgstr "måned(er)" -#: archivedialog.cpp:186 +#: archivedialog.cpp:185 #, kde-format msgctxt "@label" msgid "Archive &file:" @@ -285,18 +285,18 @@ "Velg dette alternativet for å slette gamle hendelser og gjøremål uten å " "arkivere dem. Det er ikke mulig å hente inn igjen disse elementene senere." -#: archivedialog.cpp:302 +#: archivedialog.cpp:304 #, kde-format msgctxt "@info" msgid "The archive file name is not valid." msgstr "Arkivfilnavnet er ikke gyldig." -#: attachmenthandler.cpp:109 +#: attachmenthandler.cpp:108 #, kde-format msgid "No attachment named \"%1\" found in the incidence." msgstr "Fant ikke vedlegg med navnet «%1» i hendelsen." -#: attachmenthandler.cpp:119 +#: attachmenthandler.cpp:118 #, kde-format msgid "" "The attachment \"%1\" is a web link that is inaccessible from this computer. " @@ -304,7 +304,7 @@ "Invitasjonsvedlegget «%1» er en nettverkslenke som ikke er tilgjengelig fra " "denne maskinen. " -#: attachmenthandler.cpp:138 +#: attachmenthandler.cpp:137 #, kde-format msgid "" "The calendar invitation stored in this email message is broken in some way. " @@ -313,7 +313,7 @@ "Kalenderinvitasjonen som er lagret i denne e-postmeldinga er ødelagt på et " "vis. Kan ikke fortsette." -#: attachmenthandler.cpp:197 attachmenthandler.cpp:255 +#: attachmenthandler.cpp:198 attachmenthandler.cpp:256 #, kde-format msgid "Unable to create a temporary file for the attachment." msgstr "Klarte ikke opprette midlertidig fil for vedlegget." @@ -323,13 +323,13 @@ msgid "Save Attachment" msgstr "Lagre vedlegg" -#: calendarutils.cpp:265 +#: calendarutils.cpp:264 #, kde-format msgctxt "@info" msgid "Unable to purge to-dos with uncompleted children." msgstr "Kan ikke slette gjøremål som har ufullførte delgjøremål." -#: calendarutils.cpp:266 +#: calendarutils.cpp:265 #, kde-format msgctxt "@title:window" msgid "Delete To-do" @@ -425,7 +425,7 @@ msgid "There are no items before %1" msgstr "Det er ingen elementer før %1" -#: eventarchiver.cpp:178 +#: eventarchiver.cpp:179 #, kde-format msgid "" "Delete all items before %1 without saving?\n" @@ -434,7 +434,7 @@ "Slette alle elementer før %1 uten å lagre?\n" "Følgende elementer vil bli slettet:" -#: eventarchiver.cpp:182 +#: eventarchiver.cpp:183 #, kde-format msgid "Delete Old Items" msgstr "Slett gamle elementer" @@ -460,43 +460,43 @@ msgid "Archiving events" msgstr "Arkiverer hendelser" -#: freebusymodel/freebusycalendar.cpp:133 +#: freebusymodel/freebusycalendar.cpp:138 #, kde-format msgid "Free" msgstr "Ledig" -#: freebusymodel/freebusycalendar.cpp:136 +#: freebusymodel/freebusycalendar.cpp:141 #, kde-format msgid "Busy" msgstr "Opptatt" -#: freebusymodel/freebusycalendar.cpp:139 +#: freebusymodel/freebusycalendar.cpp:144 #, kde-format msgid "Unavailable" msgstr "Ikke tilgjengelig" -#: freebusymodel/freebusycalendar.cpp:142 +#: freebusymodel/freebusycalendar.cpp:147 #, kde-format msgid "Tentative" msgstr "" -#: freebusymodel/freebusycalendar.cpp:145 +#: freebusymodel/freebusycalendar.cpp:150 #, kde-format msgid "Unknown" msgstr "Ukjent" -#: freebusymodel/freebusyitemmodel.cpp:230 +#: freebusymodel/freebusyitemmodel.cpp:234 #, kde-format msgid "Attendee" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:145 +#: freebusymodel/freeperiodmodel.cpp:146 #, kde-format msgctxt "@label Day of the week name, example: Monday," msgid "%1," msgstr "" -#: freebusymodel/freeperiodmodel.cpp:160 +#: freebusymodel/freeperiodmodel.cpp:162 #, kde-format msgctxt "" "@label A time period duration. It is preceded/followed (based on the " @@ -505,7 +505,7 @@ msgid "%1 %2, %3 to %4" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:180 +#: freebusymodel/freeperiodmodel.cpp:183 #, kde-format msgctxt "" "@label A time period duration. KLocale is used to format the components. " @@ -513,25 +513,25 @@ msgid "%1, %2 %3, %4 to %5" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:194 +#: freebusymodel/freeperiodmodel.cpp:196 #, kde-format msgctxt "@info:tooltip" msgid "Free Period" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:196 +#: freebusymodel/freeperiodmodel.cpp:199 #, kde-format msgctxt "@info:tooltip period start time" msgid "Start:" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:199 +#: freebusymodel/freeperiodmodel.cpp:203 #, kde-format msgctxt "@info:tooltip period end time" msgid "End:" msgstr "" -#: freebusymodel/freeperiodmodel.cpp:202 +#: freebusymodel/freeperiodmodel.cpp:207 #, kde-format msgctxt "@info:tooltip period duration" msgid "Duration:" @@ -553,32 +553,32 @@ msgid "Summary" msgstr "Sammendrag" -#: kcalmodel.cpp:196 +#: kcalmodel.cpp:197 #, kde-format msgctxt "@title:column, calendar event start date and time" msgid "Start date and time" msgstr "Startdato og -tidspunkt" -#: kcalmodel.cpp:198 +#: kcalmodel.cpp:199 #, kde-format msgctxt "@title:column, calendar event end date and time" msgid "End date and time" msgstr "Sluttdato og -tidspunkt" -#: kcalmodel.cpp:200 +#: kcalmodel.cpp:201 #, kde-format msgctxt "@title:column, calendar event type" msgid "Type" msgstr "Type" #. i18n: ectx: label, entry (EmailControlCenter), group (Personal Settings) -#: kcalprefs.kcfg:16 +#: kcalprefs.kcfg:15 #, kde-format msgid "Use email settings from System Settings" msgstr "Bruk e-postinnstillinger fra Systeminnstillinger" #. i18n: ectx: whatsthis, entry (EmailControlCenter), group (Personal Settings) -#: kcalprefs.kcfg:17 +#: kcalprefs.kcfg:16 #, kde-format msgid "" "Check this box to use the KDE-wide e-mail settings, which are defined using " @@ -590,13 +590,13 @@ "boksen hvis du vil oppgi ditt fulle navn og e-postadresse." #. i18n: ectx: label, entry (StartTime), group (Default Datetimes) -#: kcalprefs.kcfg:25 +#: kcalprefs.kcfg:24 #, kde-format msgid "Default appointment time" msgstr "Standard avtaletid" #. i18n: ectx: whatsthis, entry (StartTime), group (Default Datetimes) -#: kcalprefs.kcfg:26 +#: kcalprefs.kcfg:25 #, kde-format msgid "" "Enter the default time for events here. The default is used if you do not " @@ -606,13 +606,13 @@ "starttid." #. i18n: ectx: label, entry (DefaultDuration), group (Default Datetimes) -#: kcalprefs.kcfg:31 +#: kcalprefs.kcfg:30 #, kde-format msgid "Default duration of new appointment (HH:MM)" msgstr "Standard varighet for ny avtale (TT:MM)" #. i18n: ectx: whatsthis, entry (DefaultDuration), group (Default Datetimes) -#: kcalprefs.kcfg:32 +#: kcalprefs.kcfg:31 #, kde-format msgid "" "Enter default duration for events here. The default is used if you do not " @@ -622,13 +622,13 @@ "sluttid." #. i18n: ectx: label, entry (defaultAudioFileReminders), group (Default Datetimes) -#: kcalprefs.kcfg:37 +#: kcalprefs.kcfg:36 #, kde-format msgid "Enable a default sound file for audio reminders" msgstr "Slå på en standard lydfil for lyd-påminnelser" #. i18n: ectx: whatsthis, entry (defaultAudioFileReminders), group (Default Datetimes) -#: kcalprefs.kcfg:38 +#: kcalprefs.kcfg:37 #, kde-format msgid "" "Check this box if you want to enable the specified file to be used as the " @@ -640,13 +640,13 @@ "Påminnelse-oppsettet som kan nås fra Hendelser- eller Gjøremål-redigeringene." #. i18n: ectx: label, entry (audioFilePath), group (Default Datetimes) -#: kcalprefs.kcfg:43 +#: kcalprefs.kcfg:42 #, kde-format msgid "Default audio file" msgstr "Standard lydfil" #. i18n: ectx: whatsthis, entry (audioFilePath), group (Default Datetimes) -#: kcalprefs.kcfg:44 +#: kcalprefs.kcfg:43 #, kde-format msgid "" "Set a file to be used as the default sound file for new reminders. You can " @@ -658,13 +658,13 @@ "Hendelser- eller Gjøremål-redigeringene." #. i18n: ectx: label, entry (defaultEventReminders), group (Default Datetimes) -#: kcalprefs.kcfg:48 +#: kcalprefs.kcfg:47 #, kde-format msgid "Enable reminders for new Events" msgstr "Slå på påminnelser for nye hendelser" #. i18n: ectx: whatsthis, entry (defaultEventReminders), group (Default Datetimes) -#: kcalprefs.kcfg:49 +#: kcalprefs.kcfg:48 #, kde-format msgid "" "Check this box if you want to enable reminders for all newly created Events. " @@ -674,19 +674,19 @@ "Du kan alltid slå av påminnelsene i dialogen for hendelsesredigering." #. i18n: ectx: tooltip, entry (defaultEventReminders), group (Default Datetimes) -#: kcalprefs.kcfg:50 +#: kcalprefs.kcfg:49 #, kde-format msgid "By default, enable reminders for new events" msgstr "Som standard, slå på påminnelser for nye hendelser" #. i18n: ectx: label, entry (defaultTodoReminders), group (Default Datetimes) -#: kcalprefs.kcfg:55 +#: kcalprefs.kcfg:54 #, kde-format msgid "Enable reminders for new To-dos" msgstr "Slå på påminnelser for nye gjøremål" #. i18n: ectx: whatsthis, entry (defaultTodoReminders), group (Default Datetimes) -#: kcalprefs.kcfg:56 +#: kcalprefs.kcfg:55 #, kde-format msgid "" "Check this box if you want to enable reminders for all newly created To-dos. " @@ -696,19 +696,19 @@ "Du kan alltid slå av påminnelsene i dialogen for gjøremålsredigering." #. i18n: ectx: tooltip, entry (defaultTodoReminders), group (Default Datetimes) -#: kcalprefs.kcfg:57 +#: kcalprefs.kcfg:56 #, kde-format msgid "By default, enable reminders for new to-dos" msgstr "Som standard, slå på påminnelser for nye gjøremål" #. i18n: ectx: label, entry (ReminderTime), group (Default Datetimes) -#: kcalprefs.kcfg:63 +#: kcalprefs.kcfg:62 #, kde-format msgid "Default reminder time" msgstr "Standard varslingstidspunkt" #. i18n: ectx: whatsthis, entry (ReminderTime), group (Default Datetimes) -#: kcalprefs.kcfg:64 +#: kcalprefs.kcfg:63 #, kde-format msgid "" "Enter the default reminder time for all newly created items. The time unit " @@ -718,13 +718,13 @@ "Tidsenheten spesifiseres i den tilhørende kombinasjonsboksen." #. i18n: ectx: tooltip, entry (ReminderTime), group (Default Datetimes) -#: kcalprefs.kcfg:65 +#: kcalprefs.kcfg:64 #, kde-format msgid "Default time for reminders" msgstr "Standard varslingstidspunkt" #. i18n: ectx: whatsthis, entry (ReminderTimeUnits), group (Default Datetimes) -#: kcalprefs.kcfg:70 +#: kcalprefs.kcfg:69 #, kde-format msgid "" "Enter the default reminder time units for all newly created items. The time " @@ -734,19 +734,19 @@ "Tiden spesifiseres i den tilhørende tallboksen." #. i18n: ectx: tooltip, entry (ReminderTimeUnits), group (Default Datetimes) -#: kcalprefs.kcfg:71 +#: kcalprefs.kcfg:70 #, kde-format msgid "Default time unit for reminders" msgstr "Standard tidsenhet for påminnelser" #. i18n: ectx: label, entry (DayBegins), group (Time & Date) -#: kcalprefs.kcfg:79 +#: kcalprefs.kcfg:78 #, kde-format msgid "Day begins at" msgstr "Dagen starter" #. i18n: ectx: whatsthis, entry (DayBegins), group (Time & Date) -#: kcalprefs.kcfg:80 +#: kcalprefs.kcfg:79 #, kde-format msgid "" "Enter the start time for events here. This time should be the earliest time " @@ -756,13 +756,13 @@ "tidspunktet som du bruker for hendelser." #. i18n: ectx: label, entry, group (Time & Date) -#: kcalprefs.kcfg:85 +#: kcalprefs.kcfg:84 #, kde-format msgid "Exclude holidays" msgstr "Ta ikke med helligdager" #. i18n: ectx: whatsthis, entry, group (Time & Date) -#: kcalprefs.kcfg:86 +#: kcalprefs.kcfg:85 #, kde-format msgid "" "Check this box to prevent KOrganizer from marking the working hours on " @@ -772,13 +772,13 @@ "helligdager." #. i18n: ectx: label, entry (Holidays), group (Time & Date) -#: kcalprefs.kcfg:91 +#: kcalprefs.kcfg:90 #, kde-format msgid "Use holiday region:" msgstr "Bruk fridagsregion:" #. i18n: ectx: whatsthis, entry (Holidays), group (Time & Date) -#: kcalprefs.kcfg:92 +#: kcalprefs.kcfg:91 #, kde-format msgid "" "Select from which region you want to use the holidays here. Defined holidays " @@ -788,13 +788,13 @@ "høytider vises som fridager i datonavigatøren, planleggerlista osv." #. i18n: ectx: label, entry, group (Group Scheduling) -#: kcalprefs.kcfg:99 +#: kcalprefs.kcfg:98 #, kde-format msgid "Use Groupware communication" msgstr "Bruk gruppevare-kommunikasjon" #. i18n: ectx: whatsthis, entry, group (Group Scheduling) -#: kcalprefs.kcfg:100 +#: kcalprefs.kcfg:99 #, kde-format msgid "" "Check this box to enable automatic generation of mails when creating, " @@ -808,25 +808,25 @@ "Kontact som en KDE Kolab-klient)." #. i18n: ectx: label, entry (SendPolicy), group (Group Scheduling) -#: kcalprefs.kcfg:105 +#: kcalprefs.kcfg:104 #, kde-format msgid "Default policy for invitations to other users:" msgstr "" #. i18n: ectx: label, entry (SendPolicy), group (Group Scheduling) -#: kcalprefs.kcfg:108 +#: kcalprefs.kcfg:107 #, kde-format msgid "Send mails without asking." msgstr "" #. i18n: ectx: label, entry (SendPolicy), group (Group Scheduling) -#: kcalprefs.kcfg:111 +#: kcalprefs.kcfg:110 #, kde-format msgid "Ask for every individual attendee what to do." msgstr "" #. i18n: ectx: label, entry (SendPolicy), group (Group Scheduling) -#: kcalprefs.kcfg:114 +#: kcalprefs.kcfg:113 #, kde-format msgid "" "Do not send invitation emails at all (this can break group scheduling for " @@ -834,19 +834,19 @@ msgstr "" #. i18n: ectx: label, entry (ShowTimeZoneSelectorInIncidenceEditor), group (Hidden Options) -#: kcalprefs.kcfg:127 +#: kcalprefs.kcfg:126 #, kde-format msgid "Show timezone selectors in the event and todo editor dialog." msgstr "Vis tidssonevelgere i redigeringsdialogen for hendelser og gjøremål." #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:135 +#: kcalprefs.kcfg:134 #, kde-format msgid "Regularly archive events" msgstr "Arkiver hendelser regelmessig" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:140 +#: kcalprefs.kcfg:139 #, kde-format msgid "" "If auto-archiving is enabled, events older than this amount will be " @@ -856,73 +856,73 @@ "arkiveres. Enheten til denne verdien er bestemt i et annet vindu." #. i18n: ectx: label, entry (ExpiryUnit), group (Archive Dialog) -#: kcalprefs.kcfg:145 +#: kcalprefs.kcfg:144 #, kde-format msgid "The unit in which the expiry time is expressed." msgstr "Enheten som utløpstiden angis i." #. i18n: ectx: label, entry (ExpiryUnit), group (Archive Dialog) -#: kcalprefs.kcfg:148 +#: kcalprefs.kcfg:147 #, kde-format msgid "In days" msgstr "I dager" #. i18n: ectx: label, entry (ExpiryUnit), group (Archive Dialog) -#: kcalprefs.kcfg:151 +#: kcalprefs.kcfg:150 #, kde-format msgid "In weeks" msgstr "I uker" #. i18n: ectx: label, entry (ExpiryUnit), group (Archive Dialog) -#: kcalprefs.kcfg:154 +#: kcalprefs.kcfg:153 #, kde-format msgid "In months" msgstr "I måneder" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:161 +#: kcalprefs.kcfg:160 #, kde-format msgid "URL of the file where old events should be archived" msgstr "Adressen til fila hvor gamle hendelser skal lagres" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:165 +#: kcalprefs.kcfg:164 #, kde-format msgid "Archive events" msgstr "Arkiver hendelser" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:170 +#: kcalprefs.kcfg:169 #, kde-format msgid "Archive to-dos" msgstr "Arkiver gjøremål" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:175 +#: kcalprefs.kcfg:174 #, kde-format msgid "What to do when archiving" msgstr "Hva skal gjøres ved arkivering" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:178 +#: kcalprefs.kcfg:177 #, kde-format msgid "Delete old events" msgstr "Slett gamle hendelser" #. i18n: ectx: label, entry, group (Archive Dialog) -#: kcalprefs.kcfg:181 +#: kcalprefs.kcfg:180 #, kde-format msgid "Archive old events to a separate file" msgstr "Arkiver gamle hendelser til en egen fil" #. i18n: ectx: label, entry (UserName), group (Internal Settings) -#: kcalprefs.kcfg:195 +#: kcalprefs.kcfg:194 #, kde-format msgid "Full &name" msgstr "Fullt &navn" #. i18n: ectx: whatsthis, entry (UserName), group (Internal Settings) -#: kcalprefs.kcfg:196 +#: kcalprefs.kcfg:195 #, kde-format msgid "" "Enter your full name here. This name will be displayed as \"Organizer\" in " @@ -931,19 +931,19 @@ "Skriv inn ditt fulle navn. Dette navnet vil vises som «Koordinator» i " "hendelser og gjøremål som du lager." -#: kcalprefs.kcfg:197 +#: kcalprefs.kcfg:196 #, kde-format msgid "Anonymous" msgstr "Anonym" #. i18n: ectx: label, entry (UserEmail), group (Internal Settings) -#: kcalprefs.kcfg:201 +#: kcalprefs.kcfg:200 #, kde-format msgid "E&mail address" msgstr "E-&postadresse" #. i18n: ectx: whatsthis, entry (UserEmail), group (Internal Settings) -#: kcalprefs.kcfg:202 +#: kcalprefs.kcfg:201 #, kde-format msgid "" "Enter here your e-mail address. This e-mail address will be used to identify " @@ -953,19 +953,19 @@ "identifisere kalenderens eier, og vil bli vist i hendelser og gjøremål som " "du lager." -#: kcalprefs.kcfg:203 +#: kcalprefs.kcfg:202 #, kde-format msgid "nobody@nowhere" msgstr "ukjent@ingensteds" #. i18n: ectx: label, entry, group (Colors) -#: kcalprefs.kcfg:221 +#: kcalprefs.kcfg:220 #, kde-format msgid "\"No category\" color (for \"Only category\" drawing schemes)" msgstr "«Ingen kategori»-farge (for tegneoppsett med «Bare kategori»)" #. i18n: ectx: whatsthis, entry, group (Colors) -#: kcalprefs.kcfg:222 +#: kcalprefs.kcfg:221 #, kde-format msgid "" "Select a color to use for the \"no category\" or \"unset category\" " @@ -979,7 +979,7 @@ "«Bare kategori»." #. i18n: ectx: tooltip, entry, group (Colors) -#: kcalprefs.kcfg:223 +#: kcalprefs.kcfg:222 #, kde-format msgid "Use this color when drawing items without a category" msgstr "Bruk denne fargen til å tegne opp elementer uten kategori" @@ -1437,54 +1437,54 @@ msgid "&Use colors" msgstr "Bruk &farger" -#: printing/calprintdefaultplugins.cpp:147 -#: printing/calprintdefaultplugins.cpp:179 -#: printing/calprintdefaultplugins.cpp:199 +#: printing/calprintdefaultplugins.cpp:146 +#: printing/calprintdefaultplugins.cpp:177 +#: printing/calprintdefaultplugins.cpp:198 #, kde-format msgid "Start date: " msgstr "Startdato: " -#: printing/calprintdefaultplugins.cpp:151 -#: printing/calprintdefaultplugins.cpp:183 +#: printing/calprintdefaultplugins.cpp:150 +#: printing/calprintdefaultplugins.cpp:181 #, kde-format msgid "No start date" msgstr "Ingen startdato" -#: printing/calprintdefaultplugins.cpp:157 +#: printing/calprintdefaultplugins.cpp:155 #, kde-format msgid "End date: " msgstr "Sluttdato: " -#: printing/calprintdefaultplugins.cpp:162 +#: printing/calprintdefaultplugins.cpp:159 #, kde-format msgid "Duration: " msgstr "Varighet: " -#: printing/calprintdefaultplugins.cpp:165 +#: printing/calprintdefaultplugins.cpp:162 #, kde-format msgid "1 hour " msgid_plural "%1 hours " msgstr[0] " 1 time " msgstr[1] "%1 timer " -#: printing/calprintdefaultplugins.cpp:168 +#: printing/calprintdefaultplugins.cpp:165 #, kde-format msgid "1 minute " msgid_plural "%1 minutes " msgstr[0] " 1 minutt " msgstr[1] "%1 minutter " -#: printing/calprintdefaultplugins.cpp:171 +#: printing/calprintdefaultplugins.cpp:168 #, kde-format msgid "No end date" msgstr "Ingen sluttdato" -#: printing/calprintdefaultplugins.cpp:189 +#: printing/calprintdefaultplugins.cpp:186 #, kde-format msgid "Due date: " msgstr "Forfallsdato: " -#: printing/calprintdefaultplugins.cpp:193 +#: printing/calprintdefaultplugins.cpp:190 #, kde-format msgid "No due date" msgstr "Ingen forfallsdato" @@ -1558,135 +1558,135 @@ msgstr[1] "%1 minutter" #: printing/calprintdefaultplugins.cpp:391 -#: printing/calprintdefaultplugins.cpp:663 +#: printing/calprintdefaultplugins.cpp:664 #, kde-format msgctxt "Spacer for the joined list of categories" msgid ", " msgstr ", " -#: printing/calprintdefaultplugins.cpp:398 +#: printing/calprintdefaultplugins.cpp:397 #, kde-format msgid "Organizer: " msgstr "Planlegger: " -#: printing/calprintdefaultplugins.cpp:410 +#: printing/calprintdefaultplugins.cpp:409 #, kde-format msgid "Location: " msgstr "Sted: " -#: printing/calprintdefaultplugins.cpp:473 +#: printing/calprintdefaultplugins.cpp:472 #, kde-format msgid "Description:" msgstr "Beskrivelse:" -#: printing/calprintdefaultplugins.cpp:486 +#: printing/calprintdefaultplugins.cpp:485 #, kde-format msgid "Notes:" msgstr "Merknader:" -#: printing/calprintdefaultplugins.cpp:494 +#: printing/calprintdefaultplugins.cpp:492 #, kde-format msgid "No Subitems" msgstr "Ingen underposter" -#: printing/calprintdefaultplugins.cpp:497 +#: printing/calprintdefaultplugins.cpp:495 #, kde-format msgid "1 Subitem:" msgid_plural "%1 Subitems:" msgstr[0] "1 underpost:" msgstr[1] "%1 underposter:" -#: printing/calprintdefaultplugins.cpp:516 +#: printing/calprintdefaultplugins.cpp:514 #, kde-format msgctxt "no status" msgid "none" msgstr "ingen" -#: printing/calprintdefaultplugins.cpp:518 +#: printing/calprintdefaultplugins.cpp:516 #, kde-format msgctxt "unknown status" msgid "unknown" msgstr "ukjent" -#: printing/calprintdefaultplugins.cpp:526 +#: printing/calprintdefaultplugins.cpp:522 #, kde-format msgctxt "subitem start date" msgid "Start Date: %1\n" msgstr "Startdato: %1\n" -#: printing/calprintdefaultplugins.cpp:531 +#: printing/calprintdefaultplugins.cpp:526 #, kde-format msgctxt "subitem start time" msgid "Start Time: %1\n" msgstr "Starttid: %1\n" -#: printing/calprintdefaultplugins.cpp:538 +#: printing/calprintdefaultplugins.cpp:532 #, kde-format msgctxt "subitem due date" msgid "Due Date: %1\n" msgstr "Forfallsdato: %1\n" -#: printing/calprintdefaultplugins.cpp:545 +#: printing/calprintdefaultplugins.cpp:539 #, kde-format msgctxt "subitem due time" msgid "Due Time: %1\n" msgstr "Forfallstid: %1\n" -#: printing/calprintdefaultplugins.cpp:551 +#: printing/calprintdefaultplugins.cpp:547 #, kde-format msgctxt "subitem counter" msgid "%1: " msgstr "%1: " -#: printing/calprintdefaultplugins.cpp:559 +#: printing/calprintdefaultplugins.cpp:555 #, kde-format msgctxt "subitem Status: statusString" msgid "Status: %1\n" msgstr "Status: %1\n" -#: printing/calprintdefaultplugins.cpp:563 +#: printing/calprintdefaultplugins.cpp:560 #, kde-format msgctxt "subitem Priority: N" msgid "Priority: %1\n" msgstr "Prioritet: %1\n" -#: printing/calprintdefaultplugins.cpp:566 +#: printing/calprintdefaultplugins.cpp:563 #, kde-format msgctxt "subitem Secrecy: secrecyString" msgid "Secrecy: %1\n" msgstr "Konfidensialitet: %1\n" -#: printing/calprintdefaultplugins.cpp:580 +#: printing/calprintdefaultplugins.cpp:577 #, kde-format msgid "No Attachments" msgstr "Ingen vedlegg" -#: printing/calprintdefaultplugins.cpp:583 +#: printing/calprintdefaultplugins.cpp:580 #, kde-format msgid "1 Attachment:" msgid_plural "%1 Attachments:" msgstr[0] "1 vedlegg:" msgstr[1] "%1 vedlegg:" -#: printing/calprintdefaultplugins.cpp:591 +#: printing/calprintdefaultplugins.cpp:588 #, kde-format msgctxt "Spacer for list of attachments" msgid " " msgstr "‥" -#: printing/calprintdefaultplugins.cpp:604 +#: printing/calprintdefaultplugins.cpp:601 #, kde-format msgid "No Attendees" msgstr "Ingen deltakere" -#: printing/calprintdefaultplugins.cpp:606 +#: printing/calprintdefaultplugins.cpp:603 #, kde-format msgid "1 Attendee:" msgid_plural "%1 Attendees:" msgstr[0] "En deltaker:" msgstr[1] "%1 deltakere:" -#: printing/calprintdefaultplugins.cpp:620 +#: printing/calprintdefaultplugins.cpp:617 #, kde-format msgctxt "" "Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer " @@ -1694,12 +1694,12 @@ msgid "%1 (%2): %3" msgstr "%1 (%2): %3" -#: printing/calprintdefaultplugins.cpp:633 +#: printing/calprintdefaultplugins.cpp:631 #, kde-format msgid "Status: %1" msgstr "Status: %1" -#: printing/calprintdefaultplugins.cpp:637 +#: printing/calprintdefaultplugins.cpp:636 #, kde-format msgid "Secrecy: %1" msgstr "Konfidensialitet: %1" @@ -1730,14 +1730,14 @@ msgstr "Kategorier: " #: printing/calprintdefaultplugins.cpp:827 -#: printing/calprintdefaultplugins.cpp:1120 +#: printing/calprintdefaultplugins.cpp:1121 #, kde-format msgctxt "date from-to" msgid "%1 - %2" msgstr "%1 – %2" #: printing/calprintdefaultplugins.cpp:829 -#: printing/calprintdefaultplugins.cpp:1122 +#: printing/calprintdefaultplugins.cpp:1123 #, kde-format msgctxt "" "date from-\n" @@ -1749,25 +1749,25 @@ "%1 -\n" "%2" -#: printing/calprintdefaultplugins.cpp:893 +#: printing/calprintdefaultplugins.cpp:894 #, kde-format msgid "Today's Events" msgstr "Dagens hendelser" -#: printing/calprintdefaultplugins.cpp:914 printing/calprintpluginbase.cpp:1017 -#: printing/calprintpluginbase.cpp:1151 printing/calprintpluginbase.cpp:1210 +#: printing/calprintdefaultplugins.cpp:915 printing/calprintpluginbase.cpp:1021 +#: printing/calprintpluginbase.cpp:1156 printing/calprintpluginbase.cpp:1217 #, kde-format msgctxt "summary, location" msgid "%1, %2" msgstr "%1, %2" -#: printing/calprintdefaultplugins.cpp:1147 +#: printing/calprintdefaultplugins.cpp:1148 #, kde-format msgctxt "date from - to (week number)" msgid "%1 - %2 (Week %3)" msgstr "%1 – %2 (Uke %3)" -#: printing/calprintdefaultplugins.cpp:1150 +#: printing/calprintdefaultplugins.cpp:1151 #, kde-format msgctxt "" "date from -\n" @@ -1779,55 +1779,55 @@ "%1 -\n" "%2 (Uke %3)" -#: printing/calprintdefaultplugins.cpp:1344 +#: printing/calprintdefaultplugins.cpp:1346 #, kde-format msgctxt "monthname year" msgid "%1 %2" msgstr "%1 %2" -#: printing/calprintdefaultplugins.cpp:1452 +#: printing/calprintdefaultplugins.cpp:1453 #, kde-format msgctxt "@option sort by title" msgid "Title" msgstr "Tittel" -#: printing/calprintdefaultplugins.cpp:1453 +#: printing/calprintdefaultplugins.cpp:1454 #, kde-format msgctxt "@option sort by start date/time" msgid "Start Date" msgstr "Startdato" -#: printing/calprintdefaultplugins.cpp:1454 +#: printing/calprintdefaultplugins.cpp:1455 #, kde-format msgctxt "@option sort by due date/time" msgid "Due Date" msgstr "Forfallsdato" -#: printing/calprintdefaultplugins.cpp:1455 +#: printing/calprintdefaultplugins.cpp:1456 #, kde-format msgctxt "@option sort by priority" msgid "Priority" msgstr "Prioritet" -#: printing/calprintdefaultplugins.cpp:1456 +#: printing/calprintdefaultplugins.cpp:1458 #, kde-format msgctxt "@option sort by percent completed" msgid "Percent Complete" msgstr "Prosent fullført" -#: printing/calprintdefaultplugins.cpp:1462 +#: printing/calprintdefaultplugins.cpp:1464 #, kde-format msgctxt "@option sort in increasing order" msgid "Ascending" msgstr "Stigende" -#: printing/calprintdefaultplugins.cpp:1463 +#: printing/calprintdefaultplugins.cpp:1465 #, kde-format msgctxt "@option sort in descreasing order" msgid "Descending" msgstr "Synkende" -#: printing/calprintdefaultplugins.cpp:1475 +#: printing/calprintdefaultplugins.cpp:1477 #, kde-format msgid "To-do list" msgstr "Gjøremålsliste" @@ -1855,7 +1855,7 @@ msgid "Due" msgstr "Innen" -#: printing/calprintdefaultplugins.h:53 +#: printing/calprintdefaultplugins.h:52 #, kde-format msgid "Print &incidence" msgstr "Skriv ut &hendelse" @@ -1865,42 +1865,42 @@ msgid "Prints an incidence on one page" msgstr "Skriver en hendelser på én side" -#: printing/calprintdefaultplugins.h:104 +#: printing/calprintdefaultplugins.h:106 #, kde-format msgid "Print da&y" msgstr "Skriv ut &dag" -#: printing/calprintdefaultplugins.h:108 +#: printing/calprintdefaultplugins.h:111 #, kde-format msgid "Prints all events of a single day on one page" msgstr "Skriver ut alle hendelser for én dag på en side" -#: printing/calprintdefaultplugins.h:156 +#: printing/calprintdefaultplugins.h:163 #, kde-format msgid "Print &week" msgstr "Skriv ut &uke" -#: printing/calprintdefaultplugins.h:160 +#: printing/calprintdefaultplugins.h:168 #, kde-format msgid "Prints all events of one week on one page" msgstr "Skriver alle hendelser for en uke på en side" -#: printing/calprintdefaultplugins.h:211 +#: printing/calprintdefaultplugins.h:223 #, kde-format msgid "Print mont&h" msgstr "Skriv ut &måned" -#: printing/calprintdefaultplugins.h:215 +#: printing/calprintdefaultplugins.h:228 #, kde-format msgid "Prints all events of one month on one page" msgstr "Skriver alle hendelser for en måned på en side" -#: printing/calprintdefaultplugins.h:262 +#: printing/calprintdefaultplugins.h:279 #, kde-format msgid "Print to-&dos" msgstr "Skri&v ut gjøremål" -#: printing/calprintdefaultplugins.h:266 +#: printing/calprintdefaultplugins.h:284 #, kde-format msgid "Prints all to-dos in a (tree-like) list" msgstr "Skriver ut alle gjøremålene i en (tre-liknende) liste" @@ -1917,31 +1917,31 @@ msgid "Printing error" msgstr "Feil ved utskrift" -#: printing/calprinter.cpp:182 +#: printing/calprinter.cpp:185 #, kde-format msgctxt "@title:window" msgid "Print" msgstr "Skriv ut" -#: printing/calprinter.cpp:201 +#: printing/calprinter.cpp:205 #, kde-format msgctxt "@title:group" msgid "Print Style" msgstr "Utskriftsstil" -#: printing/calprinter.cpp:213 +#: printing/calprinter.cpp:217 #, kde-format msgctxt "@label" msgid "Page &orientation:" msgstr "Side&orientering:" -#: printing/calprinter.cpp:219 +#: printing/calprinter.cpp:223 #, kde-format msgctxt "@info:tooltip" msgid "Set the print orientation" msgstr "Oppgi utskriftsretning" -#: printing/calprinter.cpp:222 +#: printing/calprinter.cpp:226 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -1953,37 +1953,37 @@ "som standard at retningen passer best med den valgte stilen eller skriverens " "standardinnstilling." -#: printing/calprinter.cpp:226 +#: printing/calprinter.cpp:230 #, kde-format msgctxt "@item:inlistbox" msgid "Use Default Orientation of Selected Style" msgstr "Bruk standard orientering for valgt stil" -#: printing/calprinter.cpp:228 +#: printing/calprinter.cpp:232 #, kde-format msgctxt "@item:inlistbox" msgid "Use Printer Default" msgstr "Bruk standardoppsett for skriver" -#: printing/calprinter.cpp:230 +#: printing/calprinter.cpp:234 #, kde-format msgctxt "@item:inlistbox" msgid "Portrait" msgstr "Stående" -#: printing/calprinter.cpp:232 +#: printing/calprinter.cpp:236 #, kde-format msgctxt "@item:inlistbox" msgid "Landscape" msgstr "Liggende" -#: printing/calprinter.cpp:256 +#: printing/calprinter.cpp:261 #, kde-format msgctxt "@info:tooltip" msgid "Select the type of print" msgstr "Velg utskriftstype" -#: printing/calprinter.cpp:259 +#: printing/calprinter.cpp:264 #, kde-format msgctxt "@info:whatsthis" msgid "" @@ -1995,7 +1995,7 @@ "ut ett enkelt element, eller alle elementer innen et oppgitt tidsrom (en " "dag, uke eller måned) eller du vil skrive ut gjøremålslista." -#: printing/calprinter.cpp:289 +#: printing/calprinter.cpp:294 #, kde-format msgctxt "@action:button" msgid "&Preview" @@ -2373,86 +2373,86 @@ "colors will be used." msgstr "Kryss av her hvis du vil bruke farger. Kategorifarger vil bli brukt." -#: printing/calprintpluginbase.cpp:148 +#: printing/calprintpluginbase.cpp:159 #, kde-format msgid "This printing style does not have any configuration options." msgstr "Denne utskriftsstilen har ingen innstillinger." -#: printing/calprintpluginbase.cpp:307 +#: printing/calprintpluginbase.cpp:320 #, kde-format msgctxt "@item:intext delimiter for joining holiday names" msgid "," msgstr "," -#: printing/calprintpluginbase.cpp:319 +#: printing/calprintpluginbase.cpp:332 #, kde-format msgid "Holiday" msgstr "Fridag" -#: printing/calprintpluginbase.cpp:649 +#: printing/calprintpluginbase.cpp:659 #, kde-format msgctxt "print date: formatted-datetime" msgid "printed: %1" msgstr "skrevet ut: %1" -#: printing/calprintpluginbase.cpp:1023 +#: printing/calprintpluginbase.cpp:1027 #, kde-format msgctxt "starttime - endtime summary" msgid "%1-%2 %3" msgstr "%1-%2 %3" -#: printing/calprintpluginbase.cpp:1029 +#: printing/calprintpluginbase.cpp:1033 #, kde-format msgctxt "starttime - endtime summary, location" msgid "%1-%2 %3, %4" msgstr "%1-%2 %3, %4" -#: printing/calprintpluginbase.cpp:1089 +#: printing/calprintpluginbase.cpp:1091 #, kde-format msgctxt "weekday, shortmonthname daynumber" msgid "%1, %2 %3" msgstr "%1, %3. %2" -#: printing/calprintpluginbase.cpp:1216 +#: printing/calprintpluginbase.cpp:1223 #, kde-format msgctxt "to-do summary (Due: datetime)" msgid "%1 (Due: %2)" msgstr "%1 (Forfall: %2)" -#: printing/calprintpluginbase.cpp:1220 +#: printing/calprintpluginbase.cpp:1228 #, kde-format msgctxt "to-do summary (Due: date)" msgid "%1 (Due: %2)" msgstr "%1 (Forfall: %2)" -#: printing/calprintpluginbase.cpp:1229 +#: printing/calprintpluginbase.cpp:1237 #, kde-format msgid "To-do: %1" msgstr "Gjøremål: %1" -#: printing/calprintpluginbase.cpp:1995 +#: printing/calprintpluginbase.cpp:1980 #, kde-format msgid "%1%" msgstr "%1%" -#: printing/calprintpluginbase.cpp:2127 +#: printing/calprintpluginbase.cpp:2111 #, kde-format msgctxt "Description - date" msgid "%1 - %2" msgstr "%1 – %2" -#: printing/calprintpluginbase.cpp:2146 +#: printing/calprintpluginbase.cpp:2130 #, kde-format msgid "Person: %1" msgstr "Person: %1" -#: printing/calprintpluginbase.cpp:2170 +#: printing/calprintpluginbase.cpp:2153 #, kde-format msgctxt "Date range: Month dayStart - dayEnd" msgid "%1 %2 - %3" msgstr "%2 – %3 %1" -#: printing/calprintpluginbase.cpp:2175 +#: printing/calprintpluginbase.cpp:2158 #, kde-format msgctxt "Date range: monthStart dayStart - monthEnd dayEnd" msgid "%1 %2 - %3 %4" @@ -2822,17 +2822,17 @@ msgid "Prints a list of events and to-dos" msgstr "Skriver ut en liste over hendelser og gjøremål" -#: printing/journalprint.cpp:125 +#: printing/journalprint.cpp:124 #, kde-format msgid "Journal entries" msgstr "Dagboknotiser" -#: printing/journalprint.h:45 +#: printing/journalprint.h:49 #, kde-format msgid "Print &journal" msgstr "Skriv ut &dagbok" -#: printing/journalprint.h:49 +#: printing/journalprint.h:54 #, kde-format msgid "Prints all journals for a given date range" msgstr "Skriver ut alle dagbøker for et gitt tidsrom" @@ -2865,77 +2865,77 @@ "%1 -\n" "%2" -#: printing/yearprint.h:43 +#: printing/yearprint.h:48 #, kde-format msgid "Print &year" msgstr "Skriv ut &År" -#: printing/yearprint.h:47 +#: printing/yearprint.h:53 #, kde-format msgid "Prints a calendar for an entire year" msgstr "Skriver ut en kalender for et helt år" -#: utils.cpp:422 +#: utils.cpp:416 #, kde-format msgid "Select Calendar" msgstr "Velg kalender" -#: utils.cpp:423 +#: utils.cpp:417 #, kde-format msgid "Select the calendar where this item will be stored." msgstr "Velg kalenderen der dette elementet blir lagret." -#: utils.cpp:565 utils.cpp:622 +#: utils.cpp:561 utils.cpp:621 #, kde-format msgid "Calendar" msgstr "Kalender" -#: utils.cpp:566 utils.cpp:624 +#: utils.cpp:562 utils.cpp:623 #, kde-format msgid "Tasks" msgstr "Oppgaver" -#: utils.cpp:567 utils.cpp:626 +#: utils.cpp:563 utils.cpp:625 #, kde-format msgid "Journal" msgstr "Journal" -#: utils.cpp:568 utils.cpp:628 +#: utils.cpp:564 utils.cpp:627 #, kde-format msgid "Notes" msgstr "Notater" -#: utils.cpp:582 +#: utils.cpp:578 #, kde-format msgctxt "%1 is folder contents" msgid "My Kolab %1" msgstr "Min Kolab %1" -#: utils.cpp:587 +#: utils.cpp:583 #, kde-format msgctxt "%1 is folder name, %2 is folder contents" msgid "Shared Kolab %1 %2" msgstr "Delt Kolab %1 %2" -#: utils.cpp:591 +#: utils.cpp:587 #, kde-format msgctxt "%1 is folder owner name, %2 is folder contents" msgid "%1's Kolab %2" msgstr "%1s Kolab %2" -#: utils.cpp:594 +#: utils.cpp:591 #, kde-format msgctxt "%1 is folder owner name, %2 is folder name, %3 is folder contents" msgid "%1's %2 Kolab %3" msgstr "%1s %2 Kolab %3" -#: utils.cpp:599 +#: utils.cpp:596 #, kde-format msgctxt "%1 is folder contents" msgid "Kolab %1" msgstr "Kolab %1" -#: utils.cpp:606 +#: utils.cpp:604 #, kde-format msgctxt "%1 is the folder name" msgid "%1 in %2" @@ -2964,7 +2964,7 @@ msgid "My %1" msgstr "Min %1" -#: utils.cpp:658 +#: utils.cpp:659 #, kde-format msgctxt "unknown resource" msgid "Unknown" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calendarsupport-17.12.2/po/zh_CN/calendarsupport.po new/calendarsupport-17.12.3/po/zh_CN/calendarsupport.po --- old/calendarsupport-17.12.2/po/zh_CN/calendarsupport.po 2018-02-06 01:43:27.000000000 +0100 +++ new/calendarsupport-17.12.3/po/zh_CN/calendarsupport.po 2018-03-06 01:31:28.000000000 +0100 @@ -11,7 +11,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-07 03:34+0200\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
