From e997befadb1e8138712d6fc087595eca3c3292fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Mon, 7 May 2018 11:17:06 +0200
Subject: [PATCH 1/8] Bump VERSION to 7.4.5

---
 lib/open_project/meeting/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb
index 0f809f0aa2..08d6d55b0f 100644
--- a/lib/open_project/meeting/version.rb
+++ b/lib/open_project/meeting/version.rb
@@ -20,6 +20,6 @@
 
 module OpenProject
   module Meeting
-    VERSION = "7.4.4"
+    VERSION = "7.4.5"
   end
 end

From 924c863a92a3e667ff01de4b5d040d123abf6148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Fri, 25 May 2018 15:45:13 +0200
Subject: [PATCH 2/8] Bump VERSION to 7.4.6

---
 lib/open_project/meeting/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb
index 08d6d55b0f..4e568a4cc5 100644
--- a/lib/open_project/meeting/version.rb
+++ b/lib/open_project/meeting/version.rb
@@ -20,6 +20,6 @@
 
 module OpenProject
   module Meeting
-    VERSION = "7.4.5"
+    VERSION = "7.4.6"
   end
 end

From c0e87a0fc2f7a6e382f329869a4de93eebb68868 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Fri, 1 Jun 2018 14:00:01 +0000
Subject: [PATCH 3/8] update locales from crowdin

---
 config/locales/crowdin/ar.yml    | 5 +++--
 config/locales/crowdin/da.yml    | 1 +
 config/locales/crowdin/de.yml    | 1 +
 config/locales/crowdin/es-ES.yml | 1 +
 config/locales/crowdin/fi.yml    | 1 +
 config/locales/crowdin/fil.yml   | 1 +
 config/locales/crowdin/fr.yml    | 1 +
 config/locales/crowdin/he.yml    | 1 +
 config/locales/crowdin/hr.yml    | 1 +
 config/locales/crowdin/hu.yml    | 1 +
 config/locales/crowdin/id.yml    | 1 +
 config/locales/crowdin/it.yml    | 1 +
 config/locales/crowdin/ko.yml    | 1 +
 config/locales/crowdin/lt.yml    | 1 +
 config/locales/crowdin/nl.yml    | 1 +
 config/locales/crowdin/no.yml    | 1 +
 config/locales/crowdin/pl.yml    | 1 +
 config/locales/crowdin/pt-BR.yml | 1 +
 config/locales/crowdin/pt-PT.yml | 1 +
 config/locales/crowdin/ru.yml    | 1 +
 config/locales/crowdin/sk.yml    | 1 +
 config/locales/crowdin/sv-SE.yml | 1 +
 config/locales/crowdin/tr.yml    | 1 +
 config/locales/crowdin/zh-CN.yml | 1 +
 config/locales/crowdin/zh-TW.yml | 1 +
 25 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml
index a5bbfcb296..9deb11644a 100644
--- a/config/locales/crowdin/ar.yml
+++ b/config/locales/crowdin/ar.yml
@@ -37,7 +37,7 @@ ar:
   label_meeting_date_time: "التاريخ/الوقت"
   label_meeting_diff: "الاختلاف"
   label_notify: "إرسال للمراجعة"
-  label_icalendar: "Send iCalendar"
+  label_icalendar: "إرسال iCalendar"
   label_version: "النسخة"
   label_time_zone: "المنطقة الزمنية"
   label_start_date: "تاريخ البدء"
@@ -56,8 +56,9 @@ ar:
   text_duration_in_hours: "المدة بالساعات"
   text_in_hours: "في الساعات"
   text_meeting_agenda_for_meeting: 'جدول أعمال للاجتماع "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "سيتم فقدان محتوى محضر الجلسة التي لم يتم حفظها! هل تريد المتابعة؟"
   text_meeting_minutes_for_meeting: 'محضر الجسلة للاجتماع "%{meeting}"'
   text_review_meeting_agenda: "%{author} طرح %{link} للمراجعة."
   text_review_meeting_minutes: "%{author} طرح %{link} للمراجعة."
-  text_notificiation_invited: "This mail contains an ics entry for the meeting below:"
+  text_notificiation_invited: "هذا البريد الألكتروني يحتوي على مدخل (ics) للاجتماع أدناه:"
diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml
index 825eae4db0..346a479739 100644
--- a/config/locales/crowdin/da.yml
+++ b/config/locales/crowdin/da.yml
@@ -56,6 +56,7 @@ da:
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "i timer"
   text_meeting_agenda_for_meeting: 'dagsorden for mødet "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Indhold i referatet, der ikke er gemt vil gå tabt! Fortsæt?"
   text_meeting_minutes_for_meeting: 'referat  for mødet "%{meeting}"'
   text_review_meeting_agenda: "%{author} har lagt dette %{link} ud til vurdering."
diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
index ed4b5ec360..10c139797e 100644
--- a/config/locales/crowdin/de.yml
+++ b/config/locales/crowdin/de.yml
@@ -56,6 +56,7 @@ de:
   text_duration_in_hours: "Dauer in Stunden"
   text_in_hours: "in Stunden"
   text_meeting_agenda_for_meeting: 'Agenda für die Besprechung "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Nicht-gespeicherte Inhalte des Protokolls werden durch diese Aktion verworfen! Weitermachen?"
   text_meeting_minutes_for_meeting: 'Protokoll für die Besprechung "%{meeting}"'
   text_review_meeting_agenda: "%{author} hat die %{link} zur Einsicht freigegeben."
diff --git a/config/locales/crowdin/es-ES.yml b/config/locales/crowdin/es-ES.yml
index b4e26a7047..8706863aec 100644
--- a/config/locales/crowdin/es-ES.yml
+++ b/config/locales/crowdin/es-ES.yml
@@ -56,6 +56,7 @@ es:
   text_duration_in_hours: "Duración en horas"
   text_in_hours: "en horas"
   text_meeting_agenda_for_meeting: 'agenda para la reunión "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "¡El contenido no guardado de los minutos se perderá! ¿Continuar?"
   text_meeting_minutes_for_meeting: 'minutos para la reunión "%{meeting}"'
   text_review_meeting_agenda: "%{author} ha puesto el %{link} para revisión."
diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml
index 11cc320911..4523f023f2 100644
--- a/config/locales/crowdin/fi.yml
+++ b/config/locales/crowdin/fi.yml
@@ -56,6 +56,7 @@ fi:
   text_duration_in_hours: "Keston tunteina"
   text_in_hours: "tuntia"
   text_meeting_agenda_for_meeting: 'kokouksen "%{meeting}" esityslista'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Pöytäkirjaan tallentamaton sisältö menetetään! Haluatko jatkaa?"
   text_meeting_minutes_for_meeting: 'kokouksen "%{meeting}" pöytäkirja'
   text_review_meeting_agenda: "%{author} on tehnyt %{link} tarkasteltavaksi."
diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml
index 3f70c27192..4f2cff9720 100644
--- a/config/locales/crowdin/fil.yml
+++ b/config/locales/crowdin/fil.yml
@@ -56,6 +56,7 @@ fil:
   text_duration_in_hours: "Tagal sa oras"
   text_in_hours: "sa mga oras"
   text_meeting_agenda_for_meeting: 'adyenda para sa pulong "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Mawawala ang hindi nakasave na mga nilalaman sa minutes! Ipagpatuloy?"
   text_meeting_minutes_for_meeting: 'minutes para sa pulong "%{meeting}"'
   text_review_meeting_agenda: "Ang %{author} ay naglagay ng %{link} para sa pagsusuri."
diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml
index 6b69c10079..0776b5a908 100644
--- a/config/locales/crowdin/fr.yml
+++ b/config/locales/crowdin/fr.yml
@@ -56,6 +56,7 @@ fr:
   text_duration_in_hours: "Durée en heures"
   text_in_hours: "en heures"
   text_meeting_agenda_for_meeting: 'ordre du jour de la réunion «%{meeting} »'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Le contenu non enregistré des minutes de la réunion sera perdu ! Continuer ?"
   text_meeting_minutes_for_meeting: 'Minutes de la réunion "%{meeting}"'
   text_review_meeting_agenda: "%{author} à marqué le %{link} pour vérification."
diff --git a/config/locales/crowdin/he.yml b/config/locales/crowdin/he.yml
index cbdf3a4c32..ebb3ae0057 100644
--- a/config/locales/crowdin/he.yml
+++ b/config/locales/crowdin/he.yml
@@ -56,6 +56,7 @@ he:
   text_duration_in_hours: "משך הזמן בשעות"
   text_in_hours: "בשעות"
   text_meeting_agenda_for_meeting: 'סדר היום לפגישה "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "תוכן שלא נשמר בדקות יאבד! האם להמשיך?"
   text_meeting_minutes_for_meeting: 'דקות לפגישה "%{meeting}"'
   text_review_meeting_agenda: "על %{author} לשים את %{link} לבדיקה."
diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml
index ce6760b08c..6813f22c6f 100644
--- a/config/locales/crowdin/hr.yml
+++ b/config/locales/crowdin/hr.yml
@@ -56,6 +56,7 @@ hr:
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "u satima"
   text_meeting_agenda_for_meeting: 'dnevni red za sastank "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Nepohranjeni sadržaj u minutama biti će izgubljen! Da li želite nastaviti?"
   text_meeting_minutes_for_meeting: 'minute za sastanak "%{meeting}"'
   text_review_meeting_agenda: "%{author} je dodao poveznicu %{link} za provjeru."
diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml
index 08bf6d31d1..fae142d6cf 100644
--- a/config/locales/crowdin/hu.yml
+++ b/config/locales/crowdin/hu.yml
@@ -56,6 +56,7 @@ hu:
   text_duration_in_hours: "Hossza (óra)"
   text_in_hours: "órában"
   text_meeting_agenda_for_meeting: 'a "%{meeting}" megbeszélés napirendje'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "A jegyzőkönyv mentetlen tartalma elvész! Folytatja?"
   text_meeting_minutes_for_meeting: 'a "%{meeting}" megbeszélés jegyzőkönyve'
   text_review_meeting_agenda: "%{author} véleményezésre küldte %{link} -t."
diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml
index fc4141f248..eb644778dc 100644
--- a/config/locales/crowdin/id.yml
+++ b/config/locales/crowdin/id.yml
@@ -56,6 +56,7 @@ id:
   text_duration_in_hours: "Durasi dalam jam"
   text_in_hours: "dalam jam"
   text_meeting_agenda_for_meeting: 'agenda untuk rapat "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Konten yang tidak disimpan dalam laporan akan hilang! Lanjutkan?"
   text_meeting_minutes_for_meeting: 'laporan untuk rapat "%{meeting}"'
   text_review_meeting_agenda: "%{author} telah memberikan %{link} untuk diulas."
diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml
index 8d8aeebde8..f9d10e1daf 100644
--- a/config/locales/crowdin/it.yml
+++ b/config/locales/crowdin/it.yml
@@ -56,6 +56,7 @@ it:
   text_duration_in_hours: "Durata in ore"
   text_in_hours: "in ore"
   text_meeting_agenda_for_meeting: 'ordine del giorno della riunione "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Il contenuto non salvato nei verbali verrà perso! Continuare?"
   text_meeting_minutes_for_meeting: 'verbali per l''incontro "%{meeting}"'
   text_review_meeting_agenda: "%{author} ha pubblicato %{link} per la revisione."
diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml
index 08b7704d52..4aa599c179 100644
--- a/config/locales/crowdin/ko.yml
+++ b/config/locales/crowdin/ko.yml
@@ -56,6 +56,7 @@ ko:
   text_duration_in_hours: "기간(시간)"
   text_in_hours: " 시간"
   text_meeting_agenda_for_meeting: '미팅 "%{meeting}"에 대한 의제'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "의사록의 저장되지 않은 콘텐츠는 손실됩니다! 계속하시겠습니까?"
   text_meeting_minutes_for_meeting: '미팅 "%{meeting}"에 대한 의사록'
   text_review_meeting_agenda: "%{author} 님이 검토를 위해 %{link}을(를) 넣었습니다."
diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml
index fe67ac79ef..0c80619657 100644
--- a/config/locales/crowdin/lt.yml
+++ b/config/locales/crowdin/lt.yml
@@ -56,6 +56,7 @@ lt:
   text_duration_in_hours: "Trukmė valandomis"
   text_in_hours: " valandos(-ų) "
   text_meeting_agenda_for_meeting: 'pasitarimo „%{meeting}“ darbotvarkę'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Neišsaugoti minučių pakeitimai bus prarasti! Tikrai norite tęsti?"
   text_meeting_minutes_for_meeting: 'pasitarimo „%{meeting}“ minutės'
   text_review_meeting_agenda: "%{author} įdėjo %{link} peržiūroje."
diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml
index a2ced20a04..ea0ca0f78c 100644
--- a/config/locales/crowdin/nl.yml
+++ b/config/locales/crowdin/nl.yml
@@ -56,6 +56,7 @@ nl:
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "in uren"
   text_meeting_agenda_for_meeting: 'agenda voor de vergadering "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Niet-opgeslagen inhoud in de notulen zullen verloren gaan! Blijven?"
   text_meeting_minutes_for_meeting: 'minuten voor de vergadering "%{meeting}"'
   text_review_meeting_agenda: "%{author} heeft de %{link} geselecteerd voor herziening."
diff --git a/config/locales/crowdin/no.yml b/config/locales/crowdin/no.yml
index dbf38a60c8..38c9b1a3ab 100644
--- a/config/locales/crowdin/no.yml
+++ b/config/locales/crowdin/no.yml
@@ -56,6 +56,7 @@
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "i timer"
   text_meeting_agenda_for_meeting: 'saksliste for møtet "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Ulagret innhold i refarat går tapt! Vil du fortsette?"
   text_meeting_minutes_for_meeting: 'referat for møtet "%{meeting}"'
   text_review_meeting_agenda: "%{author} har lagt opp %{link} for gjennomgang."
diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml
index 227ffe631d..ea5057fe6b 100644
--- a/config/locales/crowdin/pl.yml
+++ b/config/locales/crowdin/pl.yml
@@ -56,6 +56,7 @@ pl:
   text_duration_in_hours: "Czas trwania w godzinach"
   text_in_hours: "w godzinach"
   text_meeting_agenda_for_meeting: 'agenda spotkania "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Niezapisane zmiany protokołu zostaną utracone! Kontynuować?"
   text_meeting_minutes_for_meeting: 'protokół ze spotkania "%{meeting}"'
   text_review_meeting_agenda: "%{author} umieścił %{link} do przeglądu."
diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml
index 5d7bda583b..654849ecb8 100644
--- a/config/locales/crowdin/pt-BR.yml
+++ b/config/locales/crowdin/pt-BR.yml
@@ -56,6 +56,7 @@ pt-BR:
   text_duration_in_hours: "Duração em horas"
   text_in_hours: "em horas"
   text_meeting_agenda_for_meeting: 'agenda para a reunião "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Conteúdo não salvo na ata será perdido! Continuar?"
   text_meeting_minutes_for_meeting: 'ata da reunião "%{meeting}"'
   text_review_meeting_agenda: "%{author} marcou o %{link} para revisão."
diff --git a/config/locales/crowdin/pt-PT.yml b/config/locales/crowdin/pt-PT.yml
index eba2113b10..461f12c4c4 100644
--- a/config/locales/crowdin/pt-PT.yml
+++ b/config/locales/crowdin/pt-PT.yml
@@ -56,6 +56,7 @@ pt:
   text_duration_in_hours: "Duração em horas"
   text_in_hours: "em horas"
   text_meeting_agenda_for_meeting: 'agenda para a reunião "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Conteúdo não guardado nos minutos será perdido! Continuar?"
   text_meeting_minutes_for_meeting: 'minutos para a reunião "%{meeting}"'
   text_review_meeting_agenda: "%{author} colocou o %{link} para revisão."
diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml
index ab995e0ccd..0048b34c14 100644
--- a/config/locales/crowdin/ru.yml
+++ b/config/locales/crowdin/ru.yml
@@ -56,6 +56,7 @@ ru:
   text_duration_in_hours: "Длительность в часах"
   text_in_hours: "в часах"
   text_meeting_agenda_for_meeting: 'Повестка дня встречи «%{meeting}»'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Несохраненное содержимое протокола будет потеряно! Продолжить?"
   text_meeting_minutes_for_meeting: 'Протокол совещания «%{meeting}»'
   text_review_meeting_agenda: "%{author} поставил %{link} для рецензии."
diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml
index f148a60061..5da8cf4042 100644
--- a/config/locales/crowdin/sk.yml
+++ b/config/locales/crowdin/sk.yml
@@ -56,6 +56,7 @@ sk:
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "v hodinách"
   text_meeting_agenda_for_meeting: 'agenda stretnutia "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Neuložené obsah zápisnice stretnutia bude stratený! Chcete pokračovať?"
   text_meeting_minutes_for_meeting: 'zápisnica zo stretnutia "%{meeting}"'
   text_review_meeting_agenda: "%{author} odoslal %{link} na revíziu."
diff --git a/config/locales/crowdin/sv-SE.yml b/config/locales/crowdin/sv-SE.yml
index bea1c24323..eb92dee9c6 100644
--- a/config/locales/crowdin/sv-SE.yml
+++ b/config/locales/crowdin/sv-SE.yml
@@ -56,6 +56,7 @@ sv:
   text_duration_in_hours: "Varaktighet i timmar"
   text_in_hours: "i timmar"
   text_meeting_agenda_for_meeting: 'agenda för mötet "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Osparat innehåll i protokollet kommer att förloras! Vill du fortsätta?"
   text_meeting_minutes_for_meeting: 'protokollet för mötet "%{meeting}"'
   text_review_meeting_agenda: "%{author} har lagt upp %{link} för granskning."
diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml
index c99b0b95cc..868d8cfafc 100644
--- a/config/locales/crowdin/tr.yml
+++ b/config/locales/crowdin/tr.yml
@@ -56,6 +56,7 @@ tr:
   text_duration_in_hours: "Saat süresi"
   text_in_hours: "saatlerde"
   text_meeting_agenda_for_meeting: 'toplantı gündemi "%{meeting}"'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "Dakikalar içinde kaydedilmemiş içerik kaybolacak! Devam et?"
   text_meeting_minutes_for_meeting: 'toplantı için dakikalar "%{meeting}"'
   text_review_meeting_agenda: "%{author}, %{link} 'i incelemeye koydu."
diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml
index 8fdea08bca..891adf56a9 100644
--- a/config/locales/crowdin/zh-CN.yml
+++ b/config/locales/crowdin/zh-CN.yml
@@ -56,6 +56,7 @@ zh-CN:
   text_duration_in_hours: "持续时间（单位：小时）"
   text_in_hours: "时长"
   text_meeting_agenda_for_meeting: '“%{meeting}”会议议程'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "会议记录中未保存的内容将丢失！确定要继续吗？"
   text_meeting_minutes_for_meeting: '“%{meeting}“会议记录'
   text_review_meeting_agenda: "%{author} 已经将 %{link} 上传待审阅。"
diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml
index 82b1a60e28..08df0faab6 100644
--- a/config/locales/crowdin/zh-TW.yml
+++ b/config/locales/crowdin/zh-TW.yml
@@ -56,6 +56,7 @@ zh-TW:
   text_duration_in_hours: "Duration in hours"
   text_in_hours: "在一小時內"
   text_meeting_agenda_for_meeting: '%{meeting} 的會議大綱'
+  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
   text_meeting_agenda_open_are_you_sure: "會議記錄中未儲存的內容會遺失！確定要繼續嗎？"
   text_meeting_minutes_for_meeting: '%{meeting} 的會議記錄'
   text_review_meeting_agenda: "%{author} 已經放上 %{link} 來審閱"

From 231681c3554e7512dbdde9003b41e2bb74b8ac88 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Fri, 1 Jun 2018 14:09:21 +0000
Subject: [PATCH 4/8] update locales from crowdin

---
 config/locales/crowdin/de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
index 10c139797e..36f1bf1b5a 100644
--- a/config/locales/crowdin/de.yml
+++ b/config/locales/crowdin/de.yml
@@ -56,7 +56,7 @@ de:
   text_duration_in_hours: "Dauer in Stunden"
   text_in_hours: "in Stunden"
   text_meeting_agenda_for_meeting: 'Agenda für die Besprechung "%{meeting}"'
-  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
+  text_meeting_closing_are_you_sure: "Möchten Sie dieses Meeting wirklich schließen?"
   text_meeting_agenda_open_are_you_sure: "Nicht-gespeicherte Inhalte des Protokolls werden durch diese Aktion verworfen! Weitermachen?"
   text_meeting_minutes_for_meeting: 'Protokoll für die Besprechung "%{meeting}"'
   text_review_meeting_agenda: "%{author} hat die %{link} zur Einsicht freigegeben."

From ce2139111919fbfde926a5c9cea22400e3b58f6d Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Tue, 19 Jun 2018 14:18:42 +0000
Subject: [PATCH 5/8] update locales from crowdin

---
 config/locales/crowdin/zh-TW.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml
index 08df0faab6..7b5d9e2443 100644
--- a/config/locales/crowdin/zh-TW.yml
+++ b/config/locales/crowdin/zh-TW.yml
@@ -8,10 +8,10 @@ zh-TW:
         participants_attended: "出席人員"
         participants_invited: "受邀人員"
         start_time: "時間"
-        start_time_hour: "Starting time"
+        start_time_hour: "開始時間"
     errors:
       messages:
-        invalid_time_format: "is not a valid time. Required format: HH:MM"
+        invalid_time_format: "不是有效時間。所需格式: HH:MM"
     models:
       meeting_agenda: "會議大綱"
       meeting_minutes: "會議記錄"
@@ -37,7 +37,7 @@ zh-TW:
   label_meeting_date_time: "日期 / 時間"
   label_meeting_diff: "比較"
   label_notify: "送出審閱"
-  label_icalendar: "Send iCalendar"
+  label_icalendar: "發送 iCalendar"
   label_version: "版本"
   label_time_zone: "時區"
   label_start_date: "開始日期"
@@ -53,12 +53,12 @@ zh-TW:
   permission_create_meeting_minutes: "管理會議記錄"
   permission_send_meeting_minutes_notification: "傳送會議記錄審閱通知"
   project_module_meetings: "會議"
-  text_duration_in_hours: "Duration in hours"
+  text_duration_in_hours: "持續時間 (小時)"
   text_in_hours: "在一小時內"
   text_meeting_agenda_for_meeting: '%{meeting} 的會議大綱'
-  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
+  text_meeting_closing_are_you_sure: "確實要關閉會議嗎？"
   text_meeting_agenda_open_are_you_sure: "會議記錄中未儲存的內容會遺失！確定要繼續嗎？"
   text_meeting_minutes_for_meeting: '%{meeting} 的會議記錄'
   text_review_meeting_agenda: "%{author} 已經放上 %{link} 來審閱"
   text_review_meeting_minutes: "%{author} 已經放上 %{link} 來審閱"
-  text_notificiation_invited: "This mail contains an ics entry for the meeting below:"
+  text_notificiation_invited: "此郵件包含以下會議的 ics 條目:"

From 47a74ea9b2d811ef033aa370fc85c3a0ec4d7b6c Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Fri, 29 Jun 2018 14:24:36 +0000
Subject: [PATCH 6/8] update locales from crowdin

---
 config/locales/crowdin/pt-BR.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml
index 654849ecb8..fd533ba5a9 100644
--- a/config/locales/crowdin/pt-BR.yml
+++ b/config/locales/crowdin/pt-BR.yml
@@ -56,7 +56,7 @@ pt-BR:
   text_duration_in_hours: "Duração em horas"
   text_in_hours: "em horas"
   text_meeting_agenda_for_meeting: 'agenda para a reunião "%{meeting}"'
-  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
+  text_meeting_closing_are_you_sure: "Tem certeza de que quer encerrar a reunião?"
   text_meeting_agenda_open_are_you_sure: "Conteúdo não salvo na ata será perdido! Continuar?"
   text_meeting_minutes_for_meeting: 'ata da reunião "%{meeting}"'
   text_review_meeting_agenda: "%{author} marcou o %{link} para revisão."

From 220a2890f1d50603a07de3bbeab63dd4f7bc1d6b Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Sat, 30 Jun 2018 14:22:53 +0000
Subject: [PATCH 7/8] update locales from crowdin

---
 config/locales/crowdin/es-ES.yml |  2 +-
 config/locales/crowdin/ja.yml    | 64 ++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 config/locales/crowdin/ja.yml

diff --git a/config/locales/crowdin/es-ES.yml b/config/locales/crowdin/es-ES.yml
index 8706863aec..2ff677c337 100644
--- a/config/locales/crowdin/es-ES.yml
+++ b/config/locales/crowdin/es-ES.yml
@@ -56,7 +56,7 @@ es:
   text_duration_in_hours: "Duración en horas"
   text_in_hours: "en horas"
   text_meeting_agenda_for_meeting: 'agenda para la reunión "%{meeting}"'
-  text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting?"
+  text_meeting_closing_are_you_sure: "¿Está seguro que desea cerrar la reunión?"
   text_meeting_agenda_open_are_you_sure: "¡El contenido no guardado de los minutos se perderá! ¿Continuar?"
   text_meeting_minutes_for_meeting: 'minutos para la reunión "%{meeting}"'
   text_review_meeting_agenda: "%{author} ha puesto el %{link} para revisión."
diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml
new file mode 100644
index 0000000000..4aec806234
--- /dev/null
+++ b/config/locales/crowdin/ja.yml
@@ -0,0 +1,64 @@
+ja:
+  activerecord:
+    attributes:
+      meeting:
+        location: "場所"
+        duration: "期間"
+        participants: "参加者"
+        participants_attended: "出席者"
+        participants_invited: "招待者"
+        start_time: "時間"
+        start_time_hour: "開始時刻"
+    errors:
+      messages:
+        invalid_time_format: "有効な時間ではありません。必要なフォーマット: HH:MM"
+    models:
+      meeting_agenda: "アジェンダ"
+      meeting_minutes: "議事録"
+  description_attended: "出席した"
+  description_invite: "招待済み"
+  events:
+    meeting: 会議が編集されました
+    meeting_agenda: 会議の議題が編集されました
+    meeting_agenda_closed: 会議の議題は終了しました
+    meeting_agenda_opened: 会議の議題を開始しました
+    meeting_minutes: 会議の議事録が編集されました
+    meeting_minutes_created: 議事録の作成
+  error_notification_with_errors: "通知を送信できませんでした。次の受信者には通知できませんでした: %{recipients}"
+  label_meeting: "会議"
+  label_meeting_plural: "会議"
+  label_meeting_new: "新しい会議"
+  label_meeting_edit: "会議を編集"
+  label_meeting_agenda: "アジェンダ"
+  label_meeting_minutes: "議事録"
+  label_meeting_close: "終了する"
+  label_meeting_open: "開く"
+  label_meeting_agenda_close: "議題を閉じて議事録を開始する"
+  label_meeting_date_time: "日付/時刻"
+  label_meeting_diff: "差分"
+  label_notify: "レビュー用に送信"
+  label_icalendar: "iCalendar を送信"
+  label_version: "バージョン"
+  label_time_zone: "タイムゾーン"
+  label_start_date: "開始日"
+  notice_successful_notification: "通知が正常に送信されました"
+  notice_timezone_missing: タイムゾーンが設定されていない場合、%{zone} が使用されます。タイムゾーンを選択するには、ここをクリックしてください。
+  permission_create_meetings: "会議を作成"
+  permission_edit_meetings: "会議の編集"
+  permission_delete_meetings: "会議の削除"
+  permission_view_meetings: "会議を表示"
+  permission_create_meeting_agendas: "議題を管理する"
+  permission_close_meeting_agendas: "議題を閉じる"
+  permission_send_meeting_agendas_notification: "議題のレビュー通知を送信する"
+  permission_create_meeting_minutes: "議事録の管理"
+  permission_send_meeting_minutes_notification: "議事録のレビュー通知を送信する"
+  project_module_meetings: "会議"
+  text_duration_in_hours: "期間（時間）"
+  text_in_hours: "数時間以内"
+  text_meeting_agenda_for_meeting: '会議の議題 "%{meeting}"'
+  text_meeting_closing_are_you_sure: "会議を終了してもよろしいですか？"
+  text_meeting_agenda_open_are_you_sure: "保存されていない議事録のコンテンツは失われます！続行しますか？"
+  text_meeting_minutes_for_meeting: '会議の議事録 "%{meeting}"'
+  text_review_meeting_agenda: "%{author} はレビューのために %{link} をアップしました。"
+  text_review_meeting_minutes: "%{author} はレビューのために %{link} をアップしました。"
+  text_notificiation_invited: "このメールには以下のミーティングのicsエントリーが含まれています:"

From c34a182b5f8d21dc6aaf6dff369c3e06b249f4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 10 Jul 2018 10:03:27 +0200
Subject: [PATCH 8/8] Bump VERSION to 7.4.7

---
 lib/open_project/meeting/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb
index 4e568a4cc5..50a962afb8 100644
--- a/lib/open_project/meeting/version.rb
+++ b/lib/open_project/meeting/version.rb
@@ -20,6 +20,6 @@
 
 module OpenProject
   module Meeting
-    VERSION = "7.4.6"
+    VERSION = "7.4.7"
   end
 end