Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e794b3 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

conflict resolved

parent 19be0d25

l10n/is.js

+15 −4
Original line number Diff line number Diff line
@@ -86,11 +86,8 @@ OC.L10N.register( 
    "Calendar link copied to clipboard." : "Dagatalstengill afritaður á klippispjald.",

    "Calendar link could not be copied to clipboard." : "Ekki var hægt að afrita dagatalstengil á klippispjald.",

    "Trash bin" : "Ruslafata",



=======

    "Loading deleted items." : "Hleð inn eyddum atriðum.",

    "You do not have any deleted items." : "Þú ert ekki með nein eydd atriði.",

>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d

    "Name" : "Heiti",

    "Deleted" : "Eytt",

    "Restore" : "Endurheimta",
@@ -420,6 +417,20 @@ OC.L10N.register( 
    "Show more details" : "Sýna frekari upplýsingar",

    "Subscribe to {name}" : "Panta áskrift að {name}",

    "Export {name}" : "Flytja út {name}",

    "Anniversary" : "Afmæli",

    "Appointment" : "Stefnumót",

    "Business" : "Viðskipti",

    "Education" : "Menntun",

    "Holiday" : "Frí",

    "Meeting" : "Fundur",

    "Miscellaneous" : "Ýmislegt",

    "Non-working hours" : "Utan vinnutíma",

    "Not in office" : "Ekki á skrifstofunni",

    "Phone call" : "Símtal",

    "Sick day" : "Veikindadagur",

    "Special occasion" : "Sérstakt tilefni",

    "Travel" : "Ferðalög",

    "Vacation" : "Í fríi",

    "Midnight on the day the event starts" : "Miðnætti dagsins sem atburður hefst",

    "_%n day before the event at {formattedHourMinute}_::_%n days before the event at {formattedHourMinute}_" : ["%n degi fyrir atburðinn kl. {formattedHourMinute}","%n dögum fyrir atburðinn kl. {formattedHourMinute}"],

    "_%n week before the event at {formattedHourMinute}_::_%n weeks before the event at {formattedHourMinute}_" : ["%n viku fyrir atburðinn kl. {formattedHourMinute}","%n vikum fyrir atburðinn kl. {formattedHourMinute}"],

src/views/EditSidebar.vue

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ import InviteesList from '../components/Editor/Invitees/InviteesList.vue' 
import PropertyCalendarPicker from '../components/Editor/Properties/PropertyCalendarPicker.vue'

import PropertySelect from '../components/Editor/Properties/PropertySelect.vue'

import PropertyText from '../components/Editor/Properties/PropertyText.vue'

import PropertyTextLocation from '../components/Editor/Properties/PropertyTextLocation.vue'

import PropertyTitleTimePicker from '../components/Editor/Properties/PropertyTitleTimePicker.vue'

import Repeat from '../components/Editor/Repeat/Repeat.vue'

src/views/EditSimple.vue

+3 −1
Original line number Diff line number Diff line
@@ -133,11 +133,13 @@ 
					@update-end-timezone="updateEndTimezone"

					@toggle-all-day="toggleAllDay" />



				<PropertyText :is-read-only="isReadOnly"

				<PropertyTextLocation class="event-location"

					:is-read-only="isReadOnly"

					:prop-model="rfcProps.location"

					:value="location"

					:linkify-links="true"

					@update:value="updateLocation" />



				<PropertyText :is-read-only="isReadOnly"

					:prop-model="rfcProps.description"

					:value="description"