From 2595c874ace6a6650c617117230801dc1b51a71d Mon Sep 17 00:00:00 2001 From: lunika <767834+lunika@users.noreply.github.com> Date: Thu, 22 Oct 2026 19:04:47 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8C=90(i18n)=20update=20translated=20?= =?UTF-8?q?strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update translated files with new translations --- .../locale/br_FR/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/de_DE/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/el_GR/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/en_US/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/es_ES/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/fr_FR/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/it_IT/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/nl_NL/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/pl_PL/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/pt_PT/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/ru_RU/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/sl_SI/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/sv_SE/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/tr_TR/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/uk_UA/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/zh_CN/LC_MESSAGES/django.po | 320 +++++++++++------- .../locale/zh_TW/LC_MESSAGES/django.po | 320 +++++++++++------- .../apps/impress/src/i18n/translations.json | 2 +- 18 files changed, 3367 insertions(+), 2075 deletions(-) diff --git a/src/backend/locale/br_FR/LC_MESSAGES/django.po b/src/backend/locale/br_FR/LC_MESSAGES/django.po index 00a05b2874..84aac9c2bb 100644 --- a/src/backend/locale/br_FR/LC_MESSAGES/django.po +++ b/src/backend/locale/br_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Breton\n" "Language: br_FR\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Titouroù personel" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Aotreoù" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Deiziadoù a-bouez" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Gwezennadur" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titl" @@ -152,198 +208,202 @@ msgstr "Kleiz" msgid "Right" msgstr "Dehoù" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "alc'hwez kentañ evit an enrollañ evel UIID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "krouet d'ar/al" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "deiziad hag eurvezh krouidigezh an enrolladenn" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "hizivaet d'ar/al" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "deiziad hag eurvezh m'eo bet hizivaet an enrolladenn" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "N'hon eus kavet implijer ebet gant an isstrollad-mañ met ar postel a zo liammet ouzh un implijer enrollet." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "isstrollad" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "anv klok" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "anv berr" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "postel identelezh" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "postel ar merour" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "yezh" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Ar yezh a vo implijet evit etrefas an implijer." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Ar gwerzhid-eur a vo implijet evit etrefas an implijer." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "trevnad" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Pe vefe an implijer un aparailh pe un implijer gwirion." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "statud ar skipailh" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Ma c'hall an implijer kevreañ ouzh al lec'hienn verañ-mañ." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "oberiant" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Ma rank bezañ tretet an implijer-mañ evel oberiant. Diziuzit an dra-mañ e-plas dilemel kontoù." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "implijer" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "implijerien" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "titl" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "bomm" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Restr" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Restroù" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Restr hep titl" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Digeriñ" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} en deus rannet ur restr ganeoc'h!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} en deus pedet ac'hanoc'h gant ar rol \"{role}\" war ar restr da-heul:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} en deus rannet ur restr ganeoc'h: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Roud liamm ar restr/an implijer" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Roudoù liamm ar restr/an implijer" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Ur roud liamm a zo dija evit an restr/an implijer." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Restr muiañ-karet" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Restroù muiañ-karet" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Ar restr-mañ a zo ur restr muiañ karet gant an implijer-mañ." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Liamm restr/implijer" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Liammoù restr/implijer" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "An implijer-mañ a zo dija er restr-mañ." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Ar skipailh-mañ a zo dija en restr-mañ." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "An implijer pe ar skipailh a rank bezañ termenet, ket an daou avat." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Goulenn tizhout ar restr" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Goulennoù tizhout ar restr" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "An implijer en deus goulennet tizhout ar restr-mañ." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} en defe c'hoant da dizhout ar restr-mañ!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} en defe c'hoant da dizhout ar restr da-heul:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} en defe c'hoant da dizhout ar restr: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "postel" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Pedadenn d'ur restr" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Pedadennoù d'ur restr" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Ar postel-mañ a zo liammet ouzh un implijer enskrivet." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/de_DE/LC_MESSAGES/django.po b/src/backend/locale/de_DE/LC_MESSAGES/django.po index b65f09785c..a5b651399f 100644 --- a/src/backend/locale/de_DE/LC_MESSAGES/django.po +++ b/src/backend/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Persönliche Daten" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Berechtigungen" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Wichtige Termine" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Import-Job erstellt und in der Warteschlange." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Baumstruktur" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titel" @@ -152,198 +208,202 @@ msgstr "Links" msgid "Right" msgstr "Rechts" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "ID" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "Primärschlüssel für den Datensatz als UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "Erstellt am" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "Datum und Uhrzeit, an dem ein Datensatz erstellt wurde" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "Aktualisiert" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "Datum und Uhrzeit, an dem zuletzt aktualisiert wurde" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Wir konnten keinen Benutzer mit diesem Abo finden, aber die E-Mail-Adresse ist bereits einem registrierten Benutzer zugeordnet." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Pflichtfeld. 255 Zeichen oder weniger. Buchstaben (nur ASCII), Ziffern und die Zeichen @/-/_/." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "Name" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "Kurzbezeichnung" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "Identitäts-E-Mail-Adresse" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "Admin E-Mail-Adresse" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "Sprache" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Die Sprache, in der der Benutzer die Benutzeroberfläche sehen möchte." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Die Zeitzone, in der der Nutzer Zeiten sehen möchte." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "Gerät" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Ob der Benutzer ein Gerät oder ein echter Benutzer ist." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "Status des Teammitgliedes" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Gibt an, ob der Benutzer sich in diese Admin-Seite einloggen kann." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "aktiviert" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Ob dieser Benutzer als aktiviert behandelt werden soll. Deaktivieren Sie diese Option, anstatt Konten zu löschen." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "Status der ersten Verbindung" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Gibt an, ob der Benutzer die Prozedur der ersten Verbindung abgeschlossen hat." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "Benutzer" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "Benutzer" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Aktive E-Mail-Adresse" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Zu deaktivierende E-Mail-Adresse" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "Ausstehend" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Bereit" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Fertig" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Fehler" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Klicken Sie hier" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Bestätigen Sie" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Ihre Konten wurden zusammengelegt" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Klicken Sie hier um zu sehen" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Meine Dokumente einsehen" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "CSV-Datei" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "Wird ausgeführt" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Neue Anfrage erstellen" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "Titel" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "Auszug" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Dokument" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Dokumente" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Unbenanntes Dokument" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Öffnen" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} hat ein Dokument mit Ihnen geteilt!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} hat Sie mit der Rolle \"{role}\" zu folgendem Dokument eingeladen:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} hat ein Dokument mit Ihnen geteilt: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Dokument/Benutzer Linkverfolgung" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Dokument/Benutzer Linkverfolgung" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Für dieses Dokument/ diesen Benutzer ist bereits eine Linkverfolgung vorhanden." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Dokumentenfavorit" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Dokumentfavoriten" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Dieses Dokument ist bereits durch den gleichen Benutzer favorisiert worden." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Dokument/Benutzerbeziehung" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Dokument/Benutzerbeziehungen" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Dieser Benutzer befindet sich bereits in diesem Dokument." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Dieses Team befindet sich bereits in diesem Dokument." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Benutzer oder Team müssen gesetzt werden, nicht beides." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Dokument um Zugriff bitten" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Dokumentenabfragen" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Dieser Benutzer hat bereits um Zugang zu diesem Dokument gebeten." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} möchte Zugriff auf ein Dokument erhalten!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} möchte auf das folgende Dokument zugreifen:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} bittet um Zugang zum Dokument: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Thread" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Threads" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Gast" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Kommentar" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Kommentare" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Reaktion" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Reaktionen" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "E-Mail-Adresse" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Einladung zum Dokument" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Dokumenteinladungen" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Diese E-Mail ist bereits einem registrierten Benutzer zugeordnet." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/el_GR/LC_MESSAGES/django.po b/src/backend/locale/el_GR/LC_MESSAGES/django.po index e01693f979..a3fbb0c5d3 100644 --- a/src/backend/locale/el_GR/LC_MESSAGES/django.po +++ b/src/backend/locale/el_GR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Προσωπικές πληροφορίες" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Δικαιώματα" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Σημαντικές ημερομηνίες" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Η εργασία εισαγωγής δημιουργήθηκε και μπήκε στην ουρά." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Επεξεργασία επιλεγμένων συμφωνιών χρηστών" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Δομή δέντρου" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Τίτλος" @@ -152,147 +208,151 @@ msgstr "Αριστερά" msgid "Right" msgstr "Δεξιά" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "αναγνωριστικό" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "πρωτεύον κλειδί για την εγγραφή ως UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "δημιουργήθηκε στις" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "ημερομηνία και ώρα δημιουργίας μιας εγγραφής" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "ενημερώθηκε στις" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "ημερομηνία και ώρα τελευταίας ενημέρωσης μιας εγγραφής" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Δεν μπορέσαμε να βρούμε χρήστη με αυτό το sub, αλλά το email σχετίζεται ήδη με έναν εγγεγραμμένο χρήστη." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub (αναγνωριστικό υποκειμένου)" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Υποχρεωτικό. 255 χαρακτήρες ή λιγότεροι. Μόνο χαρακτήρες ASCII." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "πλήρες όνομα" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "σύντομο όνομα" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "διεύθυνση email ταυτότητας" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "διεύθυνση email διαχειριστή" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "γλώσσα" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Η γλώσσα στην οποία ο χρήστης θέλει να δει τη διεπαφή." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Η ζώνη ώρας στην οποία ο χρήστης θέλει να βλέπει την ώρα." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "συσκευή" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Εάν ο χρήστης είναι μια συσκευή ή πραγματικός χρήστης." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "κατάσταση προσωπικού" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Εάν ο χρήστης μπορεί να συνδεθεί σε αυτόν τον ιστότοπο διαχείρισης." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "ενεργός" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Εάν αυτός ο χρήστης πρέπει να θεωρείται ενεργός. Αποεπιλέξτε το αντί να διαγράψετε λογαριασμούς." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "πρώτη κατάσταση σύνδεσης" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Εάν ο χρήστης έχει ολοκληρώσει τη διαδικασία της πρώτης σύνδεσης." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "χρήστης" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "χρήστες" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Ενεργή διεύθυνση email" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Διεύθυνση email για απενεργοποίηση" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Μοναδικό αναγνωριστικό στο πηγαίο αρχείο" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "Σε εκκρεμότητα" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Έτοιμο" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Ολοκληρώθηκε" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Σφάλμα" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "συμφωνία χρήστη" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "συμφωνία χρηστών" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Έχετε ζητήσει έναν συνδυασμό των λογαρ " Για να επιβεβαιώσετε ότι είστε εκείνος που ξεκίνησε το αίτημα\n" " και ότι αυτό το email ανήκει σε σας:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Επιβεβαιώστε κάνοντας κλικ στο σύνδεσμο για να ξεκινήσει η συμφωνία" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Κάντε κλικ εδώ" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Επιβεβαίωση" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Το αίτημά σας για συμφωνία έχει επεξεργαστεί.\n" " Νέα έγγραφα είναι πιθανό να σχετίζονται με τον λογαριασμό σας:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Οι λογαριασμοί σας έχουν συγχωνευθεί" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Κάντε κλικ εδώ για να δείτε" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Δείτε τα έγγραφά μου" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "Αρχείο CSV" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "Εκτελείται" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "εισαγωγή CSV συμφωνίας χρηστών" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "εισαγωγές CSV συμφωνίας χρηστών" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Το αίτημά σας για επαλήθευση δεν ολοκλη " Παρακαλούμε ελέγξτε αν υπάρχουν τυπογραφικά λάθη.\n" " Μπορείτε να υποβάλετε ένα νέο αίτημα με τις σωστές διευθύνσεις email." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Η συμφωνία των λογαριασμών σας Docs δεν ολοκληρώθηκε" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Κάντε ένα νέο αίτημα" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "τίτλος" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "απόσπασμα" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Έγγραφο" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Έγγραφα" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Έγγραφο χωρίς τίτλο" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Άνοιγμα" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "Ο/Η {name} μοιράστηκε ένα έγγραφο μαζί σας!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "Ο/Η {name} σας προσκάλεσε με τον ρόλο \"{role}\" στο ακόλουθο έγγραφο:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "Ο/Η {name} μοιράστηκε ένα έγγραφο μαζί σας: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Ίχνος συνδέσμου εγγράφου/χρήστη" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Ίχνη συνδέσμου εγγράφου/χρήστη" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Ένα ίχνος συνδέσμου υπάρχει ήδη για αυτό το έγγραφο/χρήστη." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Αγαπημένο έγγραφο" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Αγαπημένα έγγραφα" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Αυτό το έγγραφο στοχεύεται ήδη από μια σχέση αγαπημένου για τον ίδιο χρήστη." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Σχέση εγγράφου/χρήστη" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Σχέσεις εγγράφου/χρήστη" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Αυτός ο χρήστης συμμετέχει ήδη σε αυτό το έγγραφο." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Αυτή η ομάδα συμμετέχει ήδη σε αυτό το έγγραφο." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Πρέπει να οριστεί είτε χρήστης είτε ομάδα, όχι και τα δύο." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Αίτημα πρόσβασης σε έγγραφο" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Αιτήματα πρόσβασης σε έγγραφα" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Αυτός ο χρήστης έχει ήδη ζητήσει πρόσβαση σε αυτό το έγγραφο." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "Ο/Η {name} θα ήθελε πρόσβαση σε ένα έγγραφο!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "Ο/Η {name} θα ήθελε πρόσβαση στο ακόλουθο έγγραφο:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "Ο/Η {name} ζητά πρόσβαση στο έγγραφο: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Νήμα" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Νήματα" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Ανώνυμος" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Σχόλιο" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Σχόλια" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Αυτό το emoji έχει χρησιμοποιηθεί ήδη ως αντίδραση σε αυτό το σχόλιο." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Αντίδραση" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Αντιδράσεις" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "διεύθυνση email" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Πρόσκληση σε έγγραφο" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Προσκλήσεις εγγράφου" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Αυτό το email σχετίζεται ήδη με έναν εγγεγραμμένο χρήστη." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/en_US/LC_MESSAGES/django.po b/src/backend/locale/en_US/LC_MESSAGES/django.po index 594460cf65..f9b1cf9a98 100644 --- a/src/backend/locale/en_US/LC_MESSAGES/django.po +++ b/src/backend/locale/en_US/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: English\n" "Language: en_US\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "" @@ -152,198 +208,202 @@ msgstr "" msgid "Right" msgstr "" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "" -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/es_ES/LC_MESSAGES/django.po b/src/backend/locale/es_ES/LC_MESSAGES/django.po index 4ebd85d7dc..35af89d316 100644 --- a/src/backend/locale/es_ES/LC_MESSAGES/django.po +++ b/src/backend/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Información Personal" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Permisos" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Fechas importantes" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Estructura en árbol" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Título" @@ -152,198 +208,202 @@ msgstr "Izquierda" msgid "Right" msgstr "Derecha" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "clave primaria para el registro como UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "creado el" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "fecha y hora en la que se creó un registro" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "actualizado el" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "fecha y hora en la que un registro fue actualizado por última vez" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "No se ha podido encontrar un usuario con este sub (UUID), pero el correo electrónico ya está asociado con un usuario." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub (UUID)" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Obligatorio. 255 caracteres o menos. Solo caracteres ASCII." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "nombre completo" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "nombre abreviado" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "correo electrónico de identidad" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "correo electrónico del administrador" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "idioma" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "El idioma en el que el usuario desea ver la interfaz." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "La zona horaria en la que el usuario quiere ver los tiempos." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "dispositivo" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Si el usuario es un dispositivo o un usuario real." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "rol en el equipo" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Si el usuario puede iniciar sesión en esta página web de administración." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "activo" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Si este usuario debe ser considerado como activo. Deseleccionar en lugar de eliminar cuentas." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "usuario" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "usuarios" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "Pending" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Listo" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Terminado" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Error" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Haga click aquí" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Confirmar" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Haz clic aquí para ver" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "Archivo CSV" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "En ejecución" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Hacer un nuevo pedido" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "título" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "resumen" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Documento" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Documentos" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Documento sin título" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Abrir" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "¡{name} ha compartido un documento contigo!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "Te ha invitado {name} al siguiente documento con el rol \"{role}\" :" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} ha compartido un documento contigo: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Traza del enlace de documento/usuario" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Trazas del enlace de documento/usuario" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Ya existe una traza de enlace para este documento/usuario." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Documento favorito" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Documentos favoritos" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Este documento ya ha sido marcado como favorito por el usuario." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Relación documento/usuario" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Relaciones documento/usuario" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Este usuario ya forma parte del documento." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Este equipo ya forma parte del documento." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Debe establecerse un usuario o un equipo, no ambos." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Solicitud de acceso" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Solicitud de accesos" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Este usuario ya ha solicitado acceso a este documento." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "¡{name} desea acceder a un documento!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} desea acceso al siguiente documento:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} está pidiendo acceso al documento: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Thread" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Threads" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Anónimo" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Comentario" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Comentarios" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Reacción" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Reacciones" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "dirección de correo electrónico" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Invitación al documento" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Invitaciones a documentos" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Este correo electrónico está asociado a un usuario registrado." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.po b/src/backend/locale/fr_FR/LC_MESSAGES/django.po index 4d0372ad83..55dec48180 100644 --- a/src/backend/locale/fr_FR/LC_MESSAGES/django.po +++ b/src/backend/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "Oui" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Infos Personnelles" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Permissions" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Dates importantes" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Supprimer définitivement les utilisateurs sélectionnés" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Tâche d'import créée et mise en file d'attente." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Traiter les rapprochements de l'utilisateur sélectionné" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "de " + +#: core/admin.py:308 +msgid "to" +msgstr "à " + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Arborescence" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titre" @@ -152,147 +208,151 @@ msgstr "Gauche" msgid "Right" msgstr "Droite" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "identifiant/id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "clé primaire pour l'enregistrement en tant que UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "créé le" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "date et heure de création de l'enregistrement" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "mis à jour le" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "date et heure de la dernière mise à jour de l'enregistrement" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Nous n'avons pas pu trouver un utilisateur avec ce sous-groupe mais l'e-mail est déjà associé à un utilisateur enregistré." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sous-groupe" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Obligatoire. 255 caractères ou moins. Caractères ASCII uniquement." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "nom complet" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "nom court" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "adresse e-mail d'identité" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "adresse e-mail de l'administrateur" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "langue" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "La langue dans laquelle l'utilisateur veut voir l'interface." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Le fuseau horaire dans lequel l'utilisateur souhaite voir les heures." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "appareil" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Si l'utilisateur est un appareil ou un utilisateur réel." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "statut d'équipe" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Si l'utilisateur peut se connecter à ce site d'administration." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "actif" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Si cet utilisateur doit être traité comme actif. Désélectionnez ceci au lieu de supprimer des comptes." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "état de la première connexion" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Si l'utilisateur a terminé le processus de première connexion." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "utilisateur" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "utilisateurs" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Adresse email active" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Adresse email à désactiver" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Identifiant unique dans le fichier source" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "En attente" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Prêt" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Terminé" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Erreur" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "rapprochement de l'utilisateur" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "rapprochements de l'utilisateur" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Vous avez demandé un rapprochement de vos comptes utilisateur sur Docs. " Pour confirmer que vous êtes bien à l'origine de cette demande\n" " et que cet e-mail vous appartient :" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Confirmez en cliquant sur le lien pour commencer le rapprochement" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Cliquez ici" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Confirmer" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Votre demande de rapprochement a été traitée.\n" " De nouveaux documents sont probablement associés à votre compte :" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Vos comptes ont été fusionnés" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Cliquez ici pour voir" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Voir mes documents" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "Fichier CSV" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "En cours" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "import du CSV de rapprochement utilisateur" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "import du CSV de rapprochement utilisateur" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Votre demande de rapprochement n'a pas abouti.\n" " Veuillez vérifier qu'il n'y a pas de fautes de frappe.\n" " Vous pouvez envoyer une nouvelle demande avec des adresses e-mail valides." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Le rapprochement de vos comptes Docs n'est pas terminé" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Faire une nouvelle demande" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "titre" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "extrait" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Document" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Documents" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Document sans titre" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Ouvrir" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} a partagé un document avec vous !" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} vous a invité avec le rôle \"{role}\" sur le document suivant :" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} a partagé un document avec vous : {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Trace du lien document/utilisateur" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Traces du lien document/utilisateur" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Une trace de lien existe déjà pour ce document/utilisateur." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Document favori" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Documents favoris" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Ce document est déjà un favori de cet utilisateur." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Relation document/utilisateur" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Relations document/utilisateur" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Cet utilisateur est déjà dans ce document." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Cette équipe est déjà dans ce document." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "L'utilisateur ou l'équipe doivent être définis, pas les deux." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Demande d'accès au document" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Demande d'accès au document" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Cet utilisateur a déjà demandé l'accès à ce document." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} souhaiterait accéder au document suivant !" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} souhaiterait accéder au document suivant :" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} demande l'accès au document : {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Conversation" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Conversations" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Anonyme" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Commentaire" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Commentaires" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Cet émoji a déjà été réagi à ce commentaire." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Réaction" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Réactions" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "Mention" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "Mentions" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "un utilisateur supprimé" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "Le fil de discussion n'appartient pas à ce document." -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "{name} vous a mentionné(e) dans un commentaire dans \"{title}\"" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "{name} vous a mentionné(e) dans un commentaire dans le document suivant :" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "{name} vous a mentionné(e) dans \"{title}\"" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "{name} vous a mentionné(e) dans le document suivant :" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "adresse e-mail" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Invitation à un document" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Invitations à un document" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Cette adresse email est déjà associée à un utilisateur inscrit." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "Migré" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "Déjà migré" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "Rien dans le stockage d'objets" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "Aucune version lisible" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "Échec" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "statut" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "versions" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "appliqué" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "versions ayant ajouté du contenu, une entrée d'activité chacune" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "ignoré" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "versions qui n'ont pas pu être lues" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "abandonné" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "versions antérieures à celles que le serveur rejoue" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "durée" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "erreur" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "Migration de document" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "Migration des documents" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "Les accès, les documents créés, les invitations envoyées, les favoris, l'historique des liens, les fils de discussion, les commentaires et les réactions de ces utilisateurs seront transférés vers l'utilisateur sélectionné, qui en sera informé par e-mail ; ces utilisateurs seront ensuite désactivés :" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "Les documents créés par l'utilisateur source, ainsi que ses droits d'accès à ces documents et à leurs sous-documents, y compris ceux qui ont été supprimés, seront transférés à l'utilisateur cible. Les droits d'accès des équipes de l'utilisateur source restent inchangés. L'utilisateur cible hérite du rôle que l'utilisateur source a hérité des documents parents, que ce dernier conserve :" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/it_IT/LC_MESSAGES/django.po b/src/backend/locale/it_IT/LC_MESSAGES/django.po index d7d0206007..2fa8223fb4 100644 --- a/src/backend/locale/it_IT/LC_MESSAGES/django.po +++ b/src/backend/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Informazioni personali" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Permessi" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Date importanti" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Elimina permanentemente gli utenti selezionati" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Attività di importazione creata e inserita in coda." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Elabora le riconciliazioni utenti selezionate" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Struttura ad albero" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titolo" @@ -152,147 +208,151 @@ msgstr "Sinistra" msgid "Right" msgstr "Destra" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "Id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "chiave primaria per il record come UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "creato il" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "data e ora in cui è stato creato un record" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "aggiornato il" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "data e ora in cui l’ultimo record è stato aggiornato" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Impossibile trovare un utente con questo sub, ma l'email è già associata a un utente registrato." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Obbligatorio. Massimo 255 caratteri. Solo caratteri ASCII." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "nome completo" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "nome" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "indirizzo email di identità" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "Indirizzo email dell'amministratore" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "lingua" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "La lingua in cui l'utente vuole vedere l'interfaccia." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Il fuso orario in cui l'utente vuole vedere gli orari." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "dispositivo" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Se l'utente è un dispositivo o un utente reale." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "stato del personale" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Indica se l'utente può accedere a questo sito amministratore." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "attivo" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Indica se questo utente deve essere trattato come attivo. Deseleziona invece di eliminare gli account." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "stato della prima connessione" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Indica se l'utente ha completato il processo di prima connessione." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "utente" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "utenti" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Indirizzo email attivo" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Indirizzo email da disattivare" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "ID univoco nel file sorgente" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "In attesa" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Pronto" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Completato" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Errore" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "riconciliazione utente" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "riconciliazioni utente" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Hai richiesto una riconciliazione dei tuoi account utente su Docs.\n" " Per confermare che sei stato tu a avviare la richiesta\n" " e che questo indirizzo email ti appartiene:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Conferma cliccando sul link per avviare la riconciliazione" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Clicca qui" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Conferma" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "La tua richiesta di riconciliazione è stata elaborata.\n" " È probabile che nuovi documenti siano ora associati al tuo account:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "I tuoi account sono stati uniti" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Clicca qui per vedere" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Vedi i miei documenti" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "File CSV" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "In esecuzione" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "importazione CSV riconciliazione utenti" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "importazioni CSV riconciliazione utenti" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "La tua richiesta di riconciliazione non è andata a buon fine.\n" " Verifica che non ci siano errori di battitura.\n" " Puoi inviare un'altra richiesta con gli indirizzi email validi." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Riconciliazione dei tuoi account Docs non completata" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Fai una nuova richiesta" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "titolo" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "estratto" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Documento" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Documenti" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Documento senza titolo" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Apri" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} ha condiviso un documento con te!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} ti ha invitato con il ruolo \"{role}\" nel seguente documento:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} ha condiviso un documento con te: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Traccia del link documento/utente" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Tracce del link documento/utente" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Esiste già una traccia del link per questo documento/utente." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Documento preferito" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Documenti preferiti" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Questo documento è già associato a un'istanza di relazione preferita per lo stesso utente." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Relazione documento/utente" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Relazioni documento/utente" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Questo utente è già presente in questo documento." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Questo team è già presente in questo documento." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Deve essere impostato l'utente o il team, non entrambi." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Richiesta di accesso al documento" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Richieste di accesso al documento" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Questo utente ha già richiesto l'accesso a questo documento." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} desidera accedere a un documento!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} desidera accedere al seguente documento:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} sta richiedendo l'accesso al documento: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Discussione" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Discussioni" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Anonimo" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Commento" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Commenti" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Questa emoji è già stata usata come reazione a questo commento." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Reazione" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Reazioni" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "indirizzo email" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Invito al documento" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Inviti al documento" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Questa email è già associata a un utente registrato." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/nl_NL/LC_MESSAGES/django.po b/src/backend/locale/nl_NL/LC_MESSAGES/django.po index d6daebacab..6f5d1f5d9e 100644 --- a/src/backend/locale/nl_NL/LC_MESSAGES/django.po +++ b/src/backend/locale/nl_NL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Persoonlijke informatie" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Machtigingen" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Belangrijke data" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Geselecteerde gebruikers permanent verwijderen" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Import taak gemaakt en in de wachtrij geplaatst." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Verwerk geselecteerde gebruikers samenvoeging" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Boomstructuur" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titel" @@ -152,147 +208,151 @@ msgstr "Links" msgid "Right" msgstr "Rechts" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "primaire sleutel voor dossier als UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "gecreëerd op" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "datum en tijd waarop dossier is gecreeërd" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "Laatst gewijzigd op" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "datum en tijd waarop dossier laatst was gewijzigd" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Wij konden geen gebruiker vinden met dit id, maar de email is al geassocieerd met een geregistreerde gebruiker." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "id" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Vereist. 255 tekens of minder. Alleen ASCII tekens." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "volledige naam" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "gebruikersnaam" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "identiteit emailadres" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "admin emailadres" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "taal" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "De taal waarin de gebruiker de interface wil zien." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "De tijdzone waarin de gebruiker de tijden wil zien." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "apparaat" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Of de gebruiker een apparaat is of een echte gebruiker." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "beheerder status" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Of de gebruiker kan inloggen in het beheer gedeelte." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "actief" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Of een gebruiker als actief moet worden beschouwd. Deselecteer dit in plaats van het account te deleten." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "eerste verbinding status" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Of de gebruiker het eerste verbindingsproces heeft voltooid." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "gebruiker" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "gebruikers" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Actieve e-mail adres" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "E-mailadres om te deactiveren" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Unieke ID in het bronbestand" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "In behandeling" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Klaar" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Klaar" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Fout" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "gebruiker samenvoegen" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "gebruikers samenvoegen" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Je hebt gevraagd om een samenvoeging van je gebruikersaccounts op Docs.\ " Om te bevestigen dat u degene bent die het verzoek\n" " heeft geïnitieerd en dat deze e-mail van u is:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Bevestig door te klikken op de link om de samenvoeging te starten" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Klik hier" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Bevestig" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Uw samenvoegingsverzoek is verwerkt.\n" " Nieuwe documenten worden waarschijnlijk geassocieerd met uw account:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Je accounts zijn samengevoegd" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Klik hier om te bekijken" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Mijn documenten bekijken" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "CSV bestand" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "Bezig" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "gebruiker samenvoeging CSV import" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "gebruiker reconciliation CSV imports" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Uw verzoek tot verzoening is mislukt.\n" " Controleer op typefouten.\n" " U kunt een ander verzoek indienen met de geldige e-mailadressen." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Samenvoeging van je Docs accounts is niet voltooid" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Maak een nieuw verzoek" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "titel" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "uittreksel" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Document" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Documenten" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Naamloos Document" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Open" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} heeft een document met u gedeeld!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} heeft u uitgenodigd met de rol \"{role}\" op het volgende document:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} heeft een document met u gedeeld: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Document/gebruiker link" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Document/gebruiker link" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Een link bestaat al voor dit document/deze gebruiker." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Document favoriet" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Document favorieten" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Dit document is al in gebruik als favoriet door dezelfde gebruiker." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Document/gebruiker relatie" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Document/gebruiker relaties" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "De gebruiker bestaat al in dit document." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Dit team bestaat al in dit document." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Een gebruiker of team moet gekozen worden, maar niet beide." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Document verzoekt om toegang" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Document verzoekt om toegangen" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Deze gebruiker heeft al om toegang tot dit document gevraagd." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} verzoekt toegang tot een document!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} verzoekt toegang tot het volgende document:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} verzoekt toegang tot het document: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Kanaal" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Kanalen" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Anoniem" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Reactie" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Reacties" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Deze emoji is al op deze opmerking gereageerd." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Reactie" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Reacties" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "Vermelding" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "Vermeldingen" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "een verwijderde gebruiker" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "De discussie hoort niet bij dit document." -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "{name} noemde u in een opmerking in \"{title}\"" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "{name} noemde u in een opmerking in het volgende document:" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "{name} noemde u in \"{title}\"" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "{name} noemde u in het volgende document:" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "e-mailadres" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Document uitnodiging" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Document uitnodigingen" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Deze email is al geassocieerd met een geregistreerde gebruiker." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "Gemigreerd" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "Al gemigreerd" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "Niets in de objectopslag" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "Geen leesbare versie" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "Mislukt" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "status" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "versies" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "toegepast" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "versies die inhoud hebben toegevoegd, met elk één activiteitvermelding" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "overgeslagen" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "versies die niet konden worden gelezen" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "laten vallen" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "versies ouder dan degene die de server opnieuw afspeelt" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "duur" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "fout" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "Document migratie" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "Document migraties" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/pl_PL/LC_MESSAGES/django.po b/src/backend/locale/pl_PL/LC_MESSAGES/django.po index 91b6f99e71..9050c9424d 100644 --- a/src/backend/locale/pl_PL/LC_MESSAGES/django.po +++ b/src/backend/locale/pl_PL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Dane osobowe" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Uprawnienia" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Ważne daty" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Trwale usuń wybranych użytkowników" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Zadanie importu zostało utworzone i dodane do kolejki." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Przetwórz wybrane połączenia użytkowników" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Struktura drzewa" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Tytuł" @@ -152,147 +208,151 @@ msgstr "W lewo" msgid "Right" msgstr "W prawo" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "klucz główny dla rekordu jako UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "utworzono" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "data i godzina utworzenia rekordu" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "zaktualizowano" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "data i godzina ostatniej aktualizacji rekordu" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Nie znaleźliśmy użytkownika z tym identyfikatorem sub, ale adres e-mail jest już powiązany z zarejestrowanym użytkownikiem." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Wymagane. 255 znaków lub mniej. Tylko znaki ASCII." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "imię i nazwisko" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "krótka nazwa" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "adres e-mail używany do identyfikacji" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "adres e-mail administratora" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "język" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Język, w którym użytkownik chce wyświetlać interfejs." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Strefa czasowa, według której użytkownik chce wyświetlać czas." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "urządzenie" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Określa, czy konto reprezentuje urządzenie, czy rzeczywistego użytkownika." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "status członka personelu" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Określa, czy użytkownik może zalogować się do panelu administracyjnego." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "aktywny" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Określa, czy ten użytkownik powinien być traktowany jako aktywny. Odznacz tę opcję zamiast usuwać konto." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "status pierwszego połączenia" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Czy użytkownik zakończył proces pierwszego połączenia." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "użytkownik" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "użytkownicy" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Aktywny adres e-mail" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Adres e-mail do dezaktywacji" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Unikalny identyfikator w pliku źródłowym" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "Oczekujące" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Gotowe" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Zakończone" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Błąd" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "łączenie kont użytkownika" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "łączenie kont użytkowników" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Otrzymaliśmy Twoją prośbę o połączenie kont w Docs.\n" " Aby potwierdzić, że prośba została wysłana przez Ciebie\n" " i że ten adres e-mail należy do Ciebie:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Potwierdź, klikając link, aby rozpocząć łączenie kont" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Kliknij tutaj" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Potwierdź" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Twoja prośba o połączenie kont została przetworzona.\n" " Nowe dokumenty zostały prawdopodobnie przypisane do Twojego konta:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Twoje konta zostały połączone" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Kliknij tutaj, aby zobaczyć" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Zobacz moje dokumenty" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "Plik CSV" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "W toku" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "import pliku CSV do łączenia kont użytkowników" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "importy plików CSV do łączenia kont użytkowników" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Twoja prośba o połączenie kont nie powiodła się.\n" " Sprawdź, czy nie ma literówek.\n" " Możesz złożyć kolejną prośbę, podając prawidłowe adresy e-mail." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Łączenie Twoich kont Docs nie zostało ukończone" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Złóż nową prośbę" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "tytuł" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "fragment" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Dokument" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Dokumenty" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Dokument bez tytułu" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Otwórz" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "Dokument został Ci udostępniony przez {name}!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} zaprasza Cię z rolą \"{role}\" do następującego dokumentu:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "Dokument został Ci udostępniony przez {name}: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Ślad powiązania dokumentu z użytkownikiem" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Ślady powiązań dokumentu z użytkownikiem" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Ślad powiązania dla tego dokumentu i użytkownika już istnieje." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Ulubiony dokument" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Ulubione dokumenty" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Ten dokument jest już objęty relacją ulubionych dla tego samego użytkownika." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Relacja dokumentu z użytkownikiem" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Relacje dokumentu z użytkownikami" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Ten użytkownik ma już dostęp do tego dokumentu." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Ten zespół ma już dostęp do tego dokumentu." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Należy wskazać użytkownika albo zespół, ale nie oba jednocześnie." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Prośba o dostęp do dokumentu" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Prośby o dostęp do dokumentu" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Ten użytkownik już poprosił o dostęp do tego dokumentu." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} chce uzyskać dostęp do dokumentu!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} chce uzyskać dostęp do następującego dokumentu:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} prosi o dostęp do dokumentu: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Wątek" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Wątki" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Anonimowy" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Komentarz" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Komentarze" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Ta reakcja emoji została już dodana do tego komentarza." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Reakcja" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Reakcje" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "adres e-mail" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Zaproszenie do dokumentu" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Zaproszenia do dokumentu" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Ten e-mail jest już powiązany z zarejestrowanym użytkownikiem." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/pt_PT/LC_MESSAGES/django.po b/src/backend/locale/pt_PT/LC_MESSAGES/django.po index 12d5acb057..a98e77bb41 100644 --- a/src/backend/locale/pt_PT/LC_MESSAGES/django.po +++ b/src/backend/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Informações Pessoais" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Permissões" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Datas importantes" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Estrutura de árvore" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Título" @@ -152,198 +208,202 @@ msgstr "Esquerda" msgid "Right" msgstr "" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "utilizador" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Concluído" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Abrir" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "" -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/ru_RU/LC_MESSAGES/django.po b/src/backend/locale/ru_RU/LC_MESSAGES/django.po index 1f5bc1077c..b75a37e237 100644 --- a/src/backend/locale/ru_RU/LC_MESSAGES/django.po +++ b/src/backend/locale/ru_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "дублирование электронной почты" + +#: core/admin.py:40 +msgid "Yes" +msgstr "Да" + +#: core/admin.py:56 +msgid "merge into" +msgstr "объединить с" + +#: core/admin.py:81 msgid "Personal info" msgstr "Личная информация" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Разрешения" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Важные даты" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Полностью удалить выбранных пользователей" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "Объединить с другим пользователем" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "Объединить пользователей" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "Пользователи без электронной почты не могут быть объединены." + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "Отключить наименее часто используемые дубликаты" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Задание по импорту создано и поставлено в очередь." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Обработка выбранных пользовательских сверок" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "от" + +#: core/admin.py:308 +msgid "to" +msgstr "кому" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "берегти доступи вихідного користувача" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "Исходный и целевой пользователи должны различаться." + +#: core/admin.py:354 msgid "Tree structure" msgstr "Древовидная структура" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "Передать другому пользователю" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "Передача документов" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "Нет документа для передачи." + #: core/api/filters.py:48 msgid "Title" msgstr "Заголовок" @@ -152,147 +208,151 @@ msgstr "Слева" msgid "Right" msgstr "Справа" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "первичный ключ для записи как UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "создано" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "дата и время создания записи" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "обновлено" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "дата и время последнего обновления записи" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "С этим адресом связаны несколько активных пользователей." + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Мы не смогли найти пользователя с этими данными, но этот адрес уже связан с зарегистрированным пользователем." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "вложение" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Обязательно. 255 символов или меньше. Только ASCII символы." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "полное имя" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "короткое имя" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "личный адрес электронной почты" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "e-mail администратора" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "язык" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Язык, на котором пользователь хочет видеть интерфейс." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Часовой пояс, в котором пользователь хочет видеть время." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "устройство" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Пользователь является устройством или человеком." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "статус сотрудника" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Может ли пользователь войти на этот административный сайт." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "активный" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Должен ли пользователь рассматриваться как активный. Альтернатива удалению учётных записей." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "состояние первого подключения" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Завершил ли пользователь процесс первого соединения." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "пользователь" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "пользователи" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Активный адрес электронной почты" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Адрес электронной почты для деактивации" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Уникальный идентификатор в исходном файле" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "В обработке" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Готово" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Выполнено" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Ошибка" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "сверка данных пользователя" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "сверки данных пользователя" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Вы запросили сверку учётных записей по " Чтобы подтвердить факт того, что вы являетесь инициатором запроса\n" " и что этот адрес принадлежит вам:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Чтобы начать сверку, подтвердите это, нажав на ссылку" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Нажмите здесь" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Подтверждение" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Ваш запрос на сверку был обработан.\n" " Новые документы, вероятно, связаны с вашей учётной записью:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Ваши учётные записи были объединены" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Нажмите здесь, чтобы просмотреть" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Просмотреть мои документы" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "CSV-файл" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "Выполнение" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "импорт из CSV сверки пользователей" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "импорты из CSV сверки пользователями" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Ваш запрос на сверку не удался.\n" " Пожалуйста, проверьте, нет ли в них опечаток.\n" " Вы можете отправить ещё один запрос с действительными адресами электронной почты." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Сверка ваших учётных записей Docs не завершена" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Создать новый запрос" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "заголовок" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "отрывок" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Документ" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Документы" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Безымянный документ" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Открыть" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} делится с вами документом!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} приглашает вас присоединиться к следующему документу с ролью \"{role}\":" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} делится с вами документом: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Трассировка связи документ/пользователь" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Трассировка связей документ/пользователь" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Для этого документа/пользователя уже существует трассировка ссылки." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Избранный документ" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Избранные документы" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Этот документ уже помечен как избранный для этого пользователя." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Отношение документ/пользователь" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Отношения документ/пользователь" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Этот пользователь уже имеет доступ к этому документу." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Эта команда уже имеет доступ к этому документу." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Может быть выбран либо пользователь, либо команда, но не оба варианта сразу." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Документ запрашивает доступ" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Документ запрашивает доступы" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Этот пользователь уже запросил доступ к этому документу." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} хочет получить доступ к документу!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} хочет получить доступ к следующему документу:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} запрашивает доступ к документу: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Обсуждение" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Обсуждения" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Аноним" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Комментарий" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Комментарии" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Этот эмодзи уже использован в этом комментарии." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Реакция" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Реакции" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "Упоминание" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "Упоминания" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "удалённый пользователь" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "Это обсуждение не принадлежит этому документу." -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "{name} упоминает вас в комментарии к \"{title}\"" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "{name} упоминает вас в комментарии в следующем документе:" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "{name} упоминает вас в \"{title}\"" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "{name} упоминает вас в следующем документе:" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "адрес электронной почты" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Приглашение для документа" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Приглашения для документов" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Этот адрес уже связан с зарегистрированным пользователем." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "Перенесено" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "Уже перенесено" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "В хранилище объектов ничего не найдено" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "Нет читаемой версии" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "Неудачно" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "состояние" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "версии" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "применено" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "версии, добавляющие содержимое, по одной записи активности" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "пропущено" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "версии, которые не могут быть прочитаны" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "выброшено" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "версии, старше тех версий, которые воспроизводит сервер" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "длительность" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "ошибка" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "Перенос документа" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "Перенос документов" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "Просмотры, созданные документы, отправленные приглашения, избранное, история переходов по ссылкам, ветки обсуждений, комментарии и реакции этих пользователей будут перенесены к выбранному пользователю, который получит уведомление по электронной почте, после чего эти пользователи будут деактивированы:" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "Слияние" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "Документы, созданные исходным пользователем, а также его права доступа к этим документам и их вложенным документам, включая удалённые, будут перенесены целевому пользователю. Права доступа команд исходного пользователя остаются без изменений. Целевой пользователь получает роль, которую исходный пользователь наследует от родительских документов, которые остаются у исходного пользователя:" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "Передать" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/sl_SI/LC_MESSAGES/django.po b/src/backend/locale/sl_SI/LC_MESSAGES/django.po index d909314eb4..5b9fcfe5a1 100644 --- a/src/backend/locale/sl_SI/LC_MESSAGES/django.po +++ b/src/backend/locale/sl_SI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Slovenian\n" "Language: sl_SI\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Osebni podatki" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Dovoljenja" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Pomembni datumi" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "Drevesna struktura" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Naslov" @@ -152,198 +208,202 @@ msgstr "Levo" msgid "Right" msgstr "Desno" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "primarni ključ za zapis kot UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "ustvarjen na" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "datum in čas, ko je bil zapis ustvarjen" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "posodobljeno dne" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "datum in čas, ko je bil zapis nazadnje posodobljen" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Nismo mogli najti uporabnika s tem sub, vendar je e-poštni naslov že povezan z registriranim uporabnikom." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "polno ime" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "kratko ime" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "elektronski naslov identitete" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "elektronski naslov skrbnika" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "jezik" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Jezik, v katerem uporabnik želi videti vmesnik." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Časovni pas, v katerem želi uporabnik videti uro." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "naprava" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Ali je uporabnik naprava ali pravi uporabnik." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "kadrovski status" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Ali se uporabnik lahko prijavi na to skrbniško mesto." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "aktivni" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Ali je treba tega uporabnika obravnavati kot aktivnega. Namesto brisanja računov počistite to izbiro." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "uporabnik" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "uporabniki" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "naslov" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "odlomek" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Dokument" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Dokumenti" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Dokument brez naslova" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Odpri" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} je delil dokument z vami!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} vas je povabil z vlogo \"{role}\" na naslednjem dokumentu:" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} je delil dokument z vami: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Dokument/sled povezave uporabnika" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Sledi povezav dokumenta/uporabnika" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Za ta dokument/uporabnika že obstaja sled povezave." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Priljubljeni dokument" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Priljubljeni dokumenti" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Ta dokument je že ciljno usmerjen s priljubljenim primerkom relacije za istega uporabnika." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Odnos dokument/uporabnik" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Odnosi dokument/uporabnik" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Ta uporabnik je že v tem dokumentu." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Ta ekipa je že v tem dokumentu." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Nastaviti je treba bodisi uporabnika ali ekipo, a ne obojega." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "elektronski naslov" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Vabilo na dokument" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Vabila na dokument" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Ta e-poštni naslov je že povezan z registriranim uporabnikom." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/sv_SE/LC_MESSAGES/django.po b/src/backend/locale/sv_SE/LC_MESSAGES/django.po index 2ace0a8c43..cdf744f698 100644 --- a/src/backend/locale/sv_SE/LC_MESSAGES/django.po +++ b/src/backend/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "Personuppgifter" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Behörigheter" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Viktiga datum" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "Titel" @@ -152,198 +208,202 @@ msgstr "" msgid "Right" msgstr "" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "aktiv" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Öppna" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "e-postadress" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Bjud in dokument" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Inbjudningar dokument" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Denna e-postadress är redan associerad med en registrerad användare." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/tr_TR/LC_MESSAGES/django.po b/src/backend/locale/tr_TR/LC_MESSAGES/django.po index 0b121212e4..aed24c495f 100644 --- a/src/backend/locale/tr_TR/LC_MESSAGES/django.po +++ b/src/backend/locale/tr_TR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "" @@ -152,198 +208,202 @@ msgstr "" msgid "Right" msgstr "" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "" -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/uk_UA/LC_MESSAGES/django.po b/src/backend/locale/uk_UA/LC_MESSAGES/django.po index 977c92b3a7..61b05de20a 100644 --- a/src/backend/locale/uk_UA/LC_MESSAGES/django.po +++ b/src/backend/locale/uk_UA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Ukrainian\n" "Language: uk_UA\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "електронна адреса повторюється" + +#: core/admin.py:40 +msgid "Yes" +msgstr "Так" + +#: core/admin.py:56 +msgid "merge into" +msgstr "об'єднати в" + +#: core/admin.py:81 msgid "Personal info" msgstr "Особисті дані" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "Дозволи" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "Важливі дати" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "Видалити вибраних користувачів назавжди" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "Об'єднати з іншим користувачем" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "Об'єднання користувачів" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "Користувачі без електронної пошти не можуть бути об'єднані." + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "Деактивувати найменш використовувані дублікати" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "Завдання імпорту створено і поставлено в чергу." -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "Обробити обрані узгодження користувача" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "від" + +#: core/admin.py:308 +msgid "to" +msgstr "кому" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "зберегти доступ до вихідного користувача" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "Вихідний і цільовий користувачі повинні відрізнятися." + +#: core/admin.py:354 msgid "Tree structure" msgstr "Ієрархічна структура" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "Перенести до іншого користувача" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "Перенесення документів" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "Немає документів для перенесення." + #: core/api/filters.py:48 msgid "Title" msgstr "Заголовок" @@ -152,147 +208,151 @@ msgstr "Ліворуч" msgid "Right" msgstr "Праворуч" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "id" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "первинний ключ для запису як UUID" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "створено" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "дата і час, коли запис було створено" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "оновлено" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "дата і час, коли запис був востаннє оновлений" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "З цією адресою пов’язано кілька активних користувачів." + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "Ми не змогли знайти користувача з цими даними, але адреса вже пов'язана з зареєстрованим користувачем." -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "вкладений документ" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "Обов'язкове. 255 символів або менше. Тільки символи ASCII." -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "повне ім'я" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "коротке ім'я" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "адреса електронної пошти особи" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "електронна адреса адміністратора" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "мова" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "Мова, якою користувач хоче бачити інтерфейс." -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "Часовий пояс, в якому користувач хоче бачити час." -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "пристрій" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "Чи є користувач пристроєм чи реальним користувачем." -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "статус співробітника" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "Чи може користувач увійти на цей сайт адміністратора." -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "активний" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "Чи слід ставитися до цього користувача як до активного. Зніміть вибір замість видалення облікового запису." -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "стан першого з'єднання" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "Чи завершив користувач перший процес з'єднання." -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "користувач" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "користувачі" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "Активна електронна адреса" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "Електронна адреса, що буде деактивована" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "Унікальний ідентифікатор у вихідному файлі" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "В очікуванні" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "Готово" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "Виконано" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "Помилка" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "узгодження користувачів" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "узгодження користувачів" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "Ви запросили узгодження своїх облікови " Щоб підтвердити, що саме ви ініціювали запит\n" " і що ця електронна адреса належить вам:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "Підтвердіть, натиснувши на посилання, щоб почати узгодження" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "Натисніть тут" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "Підтвердження" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "Ваш запит на узгодження оброблено.\n" " Нові документи, ймовірно, пов'язані з вашим обліковим записом:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "Ваші облікові записи були об'єднані" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "Натисніть тут, щоб переглянути" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "Переглянути мої документи" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "CSV-файл" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "Виконується" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "імпорт CSV для узгодження користувачів" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "імпорт CSV для узгодження користувачів" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "Ваш запит на узгодження не був виконани " Перевірте, чи немає помилок.\n" " Ви можете надіслати інший запит із дійсними адресами електронної пошти." -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "Узгодження ваших облікових записів не завершено" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "Зробити новий запит" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "заголовок" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "уривок" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "Документ" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "Документи" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "Документ без назви" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "Відкрити" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} ділиться з вами документом!" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} запрошує вас для роботи з документом із роллю \"{role}\":" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} ділиться з вами документом: {title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "Трасування посилання Документ/користувач" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "Трасування посилань Документ/користувач" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "Відстеження вже існуючих посилань для цього документа/користувача." -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "Обраний документ" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "Обрані документи" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "Цей документ вже вказаний як обраний для одного користувача." -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "Відносини документ/користувач" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "Відносини документ/користувач" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "Цей користувач вже має доступ до цього документу." -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "Ця команда вже має доступ до цього документа." -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "Вкажіть користувача або команду, а не обох." -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "Запит доступу до документа" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "Запит доступу для документа" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "Цей користувач вже попросив доступ до цього документа." -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} хоче отримати доступ до документа!" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} бажає отримати доступ до наступного документа:" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} запитує доступ до документа: {title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "Обговорення" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "Обговорення" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "Анонім" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "Коментар" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "Коментарі" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "Цим емодзі вже відреагували на цей коментар." -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "Реакція" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "Реакції" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "Згадування" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "Згадування" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "видалений користувач" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "Обговорення не належить цьому документу." -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "{name} згадує вас у коментарі в \"{title}\"" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "{name} згадує вас у коментарі в наступному документі:" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "{name} згадує вас у \"{title}\"" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "{name} згадує вас у наступному документі:" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "електронна адреса" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "Запрошення до редагування документа" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "Запрошення до редагування документів" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "Ця електронна пошта вже пов'язана з зареєстрованим користувачем." -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "Перенесено" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "Вже перенесено" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "Нічого у сховищі об’єкта" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "Немає читабельної версії" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "Збій" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "стан" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "версії" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "застосовано" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "версії, які додали вміст, по одному запису діяльності" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "пропущено" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "версії, які не можуть бути прочитані" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "викинуті" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "версії старші тих, що може відтворити сервер" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "тривалість" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "помилка" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "Перенесення документа" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "Перенесення документів" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "Доступи, створені документи, надіслані запрошення, обране, історія переходів за посиланнями, обговорення, коментарі та реакції цих користувачів будуть перенесені до обраного користувача, який отримає відповідне повідомлення електронною поштою, після чого ці користувачі будуть деактивовані:" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "Об'єднати" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "Документи, створені вихідним користувачем, а також його права доступу до цих документів та їхніх вкладених документів, у тому числі видалених, будуть перенесені до цільового користувача. Права доступу команд вихідного користувача залишаються без змін. Цільовий користувач отримує роль, яку вихідний користувач успадковує від батьківських документів, які залишаються у володінні вихідного користувача:" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "Перенести" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/zh_CN/LC_MESSAGES/django.po b/src/backend/locale/zh_CN/LC_MESSAGES/django.po index b19351f4df..99ed8a1fec 100644 --- a/src/backend/locale/zh_CN/LC_MESSAGES/django.po +++ b/src/backend/locale/zh_CN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "个人信息" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "权限" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "重要日期" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "永久删除所选用户" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "导入任务已创建并加入队列。" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "处理所选用户的账号合并" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "树形结构" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "标题" @@ -152,147 +208,151 @@ msgstr "左" msgid "Right" msgstr "右" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "ID" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "记录的主键（UUID）" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "创建于" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "记录的创建日期与时间" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "更新于" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "记录的最后更新日期与时间" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "未找到此 sub 对应的用户，但该邮箱已被注册。" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "sub" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "必填。不超过 255 个字符。仅限 ASCII 字符。" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "全名" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "简称" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "身份邮箱" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "管理员邮箱地址" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "语言" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "用户希望界面显示的语言。" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "用户希望显示时间所用的时区。" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "设备" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "该用户是设备还是真实用户。" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "工作人员状态" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "用户是否可以登录此管理后台。" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "启用" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "此用户是否处于启用状态。如需停用，请取消勾选此项，而非删除账号。" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "首次连接状态" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "用户是否已完成首次连接流程。" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "用户" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "用户" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "生效邮箱地址" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "待停用邮箱地址" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "源文件中的唯一 ID" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "待处理" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "就绪" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "已完成" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "错误" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "账号合并" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "账号合并" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" @@ -300,53 +360,53 @@ msgstr "你在 Docs 上发起了用户账号合并请求。\n" " 要确认该请求由你本人发起\n" " 且此邮箱属于你:" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "点击链接确认，开始账号合并" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "点击这里" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "确认" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "你的账号合并请求已处理。\n" " 以下新文档可能已关联至你的账号:" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "你的账号已完成合并" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "点击这里查看" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "查看我的文档" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "CSV 文件" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "进行中" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "账号合并 CSV 导入" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "账号合并 CSV 导入" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -359,276 +419,292 @@ msgstr "你的账号合并请求未能完成。\n" " 请检查是否有拼写错误。\n" " 你可以使用有效的邮箱地址重新发起请求。" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "你的 Docs 账号合并未完成" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "发起新请求" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "标题" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "摘要" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "文档" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "文档" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "未命名文档" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "打开" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "{name} 与你分享了一份文档！" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "{name} 邀请你以“{role}”角色加入以下文档：" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "{name} 与你分享了一份文档：{title}" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "文档/用户关联记录" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "文档/用户关联记录" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "此文档/用户已存在关联记录。" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "文档收藏" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "文档收藏" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "此用户已将此文档加入收藏。" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "文档/用户关联" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "文档/用户关联" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "该用户已是此文档的成员。" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "该团队已是此文档的成员。" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "必须设置用户或团队其中之一，不能同时设置两者。" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "文档访问申请" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "文档访问申请" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "此用户已申请过访问此文档的权限。" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "{name} 想要访问文档！" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "{name} 想要访问以下文档：" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "{name} 申请访问文档：{title}" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "讨论串" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "讨论串" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "匿名" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "评论" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "评论" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "此评论已添加过该表情回应。" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "回应" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "回应" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "提及" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "提及" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "已删除的用户" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "该评论串不属于此文档。" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "{name} 在“{title}”的评论中提到了你" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "{name} 在以下文档的评论中提到了你:" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "{name} 在“{title}”中提到了你" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "{name} 在以下文档中提到了你:" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "邮箱地址" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "文档邀请" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "文档邀请" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "该邮箱已被注册。" -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "已迁移" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "已迁移过" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "对象存储中无内容" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "无可读版本" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "失败" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "状态" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "版本" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "已应用" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "添加了内容的版本,每个版本对应一条活动记录" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "已跳过" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "无法读取的版本" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "已丢弃" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "早于服务器重放范围的旧版本" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "耗时" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "错误" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "文档迁移" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "文档迁移" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/backend/locale/zh_TW/LC_MESSAGES/django.po b/src/backend/locale/zh_TW/LC_MESSAGES/django.po index 1f8eb3ca27..8d4e547880 100644 --- a/src/backend/locale/zh_TW/LC_MESSAGES/django.po +++ b/src/backend/locale/zh_TW/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-docs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-20 16:11+0000\n" -"PO-Revision-Date: 2026-10-21 14:40\n" +"POT-Creation-Date: 2026-10-22 16:37+0000\n" +"PO-Revision-Date: 2026-10-23 08:58\n" "Last-Translator: \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -17,34 +17,90 @@ msgstr "" "X-Crowdin-File: backend-impress.pot\n" "X-Crowdin-File-ID: 18\n" -#: core/admin.py:33 +#: core/admin.py:35 +msgid "duplicate email" +msgstr "" + +#: core/admin.py:40 +msgid "Yes" +msgstr "" + +#: core/admin.py:56 +msgid "merge into" +msgstr "" + +#: core/admin.py:81 msgid "Personal info" msgstr "" -#: core/admin.py:46 core/admin.py:190 +#: core/admin.py:94 core/admin.py:344 msgid "Permissions" msgstr "" -#: core/admin.py:58 +#: core/admin.py:107 msgid "Important dates" msgstr "" -#: core/admin.py:119 +#: core/admin.py:184 msgid "Permanently delete selected users" msgstr "" -#: core/admin.py:141 +#: core/admin.py:191 +msgid "Merge into another user" +msgstr "" + +#: core/admin.py:201 +msgid "Merge users" +msgstr "" + +#: core/admin.py:212 +msgid "Users without email cannot be merged." +msgstr "" + +#: core/admin.py:231 +msgid "Deactivate the least recently used duplicates" +msgstr "" + +#: core/admin.py:262 msgid "Import job created and queued." msgstr "" -#: core/admin.py:145 +#: core/admin.py:266 msgid "Process selected user reconciliations" msgstr "" -#: core/admin.py:200 +#: core/admin.py:300 +msgid "from" +msgstr "" + +#: core/admin.py:308 +msgid "to" +msgstr "" + +#: core/admin.py:316 +msgid "keep the accesses of the source user" +msgstr "" + +#: core/admin.py:325 +msgid "The source and target users must differ." +msgstr "" + +#: core/admin.py:354 msgid "Tree structure" msgstr "" +#: core/admin.py:408 +msgid "Transfer to another user" +msgstr "" + +#: core/admin.py:418 +msgid "Transfer documents" +msgstr "" + +#: core/admin.py:428 +msgid "No document left to transfer." +msgstr "" + #: core/api/filters.py:48 msgid "Title" msgstr "" @@ -152,198 +208,202 @@ msgstr "" msgid "Right" msgstr "" -#: core/models.py:82 +#: core/models.py:87 msgid "id" msgstr "" -#: core/models.py:83 +#: core/models.py:88 msgid "primary key for the record as UUID" msgstr "" -#: core/models.py:89 +#: core/models.py:94 msgid "created on" msgstr "" -#: core/models.py:90 +#: core/models.py:95 msgid "date and time at which a record was created" msgstr "" -#: core/models.py:95 core/models.py:2350 +#: core/models.py:100 core/models.py:2379 msgid "updated on" msgstr "" -#: core/models.py:96 +#: core/models.py:101 msgid "date and time at which a record was last updated" msgstr "" -#: core/models.py:132 +#: core/models.py:131 +msgid "Several active users are associated with this email." +msgstr "" + +#: core/models.py:140 msgid "We couldn't find a user with this sub but the email is already associated with a registered user." msgstr "" -#: core/models.py:143 +#: core/models.py:151 msgid "sub" msgstr "" -#: core/models.py:144 +#: core/models.py:152 msgid "Required. 255 characters or fewer. ASCII characters only." msgstr "" -#: core/models.py:152 +#: core/models.py:160 msgid "full name" msgstr "" -#: core/models.py:154 +#: core/models.py:162 msgid "short name" msgstr "" -#: core/models.py:157 +#: core/models.py:165 msgid "identity email address" msgstr "" -#: core/models.py:162 +#: core/models.py:170 msgid "admin email address" msgstr "" -#: core/models.py:169 +#: core/models.py:177 msgid "language" msgstr "" -#: core/models.py:170 +#: core/models.py:178 msgid "The language in which the user wants to see the interface." msgstr "" -#: core/models.py:178 +#: core/models.py:186 msgid "The timezone in which the user wants to see times." msgstr "" -#: core/models.py:181 +#: core/models.py:189 msgid "device" msgstr "" -#: core/models.py:183 +#: core/models.py:191 msgid "Whether the user is a device or a real user." msgstr "" -#: core/models.py:186 +#: core/models.py:194 msgid "staff status" msgstr "" -#: core/models.py:188 +#: core/models.py:196 msgid "Whether the user can log into this admin site." msgstr "" -#: core/models.py:191 +#: core/models.py:199 msgid "active" msgstr "" -#: core/models.py:194 +#: core/models.py:202 msgid "Whether this user should be treated as active. Unselect this instead of deleting accounts." msgstr "" -#: core/models.py:199 +#: core/models.py:207 msgid "first connection status" msgstr "" -#: core/models.py:201 +#: core/models.py:209 msgid "Whether the user has completed the first connection process." msgstr "" -#: core/models.py:211 +#: core/models.py:219 msgid "user" msgstr "" -#: core/models.py:212 +#: core/models.py:220 msgid "users" msgstr "" -#: core/models.py:469 +#: core/models.py:477 msgid "Active email address" msgstr "" -#: core/models.py:470 +#: core/models.py:478 msgid "Email address to deactivate" msgstr "" -#: core/models.py:497 +#: core/models.py:505 msgid "Unique ID in the source file" msgstr "" -#: core/models.py:503 core/models.py:812 +#: core/models.py:511 core/models.py:841 msgid "Pending" msgstr "" -#: core/models.py:504 +#: core/models.py:512 msgid "Ready" msgstr "" -#: core/models.py:505 core/models.py:814 +#: core/models.py:513 core/models.py:843 msgid "Done" msgstr "" -#: core/models.py:506 core/models.py:815 +#: core/models.py:514 core/models.py:844 msgid "Error" msgstr "" -#: core/models.py:514 +#: core/models.py:522 msgid "user reconciliation" msgstr "" -#: core/models.py:515 +#: core/models.py:523 msgid "user reconciliations" msgstr "" -#: core/models.py:764 +#: core/models.py:793 msgid "You have requested a reconciliation of your user accounts on Docs.\n" " To confirm that you are the one who initiated the request\n" " and that this email belongs to you:" msgstr "" -#: core/models.py:770 +#: core/models.py:799 msgid "Confirm by clicking the link to start the reconciliation" msgstr "" -#: core/models.py:775 core/models.py:881 +#: core/models.py:804 core/models.py:910 msgid "Click here" msgstr "" -#: core/models.py:776 +#: core/models.py:805 msgid "Confirm" msgstr "" -#: core/models.py:787 +#: core/models.py:816 msgid "Your reconciliation request has been processed.\n" " New documents are likely associated with your account:" msgstr "" -#: core/models.py:792 +#: core/models.py:821 msgid "Your accounts have been merged" msgstr "" -#: core/models.py:797 +#: core/models.py:826 msgid "Click here to see" msgstr "" -#: core/models.py:798 +#: core/models.py:827 msgid "See my documents" msgstr "" -#: core/models.py:808 +#: core/models.py:837 msgid "CSV file" msgstr "" -#: core/models.py:813 +#: core/models.py:842 msgid "Running" msgstr "" -#: core/models.py:823 +#: core/models.py:852 msgid "user reconciliation CSV import" msgstr "" -#: core/models.py:824 +#: core/models.py:853 msgid "user reconciliation CSV imports" msgstr "" -#: core/models.py:868 +#: core/models.py:897 #, python-brace-format msgid "Your request for reconciliation was unsuccessful.\n" " Reconciliation failed for the following email addresses:\n" @@ -352,276 +412,292 @@ msgid "Your request for reconciliation was unsuccessful.\n" " You can submit another request with the valid email addresses." msgstr "" -#: core/models.py:876 +#: core/models.py:905 msgid "Reconciliation of your Docs accounts not completed" msgstr "" -#: core/models.py:882 +#: core/models.py:911 msgid "Make a new request" msgstr "" -#: core/models.py:997 +#: core/models.py:1026 msgid "title" msgstr "" -#: core/models.py:998 +#: core/models.py:1027 msgid "excerpt" msgstr "" -#: core/models.py:1045 +#: core/models.py:1074 msgid "Document" msgstr "" -#: core/models.py:1046 +#: core/models.py:1075 msgid "Documents" msgstr "" -#: core/models.py:1063 core/models.py:1442 core/models.py:2181 +#: core/models.py:1092 core/models.py:1471 core/models.py:2210 msgid "Untitled Document" msgstr "" -#: core/models.py:1443 +#: core/models.py:1472 msgid "Open" msgstr "" -#: core/models.py:1478 +#: core/models.py:1507 #, python-brace-format msgid "{name} shared a document with you!" msgstr "" -#: core/models.py:1482 +#: core/models.py:1511 #, python-brace-format msgid "{name} invited you with the role \"{role}\" on the following document:" msgstr "" -#: core/models.py:1488 +#: core/models.py:1517 #, python-brace-format msgid "{name} shared a document with you: {title}" msgstr "" -#: core/models.py:1588 +#: core/models.py:1617 msgid "Document/user link trace" msgstr "" -#: core/models.py:1589 +#: core/models.py:1618 msgid "Document/user link traces" msgstr "" -#: core/models.py:1595 +#: core/models.py:1624 msgid "A link trace already exists for this document/user." msgstr "" -#: core/models.py:1618 +#: core/models.py:1647 msgid "Document favorite" msgstr "" -#: core/models.py:1619 +#: core/models.py:1648 msgid "Document favorites" msgstr "" -#: core/models.py:1625 +#: core/models.py:1654 msgid "This document is already targeted by a favorite relation instance for the same user." msgstr "" -#: core/models.py:1647 +#: core/models.py:1676 msgid "Document/user relation" msgstr "" -#: core/models.py:1648 +#: core/models.py:1677 msgid "Document/user relations" msgstr "" -#: core/models.py:1654 +#: core/models.py:1683 msgid "This user is already in this document." msgstr "" -#: core/models.py:1660 +#: core/models.py:1689 msgid "This team is already in this document." msgstr "" -#: core/models.py:1666 +#: core/models.py:1695 msgid "Either user or team must be set, not both." msgstr "" -#: core/models.py:1817 +#: core/models.py:1846 msgid "Document ask for access" msgstr "" -#: core/models.py:1818 +#: core/models.py:1847 msgid "Document ask for accesses" msgstr "" -#: core/models.py:1824 +#: core/models.py:1853 msgid "This user has already asked for access to this document." msgstr "" -#: core/models.py:1881 +#: core/models.py:1910 #, python-brace-format msgid "{name} would like access to a document!" msgstr "" -#: core/models.py:1885 +#: core/models.py:1914 #, python-brace-format msgid "{name} would like access to the following document:" msgstr "" -#: core/models.py:1891 +#: core/models.py:1920 #, python-brace-format msgid "{name} is asking for access to the document: {title}" msgstr "" -#: core/models.py:1933 +#: core/models.py:1962 msgid "Thread" msgstr "" -#: core/models.py:1934 +#: core/models.py:1963 msgid "Threads" msgstr "" -#: core/models.py:1937 core/models.py:1989 +#: core/models.py:1966 core/models.py:2018 msgid "Anonymous" msgstr "" -#: core/models.py:1984 +#: core/models.py:2013 msgid "Comment" msgstr "" -#: core/models.py:1985 +#: core/models.py:2014 msgid "Comments" msgstr "" -#: core/models.py:2034 +#: core/models.py:2063 msgid "This emoji has already been reacted to this comment." msgstr "" -#: core/models.py:2038 +#: core/models.py:2067 msgid "Reaction" msgstr "" -#: core/models.py:2039 +#: core/models.py:2068 msgid "Reactions" msgstr "" -#: core/models.py:2090 +#: core/models.py:2119 msgid "Mention" msgstr "" -#: core/models.py:2091 +#: core/models.py:2120 msgid "Mentions" msgstr "" -#: core/models.py:2104 +#: core/models.py:2133 msgid "a deleted user" msgstr "" -#: core/models.py:2114 +#: core/models.py:2143 msgid "The thread does not belong to this document." msgstr "" -#: core/models.py:2183 +#: core/models.py:2212 #, python-brace-format msgid "{name} mentioned you in a comment in \"{title}\"" msgstr "" -#: core/models.py:2187 +#: core/models.py:2216 #, python-brace-format msgid "{name} mentioned you in a comment in the following document:" msgstr "" -#: core/models.py:2190 +#: core/models.py:2219 #, python-brace-format msgid "{name} mentioned you in \"{title}\"" msgstr "" -#: core/models.py:2193 +#: core/models.py:2222 #, python-brace-format msgid "{name} mentioned you in the following document:" msgstr "" -#: core/models.py:2219 +#: core/models.py:2248 msgid "email address" msgstr "" -#: core/models.py:2238 +#: core/models.py:2267 msgid "Document invitation" msgstr "" -#: core/models.py:2239 +#: core/models.py:2268 msgid "Document invitations" msgstr "" -#: core/models.py:2259 +#: core/models.py:2288 msgid "This email is already associated to a registered user." msgstr "" -#: core/models.py:2302 +#: core/models.py:2331 msgid "Migrated" msgstr "" -#: core/models.py:2303 +#: core/models.py:2332 msgid "Already migrated" msgstr "" -#: core/models.py:2304 +#: core/models.py:2333 msgid "Nothing in the object storage" msgstr "" -#: core/models.py:2305 +#: core/models.py:2334 msgid "No readable version" msgstr "" -#: core/models.py:2306 +#: core/models.py:2335 msgid "Failed" msgstr "" -#: core/models.py:2330 +#: core/models.py:2359 msgid "status" msgstr "" -#: core/models.py:2332 +#: core/models.py:2361 msgid "versions" msgstr "" -#: core/models.py:2335 +#: core/models.py:2364 msgid "applied" msgstr "" -#: core/models.py:2336 +#: core/models.py:2365 msgid "versions that added content, one activity entry each" msgstr "" -#: core/models.py:2340 +#: core/models.py:2369 msgid "skipped" msgstr "" -#: core/models.py:2341 +#: core/models.py:2370 msgid "versions that could not be read" msgstr "" -#: core/models.py:2345 +#: core/models.py:2374 msgid "dropped" msgstr "" -#: core/models.py:2346 +#: core/models.py:2375 msgid "versions older than the ones the server replays" msgstr "" -#: core/models.py:2348 +#: core/models.py:2377 msgid "duration" msgstr "" -#: core/models.py:2349 +#: core/models.py:2378 msgid "error" msgstr "" -#: core/models.py:2354 +#: core/models.py:2383 msgid "Document migration" msgstr "" -#: core/models.py:2355 +#: core/models.py:2384 msgid "Document migrations" msgstr "" +#: core/templates/core/admin/merge_users.html:5 +msgid "Accesses, created documents, issued invitations, favorites, link traces, threads, comments and reactions of these users will be moved to the chosen user, who will be notified by email, then these users will be deactivated:" +msgstr "" + +#: core/templates/core/admin/merge_users.html:19 +msgid "Merge" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:5 +msgid "Documents created by the source user and its accesses in these documents and their sub-documents, deleted ones included, will be moved to the target user. The accesses of the teams of the source user are left untouched. The target user gets the role the source user inherits from the parent documents, which the source user keeps:" +msgstr "" + +#: core/templates/core/admin/transfer_documents.html:19 +msgid "Transfer" +msgstr "" + #: core/templates/mail/html/template.html:160 #: core/templates/mail/text/template.txt:4 msgid "Logo email" diff --git a/src/frontend/apps/impress/src/i18n/translations.json b/src/frontend/apps/impress/src/i18n/translations.json index 1c5305c2e1..b3bee93226 100644 --- a/src/frontend/apps/impress/src/i18n/translations.json +++ b/src/frontend/apps/impress/src/i18n/translations.json @@ -1125,7 +1125,7 @@ "Please download it only if it comes from a trusted source.": "Por favor, descárguelo solo si viene de una fuente de confianza.", "Please sign in": "Inicia sesión, por favor", "Present": "Presentar", - "Present from here": "De aquí en adelante", + "Present from here": "Empezar la presentación desde aquí", "Presenter controls": "Controles del presentador", "Presenter mode": "Modo presentación", "Presenter slide": "Presentador de diapositivas", From 9c233b829e2119b7fce81857034b72cab2949f6d Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 22 Oct 2026 21:02:52 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=96(release)=20patch=206.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added - ✨(backend) show the last login of users in the admin #2882 - ✨(backend) filter users sharing an email in the admin #2882 - ✨(backend) show the release in the admin header #2882 - ✨(backend) deactivate the least recently used duplicates in the admin #2882 - ✨(backend) transfer created docs and invitations in reconciliations #2882 - ✨(backend) merge users from the admin #2882 - ✨(backend) transfer documents from a user to another in the admin #2882 Fixed - 🐛(backend) log in the active user when several users share an email #2882 - 🐛(backend) refresh caches and search index after a user reconciliation #2882 --- CHANGELOG.md | 5 ++++- src/backend/pyproject.toml | 2 +- src/backend/uv.lock | 2 +- src/frontend/apps/e2e/package.json | 2 +- src/frontend/apps/impress/package.json | 2 +- src/frontend/package.json | 2 +- src/frontend/packages/eslint-plugin-docs/package.json | 2 +- src/frontend/packages/i18n/package.json | 2 +- src/frontend/servers/y-provider/package.json | 2 +- src/helm/helmfile.yaml.gotmpl | 4 ++-- src/helm/impress/Chart.yaml | 2 +- src/mail/package.json | 2 +- src/yhub-server/package.json | 2 +- 13 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5755604c0..45c88289d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to ## [Unreleased] +## [v6.0.3] - 2026-10-23 + ### Added - ✨(backend) show the last login of users in the admin #2882 @@ -1724,7 +1726,8 @@ and this project adheres to - ✨(frontend) Coming Soon page (#67) - 🚀 Impress, project to manage your documents easily and collaboratively. -[unreleased]: https://github.com/suitenumerique/docs/compare/v6.0.2...main +[unreleased]: https://github.com/suitenumerique/docs/compare/v6.0.3...main +[v6.0.3]: https://github.com/suitenumerique/docs/releases/v6.0.3 [v6.0.2]: https://github.com/suitenumerique/docs/releases/v6.0.2 [v6.0.1]: https://github.com/suitenumerique/docs/releases/v6.0.1 [v6.0.0]: https://github.com/suitenumerique/docs/releases/v6.0.0 diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index 5c83a7641c..c3165bc906 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "uv_build" [project] name = "impress" -version = "6.0.2" +version = "6.0.3" authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }] classifiers = [ "Development Status :: 5 - Production/Stable", diff --git a/src/backend/uv.lock b/src/backend/uv.lock index 50fdb7fa74..8a006c799c 100644 --- a/src/backend/uv.lock +++ b/src/backend/uv.lock @@ -966,7 +966,7 @@ wheels = [ [[package]] name = "impress" -version = "6.0.2" +version = "6.0.3" source = { editable = "." } dependencies = [ { name = "beautifulsoup4" }, diff --git a/src/frontend/apps/e2e/package.json b/src/frontend/apps/e2e/package.json index 360a26f17e..f5f2ace929 100644 --- a/src/frontend/apps/e2e/package.json +++ b/src/frontend/apps/e2e/package.json @@ -1,6 +1,6 @@ { "name": "app-e2e", - "version": "6.0.2", + "version": "6.0.3", "repository": "https://github.com/suitenumerique/docs", "author": "DINUM", "license": "MIT", diff --git a/src/frontend/apps/impress/package.json b/src/frontend/apps/impress/package.json index 55697b5397..f98762bd45 100644 --- a/src/frontend/apps/impress/package.json +++ b/src/frontend/apps/impress/package.json @@ -1,6 +1,6 @@ { "name": "app-impress", - "version": "6.0.2", + "version": "6.0.3", "repository": "https://github.com/suitenumerique/docs", "author": "DINUM", "license": "MIT", diff --git a/src/frontend/package.json b/src/frontend/package.json index f9f73fa5a4..99c3d1b574 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -1,6 +1,6 @@ { "name": "impress", - "version": "6.0.2", + "version": "6.0.3", "private": true, "repository": "https://github.com/suitenumerique/docs", "author": "DINUM", diff --git a/src/frontend/packages/eslint-plugin-docs/package.json b/src/frontend/packages/eslint-plugin-docs/package.json index 60c74c34d9..a6656623f0 100644 --- a/src/frontend/packages/eslint-plugin-docs/package.json +++ b/src/frontend/packages/eslint-plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-docs", - "version": "6.0.2", + "version": "6.0.3", "repository": "https://github.com/suitenumerique/docs", "author": "DINUM", "license": "MIT", diff --git a/src/frontend/packages/i18n/package.json b/src/frontend/packages/i18n/package.json index 63e85ff428..b773e1e006 100644 --- a/src/frontend/packages/i18n/package.json +++ b/src/frontend/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "packages-i18n", - "version": "6.0.2", + "version": "6.0.3", "repository": "https://github.com/suitenumerique/docs", "author": "DINUM", "license": "MIT", diff --git a/src/frontend/servers/y-provider/package.json b/src/frontend/servers/y-provider/package.json index 3f9b0cc7e7..4100ed1d37 100644 --- a/src/frontend/servers/y-provider/package.json +++ b/src/frontend/servers/y-provider/package.json @@ -1,6 +1,6 @@ { "name": "server-y-provider", - "version": "6.0.2", + "version": "6.0.3", "description": "Y.js provider for docs", "repository": "https://github.com/suitenumerique/docs", "license": "MIT", diff --git a/src/helm/helmfile.yaml.gotmpl b/src/helm/helmfile.yaml.gotmpl index e68eef42af..bd502e9581 100644 --- a/src/helm/helmfile.yaml.gotmpl +++ b/src/helm/helmfile.yaml.gotmpl @@ -1,12 +1,12 @@ environments: dev: values: - - version: 6.0.2 + - version: 6.0.3 # a Prometheus scraping the metrics of the backend and of yhub monitoring: true feature: values: - - version: 6.0.2 + - version: 6.0.3 feature: ci domain: example.com imageTag: demo diff --git a/src/helm/impress/Chart.yaml b/src/helm/impress/Chart.yaml index c28bef136b..34612c1981 100644 --- a/src/helm/impress/Chart.yaml +++ b/src/helm/impress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 type: application name: docs -version: 6.0.2 +version: 6.0.3 appVersion: latest diff --git a/src/mail/package.json b/src/mail/package.json index ac673714a2..e87220bf89 100644 --- a/src/mail/package.json +++ b/src/mail/package.json @@ -1,6 +1,6 @@ { "name": "mail_mjml", - "version": "6.0.2", + "version": "6.0.3", "description": "An util to generate html and text django's templates from mjml templates", "type": "module", "dependencies": { diff --git a/src/yhub-server/package.json b/src/yhub-server/package.json index d8e2362bed..3172f8cf3b 100644 --- a/src/yhub-server/package.json +++ b/src/yhub-server/package.json @@ -1,6 +1,6 @@ { "name": "yhub-server", - "version": "6.0.2", + "version": "6.0.3", "private": true, "type": "module", "scripts": {