Merge branch 'master' of github.com:citizenos/citizenos-fe

Author: ilmartyrk

src/app/ideation/components/topic-ideation/topic-ideation.component.html

@@ -368,7 +368,6 @@
                     </div>
                   </div>
                 </cos-input>
-
                 <cos-input *ngIf="isCountryEstonia && hasDemograficsField.residence" [placeholder]="'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_RESIDENCE' | translate"
                   class="dropdown_input">
                   <div class="dropdown" [cosDropdown]>

src/app/ideation/components/topic-ideation/topic-ideation.component.ts

@@ -264,26 +264,6 @@ export class TopicIdeationComponent {
     this.ideaFilters.age = [...this.mobileAges];
   }
 
-  setMobileAge(_age: number | string) {
-    const age = _age.toString();
-    if (age === 'all' || age === '') {
-      this.mobileAges = [];
-      return;
-    }
-
-    const idx = this.mobileAges.indexOf(age);
-    if (idx > -1) {
-      this.mobileAges.splice(idx, 1);
-    } else {
-      this.mobileAges.push(age);
-    }
-  }
-
-  applyAgeFilter() {
-    this.ageFilter$.next([...this.mobileAges]);
-    this.ideaFilters.age = [...this.mobileAges];
-  }
-
   setGender(value: string) {
     if (value === 'all') value = '';
     this.genderFilter$.next(value);

src/app/public-topics/components/topicbox/topicbox.component.html

@@ -204,4 +204,4 @@
           </span>
       </div>
   </!--div-->
-</a>
+</a>

src/assets/i18n/bg.json

@@ -134,6 +134,8 @@
       "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT",
       "BTN_DELETE_DRAFT": "Delete draft",
       "BTN_IDEA_POST": "Add your idea",
+      "BTN_EXPAND": "Expand",
+      "BTN_COLLAPSE": "Collapse",
       "MSG_SUCCESS": "Idea successfully posted",
       "MSG_ERROR_SUBJECT": "Idea heading must be 1 to {{chars}} characters long.",
       "FIELD_IS_MANDATORY": "Field is mandatory",
@@ -274,7 +276,7 @@
       "LBL_NAME": "Please name your new folder",
       "ADD_NAME_ERROR_MSG_INVALID": "Name cannot be empty",
       "PLACEHOLDER_NAME": "@:VIEWS.MY_TOPICS_TOPICID.LNK_NAME",
-      "LBL_IDEAS_SELECTION": "Select the ideas you immediately want to add to this folder",
+      "LBL_IDEAS_SELECTION": "Select the ideas you want to include in the voting options",
       "BTN_CREATE": "Create folder",
       "LNK_CANCEL": "@:LNK_CANCEL",
       "LBL_IDEAS": "Ideas ({{count}})",
@@ -766,7 +768,9 @@
       "HEADING_SEARCH_RESULTS": "Global search results",
       "HEADING_RESULTS_IN": "Search results in: <b>{{context}}</b>",
       "LNK_VIEW_MORE_RESULTS": "View more results",
+      "LNK_HELP_PANEL": "Try here.",
       "TXT_OOPS_NO_RESULTS": "We couldn’t find any results matching your search :(",
+      "TXT_NO_RESULTS_FOUND": "No results found. Looking for help?",
       "TXT_MAYBE_TYPO": "Maybe there's a typo in your search?"
     },
     "TOPIC_IDEATION": {
@@ -813,6 +817,7 @@
       "OPTION_DELETE_FOLDER": "Delete folder",
       "BTN_CREATE_NEW_FOLDER": "Create new folder",
       "NO_FOLDERS_HEADING": "There are no idea folders yet",
+      "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.",
       "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category."
     },
     "TOUR": {
@@ -2361,9 +2366,11 @@
       "DEMOGRAPHICS_DATA_GENDER_FEMALE": "Female",
       "DEMOGRAPHICS_DATA_GENDER_PLACEHOLDER": "Your gender (optional)",
       "DEMOGRAPHICS_DATA_GENDER_OTHER": "Other - please specify",
+      "DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER": "Other",
       "DEMOGRAPHICS_DATA_RESIDENCE": "Municipality",
       "DEMOGRAPHICS_DATA_RESIDENCE_OTHER": "Other - please specify",
       "DEMOGRAPHICS_DATA_RESIDENCE_PLACEHOLDER": "Your municipality (optional)",
+      "DEMOGRAPHICS_DATA_RESIDENCE_OTHER_PLACEHOLDER": "Other",
       "PREVIEW_INFO": "<b>This is a preview of your topic!</b> You can still edit your topic at any point prior to starting a vote.",
       "BTN_IDEATION_ACTIONS": "Manage idea gathering",
       "NO_IDEAS_HEADING": "There are no ideas yet",
@@ -3467,7 +3474,7 @@
   "MSG_ERROR_POST_API_AUTH_SIGNUP_40000_PASSWORD": "Password must be at least 6 characters long, containing at least 1 digit, 1 lower-case and 1 upper-case character.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40003_PASSWORD": "Wrong password.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40002": "Account verification has not been completed. Please check your email.",
-  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or password reset code.",
+  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or reset code. Password reset codes expire after 1 hour.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_ACCOUNT": "Check your email to verify your account.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_NEW_EMAIL_ADDRESS": "Your email address has been updated. Check your mail to verify your new email address. From now on, use this email address to log in.",
   "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_SEND_40002_EMAIL": "An account with this email does not exist.",

src/assets/i18n/cs.json

@@ -134,6 +134,8 @@
       "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT",
       "BTN_DELETE_DRAFT": "Delete draft",
       "BTN_IDEA_POST": "Add your idea",
+      "BTN_EXPAND": "Expand",
+      "BTN_COLLAPSE": "Collapse",
       "MSG_SUCCESS": "Idea successfully posted",
       "MSG_ERROR_SUBJECT": "Idea heading must be 1 to {{chars}} characters long.",
       "FIELD_IS_MANDATORY": "Field is mandatory",
@@ -274,7 +276,7 @@
       "LBL_NAME": "Please name your new folder",
       "ADD_NAME_ERROR_MSG_INVALID": "Name cannot be empty",
       "PLACEHOLDER_NAME": "@:VIEWS.MY_TOPICS_TOPICID.LNK_NAME",
-      "LBL_IDEAS_SELECTION": "Select the ideas you immediately want to add to this folder",
+      "LBL_IDEAS_SELECTION": "Select the ideas you want to include in the voting options",
       "BTN_CREATE": "Create folder",
       "LNK_CANCEL": "@:LNK_CANCEL",
       "LBL_IDEAS": "Ideas ({{count}})",
@@ -766,7 +768,9 @@
       "HEADING_SEARCH_RESULTS": "Výsledky globálního hledání",
       "HEADING_RESULTS_IN": "Výsledky hledání v: <b>{{context}}</b>",
       "LNK_VIEW_MORE_RESULTS": "Zobrazit více výsledků",
+      "LNK_HELP_PANEL": "Try here.",
       "TXT_OOPS_NO_RESULTS": "Nenašli jsme žádné výsledky odpovídající vašemu hledání :(",
+      "TXT_NO_RESULTS_FOUND": "No results found. Looking for help?",
       "TXT_MAYBE_TYPO": "Možná je ve vašem hledání překlep?"
     },
     "TOPIC_IDEATION": {
@@ -813,6 +817,7 @@
       "OPTION_DELETE_FOLDER": "Delete folder",
       "BTN_CREATE_NEW_FOLDER": "Create new folder",
       "NO_FOLDERS_HEADING": "There are no idea folders yet",
+      "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.",
       "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category."
     },
     "TOUR": {
@@ -2361,9 +2366,11 @@
       "DEMOGRAPHICS_DATA_GENDER_FEMALE": "Female",
       "DEMOGRAPHICS_DATA_GENDER_PLACEHOLDER": "Your gender (optional)",
       "DEMOGRAPHICS_DATA_GENDER_OTHER": "Other - please specify",
+      "DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER": "Other",
       "DEMOGRAPHICS_DATA_RESIDENCE": "Municipality",
       "DEMOGRAPHICS_DATA_RESIDENCE_OTHER": "Other - please specify",
       "DEMOGRAPHICS_DATA_RESIDENCE_PLACEHOLDER": "Your municipality (optional)",
+      "DEMOGRAPHICS_DATA_RESIDENCE_OTHER_PLACEHOLDER": "Other",
       "PREVIEW_INFO": "<b>This is a preview of your topic!</b> You can still edit your topic at any point prior to starting a vote.",
       "BTN_IDEATION_ACTIONS": "Manage idea gathering",
       "NO_IDEAS_HEADING": "There are no ideas yet",
@@ -3467,7 +3474,7 @@
   "MSG_ERROR_POST_API_AUTH_SIGNUP_40000_PASSWORD": "Password must be at least 6 characters long, containing at least 1 digit, 1 lower-case and 1 upper-case character.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40003_PASSWORD": "Nesprávné heslo.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40002": "Account verification has not been completed. Please check your email.",
-  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or password reset code.",
+  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or reset code. Password reset codes expire after 1 hour.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_ACCOUNT": "Zkontrolujte svůj e-mail pro ověření vašeho účtu.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_NEW_EMAIL_ADDRESS": "Your email address has been updated. Check your mail to verify your new email address. From now on, use this email address to log in.",
   "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_SEND_40002_EMAIL": "An account with this email does not exist.",

src/assets/i18n/de.json

@@ -134,6 +134,8 @@
       "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT",
       "BTN_DELETE_DRAFT": "Delete draft",
       "BTN_IDEA_POST": "Ihre Idee hinzufügen",
+      "BTN_EXPAND": "Expand",
+      "BTN_COLLAPSE": "Collapse",
       "MSG_SUCCESS": "Idee erfolgreich veröffentlicht",
       "MSG_ERROR_SUBJECT": "Ideenüberschrift muss 1 bis {{chars}} Zeichen lang sein.",
       "FIELD_IS_MANDATORY": "Field is mandatory",
@@ -274,7 +276,7 @@
       "LBL_NAME": "Bitte einen Namen für den neuen Ordner eingeben",
       "ADD_NAME_ERROR_MSG_INVALID": "Der Name darf nicht leer sein",
       "PLACEHOLDER_NAME": "@:VIEWS.MY_TOPICS_TOPICID.LNK_NAME",
-      "LBL_IDEAS_SELECTION": "Wählen Sie die Ideen aus, die Sie sofort diesem Ordner hinzufügen möchten",
+      "LBL_IDEAS_SELECTION": "Select the ideas you want to include in the voting options",
       "BTN_CREATE": "Ordner erstellen",
       "LNK_CANCEL": "@:LNK_CANCEL",
       "LBL_IDEAS": "Ideen ({{count}})",
@@ -766,7 +768,9 @@
       "HEADING_SEARCH_RESULTS": "Globale Suchergebnisse",
       "HEADING_RESULTS_IN": "Suchergebnisse in: <b>{{context}}</b>",
       "LNK_VIEW_MORE_RESULTS": "Zeige weitere Ergebnisse",
+      "LNK_HELP_PANEL": "Try here.",
       "TXT_OOPS_NO_RESULTS": "Wir konnten keine passenden Ergebnisse zu Ihrer Suchanfrage finden :(",
+      "TXT_NO_RESULTS_FOUND": "No results found. Looking for help?",
       "TXT_MAYBE_TYPO": "Haben Sie sich vielleicht bei der Sucheingabe vertippt?"
     },
     "TOPIC_IDEATION": {
@@ -813,6 +817,7 @@
       "OPTION_DELETE_FOLDER": "Ordner löschen",
       "BTN_CREATE_NEW_FOLDER": "Neuen Ordner erstellen",
       "NO_FOLDERS_HEADING": "Es sind noch keine Ideenordner vorhanden",
+      "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.",
       "NO_FOLDERS_DESC": "Themenadministratoren können Ordner erstellen, um Ideen zu gruppieren, die in dieselbe Kategorie passen."
     },
     "TOUR": {
@@ -2361,9 +2366,11 @@
       "DEMOGRAPHICS_DATA_GENDER_FEMALE": "Female",
       "DEMOGRAPHICS_DATA_GENDER_PLACEHOLDER": "Your gender (optional)",
       "DEMOGRAPHICS_DATA_GENDER_OTHER": "Other - please specify",
+      "DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER": "Other",
       "DEMOGRAPHICS_DATA_RESIDENCE": "Municipality",
       "DEMOGRAPHICS_DATA_RESIDENCE_OTHER": "Other - please specify",
       "DEMOGRAPHICS_DATA_RESIDENCE_PLACEHOLDER": "Your municipality (optional)",
+      "DEMOGRAPHICS_DATA_RESIDENCE_OTHER_PLACEHOLDER": "Other",
       "PREVIEW_INFO": "<b>Dies ist eine Vorschau Ihres Themas!</b> Sie können Ihr Thema jederzeit bearbeiten, bevor Sie eine Abstimmung starten.",
       "BTN_IDEATION_ACTIONS": "Ideenfindung verwalten",
       "NO_IDEAS_HEADING": "Es sind keine Ideen vorhanden",
@@ -3467,7 +3474,7 @@
   "MSG_ERROR_POST_API_AUTH_SIGNUP_40000_PASSWORD": "Das Passwort muss mindestens 6 Zeichen lang sein und mindestens 1 Ziffer, 1 Klein- und 1 Großbuchstaben enthalten.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40003_PASSWORD": "Falsches Passwort.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40002": "Die Kontoverifizierung wurde nicht abgeschlossen. Bitte überprüfen Sie Ihre E-Mails.",
-  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or password reset code.",
+  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or reset code. Password reset codes expire after 1 hour.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_ACCOUNT": "Überprüfen Sie Ihre E-Mails, um Ihr Konto zu verifizieren.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_NEW_EMAIL_ADDRESS": "Ihre E-Mail-Adresse wurde aktualisiert. Überprüfen Sie Ihren Posteingang, um Ihre neue E-Mail-Adresse zu verifizieren. Von nun an können Sie sich mit dieser E-Mail-Adresse anmelden.",
   "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_SEND_40002_EMAIL": "Ein Konto mit dieser E-Mail existiert nicht.",

src/assets/i18n/es.json

@@ -134,6 +134,8 @@
       "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT",
       "BTN_DELETE_DRAFT": "Delete draft",
       "BTN_IDEA_POST": "Añade tu idea",
+      "BTN_EXPAND": "Expand",
+      "BTN_COLLAPSE": "Collapse",
       "MSG_SUCCESS": "Idea publicada correctamente",
       "MSG_ERROR_SUBJECT": "El título de la idea debe tener entre 1 y {{chars}} caracteres.",
       "FIELD_IS_MANDATORY": "Este campo es obligatorio",
@@ -274,7 +276,7 @@
       "LBL_NAME": "Ponle nombre a tu nueva carpeta",
       "ADD_NAME_ERROR_MSG_INVALID": "El nombre no puede quedarse vacío",
       "PLACEHOLDER_NAME": "@:VIEWS.MY_TOPICS_TOPICID.LNK_NAME",
-      "LBL_IDEAS_SELECTION": "Selecciona las ideas que deseas agregar a esta carpeta inmediatamente",
+      "LBL_IDEAS_SELECTION": "Select the ideas you want to include in the voting options",
       "BTN_CREATE": "Crear carpeta",
       "LNK_CANCEL": "@:LNK_CANCEL",
       "LBL_IDEAS": "Ideas ({{count}})",
@@ -766,7 +768,9 @@
       "HEADING_SEARCH_RESULTS": "Resultados de búsqueda global",
       "HEADING_RESULTS_IN": "Buscar resultados en: <b>{{context}}</b>",
       "LNK_VIEW_MORE_RESULTS": "Ver mas resultados",
+      "LNK_HELP_PANEL": "Try here.",
       "TXT_OOPS_NO_RESULTS": "No encontramos resultados que coincidan con tu búsqueda :(",
+      "TXT_NO_RESULTS_FOUND": "No results found. Looking for help?",
       "TXT_MAYBE_TYPO": "¿Quizás hay un error de digitación en tu búsqueda?"
     },
     "TOPIC_IDEATION": {
@@ -813,6 +817,7 @@
       "OPTION_DELETE_FOLDER": "Eliminar carpeta",
       "BTN_CREATE_NEW_FOLDER": "Create new folder",
       "NO_FOLDERS_HEADING": "There are no idea folders yet",
+      "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.",
       "NO_FOLDERS_DESC": "Topic admins can create folders to group ideas that fit in the same category."
     },
     "TOUR": {
@@ -2361,9 +2366,11 @@
       "DEMOGRAPHICS_DATA_GENDER_FEMALE": "Female",
       "DEMOGRAPHICS_DATA_GENDER_PLACEHOLDER": "Your gender (optional)",
       "DEMOGRAPHICS_DATA_GENDER_OTHER": "Other - please specify",
+      "DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER": "Other",
       "DEMOGRAPHICS_DATA_RESIDENCE": "Municipality",
       "DEMOGRAPHICS_DATA_RESIDENCE_OTHER": "Other - please specify",
       "DEMOGRAPHICS_DATA_RESIDENCE_PLACEHOLDER": "Your municipality (optional)",
+      "DEMOGRAPHICS_DATA_RESIDENCE_OTHER_PLACEHOLDER": "Other",
       "PREVIEW_INFO": "<b>This is a preview of your topic!</b> You can still edit your topic at any point prior to starting a vote.",
       "BTN_IDEATION_ACTIONS": "Manage idea gathering",
       "NO_IDEAS_HEADING": "There are no ideas yet",
@@ -3467,7 +3474,7 @@
   "MSG_ERROR_POST_API_AUTH_SIGNUP_40000_PASSWORD": "Password must be at least 6 characters long, containing at least 1 digit, 1 lower-case and 1 upper-case character.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40003_PASSWORD": "Contraseña incorrecta.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40002": "Account verification has not been completed. Please check your email.",
-  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or password reset code.",
+  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or reset code. Password reset codes expire after 1 hour.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_ACCOUNT": "Consulte su correo electrónico para verificar la cuenta.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_NEW_EMAIL_ADDRESS": "Your email address has been updated. Check your mail to verify your new email address. From now on, use this email address to log in.",
   "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_SEND_40002_EMAIL": "An account with this email does not exist.",

src/assets/i18n/et.json

@@ -134,6 +134,8 @@
       "BTN_IDEA_DRAFT": "@:VIEWS.TOPIC_CREATE.FOOTER_BTN_SAVE_AS_DRAFT",
       "BTN_DELETE_DRAFT": "Delete draft",
       "BTN_IDEA_POST": "Lisa oma idee",
+      "BTN_EXPAND": "Expand",
+      "BTN_COLLAPSE": "Collapse",
       "MSG_SUCCESS": "Idee on edukalt postitatud",
       "MSG_ERROR_SUBJECT": "Idee pealkirja lubatud pikkus on 1 kuni {{chars}} sümbolit.",
       "FIELD_IS_MANDATORY": "Kohustuslik väli",
@@ -274,7 +276,7 @@
       "LBL_NAME": "Palun pane oma uuele kaustale nimi",
       "ADD_NAME_ERROR_MSG_INVALID": "Nimi ei saa olla tühi",
       "PLACEHOLDER_NAME": "@:VIEWS.MY_TOPICS_TOPICID.LNK_NAME",
-      "LBL_IDEAS_SELECTION": "Vali ideed, mille soovid kohe sellesse kausta lisada",
+      "LBL_IDEAS_SELECTION": "Select the ideas you want to include in the voting options",
       "BTN_CREATE": "Loo kaust",
       "LNK_CANCEL": "@:LNK_CANCEL",
       "LBL_IDEAS": "Ideed ({{count}})",
@@ -766,7 +768,9 @@
       "HEADING_SEARCH_RESULTS": "Otsingu tulemused",
       "HEADING_RESULTS_IN": "Otsingu tulemused: <b>{{context}}</b>",
       "LNK_VIEW_MORE_RESULTS": "Kuva rohkem tulemusi",
+      "LNK_HELP_PANEL": "Try here.",
       "TXT_OOPS_NO_RESULTS": "Me ei leidnud sinu otsingule vastavaid tulemusi :(",
+      "TXT_NO_RESULTS_FOUND": "No results found. Looking for help?",
       "TXT_MAYBE_TYPO": "Võib-olla tegid otsisõnas kirjavea?"
     },
     "TOPIC_IDEATION": {
@@ -813,6 +817,7 @@
       "OPTION_DELETE_FOLDER": "Kustuta kaust",
       "BTN_CREATE_NEW_FOLDER": "Loo uus kaust",
       "NO_FOLDERS_HEADING": "Ideekaustad puuduvad",
+      "NO_ITEMS_FOUND": "No results found with these filters. Try adjusting your filters and search again.",
       "NO_FOLDERS_DESC": "Teemade administraatorid saavad luua kaustu samasse kategooriasse sobivate ideede rühmitamiseks."
     },
     "TOUR": {
@@ -2361,9 +2366,11 @@
       "DEMOGRAPHICS_DATA_GENDER_FEMALE": "Naine",
       "DEMOGRAPHICS_DATA_GENDER_PLACEHOLDER": "Sinu sugu (valikuline)",
       "DEMOGRAPHICS_DATA_GENDER_OTHER": "Muu - palun täpsusta",
+      "DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER": "Other",
       "DEMOGRAPHICS_DATA_RESIDENCE": "Omavalitsus",
       "DEMOGRAPHICS_DATA_RESIDENCE_OTHER": "Muu - palun täpsusta",
       "DEMOGRAPHICS_DATA_RESIDENCE_PLACEHOLDER": "Su omavalitsus (valikuline)",
+      "DEMOGRAPHICS_DATA_RESIDENCE_OTHER_PLACEHOLDER": "Other",
       "PREVIEW_INFO": "<b>See on sinu teema eelvaade!</b> Enne hääletuse alustamist saad oma teemat igal ajal redigeerida.",
       "BTN_IDEATION_ACTIONS": "Halda ideekorjet",
       "NO_IDEAS_HEADING": "Ideid veel pole",
@@ -3467,7 +3474,7 @@
   "MSG_ERROR_POST_API_AUTH_SIGNUP_40000_PASSWORD": "Salasõna peab sisaldama vähemalt kuut tähemärki, üht numbrit, üht väike- ja üht suurtähte.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40003_PASSWORD": "Vale salasõna.",
   "MSG_ERROR_POST_API_AUTH_LOGIN_40002": "Konto on veel kinnitamata. Palun vaata oma e-postkasti.",
-  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or password reset code.",
+  "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_40000": "Invalid email, password or reset code. Password reset codes expire after 1 hour.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_ACCOUNT": "Palun vaata e-postiga saadetud kinnituskirja.",
   "MSG_INFO_CHECK_EMAIL_TO_VERIFY_YOUR_NEW_EMAIL_ADDRESS": "Uuendasime su e-posti aadressi – varsti leiad oma e-postkastist kirja, kus palutakse uus e-posti aadress kinnitada. Nüüdsest saad sisse logida uue e-posti aadressiga.",
   "MSG_ERROR_POST_API_AUTH_PASSWORD_RESET_SEND_40002_EMAIL": "Sellise e-posti aadressiga kontot süsteemis ei ole.",