# HG changeset patch
# User bsw
# Date 1634737731 -7200
# Node ID 20c1c8cc28ba8ca23534c2eb32c28123d2c7fc68
# Parent  87878d24d7a8c3539a4ba9cdb070728a61fa0445
Splitted different meanings of rejected, specified context of accepted and invited

diff -r 87878d24d7a8 -r 20c1c8cc28ba app/main/initiative/_sidebar_state.lua
--- a/app/main/initiative/_sidebar_state.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/app/main/initiative/_sidebar_state.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -23,7 +23,7 @@
       elseif initiative.rank then
         head_text = _("Rejected (rank #{rank})", { rank = initiative.rank })
       else
-        head_text = _"Rejected"
+        head_text = _"Rejected [initiative]"
       end
 
       ui.heading { level = 1, content = head_text }
diff -r 87878d24d7a8 -r 20c1c8cc28ba app/main/member/_show_thumb.lua
--- a/app/main/member/_show_thumb.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/app/main/member/_show_thumb.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -128,9 +128,9 @@
 
     if initiator and initiator.accepted then
       if member.accepted == nil then
-        slot.put(_"Invited")
+        slot.put(_"Invited [as initiator]")
       elseif member.accepted == false then
-        slot.put(_"Rejected")
+        slot.put(_"Rejected [initiator invitation]")
       end
     end
 
diff -r 87878d24d7a8 -r 20c1c8cc28ba app/main/member/settings_agent.lua
--- a/app/main/member/settings_agent.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/app/main/member/settings_agent.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -32,9 +32,9 @@
                 content = function(record)
                   local text
                   if record.accepted then
-                    text = _"accepted"
+                    text = _"accepted [account access]"
                   elseif record.accepted == false then
-                    text = _"rejected"
+                    text = _"rejected [account access]"
                   else
                     text = _"not decided yet"
                   end
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.en.lua
--- a/locale/translations.en.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.en.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -340,7 +340,7 @@
 ["Invite code"] = false;
 ["Invite letter"] = "Invitation letter";
 ["Invite member"] = false;
-["Invited"] = false;
+["Invited [as initiator]"] = false;
 ["Issue #"] = false;
 ["Issue ##{id}"] = false;
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
@@ -533,7 +533,8 @@
 ["Registration rejected"] = false;
 ["Registration succeeded"] = "Registration successful";
 ["Reject access privilege"] = false;
-["Rejected"] = false;
+["Rejected [initiator invitation]"] = "Rejected";
+["Rejected [initiative]"] = "Rejected";
 ["Rejected (#{count})"] = false;
 ["Rejected (rank #{rank})"] = false;
 ["Rejected accreditation requests"] = false;
@@ -798,7 +799,7 @@
 ["[not displayed public]"] = false;
 ["abandoned"] = false;
 ["accept invitation"] = false;
-["accepted"] = false;
+["accepted [account access]"] = "accepted";
 ["account activated"] = false;
 ["action"] = false;
 ["activate account"] = false;
@@ -974,7 +975,7 @@
 ["reached #{quorum}"] = false;
 ["refresh my support"] = false;
 ["refuse invitation"] = false;
-["rejected"] = false;
+["rejected [account access]"] = "rejected";
 ["remove an initiator"] = false;
 ["remove from my contact list"] = false;
 ["remove my interest"] = "Remove my interest";
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.eo.lua
--- a/locale/translations.eo.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.eo.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "Inviti inicionton al la iniciato";
 ["Invite code"] = "Invitokodo";
 ["Invite member"] = false;
-["Invited"] = "Invitita";
+["Invited [as initiator]"] = "Invitita";
 ["Issue #"] = false;
 ["Issue ##{id}"] = "Temo ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.es.lua
--- a/locale/translations.es.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.es.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -533,7 +533,8 @@
 ["Registration rejected"] = "Registro rechazado";
 ["Registration succeeded"] = "Registro exitoso";
 ["Reject access privilege"] = "Rechazar privilegio de acceso";
-["Rejected"] = "Rechazado";
+["Rejected [initiator invitation"] = "Rechazado";
+["Rejected [initiative]"] = "Rechazado";
 ["Rejected (#{count})"] = "Rechazado (#{count})";
 ["Rejected (rank #{rank})"] = "Rechazado (rank #{rank})";
 ["Rejected accreditation requests"] = "Solicitudes de acreditación rechazadas";
@@ -798,7 +799,7 @@
 ["[not displayed public]"] = "[no se muestra públicamente]";
 ["abandoned"] = "abandonado";
 ["accept invitation"] = "aceptar invitación";
-["accepted"] = "aceptada";
+["accepted [account access]"] = "aceptada";
 ["account activated"] = "cuenta activada";
 ["action"] = "acción";
 ["activate account"] = "activar cuenta";
@@ -973,7 +974,7 @@
 ["reached #{quorum}"] = "alcanzó #{quorum}";
 ["refresh my support"] = "renovar mi apoyo";
 ["refuse invitation"] = "rechazar la invitación";
-["rejected"] = "rechazado";
+["rejected [account access]"] = "rechazado";
 ["remove an initiator"] = "Eliminar un iniciador";
 ["remove from my contact list"] = "eliminar de mi lista de contactos";
 ["remove my interest"] = "Eliminar mi interés";
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.fr.lua
--- a/locale/translations.fr.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.fr.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -355,7 +355,7 @@
 ["Invite code"] = "Code d'invitation";
 ["Invite letter"] = false;
 ["Invite member"] = "Inviter un membre";
-["Invited"] = "Invité";
+["Invited [as initiator]"] = "Invité";
 ["Issue #"] = "Thématique #";
 ["Issue ##{id}"] = "Thématique ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = "Thématique ##{issue_id}: #{initiative_name}";
@@ -566,7 +566,8 @@
 ["Registration rejected"] = false;
 ["Registration succeeded"] = false;
 ["Reject access privilege"] = false;
-["Rejected"] = "Rejeté";
+["Rejected [initiator invitation]"] = "Rejeté";
+["Rejected [initiative]"] = "Rejeté";
 ["Rejected (#{count})"] = false;
 ["Rejected (rank #{rank})"] = "Rejeté (position #{rank})";
 ["Rejected accreditation requests"] = false;
@@ -843,7 +844,7 @@
 ["[not displayed public]"] = "[affichage non public]";
 ["abandoned"] = "abandonné";
 ["accept invitation"] = "accepter l'invitation";
-["accepted"] = false;
+["accepted [account access]"] = false;
 ["account activated"] = false;
 ["action"] = "action";
 ["activate account"] = "activer le compte";
@@ -1024,7 +1025,7 @@
 ["reached #{quorum}"] = "atteint";
 ["refresh my support"] = "rénover mon soutien";
 ["refuse invitation"] = "réfuser l'invitation";
-["rejected"] = false;
+["rejected [account access]"] = false;
 ["remove an initiator"] = "retirer un promoteur";
 ["remove from my contact list"] = "retirer de ma liste des contacts";
 ["remove my interest"] = "retirer mon intérêt";
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.hu.lua
--- a/locale/translations.hu.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.hu.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "Kezdeményezõ meghívása a kezdeményezéshez";
 ["Invite code"] = "Meghívókód";
 ["Invite member"] = false;
-["Invited"] = "Meghívva";
+["Invited [as initiator]"] = "Meghívva";
 ["Issue #"] = false;
 ["Issue ##{id}"] = "Téma: ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
@@ -514,7 +514,8 @@
 ["Registration (step 1 of 3: Invite code)"] = false;
 ["Registration (step 2 of 3: Personal information)"] = false;
 ["Registration (step 3 of 3: Terms of use and password)"] = false;
-["Rejected"] = "Elutasítva";
+["Rejected [initiator invitation]"] = "Elutasítva";
+["Rejected [initiative]"] = "Elutasítva";
 ["Rejected (rank #{rank})"] = false;
 ["Remove"] = "Eltávolítás";
 ["Remove an initiator from initiative"] = false;
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.it.lua
--- a/locale/translations.it.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.it.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -370,7 +370,7 @@
 ["Invite code"] = "Codice di invito";
 ["Invite letter"] = false;
 ["Invite member"] = "Invita utente";
-["Invited"] = "Invitato";
+["Invited [as initiator]"] = "Invitato";
 ["Issue #"] = "Tematica #";
 ["Issue ##{id}"] = "Tematica ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = "Tematica ##{issue_id}: #{initiative_name}";
@@ -586,7 +586,8 @@
 ["Registration rejected"] = false;
 ["Registration succeeded"] = false;
 ["Reject access privilege"] = false;
-["Rejected"] = "Rifiutato";
+["Rejected [initiator invitation]"] = "Rifiutato";
+["Rejected [initiative]"] = "Rifiutato";
 ["Rejected (#{count})"] = false;
 ["Rejected (rank #{rank})"] = "Rifiutata (posizione #{rank})";
 ["Rejected accreditation requests"] = false;
@@ -878,7 +879,7 @@
 ["[not displayed public]"] = "[non visibile pubblicamente]";
 ["abandoned"] = "abbandonato";
 ["accept invitation"] = "accetta invito";
-["accepted"] = false;
+["accepted [account access]"] = false;
 ["account activated"] = false;
 ["action"] = "azione";
 ["activate account"] = "attiva account";
@@ -1058,7 +1059,7 @@
 ["reached #{quorum}"] = "raggiunto ";
 ["refresh my support"] = "rinnova il mio supporto";
 ["refuse invitation"] = "rifiuta l'invito";
-["rejected"] = false;
+["rejected [account access]"] = false;
 ["remove an initiator"] = "rimuovi un promotore";
 ["remove from my contact list"] = "rimuovi dalla lista dei contatti";
 ["remove my interest"] = "togli il mio interesse";
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.ka.lua
--- a/locale/translations.ka.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.ka.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "მოიწვიეთ ინიციატორი ინიციატივაზე";
 ["Invite code"] = "მოწვევის კოდი";
 ["Invite member"] = "მოიწვიეთ წევრი";
-["Invited"] = "მოწვეულია";
+["Invited [as initiator]"] = "მოწვეულია";
 ["Issue #"] = "საკითხი #";
 ["Issue ##{id}"] = "საკითხი ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = "საკითხი ##{issue_id}: #{initiative_name}";
@@ -514,7 +514,8 @@
 ["Registration (step 1 of 3: Invite code)"] = "რეგისტრაცია (3-დან 1 საფეხური: მოწვევის კოდი)";
 ["Registration (step 2 of 3: Personal information)"] = "რეგისტრაცია (3-დან 2 საფეხური: პერსონალური ინფორმაცია)";
 ["Registration (step 3 of 3: Terms of use and password)"] = "რეგისტრაცია (3-დან 3 საფეხური: მოხმარების პირობები და პაროლი)";
-["Rejected"] = "უარყოფილია";
+["Rejected [initiator invitation]"] = "უარყოფილია";
+["Rejected [initiative]"] = "უარყოფილია";
 ["Rejected (rank #{rank})"] = "უარყოფილია (rank #{rank})";
 ["Remove"] = "მოხსნა";
 ["Remove an initiator from initiative"] = "ინიციატორის ინიციატივიდან მოხსნა";
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.nl.lua
--- a/locale/translations.nl.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.nl.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "Nodig een initiatiefnemer bij een initiatief uit";
 ["Invite code"] = "Invite-Code";
 ["Invite member"] = false;
-["Invited"] = "Uitgenodigd";
+["Invited [as initiator]"] = "Uitgenodigd";
 ["Issue #"] = false;
 ["Issue ##{id}"] = "Onderwerp ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
@@ -514,7 +514,8 @@
 ["Registration (step 1 of 3: Invite code)"] = "Registratie (stap 1 van 3: uitnodigingscode)";
 ["Registration (step 2 of 3: Personal information)"] = "Registratie (stap 1 van 3: persoonlijke informatie)";
 ["Registration (step 3 of 3: Terms of use and password)"] = "Registratie (stap 1 van 3: gebruikershandleiding en wachtwoord)";
-["Rejected"] = "Verworpen";
+["Rejected [initiative]"] = "Verworpen";
+["Rejected [initiator invitation]"] = "Verworpen";
 ["Rejected (rank #{rank})"] = false;
 ["Remove"] = "Verwijderen";
 ["Remove an initiator from initiative"] = false;
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.zh-Hans.lua
--- a/locale/translations.zh-Hans.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.zh-Hans.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "邀请发起者来提案";
 ["Invite code"] = "邀请码";
 ["Invite member"] = false;
-["Invited"] = "已被邀请";
+["Invited [as initiator]"] = "已被邀请";
 ["Issue #"] = false;
 ["Issue ##{id}"] = "议题 ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
@@ -514,7 +514,8 @@
 ["Registration (step 1 of 3: Invite code)"] = "注册 (三步骤之一：邀请码)";
 ["Registration (step 2 of 3: Personal information)"] = "注册 (三步骤之二：个人资料)";
 ["Registration (step 3 of 3: Terms of use and password)"] = "注册 (三步骤之三：使用条款及密码)";
-["Rejected"] = "被婉拒";
+["Rejected [initiator invitation]"] = "被婉拒";
+["Rejected [initiative]"] = "被婉拒";
 ["Rejected (rank #{rank})"] = false;
 ["Remove"] = "移除";
 ["Remove an initiator from initiative"] = false;
diff -r 87878d24d7a8 -r 20c1c8cc28ba locale/translations.zh-TW.lua
--- a/locale/translations.zh-TW.lua	Wed Oct 20 15:47:25 2021 +0200
+++ b/locale/translations.zh-TW.lua	Wed Oct 20 15:48:51 2021 +0200
@@ -338,7 +338,7 @@
 ["Invite an initiator to initiative"] = "邀請發起者來提案";
 ["Invite code"] = "邀請碼";
 ["Invite member"] = false;
-["Invited"] = "已被邀請";
+["Invited [as initiator]"] = "已被邀請";
 ["Issue #"] = false;
 ["Issue ##{id}"] = "議題 ##{id}";
 ["Issue ##{issue_id}: #{initiative_name}"] = false;
@@ -514,7 +514,8 @@
 ["Registration (step 1 of 3: Invite code)"] = "註冊 (三步驟之一：邀請碼)";
 ["Registration (step 2 of 3: Personal information)"] = "註冊 (三步驟之二：個人資料)";
 ["Registration (step 3 of 3: Terms of use and password)"] = "註冊 (三步驟之三：使用條款及密碼)";
-["Rejected"] = "被婉拒";
+["Rejected [initiator invitation]"] = "被婉拒";
+["Rejected [initiative]"] = "被婉拒";
 ["Rejected (rank #{rank})"] = false;
 ["Remove"] = "移除";
 ["Remove an initiator from initiative"] = false;