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

Unverified Commit 9bfb5dee authored by Christoph Wurst's avatar Christoph Wurst
Browse files

Merge remote-tracking branch 'origin/main' into enhancement/create-talk-room-appointment

parents 91c0fa49 c4fe96d6

CHANGELOG.md

+16 −0
Original line number Diff line number Diff line 
# Changelog



## 3.2.1 - 2022-03-14

### Fixed

- Public Calendar Link

- Disabled Calendar Icon

- Missing Translations



## 3.2.0 - 2022-03-09

### Changed

- Allow admins to force an event type

- Allow admins to hide event exports

- Rename 'Download' to 'Export'

### Fixed

- Navigation icon bullet

- Remove dot in plural string

- Remove blurriness from event participation indicator



## 3.1.0 - 2022-02-28

### Added

- Accept & decline invitations from web

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
* ☑️ Tasks! See tasks with a due date directly in the calendar

* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.

	]]></description>

	<version>3.2.0-alpha.1</version>

	<version>3.2.0</version>

	<licence>agpl</licence>

	<author>Anna Larch</author>

	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>

l10n/eu.js

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ OC.L10N.register( 
    "Next day" : "Hurrengo eguna",

    "Next week" : "Hurrengo astea",

    "Next month" : "Hurrengo hilabetea",

    "New event" : "Gertaera berria",

    "Today" : "Gaur",

    "Day" : "Eguna",

    "Week" : "Astea",
@@ -47,11 +48,14 @@ OC.L10N.register( 
    "Appointment link could not be copied to clipboard" : "Hitzorduaren esteka ezin izan da arbelean kopiatu",

    "Add new" : "Gehitu berria",

    "Untitled calendar" : "Izenik gabeko egutegia",

    "Disable calendar" : "Desgaitu egutegia",

    "Enable calendar" : "Gaitu egutegia",

    "Edit name" : "Editatu izena",

    "Saving name …" : "Izena gordetzen …",

    "Edit color" : "Editatu kolorea",

    "Saving color …" : "Kolorea gordetzen …",

    "Copy private link" : "Kopiatu esteka pribatua",

    "Export" : "Esportatu",

    "Unshare from me" : "Kendu nirekin partekatzea",

    "An error occurred, unable to change visibility of the calendar." : "Errore bat gertatu da, ezin da egutegiaren ikusgaitasuna aldatu.",

    "An error occurred, unable to delete the calendar." : "Errore bat gertatu da, ezin da egutegia ezabatu.",

l10n/eu.json

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    "Next day" : "Hurrengo eguna",

    "Next week" : "Hurrengo astea",

    "Next month" : "Hurrengo hilabetea",

    "New event" : "Gertaera berria",

    "Today" : "Gaur",

    "Day" : "Eguna",

    "Week" : "Astea",
@@ -45,11 +46,14 @@ 
    "Appointment link could not be copied to clipboard" : "Hitzorduaren esteka ezin izan da arbelean kopiatu",

    "Add new" : "Gehitu berria",

    "Untitled calendar" : "Izenik gabeko egutegia",

    "Disable calendar" : "Desgaitu egutegia",

    "Enable calendar" : "Gaitu egutegia",

    "Edit name" : "Editatu izena",

    "Saving name …" : "Izena gordetzen …",

    "Edit color" : "Editatu kolorea",

    "Saving color …" : "Kolorea gordetzen …",

    "Copy private link" : "Kopiatu esteka pribatua",

    "Export" : "Esportatu",

    "Unshare from me" : "Kendu nirekin partekatzea",

    "An error occurred, unable to change visibility of the calendar." : "Errore bat gertatu da, ezin da egutegiaren ikusgaitasuna aldatu.",

    "An error occurred, unable to delete the calendar." : "Errore bat gertatu da, ezin da egutegia ezabatu.",

l10n/ja.js

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ OC.L10N.register( 
    "Cheers!" : "それでは！",

    "Upcoming events" : "今後のイベント",

    "Appointments" : "予定",

    "Dear %s, please confirm your booking" : "%s様、予定を承認してください。",

    "Confirm" : "承認",

    "This confirmation link expires in %s hours." : "承認用リンクの有効期限は1%s時間です。",

    "Appointment:" : "予定：",

    "Date:" : "日時:",

    "Where:" : "場所:",
@@ -24,6 +27,7 @@ OC.L10N.register( 
    "Next day" : "翌日",

    "Next week" : "翌週",

    "Next month" : "翌月",

    "New event" : "新しいイベント",

    "Today" : "今日",

    "Day" : "日",

    "Week" : "週",
@@ -33,13 +37,18 @@ OC.L10N.register( 
    "Copy link" : "リンクをコピー",

    "Edit" : "編集",

    "Delete" : "削除",

    "Appointment link was copied to clipboard" : "予定リンクがクリップボードにコピーされました",

    "Appointment link could not be copied to clipboard" : "予定リンクをクリップボードにコピーできませんでした",

    "Add new" : "新規作成",

    "Untitled calendar" : "無題のカレンダー",

    "Disable calendar" : "カレンダーを無効にする",

    "Enable calendar" : "カレンダーを有効にする",

    "Edit name" : "名前を編集",

    "Saving name …" : "名前を保存しています …",

    "Edit color" : "色を編集",

    "Saving color …" : "色を保存しています …",

    "Copy private link" : "プライベートリンクをコピー",

    "Export" : "エクスポート",

    "Unshare from me" : "共有を自分から解除",

    "An error occurred, unable to change visibility of the calendar." : "エラーが発生したため、カレンダーの表示状態を変更できません。",

    "An error occurred, unable to delete the calendar." : "エラーが発生したため、カレンダーを削除できません。",
@@ -79,6 +88,7 @@ OC.L10N.register( 
    "An error occurred, unable to change the permission of the share." : "エラーが発生したため、共有の権限を変更できませんでした。",

    "+ New calendar" : "+ 新しいカレンダー",

    "New calendar" : "新しいカレンダー",

    "Name for new calendar" : "新しいカレンダーの名前",

    "Creating calendar …" : "カレンダーを作成中 …",

    "New calendar with task list" : "タスクリスト付きの新しいカレンダー",

    "New subscription from link (read-only)" : "リンクからの新規加入 (読み取り専用)",