Georges Basile Stavracas Neto · Georges Basile Stavracas Neto · Georges Basile Stavracas Neto · Georges Basile Stavracas Neto · Georges Basile Stavracas Neto · Georges Basile Stavracas Neto
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+variables:
+  GIT_SUBMODULE_STRATEGY: 'normal'
+
+stages:
+  - 'flatpak'
+  - 'deploy'
+
+flatpak:master:
+    extends: '.flatpak'
+    image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
+    stage: 'flatpak'
+    variables:
+        MANIFEST_PATH: "build-aux/flatpak/org.gnome.Calendar.json"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+        FLATPAK_MODULE: "gnome-calendar"
+        APP_ID: "org.gnome.Calendar.Devel"
+        BUNDLE: "org.gnome.Calendar.Devel.flatpak"
+
+
+flatpak:nightly:
+    extends: '.publish_nightly'
+    dependencies:
+        - 'flatpak:master'
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
+Detailed description of the issue. Put as much information as you can, potentially
+with images showing the issue.
+
+Steps to reproduce:
+
+1. Open GNOME Calendar
+2. Create an event
+3. ...
+
+## Design Tasks
+
+* [ ]  design tasks
+
+## Development Tasks
+
+* [ ]  development tasks
+
+## QA Tasks
+
+* [ ]  qa (quality assurance) tasks
--- a/.gitlab/issue_templates/Epic.md
+++ b/.gitlab/issue_templates/Epic.md
+# Current problems
+<!--
+What are the problems that the current project has?
+
+For example:
+* User cannot use the keyboard to perform most common actions
+or
+* User cannot see documents from cloud services
+-->
+
+# Goals & use cases
+<!--
+What are the use cases that this proposal will cover? What are the end goals?
+
+For example:
+* User needs to share a file with their friends.
+or
+* It should be easy to edit a picture within the app.
+-->
+
+# Requirements
+<!--
+What does the solution needs to ensure for being succesful?
+
+For example:
+* Work on small form factors and touch
+or
+* Use the Meson build system and integrate with it
+-->
+
+# Relevant art
+<!--
+Is there any product that has implemented something similar? Put links to other
+projects, pictures, links to other code, etc.
+-->
+
+# Proposal & plan
+<!-- What's the solution and how should be achieved? It can be split in smaller
+tasks of minimum change, so they can be delivered across several releases. -->
+
+/label ~"1. Epic"
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
+Detailed description of the feature. Put as much information as you can.
+
+Proposed Mockups:
+
+(Add mockups of the proposed feature)
+
+## Design Tasks
+
+* [ ]  design tasks
+
+## Development Tasks
+
+* [ ]  development tasks
+
+## QA Tasks
+
+* [ ]  qa (quality assurance) tasks
--- a/NEWS
+++ b/NEWS
+Major changes in 41.0:
+* Updated translations
+
+Major changes in 41.rc1:
+* Small cleanups
+* Updated translations
+
 Major changes in 41.beta:
 * Implement opening ICS files and importing events
 * Updated translations

--- a/build-aux/flatpak/org.gnome.Calendar.json
+++ b/build-aux/flatpak/org.gnome.Calendar.json
@@ -15,18 +15,13 @@
        "--system-talk-name=org.freedesktop.login1",
        "--system-talk-name=org.freedesktop.timedate1",
        "--system-talk-name=org.freedesktop.GeoClue2",
-        "--talk-name=ca.desrt.dconf",
        "--talk-name=org.gnome.ControlCenter",
        "--talk-name=org.gnome.evolution.dataserver.AddressBook9",
        "--talk-name=org.gnome.evolution.dataserver.Calendar8",
        "--talk-name=org.gnome.evolution.dataserver.Sources5",
        "--talk-name=org.gnome.evolution.dataserver.Subprocess.Backend.*",
        "--talk-name=org.gnome.OnlineAccounts",
-        "--talk-name=org.gnome.SettingsDaemon.Color",
-        "--filesystem=home",
-        "--filesystem=xdg-run/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+        "--talk-name=org.gnome.SettingsDaemon.Color"
    ],
    "x-run-args" : [
        "--debug"

--- a/data/appdata/org.gnome.Calendar.appdata.xml.in.in
+++ b/data/appdata/org.gnome.Calendar.appdata.xml.in.in
@@ -45,6 +45,15 @@
  <project_group>GNOME</project_group>

  <releases>
+    <release date="2021-09-17" version="41.0">
+      <description>
+        <p>
+          GNOME Calendar 41.0 release brings updated translations, and new event preview
+          popover, and the ability to import events from calendar files.
+        </p>
+      </description>
+    </release>
+
    <release date="2021-06-03" version="40.2">
      <description>
        <p>

--- a/data/org.gnome.Calendar.desktop.in.in
+++ b/data/org.gnome.Calendar.desktop.in.in
 [Desktop Entry]
 Name=Calendar
 Comment=Access and manage your calendars
-Exec=gnome-calendar
+Exec=gnome-calendar %U
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=@icon@
 Terminal=false

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-calendar',
               'c',
-           version: '41.beta',
+           version: '41.0',
           license: 'GPL3+',
     meson_version: '>= 0.53.0'
 )

--- a/po/be.po
+++ b/po/be.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po