From 98236c95429e0728f5732f82c8599e4024cadbe3 Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 23 Nov 2021 18:04:17 +0100 Subject: [PATCH 1/5] add i18n key for permissions property on role --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index d3d4d908928..2338f22ff4c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -518,6 +518,7 @@ en: url: "URL" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "Permissions" time_entry: activity: "Activity" hours: "Hours" From 2edf6f10d534d7762991b891dd047f3523ff7d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Wed, 24 Nov 2021 08:18:41 +0100 Subject: [PATCH 2/5] Also fix pkgr yml on release branch --- .pkgr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pkgr.yml b/.pkgr.yml index 5c2df160750..50432305cef 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -47,7 +47,7 @@ wizards: - https://github.com/pkgr/addon-smtp.git - https://github.com/pkgr/addon-memcached.git - ./packaging/addons/openproject -buildpack: https://github.com/opf/heroku-buildpack-multi.git +buildpack: https://github.com/opf/heroku-buildpack-multi.git#master env: - NODE_ENV=production - NPM_CONFIG_PRODUCTION=false From 3831209153828e4dc269e00b29e8a8c5a4273c75 Mon Sep 17 00:00:00 2001 From: OpenProject Actions CI Date: Thu, 25 Nov 2021 03:13:59 +0000 Subject: [PATCH 3/5] update locales from crowdin [ci skip] --- config/locales/crowdin/ar.yml | 1 + config/locales/crowdin/bg.yml | 1 + config/locales/crowdin/ca.yml | 35 +++---- config/locales/crowdin/cs.yml | 1 + config/locales/crowdin/da.yml | 1 + config/locales/crowdin/de.yml | 1 + config/locales/crowdin/el.yml | 1 + config/locales/crowdin/es.yml | 1 + config/locales/crowdin/fi.yml | 1 + config/locales/crowdin/fil.yml | 1 + config/locales/crowdin/fr.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/ja.yml | 1 + config/locales/crowdin/js-ca.yml | 2 +- config/locales/crowdin/ko.yml | 1 + config/locales/crowdin/lt.yml | 1 + config/locales/crowdin/nl.yml | 1 + config/locales/crowdin/pl.yml | 1 + config/locales/crowdin/pt.yml | 1 + config/locales/crowdin/ro.yml | 1 + config/locales/crowdin/ru.yml | 1 + config/locales/crowdin/sk.yml | 1 + config/locales/crowdin/sl.yml | 1 + config/locales/crowdin/sv.yml | 1 + config/locales/crowdin/tr.yml | 1 + config/locales/crowdin/uk.yml | 1 + config/locales/crowdin/vi.yml | 1 + config/locales/crowdin/zh-CN.yml | 1 + config/locales/crowdin/zh-TW.yml | 1 + modules/avatars/config/locales/crowdin/ca.yml | 30 +++--- .../avatars/config/locales/crowdin/js-ca.yml | 8 +- .../backlogs/config/locales/crowdin/ca.yml | 56 +++++------ modules/bim/config/locales/crowdin/ca.yml | 94 +++++++++---------- modules/boards/config/locales/crowdin/ca.yml | 4 +- .../boards/config/locales/crowdin/js-ca.yml | 52 +++++----- 38 files changed, 171 insertions(+), 140 deletions(-) diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml index db8bff917fd..a7bc71a6f7d 100644 --- a/config/locales/crowdin/ar.yml +++ b/config/locales/crowdin/ar.yml @@ -464,6 +464,7 @@ ar: url: "الرابط" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "السماحيات" time_entry: activity: "النشاط" hours: "الساعات" diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml index 43bec40da10..3995567cfa3 100644 --- a/config/locales/crowdin/bg.yml +++ b/config/locales/crowdin/bg.yml @@ -460,6 +460,7 @@ bg: url: "URL АДРЕС" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "Права" time_entry: activity: "Активност" hours: "Часове" diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml index f94b20dd1d9..0aa482fc0d5 100644 --- a/config/locales/crowdin/ca.yml +++ b/config/locales/crowdin/ca.yml @@ -20,7 +20,7 @@ #See COPYRIGHT and LICENSE files for more details. #++ ca: - no_results_title_text: Actualment hi ha res a mostrar. + no_results_title_text: Actualment no hi ha res per a mostrar. activities: index: no_results_title_text: No hi hagut activitat al projecte en aquesta finestra de temps. @@ -28,24 +28,24 @@ ca: plugins: no_results_title_text: Actualment no hi ha plugins disponibles. custom_styles: - color_theme: "Color del tema" - color_theme_custom: "(Personalitza)" + color_theme: "Tema de color" + color_theme_custom: "(Personalitzat)" colors: alternative-color: "Alternatiu" - content-link-color: "Font enllaçada" + content-link-color: "Enllaça font" primary-color: "Primari" primary-color-dark: "Primari (fosc)" header-bg-color: "Fons de capçalera" - header-item-bg-hover-color: "Fons de capçalera en l'aire" + header-item-bg-hover-color: "Fons de capçalera en passar el ratolí" header-item-font-color: "Font de capçalera" - header-item-font-hover-color: "Font de capçalera en l'aire" + header-item-font-hover-color: "Font de capçalera en passar el ratolí" header-border-bottom-color: "Vora de capçalera" main-menu-bg-color: "Fons del menú principal" - main-menu-bg-selected-background: "Menú principal un cop seleccionat" - main-menu-bg-hover-background: "Menú principal en l'aire" + main-menu-bg-selected-background: "Menú principal quan es selecciona" + main-menu-bg-hover-background: "Menú principal en passar el ratolí" main-menu-font-color: "Font del menú principal" - main-menu-selected-font-color: "Font del menú principal un cop seleccionat" - main-menu-hover-font-color: "Font del menú principal en l'aire" + main-menu-selected-font-color: "Font del menú principal quan es selecciona" + main-menu-hover-font-color: "Font del menú principal en passar el ratolí" main-menu-border-color: "Vora del menú principal" custom_colors: "Colors personalitzats" customize: "Adapteu la vostra instal·lació d'OpenProject amb el vostre logo. Nota: aquest logo serà accessible públicament." @@ -76,7 +76,7 @@ ca: announcements: show_until: Mostra fins is_active: actualment mostrant - is_inactive: actualment no es mostren + is_inactive: no mostrats actualment attribute_help_texts: note_public: 'Any text and images you add to this field is publicly visible to all logged in users!' text_overview: 'In this view, you can create custom help texts for attributes view. When defined, these texts can be shown by clicking the help icon next to its belonging attribute.' @@ -87,7 +87,7 @@ ca: auth_sources: index: no_results_content_title: Actualment no hi ha cap mode d'autenticació. - no_results_content_text: Crear un nou mode d'autenticació + no_results_content_text: Crea un nou mode d'autenticació background_jobs: status: error_requeue: "Job experienced an error but is retrying. The error was: %{message}" @@ -147,7 +147,7 @@ ca: colors: index: no_results_title_text: Actualment no hi ha cap color. - no_results_content_text: Crear un nou color + no_results_content_text: Crea un nou color label_no_color: 'Sense color' custom_actions: actions: @@ -174,7 +174,7 @@ ca: reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" tab: no_results_title_text: Actualment no hi ha camps personalitzats. - no_results_content_text: Crear un camp personalitzat nou + no_results_content_text: Crea un camp personalitzat nou concatenation: single: 'o' documentation: @@ -312,12 +312,12 @@ ca: no_results_title_text: Actualment no hi ha cap flux de treball. work_packages: x_descendants: - one: 'One descendant work package' - other: '%{count} work package descendants' + one: 'Un paquet de treball descendent' + other: '%{count} paquets de treball descendents' bulk: could_not_be_saved: "Els següents paquets de treball no s'han pogut desar:" move: - no_common_statuses_exists: "No hi ha disponible un estat per a tots els paquets de treball seleccionats. El seu estat no es pot canviar." + no_common_statuses_exists: "No hi ha estats disponibles per a tots els paquets de treball seleccionats. El seus estats no es poden canviar." unsupported_for_multiple_projects: 'Moure o copiar en massa no està soportat per paquets de treball de múltiples projectes' summary: reports: @@ -459,6 +459,7 @@ ca: url: "URL" role: assignable: "Els paquets de treball es poden assignar als usuaris i als grups que tinguin aquest rol en el seu respectiu projecte" + permissions: "Permisos" time_entry: activity: "Activitat" hours: "Hores" diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml index f0130bc8437..3e68f0430bb 100644 --- a/config/locales/crowdin/cs.yml +++ b/config/locales/crowdin/cs.yml @@ -462,6 +462,7 @@ cs: url: "URL" role: assignable: "Pracovní balíčky mohou být přiřazeny uživatelům a skupinám, které tuto roli vlastní v příslušném projektu" + permissions: "Práva" time_entry: activity: "Aktivita" hours: "Hodiny" diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml index dd2ed3aa855..a5193228e55 100644 --- a/config/locales/crowdin/da.yml +++ b/config/locales/crowdin/da.yml @@ -458,6 +458,7 @@ da: url: "Webadresse" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "Tilladelser" time_entry: activity: "Aktivivtet" hours: "Timer" diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml index 6ebddcdb9c5..cf7b715cf9d 100644 --- a/config/locales/crowdin/de.yml +++ b/config/locales/crowdin/de.yml @@ -455,6 +455,7 @@ de: url: "URL" role: assignable: "Arbeitspakete können Benutzern und Gruppen im Besitz dieser Rolle in dem jeweiligen Projekt zugeordnet werden" + permissions: "Berechtigungen" time_entry: activity: "Aktivität" hours: "Stunden" diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml index 430cf03bcee..348721c693c 100644 --- a/config/locales/crowdin/el.yml +++ b/config/locales/crowdin/el.yml @@ -456,6 +456,7 @@ el: url: "URL" role: assignable: "Τα πακέτα εργασίας μπορούν να ανατεθούν σε χρήστες και ομάδες που έχουν αυτό το ρόλο στο αντίστοιχο έργο" + permissions: "Δικαιώματα" time_entry: activity: "Δραστηριότητα" hours: "Ώρες" diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml index 6788496cb31..ba6c795fc71 100644 --- a/config/locales/crowdin/es.yml +++ b/config/locales/crowdin/es.yml @@ -457,6 +457,7 @@ es: url: "URL" role: assignable: "Los paquetes de trabajo se pueden asignar a usuarios y grupos con este papel en los proyectos correspondientes" + permissions: "Permisos" time_entry: activity: "Actividad" hours: "Horas" diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml index 58e97f0f205..c5808a67e6a 100644 --- a/config/locales/crowdin/fi.yml +++ b/config/locales/crowdin/fi.yml @@ -460,6 +460,7 @@ fi: url: "URL" role: assignable: "Toimia paketti voidaan määrittää käyttäjät ja ryhmät hallussaan tämä rooli kunkin projekti" + permissions: "Oikeudet" time_entry: activity: "Tapahtumat" hours: "Tunnit" diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml index 640fbd409cd..198c0911e2a 100644 --- a/config/locales/crowdin/fil.yml +++ b/config/locales/crowdin/fil.yml @@ -460,6 +460,7 @@ fil: url: "Ang URL" role: assignable: "Ang mga work package ay maaring nakatalaga sa mga gumagamit at grupo sa possesyon ng tungkulin na ito sa nakatalagang proyekto" + permissions: "Mga pahintulot" time_entry: activity: "Aktibidad" hours: "Mga oras" diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml index 7ef5371d193..916ba2dc2b8 100644 --- a/config/locales/crowdin/fr.yml +++ b/config/locales/crowdin/fr.yml @@ -460,6 +460,7 @@ fr: url: "URL" role: assignable: "Des lots de travaux peuvent être assignés à des utilisateurs et des groupes possédant ce rôle dans le projet respectif" + permissions: "Autorisations" time_entry: activity: "Activité" hours: "Heures" diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml index da2aa75dc1f..6c83a9953d5 100644 --- a/config/locales/crowdin/hr.yml +++ b/config/locales/crowdin/hr.yml @@ -461,6 +461,7 @@ hr: url: "URL" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "Dozvole" time_entry: activity: "Aktivnost" hours: "Sati" diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml index f1bfb2c5326..8c82f8c7c2d 100644 --- a/config/locales/crowdin/hu.yml +++ b/config/locales/crowdin/hu.yml @@ -461,6 +461,7 @@ hu: url: "URL" role: assignable: "Munkacsomagok hozzárendelhetők a szerephez tartozó felhasználókhoz és csoportokhoz az adott projektben" + permissions: "Jogosultságok" time_entry: activity: "Tevékenység" hours: "órák" diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml index 39732fa9db1..0e94983f00c 100644 --- a/config/locales/crowdin/id.yml +++ b/config/locales/crowdin/id.yml @@ -456,6 +456,7 @@ id: url: "URL" role: assignable: "Paket kerja dapat ditetapkan untuk pengguna-pengguna tunggal dan kelompok-kelompok yang memiliki peran dalam proyek masing-masing" + permissions: "Hak akses" time_entry: activity: "Activity" hours: "Jam" diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml index 0cb1cb9583f..94842cdb3a6 100644 --- a/config/locales/crowdin/it.yml +++ b/config/locales/crowdin/it.yml @@ -457,6 +457,7 @@ it: url: "URL" role: assignable: "È possibile assegnare macro-attività ad utenti e gruppi che hanno questo ruolo nel rispettivo progetto" + permissions: "Permessi" time_entry: activity: "Attività" hours: "Ore" diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml index 05cb61c672a..fbd24158ba3 100644 --- a/config/locales/crowdin/ja.yml +++ b/config/locales/crowdin/ja.yml @@ -455,6 +455,7 @@ ja: url: "URL" role: assignable: "それぞれのプロジェクトで、ワークパッケージはこの役割をもつユーザーおよびグループに割り当てることができます。" + permissions: "権限" time_entry: activity: "活動" hours: " 時間" diff --git a/config/locales/crowdin/js-ca.yml b/config/locales/crowdin/js-ca.yml index 9c0cb0b32a7..dc47f7a8e0e 100644 --- a/config/locales/crowdin/js-ca.yml +++ b/config/locales/crowdin/js-ca.yml @@ -520,7 +520,7 @@ ca: responsible: 'accountable' facets: unread: 'Unread' - all: 'Tot' + all: 'Totes' center: and_more_users: one: 'and 1 other' diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml index 909cb62d198..475afde06cd 100644 --- a/config/locales/crowdin/ko.yml +++ b/config/locales/crowdin/ko.yml @@ -458,6 +458,7 @@ ko: url: "주소" role: assignable: "작업 패키지는 각각의 프로젝트에서 이 역할을 가진 사용자와 그룹에 할당될 수 있습니다." + permissions: "권한" time_entry: activity: "활동" hours: "시간" diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml index 347b950b4f6..0c78bf3d038 100644 --- a/config/locales/crowdin/lt.yml +++ b/config/locales/crowdin/lt.yml @@ -459,6 +459,7 @@ lt: url: "URL" role: assignable: "Darbų paketai gali būti priskirti naudotojams ir grupėms pagal rolės vaidmenį atitinkamame projekte" + permissions: "Leidimai" time_entry: activity: "Veikla" hours: "Valandų" diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml index dadbcfd2df7..ed53c5b1e4e 100644 --- a/config/locales/crowdin/nl.yml +++ b/config/locales/crowdin/nl.yml @@ -457,6 +457,7 @@ nl: url: "URL" role: assignable: "Werkpakketten kunnen worden toegewezen aan gebruikers en groepen met deze rol in het respectieve project" + permissions: "Machtigingen" time_entry: activity: "Activiteit" hours: "Uren" diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml index 2aadb439a8a..fcae00d0bb8 100644 --- a/config/locales/crowdin/pl.yml +++ b/config/locales/crowdin/pl.yml @@ -459,6 +459,7 @@ pl: url: "ADRES URL" role: assignable: "Pakiety robocze mogą być przypisane do użytkowników i grup znajdujących się w posiadaniu tej roli w odpowiednim projekcie" + permissions: "Uprawnienia" time_entry: activity: "Działanie" hours: "Godziny" diff --git a/config/locales/crowdin/pt.yml b/config/locales/crowdin/pt.yml index 256e34ee4d1..e6cac15c762 100644 --- a/config/locales/crowdin/pt.yml +++ b/config/locales/crowdin/pt.yml @@ -459,6 +459,7 @@ pt: url: "URL" role: assignable: "Pacotes de trabalho podem ser atribuídos a usuários e grupos em posse deste papel no respectivo projeto" + permissions: "Permissões" time_entry: activity: "Atividade" hours: "horas" diff --git a/config/locales/crowdin/ro.yml b/config/locales/crowdin/ro.yml index 022fb66dc44..bbb0adef5d4 100644 --- a/config/locales/crowdin/ro.yml +++ b/config/locales/crowdin/ro.yml @@ -461,6 +461,7 @@ ro: url: "URL" role: assignable: "Pachetele de lucru pot fi atribuite utilizatorilor și grupurilor care dețin acest rol în proiectul respectiv" + permissions: "Drepturi" time_entry: activity: "Activitate" hours: "Ore" diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml index 0e4617d7bab..e12e5d11fbf 100644 --- a/config/locales/crowdin/ru.yml +++ b/config/locales/crowdin/ru.yml @@ -461,6 +461,7 @@ ru: url: "URL" role: assignable: "Пакеты работ могут быть привязаны к пользователям и группам в зависимости от этой роли в рамках соответствующего проекта" + permissions: "Разрешения" time_entry: activity: "Деятельность" hours: "Часы" diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml index 321eb983671..c4a7663fbae 100644 --- a/config/locales/crowdin/sk.yml +++ b/config/locales/crowdin/sk.yml @@ -462,6 +462,7 @@ sk: url: "URL adresa" role: assignable: "Pracovné balíčky môžu byť pridelené užívateľom a skupinám, ktoré majú v príslušnom projekte túto úlohu" + permissions: "Oprávnenia" time_entry: activity: "Činnosť" hours: "Hodín" diff --git a/config/locales/crowdin/sl.yml b/config/locales/crowdin/sl.yml index 40eb8265862..c7a0885e048 100644 --- a/config/locales/crowdin/sl.yml +++ b/config/locales/crowdin/sl.yml @@ -459,6 +459,7 @@ sl: url: "URL" role: assignable: "Delovni paketi se lahko dodelijo uporabnikom in skupinam, ki imajo to vlogo v posameznem projektu" + permissions: "Dovoljenja" time_entry: activity: "Aktivnost" hours: "Ure" diff --git a/config/locales/crowdin/sv.yml b/config/locales/crowdin/sv.yml index cf2b6beedf5..04d68aebe26 100644 --- a/config/locales/crowdin/sv.yml +++ b/config/locales/crowdin/sv.yml @@ -459,6 +459,7 @@ sv: url: "URL" role: assignable: "Arbetspaket kan tilldelas användare och grupper som har denna roll i respektive projektet" + permissions: "Behörigheter" time_entry: activity: "Aktivitet" hours: "Timmar" diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml index c2b31eb7b49..35baf7794e2 100644 --- a/config/locales/crowdin/tr.yml +++ b/config/locales/crowdin/tr.yml @@ -460,6 +460,7 @@ tr: url: "URL" role: assignable: "İşpaketleri bağlı projedeki rollere göre kullanıcı ve gruplara atanabilir" + permissions: "İzinler" time_entry: activity: "Etkinlik" hours: "Saat" diff --git a/config/locales/crowdin/uk.yml b/config/locales/crowdin/uk.yml index 31dd3a99389..6c441db4314 100644 --- a/config/locales/crowdin/uk.yml +++ b/config/locales/crowdin/uk.yml @@ -462,6 +462,7 @@ uk: url: "Посилання" role: assignable: "Робочі пакети можуть бути призначені користувачам і групам, які володіють цією роллю у відповідному проекті" + permissions: "Дозволи" time_entry: activity: "Активність" hours: "Години" diff --git a/config/locales/crowdin/vi.yml b/config/locales/crowdin/vi.yml index 996e5b3ae2b..cb3783c94f3 100644 --- a/config/locales/crowdin/vi.yml +++ b/config/locales/crowdin/vi.yml @@ -461,6 +461,7 @@ vi: url: "Đường dẫn (URL)" role: assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project" + permissions: "Phân Quyền" time_entry: activity: "Hoạt động" hours: "Giờ" diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml index 22b9d637b73..2c76d14de69 100644 --- a/config/locales/crowdin/zh-CN.yml +++ b/config/locales/crowdin/zh-CN.yml @@ -455,6 +455,7 @@ zh-CN: url: "URL" role: assignable: "无法将工作包分配给在各自项目中具有此角色的用户和群组" + permissions: "权限" time_entry: activity: "活动" hours: "小时" diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml index 62f22b83881..619f937b2af 100644 --- a/config/locales/crowdin/zh-TW.yml +++ b/config/locales/crowdin/zh-TW.yml @@ -459,6 +459,7 @@ zh-TW: url: "URL" role: assignable: "可以將工作包分配給在相應專案中擁有此角色的使用者和群組" + permissions: "權限" time_entry: activity: "活動" hours: "小時" diff --git a/modules/avatars/config/locales/crowdin/ca.yml b/modules/avatars/config/locales/crowdin/ca.yml index 303b5964f47..d09f4e791c3 100644 --- a/modules/avatars/config/locales/crowdin/ca.yml +++ b/modules/avatars/config/locales/crowdin/ca.yml @@ -4,15 +4,15 @@ ca: label_avatar_plural: "Avatars" label_current_avatar: "Avatar actual" label_choose_avatar: "Tria un Avatar des d'un fitxer" - message_avatar_uploaded: "Avatar canviat correctament." + message_avatar_uploaded: "L'avatar s'ha canviat correctament." error_image_upload: "Error guardant la imatge." - error_image_size: "El fitxer és massa gran." - button_change_avatar: "Canviar avatar" - are_you_sure_delete_avatar: "Estàs segur que vols suprimir el teu avatar?" - avatar_deleted: "Avatar eliminat correctament." + error_image_size: "La imatge és massa gran." + button_change_avatar: "Canvia l'avatar" + are_you_sure_delete_avatar: "Segur que voleu suprimir el vostre avatar?" + avatar_deleted: "L'avatar s'ha eliminat correctament." unable_to_delete_avatar: "No s'ha pogut suprimir l'avatar." wrong_file_format: "Els formats permesos són jpg, png, gif " - empty_file_error: "Si us plau, puja una imatge vàlida (jpg, png, gif)" + empty_file_error: "Si us plau, pugeu una imatge vàlida (jpg, png, gif)" avatars: label_avatar: "Avatar" label_gravatar: 'Gravatar' @@ -21,20 +21,20 @@ ca: text_current_avatar: | La següent imatge mostra l'avatar actual text_upload_instructions: | - Puja el teu avatar personalitzat de 128 per 128 pixels. Les imatges més grans es re-dimensionaran i retallaran per encaixar. - Una visualització prèvia de l'avatar es mostrarà abans de carregar-la, un cop seleccioni la imatge. - text_change_gravatar_html: 'Per a canviar o afegir el Gravatar pel correu electrònic, accedeix a %{gravatar_url}.' + Pugeu el vostre avatar personalitzat de 128 per 128 píxels. Les imatges més grans es redimensionaran i retallaran per encaixar. + Una visualització prèvia de l'avatar es mostrarà abans de carregar-la, un cop seleccioneu la imatge. + text_change_gravatar_html: 'Per a canviar o afegir el Gravatar de la vostra adreça de correu electrònic, accediu a %{gravatar_url}.' text_your_local_avatar: | - OpenProject permet pujar el teu avatar personalitzat. + OpenProject us permet de pujar el vostre avatar personalitzat. text_local_avatar_over_gravatar: | - Si s'estableix un, aquest avatar personalitzat s'utilitzarà amb preferència sobre el gravatar de sobre. + Si n'establiu un, aquest avatar personalitzat s'utilitzarà preferentment abans que el gravatar de sobre. text_your_current_gravatar: | - OpenProject utilitza el teu gravatar si n'has registrat un, o una imatge o icona per defecte si aquest existeix. - L'actual gravatar es: + OpenProject fa servir el vostre gravatar si n'heu registrat un, o una imatge o icona per defecte si n'existeix una. + L'actual gravatar és el següent: settings: - enable_gravatars: 'Activa Gravatars d''usuari' + enable_gravatars: 'Activa els Gravatars d''usuari' gravatar_default: "Imatge Gravatar predeterminada" - enable_local_avatars: 'Activa avatars d''usuari personalitzats' + enable_local_avatars: 'Activa els avatars d''usuari personalitzats' diff --git a/modules/avatars/config/locales/crowdin/js-ca.yml b/modules/avatars/config/locales/crowdin/js-ca.yml index bd264f13c08..a83237eb3db 100644 --- a/modules/avatars/config/locales/crowdin/js-ca.yml +++ b/modules/avatars/config/locales/crowdin/js-ca.yml @@ -5,11 +5,11 @@ ca: button_update: 'Actualitza' avatars: label_choose_avatar: "Tria un Avatar des d'un fitxer" - uploading_avatar: "Carregant el seu avatar." + uploading_avatar: "Carregant el vostre avatar." text_upload_instructions: | - Puja el teu avatar personalitzat de 128 per 128 pixels. Les imatges més grans es re-dimensionaran i retallaran per encaixar. - Una visualització prèvia de l'avatar es mostrarà abans de carregar-la, un cop seleccioni la imatge. + Pugeu el vostre avatar personalitzat de 128 per 128 píxels. Les imatges més grans es redimensionaran i retallaran per encaixar. + Una visualització prèvia de l'avatar es mostrarà abans de carregar-la, un cop seleccioneu la imatge. error_image_too_large: "La imatge és massa gran." wrong_file_format: "Els formats permesos són jpg, png, gif " - empty_file_error: "Si us plau, puja una imatge vàlida (jpg, png, gif)" + empty_file_error: "Si us plau, pugeu una imatge vàlida (jpg, png, gif)" diff --git a/modules/backlogs/config/locales/crowdin/ca.yml b/modules/backlogs/config/locales/crowdin/ca.yml index 9f510a6affd..ebb0bdd40bc 100644 --- a/modules/backlogs/config/locales/crowdin/ca.yml +++ b/modules/backlogs/config/locales/crowdin/ca.yml @@ -27,21 +27,21 @@ ca: remaining_hours: "Hores restants" remaining_time: "Hores restants" story_points: "Punts d'història" - backlogs_work_package_type: "Tipus de llista de pendents" + backlogs_work_package_type: "Tipus de backlog" errors: models: work_package: attributes: blocks_ids: - can_only_contain_work_packages_of_current_sprint: "només pot contenir els IDs dels paquets de treball de l'esprint actual." + can_only_contain_work_packages_of_current_sprint: "només pot contenir els IDs dels paquets de treball del sprint actual." must_block_at_least_one_work_package: "ha de contenir l'ID d'almenys un tiquet." parent_id: - parent_child_relationship_across_projects: "no és vàlid perquè el paquet de treball '%{work_package_name}' és una tasca de la llista de pendents i per tant no pot tenir un pare fora el projecte actual." - type_must_be_one_of_the_following: "Tipus ha de ser un dels següents: %{type_names}." + parent_child_relationship_across_projects: "no és vàlid perquè el paquet de treball '%{work_package_name}' és una tasca de backlog i per tant no pot tenir un parent fora el projecte actual." + type_must_be_one_of_the_following: "El tipus ha de ser un dels següents: %{type_names}." version_id: - task_version_must_be_the_same_as_story_version: "ha de ser el mateix que la versió pare de la història." + task_version_must_be_the_same_as_story_version: "ha de ser la mateixa que la versió de la història pare." sprint: - cannot_end_before_it_starts: "L'sprint no pot acabar abans de que comenci." + cannot_end_before_it_starts: "El sprint no pot acabar abans de que comenci." backlogs: add_new_story: "Nova història" any: "qualsevol" @@ -56,10 +56,10 @@ ca: generating_chart: "Generant gràfic..." hours: "Hores" impediment: "Impediment" - label_versions_default_fold_state: "Mostrar les versions contretes" + label_versions_default_fold_state: "Mostra les versions contretes" work_package_is_closed: "Paquet de treball està fet, quan" label_is_done_status: "L'estat %{status_name} significa fet" - no_burndown_data: "Sense dades disponibles de progrés. És necessari tenir establertes les dates d'inici i final de l'sprint." + no_burndown_data: "No hi ha dades de progrés disponibles. És necessari tenir establertes les dates de l'inici i el final del sprint." points: "Punts" positions_could_not_be_rebuilt: "No es poden reconstruir les posicions." positions_rebuilt_successfully: "Posicions reconstruïdes amb èxit." @@ -97,37 +97,37 @@ ca: backlogs_velocity_varies: "La velocitat varia significativament d'un sprint a l'altre" backlogs_wiki_template: "Plantilla per a la pàgina wiki de l'sprint" backlogs_empty_title: "No hi ha versions definides per a ser utilitzades als backlogs" - backlogs_empty_action_text: "Per a introduir-se als backlogs, generi una nova versio i assigni-la a la columna bakclogs." - button_edit_wiki: "Editar pàgina wiki" + backlogs_empty_action_text: "Per a introduir-vos amb els backlogs, genereu una nova versió i assigneu-la a la columna backlogs." + button_edit_wiki: "Edita la pàgina wiki" error_backlogs_task_cannot_be_story: "The settings are invalid. The selected task type can not also be a story type." error_intro_plural: "S'han produït els següents errors:" error_intro_singular: "S'ha produït el següent error:" - error_outro: "Corregiu els errors anteriors abans d'enviar-lo una altra vegada." + error_outro: "Corregiu els errors anteriors abans d'enviar-ho una altra vegada." event_sprint_description: "%{summary}: %{url}%{description}" event_sprint_summary: "%{project}: %{summary}" ideal: "ideal" - inclusion: "no està inclòs a la llista" + inclusion: "no s'ha inclòs a la llista" label_back_to_project: "Tornar a la pàgina del projecte" - label_backlog: "Llista de pendents" - label_backlogs: "Llistes de pendents" - label_backlogs_unconfigured: "No heu configurat les llistes de pendents encara. Si us plau aneu a %{administration} > %{plugins}, a continuació, feu clic a l'enllaç de %{configure} per a aquest plugin. Una vegada que hagi establert els camps, torni a aquesta pàgina per començar a utilitzar l'eina." + label_backlog: "Backlog" + label_backlogs: "Backlogs" + label_backlogs_unconfigured: "No heu configurat les llistes de pendents encara. Si us plau aneu a %{administration} > %{plugins}, a continuació, feu clic a l'enllaç de %{configure} per a aquest plugin. Una vegada que hagueu establert els camps, torneu a aquesta pàgina per començar a utilitzar l'eina." label_blocks_ids: "Identificadors dels paquets de treball bloquejats" label_burndown: "Progrés" - label_column_in_backlog: "Columna a la llista de pendents" + label_column_in_backlog: "Columna al backlog" label_hours: "hores" label_work_package_hierarchy: "Jerarquia de paquet de treball" - label_master_backlog: "Màster de la llista de pendents" + label_master_backlog: "Backlog mestre" label_not_prioritized: "no prioritzats" label_points: "punts" label_points_burn_down: "A baix" label_points_burn_up: "Amunt" label_product_backlog: "llista de pendents del producte" label_select_all: "Selecciona-ho tot" - label_sprint_backlog: "esprint backlog" - label_sprint_cards: "Exporta targetes" + label_sprint_backlog: "sprint backlog" + label_sprint_cards: "Exporta les targetes" label_sprint_impediments: "Impediments d'sprint" - label_sprint_name: "Esprint \"%{name}\"" - label_sprint_velocity: "Velocitat %{velocity}, basada en %{sprints} esprints amb una mitja de %{days} dies" + label_sprint_name: "Sprint \"%{name}\"" + label_sprint_velocity: "Velocitat de %{velocity}, basada en %{sprints} sprints amb una mitjana de %{days} dies" label_stories: "Històries" label_stories_tasks: "Històries/Tasques" label_task_board: "Tauler de tasques" @@ -136,17 +136,17 @@ ca: label_webcal: "Webcal Feed" label_wiki: "Wiki" permission_view_master_backlog: "Veure el backlog mestre" - permission_view_taskboards: "Veure taulers" + permission_view_taskboards: "Visualitza els taulers de tasques" permission_select_done_statuses: "Select done statuses" - permission_update_sprints: "Actualitzar esprints" + permission_update_sprints: "Actualitza els sprints" points_accepted: "punts acceptats" - points_committed: "punts compromesos" + points_committed: "punts sotmesos" points_resolved: "punts resolts" points_to_accept: "punts no acceptats" points_to_resolve: "punts no resolts" - project_module_backlogs: "Llistes de pendents" - rb_label_copy_tasks: "Copiar paquets de treball" - rb_label_copy_tasks_all: "Tot" + project_module_backlogs: "Backlogs" + rb_label_copy_tasks: "Copia paquets de treball" + rb_label_copy_tasks_all: "Totes" rb_label_copy_tasks_none: "Cap" rb_label_copy_tasks_open: "Obert" rb_label_link_to_original: "Incloure l'enllaç a la història original" @@ -155,7 +155,7 @@ ca: required_burn_rate_points: "ritme de progrés necessari (punts)" todo_work_package_description: "%{summary}: %{url}%{description}" todo_work_package_summary: "%{type}: %{summary}" - version_settings_display_label: "Columna a la llista de pendents" + version_settings_display_label: "Columna al backlog" version_settings_display_option_left: "esquerra" version_settings_display_option_none: "cap" version_settings_display_option_right: "dreta" diff --git a/modules/bim/config/locales/crowdin/ca.yml b/modules/bim/config/locales/crowdin/ca.yml index e79db20b3c1..a3c4b92e1bb 100644 --- a/modules/bim/config/locales/crowdin/ca.yml +++ b/modules/bim/config/locales/crowdin/ca.yml @@ -4,9 +4,9 @@ ca: label_bim: 'BIM' bcf: label_bcf: 'BCF' - label_imported_failed: 'Error a l''importar els elements BCF' - label_imported_successfully: 'Succés a l''importar els elements BCF' - issues: "Temes" + label_imported_failed: 'Error a l''importar els temes BCF' + label_imported_successfully: 'S''ha importat els temes BCF correctament.' + issues: "Problemes" recommended: 'recomanat' not_recommended: 'no recomanat' no_viewpoints: 'Sense punts de vista' @@ -28,50 +28,50 @@ ca: import_canceled: 'Importació BCF-XML cancel·lada' type_not_active: "Aquest tipus de tema no està activat per aquest projecte." import: - num_issues_found: '%{x_bcf_issues} are contained in the BCF-XML file, their details are listed below.' - button_prepare: 'Prepare import' - button_perform_import: 'Confirm import' + num_issues_found: '%{x_bcf_issues} són continguts al fitxer BCF-XML, es llisten els detalls a tot seguit.' + button_prepare: 'Prepara la importació' + button_perform_import: 'Confirma la importació' button_proceed: 'Proceed with import' - button_back_to_list: 'Back to list' - no_permission_to_add_members: 'You do not have sufficient permissions to add them as members to the project.' - contact_project_admin: 'Contact your project admin to add them as members and start this import again.' - continue_anyways: 'Do you want to proceed and finish the import anyways?' - description: "Provide a BCF-XML v2.1 file to import into this project. You can examine its contents before performing the import." - invalid_types_found: 'Invalid topic type names found' - invalid_statuses_found: 'Invalid status names found' - invalid_priorities_found: 'Invalid priority names found' - invalid_emails_found: 'Invalid email addresses found' - unknown_emails_found: 'Unknown email addresses found' - unknown_property: 'Unknown property' - non_members_found: 'Non project members found' - import_types_as: 'Set all these types to' - import_statuses_as: 'Set all these statuses to' - import_priorities_as: 'Set all these priorities to' - invite_as_members_with_role: 'Invite them as members to the project "%{project}" with role' - add_as_members_with_role: 'Add them as members to the project "%{project}" with role' - no_type_provided: 'No type provided' - no_status_provided: 'No status provided' - no_priority_provided: 'No priority provided' - perform_description: "Do you want to import or update the issues listed above?" - replace_with_system_user: 'Replace them with "System" user' - import_as_system_user: 'Import them as "System" user.' + button_back_to_list: 'Torna a la llista' + no_permission_to_add_members: 'No teniu suficients permisos per a afegir-los com a membres del projecte.' + contact_project_admin: 'Contacteu amb el vostre administrador del projecte per a afegir-los com a membres i començar de nou aquesta importació' + continue_anyways: 'Voleu procedir i finalitzar la importació de totes maneres?' + description: "Proporcioneu un fitxer BCF-XML v2.1 per a importar-lo al projecte. Podeu examinar-ne els continguts abans de fer-ne la importació." + invalid_types_found: 'S''ha trobat noms de tipus de tema invàlids.' + invalid_statuses_found: 'S''ha trobat noms d''estat invàlids.' + invalid_priorities_found: 'S''ha trobat noms de prioritat invàlids.' + invalid_emails_found: 'S''ha trobat adreces de correu electrònic invàlides' + unknown_emails_found: 'S''ha trobat adreces de correu electrònic desconegudes' + unknown_property: "La propietat és desconeguda.\n" + non_members_found: 'No s''ha trobat membres del projecte' + import_types_as: 'Estableix tots aquests tipus a' + import_statuses_as: 'Estableix tots aquests estats a' + import_priorities_as: 'Estableix tots aquestes prioritats a' + invite_as_members_with_role: 'Convida''ls com a membres del projecte "%{project}" amb rol' + add_as_members_with_role: 'Afegeix-los com a membres del projecte "%{project}" amb rol' + no_type_provided: 'No s''ha proporcionat cap tipus' + no_status_provided: 'No s''ha proporcionat cap estat' + no_priority_provided: 'No s''ha proporcionat cap prioritat' + perform_description: "Voleu importar o actualitzar els problemes llistats sobre?" + replace_with_system_user: 'Substituïu-los amb l''usuari "Sistema"' + import_as_system_user: 'Importa''ls com a l''usuari "Sistema"' what_to_do: "Què voleu fer?" - work_package_has_newer_changes: "Outdated! This topic was not updated as the latest changes on the server were newer than the \"ModifiedDate\" of the imported topic. However, comments to the topic were imported." + work_package_has_newer_changes: "Obsolet! Aquest tema no s'ha actualitzat ja que els últims canvis al servidor són més nous que la \"Data de Modificació\" del tema importat. Tanmateix, els comentaris del tema s'han importat." bcf_file_not_found: "Failed to locate BCF file. Please start the upload process again." export: format: bcf: "BCF-XML" attributes: - bcf_thumbnail: "BCF snapshot" + bcf_thumbnail: "Instantània de BCF" project_module_bcf: "BCF" project_module_bim: "BCF" - permission_view_linked_issues: "View BCF issues" - permission_manage_bcf: "Import and manage BCF issues" + permission_view_linked_issues: "Visualitza els problemes de BCF" + permission_manage_bcf: "Importa i administra els problemes de BCF" permission_delete_bcf: "Delete BCF issues" oauth: scopes: - bcf_v2_1: "Full access to the BCF v2.1 API" - bcf_v2_1_text: "Application will receive full read & write access to the OpenProject BCF API v2.1 to perform actions on your behalf." + bcf_v2_1: "Accés complet a la API BCF v2.1" + bcf_v2_1_text: "L'aplicació rebrà accés complet de lectura i escriptura a la API BCF v2.1 d'OpenProject per efectuar les accions en nom vostre." activerecord: models: bim/ifc_models/ifc_model: "Model IFC" @@ -88,18 +88,18 @@ ca: ifc_attachment_missing: "Sense fitxer IFC adjunt." invalid_ifc_file: "El fitxer aportat no es un IFC vàlid." bim/bcf/viewpoint: - bitmaps_not_writable: "bitmaps is not writable as it is not yet implemented." - index_not_integer: "index is not an integer." - invalid_clipping_planes: "clipping_planes is invalid." - invalid_components: "components is invalid." - invalid_lines: "lines is invalid." - invalid_orthogonal_camera: "orthogonal_camera is invalid." - invalid_perspective_camera: "perspective_camera is invalid." - mismatching_guid: "The guid in the json_viewpoint does not match the model's guid." - no_json: "Is not a well structured json." - snapshot_type_unsupported: "snapshot_type needs to be either 'png' or 'jpg'." - snapshot_data_blank: "snapshot_data needs to be provided." - unsupported_key: "An unsupported json property is included." + bitmaps_not_writable: "Els bitmaps no es poden escriure ja que ecnara no s'ha implementat." + index_not_integer: "L'índex no és un enter." + invalid_clipping_planes: "clipping_panes no és vàlid.\n" + invalid_components: "components és invàlid." + invalid_lines: "lines no és vàlid." + invalid_orthogonal_camera: "orthogonal_camera no és vàlid." + invalid_perspective_camera: "perspective_camera no és vàlid." + mismatching_guid: "El GUID del json_viewpoint no coincideix amb el GUID del model." + no_json: "No és un json correctament estructurat." + snapshot_type_unsupported: "snapshot_type ha de ser o bé 'png' o 'jpg'." + snapshot_data_blank: "s'ha de proporcionar snapshot_data." + unsupported_key: "S'ha inclòs una propietat json no suportada." bim/bcf/issue: uuid_already_taken: "Can't import this BCF issue as there already is another with the same GUID. Could it be that this BCF issue had already been imported into a different project?" ifc_models: diff --git a/modules/boards/config/locales/crowdin/ca.yml b/modules/boards/config/locales/crowdin/ca.yml index 4676484989a..ba51b9fd729 100644 --- a/modules/boards/config/locales/crowdin/ca.yml +++ b/modules/boards/config/locales/crowdin/ca.yml @@ -1,7 +1,7 @@ #English strings go here ca: - permission_show_board_views: "Veure taulers" - permission_manage_board_views: "Administrar taulers" + permission_show_board_views: "Veure els taulells" + permission_manage_board_views: "Administrar els taulells" project_module_board_view: "Taulells" boards: label_board: "Taulell" diff --git a/modules/boards/config/locales/crowdin/js-ca.yml b/modules/boards/config/locales/crowdin/js-ca.yml index a46ede18fc6..78fc064fcd9 100644 --- a/modules/boards/config/locales/crowdin/js-ca.yml +++ b/modules/boards/config/locales/crowdin/js-ca.yml @@ -4,42 +4,42 @@ ca: boards: label_unnamed_board: 'Taulell sense nom' label_unnamed_list: 'Llista sense nom' - label_board_type: 'Taulell tipus' + label_board_type: 'Tipus de taulell' upsale: - teaser_text: 'Millori la seva gestió de projectes àgil amb aquesta vista flexible de taulells. Generi tants taulells com vulguis per a controlar tot allò que necessiti.' - upgrade_to_ee_text: 'Boards is an Enterprise feature. Please upgrade to a paid plan.' - upgrade: 'Upgrade now' + teaser_text: 'Milloreu la vostra gestió de projectes àgils amb aquesta vista de taulells flexible. Creeu tants taulells com vulgueu per a qualsevol cosa que en vulgueu fer-ne seguiment.' + upgrade_to_ee_text: 'Els taulells són una característica Enterprise. Si us plau, actualitzeu a un pla de pagament.' + upgrade: 'Actualitzeu ara' personal_demo: 'Contact us for a demo' lists: - delete: 'Delete list' + delete: 'Suprimeix la llista' version: - is_locked: 'Version is locked. No items can be added to this version.' - is_closed: 'Version is closed. No items can be added to this version.' - close_version: 'Close version' - open_version: 'Open version' - lock_version: 'Lock version' - unlock_version: 'Unlock version' - edit_version: 'Edit version' - show_version: 'Show version' + is_locked: 'La versió és bloquejada. No es poden afegir elements en aquesta versió.' + is_closed: 'La versió és tancada. No es poden afegir elements en aquesta versió.' + close_version: 'Tanca la versió' + open_version: 'Obre la versió' + lock_version: 'Bloca la versió' + unlock_version: 'Desbloca la versió' + edit_version: 'Edita la versió' + show_version: 'Mostra la versió' locked: 'Bloquejat' closed: 'Tancat' - new_board: 'New board' + new_board: 'Nou taulell' add_list: 'Add list to board' - add_card: 'Add card' - error_attribute_not_writable: "Cannot move the work package, %{attribute} is not writable." - error_loading_the_list: "Error loading the list: %{error_message}" - error_permission_missing: "No disposa de permisos per crear consultes públiques" + add_card: 'Afegeix una targeta' + error_attribute_not_writable: "No es pot moure el paquet de treball, %{attribute} no és modificable." + error_loading_the_list: "Error carregant la llista: %{error_message}" + error_permission_missing: "No disposeu de permisos per crear consultes públiques" error_cannot_move_into_self: "You can not move a work package into its own column." text_hidden_list_warning: "Not all lists are displayed because you lack the permission. Contact your admin for more information." - click_to_remove_list: "Click to remove this list" + click_to_remove_list: "Cliqueu per eliminar aquesta llista" board_type: - text: 'Taulell tipus' + text: 'Tipus de taulell' free: 'basic' select_board_type: 'Please choose the type of board you need.' free_text: > Start from scratch with a blank board. Manually add cards and columns to this board. - action: 'Action board' - action_by_attribute: 'Action board (%{attribute})' + action: 'Taulell d''acció' + action_by_attribute: 'Panell d''acció (%{attribute})' action_text: > A board with filtered lists on %{attribute} attribute. Moving work packages to other lists will update their attribute. action_text_subprojects: > @@ -65,7 +65,7 @@ ca: subproject: Subprojecte subtasks: Parent-Child basic: Basic - select_attribute: "Action attribute" + select_attribute: "Atribut d'acció" add_list_modal: labels: assignee: Select user to add as a new assignee list @@ -81,7 +81,7 @@ ca: no_member: This project currently does not have any members that can be added.
add_members: Add a new member to this project to select users again. configuration_modal: - title: 'Configure this board' + title: 'Configureu aquest taulell' display_settings: - card_mode: "Display as cards" - table_mode: "Display as table" + card_mode: "Mostreu-ho com a targetes" + table_mode: "Mostreu-ho com a taula" From 7dc0ef466a638b04cbfaf84f3bd7572c08dff1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 22 Nov 2021 18:29:37 +0100 Subject: [PATCH 4/5] npm audit --- frontend/package-lock.json | 72 ++++++++++---------------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 50d9f75c920..5b6b25aacbe 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3890,9 +3890,9 @@ "dev": true }, "@types/hast": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.2.tgz", - "integrity": "sha512-Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", + "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", "requires": { "@types/unist": "*" } @@ -4030,9 +4030,9 @@ } }, "@types/unist": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz", - "integrity": "sha512-wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g==" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", + "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" }, "@types/urijs": { "version": "1.19.6", @@ -14338,14 +14338,14 @@ } }, "react-syntax-highlighter": { - "version": "15.4.4", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.4.tgz", - "integrity": "sha512-PsOFHNTzkb3OroXdoR897eKN5EZ6grht1iM+f1lJSq7/L0YVnkJaNVwC3wEUYPOAmeyl5xyer1DjL6MrumO6Zw==", + "version": "15.4.5", + "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", + "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", "requires": { "@babel/runtime": "^7.3.1", "highlight.js": "^10.4.1", "lowlight": "^1.17.0", - "prismjs": "^1.22.0", + "prismjs": "^1.25.0", "refractor": "^3.2.0" } }, @@ -14520,20 +14520,13 @@ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" }, "refractor": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.4.0.tgz", - "integrity": "sha512-dBeD02lC5eytm9Gld2Mx0cMcnR+zhSnsTfPpWqFaMgUMJfC9A6bcN3Br/NaXrnBJcuxnLFR90k1jrkaSyV8umg==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz", + "integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==", "requires": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", - "prismjs": "~1.24.0" - }, - "dependencies": { - "prismjs": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz", - "integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow==" - } + "prismjs": "~1.25.0" } }, "regenerate": { @@ -18062,40 +18055,11 @@ "dev": true }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "wildcard": { From fc96b42878a8bd0f34670d72704d24778f36bb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Thu, 25 Nov 2021 13:08:01 +0100 Subject: [PATCH 5/5] Bump ruby to 2.7.5 https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-7-5-released/ --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- docker/ci/Dockerfile | 2 +- docker/dev/backend/Dockerfile | 2 +- docker/prod/Dockerfile | 2 +- docs/development/development-environment-docker/README.md | 2 +- docs/development/development-environment-osx/README.md | 8 ++++---- docs/development/development-environment-ubuntu/README.md | 8 ++++---- .../installation/manual/README.md | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.ruby-version b/.ruby-version index a4dd9dba4fb..a603bb50a29 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +2.7.5 diff --git a/Gemfile b/Gemfile index 757351e7b9f..fb179a407ef 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ source 'https://rubygems.org' -ruby '~> 2.7.4' +ruby '~> 2.7.5' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 87e26b1c073..2e7cb3223db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1138,7 +1138,7 @@ DEPENDENCIES with_advisory_lock (~> 4.6.0) RUBY VERSION - ruby 2.7.4p191 + ruby 2.7.5p203 BUNDLED WITH 2.1.4 diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index baf5c62efd1..c3479102d76 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster +FROM ruby:2.7.5-buster MAINTAINER operations@openproject.com ENV NODE_VERSION="14.17.0" diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile index 7188c4b632f..fe0ef9f0c00 100644 --- a/docker/dev/backend/Dockerfile +++ b/docker/dev/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster as develop +FROM ruby:2.7.5-buster as develop MAINTAINER operations@openproject.com ARG DEV_UID=1000 diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 579256d8870..e10fb4c4208 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster +FROM ruby:2.7.5-buster MAINTAINER operations@openproject.com # Allow platform-specific additions. Valid values are: on-prem,saas,bahn diff --git a/docs/development/development-environment-docker/README.md b/docs/development/development-environment-docker/README.md index 0626743d4a9..d3133f6674c 100644 --- a/docs/development/development-environment-docker/README.md +++ b/docs/development/development-environment-docker/README.md @@ -192,7 +192,7 @@ an error like the following when running `bin/compose setup`: ``` Creating core_backend_run ... done -Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.4 +Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.5 ``` This means that the current image is out-dated. You can update it like this: diff --git a/docs/development/development-environment-osx/README.md b/docs/development/development-environment-osx/README.md index 02f6cc63257..0cc162496bf 100644 --- a/docs/development/development-environment-osx/README.md +++ b/docs/development/development-environment-osx/README.md @@ -32,20 +32,20 @@ $ rbenv init ### Installing ruby-2.7 With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `2.7.4`, which we also require. +At the time of this writing, the latest stable version is `2.7.5`, which we also require. We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line and install that version. ```bash # Install the required version as read from the Gemfile -rbenv install 2.7.4 +rbenv install 2.7.5 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```bash -rbenv global 2.7.4 +rbenv global 2.7.5 ``` You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. @@ -116,7 +116,7 @@ You should now have an active ruby and node installation. Verify that it works w ```bash $ ruby --version -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] $ bundler --version Bundler version 2.1.4 diff --git a/docs/development/development-environment-ubuntu/README.md b/docs/development/development-environment-ubuntu/README.md index 988a4b603d6..e85a2943c17 100644 --- a/docs/development/development-environment-ubuntu/README.md +++ b/docs/development/development-environment-ubuntu/README.md @@ -54,20 +54,20 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build ### Installing ruby-2.7 With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `2.7.4`, which we also require. +At the time of this writing, the latest stable version is `2.7.5`, which we also require. We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line and install that version. ```bash # Install the required version as read from the Gemfile -rbenv install 2.7.4 +rbenv install 2.7.5 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```bash -rbenv global 2.7.4 +rbenv global 2.7.5 rbenv rehash ``` @@ -155,7 +155,7 @@ You should now have an active ruby and node installation. Verify that it works w ```bash ruby --version -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] bundler --version Bundler version 2.1.4 diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md index 21c7f0625e7..898b4c3fc3a 100644 --- a/docs/installation-and-operations/installation/manual/README.md +++ b/docs/installation-and-operations/installation/manual/README.md @@ -106,16 +106,16 @@ time to finish. [openproject@host] source ~/.profile [openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build -[openproject@host] rbenv install 2.7.4 +[openproject@host] rbenv install 2.7.5 [openproject@host] rbenv rehash -[openproject@host] rbenv global 2.7.4 +[openproject@host] rbenv global 2.7.5 ``` To check our Ruby installation we run `ruby --version`. It should output something very similar to: ``` -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] ``` ## Installation of Node