Merge branch 'master' into load_moderator_names

admin/package.json

@@ -18,8 +18,8 @@
     "test:coverage": "cross-env TZ=UTC vitest run --coverage",
     "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs",
     "test:watch": "cross-env TZ=UTC vitest",
-    "locales": "scripts/sort.sh",
+    "locales": "bun scripts/sortLocales.ts",
-    "locales:fix": "scripts/sort.sh --fix",
+    "locales:fix": "bun scripts/sortLocales.ts --fix",
     "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo"
   },
   "dependencies": {

admin/scripts/sortLocales.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+import { readdir, readFile, writeFile } from 'fs/promises'
+import { join } from 'path'
+
+const ROOT_DIR = join(import.meta.dir, '..')
+const LOCALES_DIR = join(ROOT_DIR, 'src', 'locales')
+
+const FIX = process.argv.includes('--fix')
+
+function sortObject(value: any): any {
+  if (Array.isArray(value)) {
+    return value.map(sortObject)
+  }
+
+  if (value && typeof value === 'object') {
+    return Object.keys(value)
+      .sort()
+      .reduce<Record<string, any>>((acc, key) => {
+        acc[key] = sortObject(value[key])
+        return acc
+      }, {})
+  }
+
+  return value
+}
+
+let exitCode = 0
+
+const files = (await readdir(LOCALES_DIR))
+  .filter(f => f.endsWith('.json'))
+
+for (const file of files) {
+  const path = join(LOCALES_DIR, file)
+
+  const originalText = await readFile(path, 'utf8')
+  const originalJson = JSON.parse(originalText)
+
+  const sortedJson = sortObject(originalJson)
+  const sortedText = JSON.stringify(sortedJson, null, 2) + '\n'
+
+  if (originalText !== sortedText) {
+    if (FIX) {
+      await writeFile(path, sortedText)
+    } else {
+      console.error(`${file} is not sorted by keys`)
+      exitCode = 1
+    }
+  }
+}
+
+process.exit(exitCode)

admin/src/components/Tables/OpenCreationsTable.vue

@@ -14,7 +14,13 @@
         <IBiBellFill v-else-if="row.item.contributionStatus === 'PENDING'" />
         <IBiCheck v-else-if="row.item.contributionStatus === 'CONFIRMED'" />
         <IBiXCircle v-else-if="row.item.contributionStatus === 'DENIED'" />
-        <IBiTrash v-else-if="row.item.contributionStatus === 'DELETED'" />
+        <IBiTrash
+          v-else-if="row.item.contributionStatus === 'DELETED'"
+          class="p-1"
+          width="24"
+          height="24"
+          style="background-color: #dc3545; color: white"
+        />
       </template>
       <template #cell(bookmark)="row">
         <div v-if="!myself(row.item)">
@@ -275,4 +281,9 @@ export default {
   background-color: #e1a908;
   border-color: #e1a908;
 }
+
+.table-danger {
+  --bs-table-bg: #e78d8d;
+  --bs-table-striped-bg: #e57373;
+}
 </style>

admin/src/locales/de.json

@@ -3,8 +3,8 @@
   "actions": "Aktionen",
   "ai": {
     "chat": "Chat",
-    "chat-open": "Chat öffnen",
     "chat-clear": "Chat-Verlauf löschen",
+    "chat-open": "Chat öffnen",
     "chat-placeholder": "Schreibe eine Nachricht...",
     "chat-placeholder-loading": "Warte, ich denke nach...",
     "chat-thread-deleted": "Chatverlauf gelöscht",
@@ -28,8 +28,8 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
-    "deleted": "Automatische Schöpfung gelöscht!",
     "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
+    "deleted": "Automatische Schöpfung gelöscht!",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
     "name": "Name",
@@ -49,8 +49,8 @@
     "validTo": "Enddatum"
   },
   "contributionMessagesForm": {
-    "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!",
+    "hasRegisteredAt": "hat sich am {createdAt} registriert.",
-    "hasRegisteredAt": "hat sich am {createdAt} registriert."
+    "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!"
   },
   "contributions": {
     "all": "Alle",
@@ -101,16 +101,16 @@
     "coordinates": "Koordinaten:",
     "createdAt": "Erstellt am",
     "gmsApiKey": "GMS API Key:",
-    "hieroTopicId": "Hiero Topic ID:",
-    "toast_gmsApiKeyAndLocationUpdated": "Der GMS Api Key und die Location wurden erfolgreich aktualisiert!",
-    "toast_gmsApiKeyUpdated": "Der GMS Api Key wurde erfolgreich aktualisiert!",
-    "toast_gmsLocationUpdated": "Die GMS Location wurde erfolgreich aktualisiert!",
-    "toast_hieroTopicIdUpdated": "Die Hiero Topic ID wurde erfolgreich aktualisiert!",
     "gradidoInstances": "Gradido Instanzen",
+    "hieroTopicId": "Hiero Topic ID:",
     "lastAnnouncedAt": "letzte Bekanntgabe",
     "lastErrorAt": "Letzer Fehler am",
     "name": "Name",
     "publicKey": "PublicKey:",
+    "toast_gmsApiKeyAndLocationUpdated": "Der GMS Api Key und die Location wurden erfolgreich aktualisiert!",
+    "toast_gmsApiKeyUpdated": "Der GMS Api Key wurde erfolgreich aktualisiert!",
+    "toast_gmsLocationUpdated": "Die GMS Location wurde erfolgreich aktualisiert!",
+    "toast_hieroTopicIdUpdated": "Die Hiero Topic ID wurde erfolgreich aktualisiert!",
     "url": "Url",
     "verified": "Verifiziert",
     "verifiedAt": "Verifiziert am"
@@ -139,8 +139,8 @@
     }
   },
   "goTo": {
-    "userSearch": "Zur Nutzersuche gehen",
+    "humhubProfile": "Zum Humhub Profil gehen",
-    "humhubProfile": "Zum Humhub Profil gehen"
+    "userSearch": "Zur Nutzersuche gehen"
   },
   "help": {
     "help": "Hilfe",
@@ -170,16 +170,16 @@
   },
   "moderator": {
     "history": "Die Daten wurden geändert. Dies sind die alten Daten.",
-    "show-submission-form": "warten auf Erinnerung?",
+    "memo": "Text ändern",
+    "memo-modified": "Text von {name} bearbeitet.",
+    "memo-tooltip": "Den Beitragstext bearbeiten",
+    "message": "Nachricht",
+    "message-tooltip": "Nachricht an Benutzer schreiben",
     "moderator": "Moderator",
     "notice": "Notiz",
     "notice-tooltip": "Die Notiz ist nur für Moderatoren sichtbar",
-    "memo": "Text ändern",
-    "memo-tooltip": "Den Beitragstext bearbeiten",
-    "memo-modified": "Text von {name} bearbeitet.",
-    "message": "Nachricht",
-    "message-tooltip": "Nachricht an Benutzer schreiben",
     "request": "Diese Nachricht ist nur für die Moderatoren sichtbar!",
+    "show-submission-form": "warten auf Erinnerung?",
     "who": "Wer?"
   },
   "name": "Name",
@@ -239,14 +239,14 @@
     "chosenSpace": "Gewählter Space: {space}",
     "created": "Neuer Projekt Branding Eintrag wurde erstellt.",
     "error": "Fehler beim Erstellen des Projekt Branding Eintrags: {message}",
+    "newUserToSpace": "Benutzer hinzufügen?",
+    "newUserToSpaceTooltip": "Neue Benutzer automatisch zum Space hinzufügen, falls Space vorhanden",
     "noAccessRightSpace": "Gewählter Space: {spaceId} (Keine Zugriffsrechte)",
     "openSpaceInHumhub": "In Humhub öffnen",
-    "spaceId": "Humhub Space ID",
     "selectSpace": "Humhub Space auswählen",
+    "spaceId": "Humhub Space ID",
     "title": "Projekt Brandings",
-    "updated": "Projekt Branding Eintrag wurde aktualisiert.",
+    "updated": "Projekt Branding Eintrag wurde aktualisiert."
-    "newUserToSpace": "Benutzer hinzufügen?",
-    "newUserToSpaceTooltip": "Neue Benutzer automatisch zum Space hinzufügen, falls Space vorhanden"
   },
   "redeemed": "eingelöst",
   "registered": "Registriert",

admin/src/locales/en.json

@@ -3,8 +3,8 @@
   "actions": "Actions",
   "ai": {
     "chat": "Chat",
-    "chat-open": "Open chat",
     "chat-clear": "Clear chat",
+    "chat-open": "Open chat",
     "chat-placeholder": "Type your message here...",
     "chat-placeholder-loading": "Wait, I think...",
     "chat-thread-deleted": "Chat thread has been deleted",
@@ -28,8 +28,8 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
-    "deleted": "Automatic creation deleted!",
     "deleteNow": "Do you really delete automatic creations '{name}'?",
+    "deleted": "Automatic creation deleted!",
     "maxPerCycle": "Repetition",
     "memo": "Memo",
     "name": "Name",
@@ -49,8 +49,8 @@
     "validTo": "End-Date"
   },
   "contributionMessagesForm": {
-    "resubmissionDateInPast": "Resubmission date is in the past!",
+    "hasRegisteredAt": "registered on {createdAt}.",
-    "hasRegisteredAt": "registered on {createdAt}."
+    "resubmissionDateInPast": "Resubmission date is in the past!"
   },
   "contributions": {
     "all": "All",
@@ -101,16 +101,16 @@
     "coordinates": "Coordinates:",
     "createdAt": "Created At ",
     "gmsApiKey": "GMS API Key:",
-    "hieroTopicId": "Hiero Topic ID:",
-    "toast_gmsApiKeyAndLocationUpdated": "The GMS Api Key and the location have been successfully updated!",
-    "toast_gmsApiKeyUpdated": "The GMS Api Key has been successfully updated!",
-    "toast_gmsLocationUpdated": "The GMS location has been successfully updated!",
-    "toast_hieroTopicIdUpdated": "The Hiero Topic ID has been successfully updated!",
     "gradidoInstances": "Gradido Instances",
+    "hieroTopicId": "Hiero Topic ID:",
     "lastAnnouncedAt": "Last Announced",
     "lastErrorAt": "last error at",
     "name": "Name",
     "publicKey": "PublicKey:",
+    "toast_gmsApiKeyAndLocationUpdated": "The GMS Api Key and the location have been successfully updated!",
+    "toast_gmsApiKeyUpdated": "The GMS Api Key has been successfully updated!",
+    "toast_gmsLocationUpdated": "The GMS location has been successfully updated!",
+    "toast_hieroTopicIdUpdated": "The Hiero Topic ID has been successfully updated!",
     "url": "Url",
     "verified": "Verified",
     "verifiedAt": "Verified at"
@@ -132,15 +132,15 @@
   },
   "geo-coordinates": {
     "both-or-none": "Please enter both or none!",
-    "label": "geo-coordinates",
     "format": "{latitude}, {longitude}",
+    "label": "geo-coordinates",
     "latitude-longitude-smart": {
       "describe": "Automatically splits coordinates in the format 'latitude, longitude'. Simply enter your coordinates from Google Maps here, for example: 49.28187664243721, 9.740672183943639."
     }
   },
   "goTo": {
-    "userSearch": "Go to user search",
+    "humhubProfile": "Go to Humhub profile",
-    "humhubProfile": "Go to Humhub profile"
+    "userSearch": "Go to user search"
   },
   "help": {
     "help": "Help",
@@ -170,16 +170,16 @@
   },
   "moderator": {
     "history": "The data has been changed. This is the old data.",
-    "show-submission-form": "wait for reminder?",
+    "memo": "Edit text",
+    "memo-modified": "Text edited by {name}",
+    "memo-tooltip": "Edit the text of the contribution",
+    "message": "Message",
+    "message-tooltip": "Write message to user",
     "moderator": "Moderator",
     "notice": "Note",
     "notice-tooltip": "The note is only visible to moderators",
-    "memo": "Edit text",
-    "memo-tooltip": "Edit the text of the contribution",
-    "memo-modified": "Text edited by {name}",
-    "message": "Message",
-    "message-tooltip": "Write message to user",
     "request": "This message is only visible to the moderators!",
+    "show-submission-form": "wait for reminder?",
     "who": "Who?"
   },
   "name": "Name",
@@ -239,14 +239,14 @@
     "chosenSpace": "Choosen Humhub Space: {space}",
     "created": "New project branding entry has been created.",
     "error": "Error when creating the project branding entry: {message}",
+    "newUserToSpace": "Add user?",
+    "newUserToSpaceTooltip": "The hours should contain a maximum of two decimal places",
     "noAccessRightSpace": "Selected space: {spaceId} (No access rights)",
     "openSpaceInHumhub": "Open in Humhub",
-    "spaceId": "Humhub Space ID",
     "selectSpace": "Select Humhub Space",
+    "spaceId": "Humhub Space ID",
     "title": "Project Branding",
-    "updated": "Project branding entry has been updated.",
+    "updated": "Project branding entry has been updated."
-    "newUserToSpace": "Add user?",
-    "newUserToSpaceTooltip": "The hours should contain a maximum of two decimal places"
   },
   "redeemed": "redeemed",
   "registered": "Registered",

core/package.json

@@ -22,8 +22,8 @@
     "typecheck": "tsc --noEmit",
     "lint": "biome check --error-on-warnings .",
     "lint:fix": "biome check --error-on-warnings . --write",
-    "locales": "scripts/sort.sh src/locales",
+    "locales": "bun scripts/sortLocales.ts",
-    "locales:fix": "scripts/sort.sh src/locales --fix",
+    "locales:fix": "bun scripts/sortLocales.ts --fix",
     "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo"
   },
   "dependencies": {

core/scripts/sortLocales.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+import { readdir, readFile, writeFile } from 'fs/promises'
+import { join } from 'path'
+
+const ROOT_DIR = join(import.meta.dir, '..')
+const LOCALES_DIR = join(ROOT_DIR, 'src', 'locales')
+
+const FIX = process.argv.includes('--fix')
+
+function sortObject(value: any): any {
+  if (Array.isArray(value)) {
+    return value.map(sortObject)
+  }
+
+  if (value && typeof value === 'object') {
+    return Object.keys(value)
+      .sort()
+      .reduce<Record<string, any>>((acc, key) => {
+        acc[key] = sortObject(value[key])
+        return acc
+      }, {})
+  }
+
+  return value
+}
+
+let exitCode = 0
+
+const files = (await readdir(LOCALES_DIR))
+  .filter(f => f.endsWith('.json'))
+
+for (const file of files) {
+  const path = join(LOCALES_DIR, file)
+
+  const originalText = await readFile(path, 'utf8')
+  const originalJson = JSON.parse(originalText)
+
+  const sortedJson = sortObject(originalJson)
+  const sortedText = JSON.stringify(sortedJson, null, 2) + '\n'
+
+  if (originalText !== sortedText) {
+    if (FIX) {
+      await writeFile(path, sortedText)
+    } else {
+      console.error(`${file} is not sorted by keys`)
+      exitCode = 1
+    }
+  }
+}
+
+process.exit(exitCode)

core/src/locales/de.json

@@ -18,10 +18,10 @@
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "du hast zu deinem Gemeinwohl-Beitrag „{contributionMemo}“ eine Nachricht von {senderFirstName} {senderLastName} erhalten.",
+      "message": "„{message}“",
       "readMessage": "Nachricht lesen und beantworten",
       "subject": "Nachricht zu deinem Gemeinwohl-Beitrag",
       "title": "Nachricht zu deinem Gemeinwohl-Beitrag",
-      "message": "„{message}“",
       "toSeeAndAnswerMessage": "Um auf die Nachricht zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“."
     },
     "contribution": {
@@ -90,8 +90,8 @@
     },
     "transactionReceived": {
       "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD erhalten von {senderFirstName} {senderLastName}",
-      "subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
       "replySubject": "Re: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
+      "subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
       "title": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
     }
   },

core/src/locales/en.json

@@ -18,10 +18,10 @@
     },
     "addedContributionMessage": {
       "commonGoodContributionMessage": "You have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.",
+      "message": "„{message}“",
       "readMessage": "Read and reply to message",
       "subject": "Message about your common good contribution",
       "title": "Message about your common good contribution",
-      "message": "„{message}“",
       "toSeeAndAnswerMessage": "To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab."
     },
     "contribution": {

frontend/package.json

@@ -16,8 +16,8 @@
     "test:coverage": "cross-env TZ=UTC vitest run --coverage",
     "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs",
     "test:watch": "cross-env TZ=UTC vitest",
-    "locales": "scripts/sort.sh",
+    "locales": "bun scripts/sortLocales.ts",
-    "locales:fix": "scripts/sort.sh --fix",
+    "locales:fix": "bun scripts/sortLocales.ts --fix",
     "compile-scss": "node ./scripts/scss.mjs compile",
     "watch-scss": "node ./scripts/scss.mjs watch",
     "compile-scss-sass": "node ./scripts/scss.mjs compile sass",

frontend/scripts/sortLocales.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+import { readdir, readFile, writeFile } from 'fs/promises'
+import { join } from 'path'
+
+const ROOT_DIR = join(import.meta.dir, '..')
+const LOCALES_DIR = join(ROOT_DIR, 'src', 'locales')
+
+const FIX = process.argv.includes('--fix')
+
+function sortObject(value: any): any {
+  if (Array.isArray(value)) {
+    return value.map(sortObject)
+  }
+
+  if (value && typeof value === 'object') {
+    return Object.keys(value)
+      .sort()
+      .reduce<Record<string, any>>((acc, key) => {
+        acc[key] = sortObject(value[key])
+        return acc
+      }, {})
+  }
+
+  return value
+}
+
+let exitCode = 0
+
+const files = (await readdir(LOCALES_DIR))
+  .filter(f => f.endsWith('.json'))
+
+for (const file of files) {
+  const path = join(LOCALES_DIR, file)
+
+  const originalText = await readFile(path, 'utf8')
+  const originalJson = JSON.parse(originalText)
+
+  const sortedJson = sortObject(originalJson)
+  const sortedText = JSON.stringify(sortedJson, null, 2) + '\n'
+
+  if (originalText !== sortedText) {
+    if (FIX) {
+      await writeFile(path, sortedText)
+    } else {
+      console.error(`${file} is not sorted by keys`)
+      exitCode = 1
+    }
+  }
+}
+
+process.exit(exitCode)

frontend/src/locales/de.json

@@ -1,21 +1,21 @@
 {
+  "85": "85%",
+  "100": "100%",
+  "125": "125%",
   "(": "(",
   ")": ")",
-  "100": "100%",
   "1000thanks": "1000 Dank, weil du bei uns bist!",
-  "125": "125%",
-  "85": "85%",
   "Chat": "Chat",
   "GDD": "GDD",
   "GDD-long": "Gradido",
   "GDT": "GDT",
   "GMS": {
-    "title": "Geo Matching System GMS (in Entwicklung)",
+    "desc": "Finde Mitglieder aller Communities auf einer Landkarte.",
-    "desc": "Finde Mitglieder aller Communities auf einer Landkarte."
+    "title": "Geo Matching System GMS (in Entwicklung)"
   },
   "Humhub": {
-    "title": "Gradido-Kreise",
+    "desc": "Gemeinsam unterstützen wir einander –  achtsam in Kreiskultur.",
-    "desc": "Gemeinsam unterstützen wir einander –  achtsam in Kreiskultur."
+    "title": "Gradido-Kreise"
   },
   "PersonalDetails": "Persönliche Angaben",
   "advanced-calculation": "Vorausberechnung",
@@ -34,27 +34,27 @@
   },
   "back": "Zurück",
   "card-circles": {
-    "headline": "Kooperationsplattform »Gradido-Kreise«",
-    "text": "Lokale Kreise, Studienkreise, Projekte, Events und Kongresse",
     "allowed": {
       "button": "Kreise öffnen..."
     },
+    "headline": "Kooperationsplattform »Gradido-Kreise«",
     "not-allowed": {
       "button": "Konfigurieren..."
-    }
+    },
+    "text": "Lokale Kreise, Studienkreise, Projekte, Events und Kongresse"
   },
   "card-user-search": {
-    "headline": "Geografische Mitgliedssuche (beta)",
     "allowed": {
       "button": "Mitgliedssuche öffnen...",
       "disabled-button": "GMS offline...",
       "text": "Finde Mitglieder aller Communities auf einer Landkarte."
     },
+    "headline": "Geografische Mitgliedssuche (beta)",
+    "info": "So gehts",
     "not-allowed": {
       "button": "Standort eintragen...",
       "text": "Um andere Mitglieder in deinem Umkreis zu finden, trage jetzt deinen Standort auf der Karte ein!"
-    },
+    }
-    "info": "So gehts"
   },
   "community": {
     "admins": "Administratoren",
@@ -95,8 +95,8 @@
     "lastContribution": "Letzte Beiträge",
     "noContributions": {
       "allContributions": "Es wurden noch keine Beiträge eingereicht.",
-      "myContributions": "Du hast noch keine Beiträge eingereicht.",
+      "emptyPage": "Diese Seite ist leer.",
-      "emptyPage": "Diese Seite ist leer."
+      "myContributions": "Du hast noch keine Beiträge eingereicht."
     },
     "noOpenCreation": {
       "allMonth": "Für alle beiden Monate ist dein Schöpfungslimit erreicht. Den Nächsten Monat kannst du wieder 1000 GDD Schöpfen.",
@@ -117,6 +117,7 @@
   "copy-to-clipboard": "In Zwischenablage kopieren",
   "creation": "Schöpfen",
   "decay": {
+    "Starting_block_decay": "Startblock Vergänglichkeit",
     "before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.",
     "calculation_decay": "Berechnung der Vergänglichkeit",
     "calculation_total": "Berechnung der Gesamtsumme",
@@ -127,7 +128,6 @@
     "new_balance": "Neuer Kontostand",
     "old_balance": "Vorheriger Kontostand",
     "past_time": "Vergangene Zeit",
-    "Starting_block_decay": "Startblock Vergänglichkeit",
     "total": "Gesamt",
     "types": {
       "creation": "Geschöpft",
@@ -186,8 +186,8 @@
     "link_decay_description": "Der Link-Betrag wird zusammen mit der maximalen Vergänglichkeit blockiert. Nach Einlösen, Verfallen oder Löschen des Links wird der Rest wieder freigegeben.",
     "memo": "Nachricht",
     "message": "Nachricht",
-    "new_balance": "Neuer Kontostand nach Bestätigung",
     "newPasswordRepeat": "Neues Passwort wiederholen",
+    "new_balance": "Neuer Kontostand nach Bestätigung",
     "no_gdd_available": "Du hast keine GDD zum versenden.",
     "ok": "Ok",
     "password": "Passwort",
@@ -201,11 +201,11 @@
     "reset": "Zurücksetzen",
     "save": "Speichern",
     "scann_code": "<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
-    "sender": "Absender",
     "send_check": "Bestätige deine Transaktion. Prüfe bitte nochmal alle Angaben!",
     "send_now": "Jetzt senden",
     "send_transaction_error": "Leider konnte die Transaktion nicht ausgeführt werden!",
     "send_transaction_success": "Deine Transaktion wurde erfolgreich ausgeführt",
+    "sender": "Absender",
     "sorry": "Entschuldigung",
     "thx": "Danke",
     "to": "bis",
@@ -214,28 +214,28 @@
     "username-placeholder": "Wähle deinen Benutzernamen",
     "validation": {
       "amount": {
-        "min": "Der Betrag sollte mindestens {min} groß sein.",
-        "max": "Der Betrag sollte höchstens {max} groß sein.",
         "decimal-places": "Der Betrag sollte maximal zwei Nachkommastellen enthalten.",
+        "max": "Der Betrag sollte höchstens {max} groß sein.",
+        "min": "Der Betrag sollte mindestens {min} groß sein.",
         "typeError": "Der Betrag sollte eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein."
       },
       "contributionDate": {
-        "required": "Das Beitragsdatum ist ein Pflichtfeld.",
+        "max": "Das Späteste Beitragsdatum ist heute, der {max}.",
         "min": "Das Frühste Beitragsdatum ist {min}.",
-        "max": "Das Späteste Beitragsdatum ist heute, der {max}."
+        "required": "Das Beitragsdatum ist ein Pflichtfeld."
       },
       "contributionMemo": {
-        "min": "Die Tätigkeitsbeschreibung sollte mindestens {min} Zeichen lang sein.",
         "max": "Die Tätigkeitsbeschreibung sollte höchstens {max} Zeichen lang sein.",
+        "min": "Die Tätigkeitsbeschreibung sollte mindestens {min} Zeichen lang sein.",
         "required": "Die Tätigkeitsbeschreibung ist ein Pflichtfeld."
       },
+      "gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein.",
       "hours": {
-        "min": "Die Stunden sollten mindestens {min} groß sein.",
-        "max": "Die Stunden sollten höchstens {max} groß sein.",
         "decimal-places": "Die Stunden sollten maximal zwei Nachkommastellen enthalten.",
+        "max": "Die Stunden sollten höchstens {max} groß sein.",
+        "min": "Die Stunden sollten mindestens {min} groß sein.",
         "typeError": "Die Stunden sollten eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein."
       },
-      "gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein.",
       "identifier": {
         "communityIsReachable": "Community nicht gefunden oder nicht erreichbar!",
         "required": "Der Empfänger ist ein Pflichtfeld.",
@@ -243,8 +243,8 @@
       },
       "is-not": "Du kannst dir selbst keine Gradidos überweisen!",
       "memo": {
-        "min": "Die Nachricht sollte mindestens {min} Zeichen lang sein.",
         "max": "Die Nachricht sollte höchstens {max} Zeichen lang sein.",
+        "min": "Die Nachricht sollte mindestens {min} Zeichen lang sein.",
         "required": "Die Nachricht ist ein Pflichtfeld."
       },
       "requiredField": "{fieldName} ist ein Pflichtfeld",
@@ -347,13 +347,13 @@
   },
   "openHours": "Offene Stunden",
   "pageTitle": {
+    "circles": "Gradido Kreise",
     "contributions": "Gradido schöpfen",
     "gdt": "Deine GDT Transaktionen",
     "information": "{community}",
     "overview": "Willkommen {name}",
     "send": "Sende Gradidos",
     "settings": "Einstellungen",
-    "circles": "Gradido Kreise",
     "transactions": "Deine Transaktionen",
     "usersearch": "Geografische Mitgliedssuche (beta)"
   },
@@ -367,8 +367,6 @@
     "warningText": "Bist du noch da?"
   },
   "settings": {
-    "community": "Kreise & Mitgliedssuche",
-    "emailInfo": "Kann aktuell noch nicht geändert werden.",
     "GMS": {
       "disabled": "Daten werden nicht nach GMS exportiert",
       "enabled": "Daten werden nach GMS exportiert",
@@ -383,20 +381,22 @@
         "communityCoords": "Ihr Gemeinschafts-Standort: Breitengrad {lat}, Längengrad {lng}",
         "communityLocationLabel": "Ihr Gemeinschafts-Standort",
         "headline": "Geografische Standorterfassung des Benutzers",
+        "search": "Nach einem Standort suchen",
         "userCoords": "Ihr Standort: Breitengrad {lat}, Längengrad {lng}",
-        "userLocationLabel": "Ihr Standort",
+        "userLocationLabel": "Ihr Standort"
-        "search": "Nach einem Standort suchen"
       },
       "naming-format": "Namen anzeigen:",
       "publish-location": {
-        "exact": "Genaue Position",
         "approximate": "Ungefähre Position",
+        "exact": "Genaue Position",
         "updated": "Positionstyp für GMS aktualisiert"
       },
       "publish-name": {
         "updated": "Namensformat für GMS aktualisiert"
       }
     },
+    "community": "Kreise & Mitgliedssuche",
+    "emailInfo": "Kann aktuell noch nicht geändert werden.",
     "hideAmountGDD": "Dein GDD Betrag ist versteckt.",
     "hideAmountGDT": "Dein GDT Betrag ist versteckt.",
     "humhub": {
@@ -448,9 +448,9 @@
       "alias-or-initials": "Benutzername oder Initialen",
       "alias-or-initials-tooltip": "Benutzername, falls vorhanden, oder die Initialen von Vorname und Nachname jeweils die ersten zwei Buchstaben",
       "first": "Vorname",
-      "first-tooltip": "Nur der Vornamen",
       "first-initial": "Vorname und Initial",
       "first-initial-tooltip": "Vornamen plus den ersten Anfangsbuchstaben des Nachnamens",
+      "first-tooltip": "Nur der Vornamen",
       "initials": "Initialen",
       "initials-tooltip": "Initialen von Vor- und Nachname also jeweils die ersten zwei Buchstaben unabhängig von der Existenz des Benutzernamens",
       "name-full": "Vorname und Nachname",
@@ -507,9 +507,9 @@
     "send_you": "sendet dir"
   },
   "usersearch": {
+    "button": "Starte die Nutzersuche...",
     "headline": "Geografische Nutzersuche",
-    "text": "Ganz gleich zu welcher Community du gehörst, mit dem Geo Matching System findest du Mitglieder aller Communities auf einer Landkarte. Du kannst nach  Angeboten und Bedürfnissen filtern und dir die Nutzer anzeigen lassen, die zu Dir passen.\n\nMit dem Button wird ein neues Browser-Fenster geöffnet, in dem dir die Nutzer in deinem Umfeld auf einer Karte angezeigt werden.",
+    "text": "Ganz gleich zu welcher Community du gehörst, mit dem Geo Matching System findest du Mitglieder aller Communities auf einer Landkarte. Du kannst nach  Angeboten und Bedürfnissen filtern und dir die Nutzer anzeigen lassen, die zu Dir passen.\n\nMit dem Button wird ein neues Browser-Fenster geöffnet, in dem dir die Nutzer in deinem Umfeld auf einer Karte angezeigt werden."
-    "button": "Starte die Nutzersuche..."
   },
   "via_link": "über einen Link",
   "welcome": "Willkommen in der Gemeinschaft"

frontend/src/locales/en.json

@@ -1,21 +1,21 @@
 {
+  "85": "85%",
+  "100": "100%",
+  "125": "125%",
   "(": "(",
   ")": ")",
-  "100": "100%",
   "1000thanks": "1000 thanks for being with us!",
-  "125": "125%",
-  "85": "85%",
   "Chat": "Chat",
   "GDD": "GDD",
   "GDD-long": "Gradido",
   "GDT": "GDT",
   "GMS": {
-    "title": "Geo Matching System GMS (in develop)",
+    "desc": "Find members of all communities on a map.",
-    "desc": "Find members of all communities on a map."
+    "title": "Geo Matching System GMS (in develop)"
   },
   "Humhub": {
-    "title": "Gradido-circles",
+    "desc": "Together we support each other - mindful in circle culture.",
-    "desc": "Together we support each other - mindful in circle culture."
+    "title": "Gradido-circles"
   },
   "PersonalDetails": "Personal details",
   "advanced-calculation": "Advanced calculation",
@@ -34,27 +34,27 @@
   },
   "back": "Back",
   "card-circles": {
-    "headline": "Cooperation platform “Gradido Circles”",
-    "text": "Local circles, study circles, projects, events and congresses",
     "allowed": {
       "button": "Open Circles..."
     },
+    "headline": "Cooperation platform “Gradido Circles”",
     "not-allowed": {
       "button": "Configurate..."
-    }
+    },
+    "text": "Local circles, study circles, projects, events and congresses"
   },
   "card-user-search": {
-    "headline": "Geographic member search (beta)",
     "allowed": {
       "button": "Open member search...",
       "disabled-button": "GMS offline...",
       "text": "Find Members of all Communities on a Map."
     },
+    "headline": "Geographic member search (beta)",
+    "info": "How it works",
     "not-allowed": {
       "button": "Enter location...",
       "text": "To find other members in your area, enter your location on the map now!"
-    },
+    }
-    "info": "How it works"
   },
   "community": {
     "admins": "Administrators",
@@ -95,8 +95,8 @@
     "lastContribution": "Last Contributions",
     "noContributions": {
       "allContributions": "No contributions have been submitted yet.",
-      "myContributions": "You have not submitted any entries yet.",
+      "emptyPage": "This page is empty.",
-      "emptyPage": "This page is empty."
+      "myContributions": "You have not submitted any entries yet."
     },
     "noOpenCreation": {
       "allMonth": "For all two months your creation limit is reached. The next month you can create 1000 GDD again.",
@@ -117,6 +117,7 @@
   "copy-to-clipboard": "Copy to clipboard",
   "creation": "Creation",
   "decay": {
+    "Starting_block_decay": "Starting Block Decay",
     "before_startblock_transaction": "This transaction does not include decay.",
     "calculation_decay": "Calculation of Decay",
     "calculation_total": "Calculation of the total Amount",
@@ -127,7 +128,6 @@
     "new_balance": "New balance",
     "old_balance": "Previous balance",
     "past_time": "Time passed",
-    "Starting_block_decay": "Starting Block Decay",
     "total": "Total",
     "types": {
       "creation": "Created",
@@ -186,8 +186,8 @@
     "link_decay_description": "The link amount is blocked along with the maximum decay. After the link has been redeemed, expired, or deleted, the rest is released again.",
     "memo": "Message",
     "message": "Message",
-    "new_balance": "Account balance after confirmation",
     "newPasswordRepeat": "Repeat new password",
+    "new_balance": "Account balance after confirmation",
     "no_gdd_available": "You do not have GDD to send.",
     "ok": "Ok",
     "password": "Password",
@@ -201,11 +201,11 @@
     "reset": "Reset",
     "save": "Save",
     "scann_code": "<strong>QR Code Scanner</strong> - Scan the QR Code of your partner",
-    "sender": "Sender",
     "send_check": "Confirm your transaction. Please check all data again!",
     "send_now": "Send now",
     "send_transaction_error": "Unfortunately, the transaction could not be executed!",
     "send_transaction_success": "Your transaction was successfully completed",
+    "sender": "Sender",
     "sorry": "Sorry",
     "thx": "Thank you",
     "to": "to",
@@ -214,28 +214,28 @@
     "username-placeholder": "Choose your username",
     "validation": {
       "amount": {
-        "min": "The amount should be at least {min} in size.",
-        "max": "The amount should not be larger than {max}.",
         "decimal-places": "The amount should contain a maximum of two decimal places.",
+        "max": "The amount should not be larger than {max}.",
+        "min": "The amount should be at least {min} in size.",
         "typeError": "The amount should be a number between {min} and {max} with at most two digits after the decimal point."
       },
       "contributionDate": {
-        "required": "The contribution date is a required field.",
+        "max": "The latest contribution date is today, {max}.",
         "min": "The earliest contribution date is {min}.",
-        "max": "The latest contribution date is today, {max}."
+        "required": "The contribution date is a required field."
       },
       "contributionMemo": {
-        "min": "The job description should be at least {min} characters long.",
         "max": "The job description should not be longer than {max} characters.",
+        "min": "The job description should be at least {min} characters long.",
         "required": "The job description is required."
       },
+      "gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits after the decimal point.",
       "hours": {
-        "min": "The hours should be at least {min} in size.",
-        "max": "The hours should not be larger than {max}.",
         "decimal-places": "The hours should contain a maximum of two decimal places.",
+        "max": "The hours should not be larger than {max}.",
+        "min": "The hours should be at least {min} in size.",
         "typeError": "The hours should be a number between {min} and {max} with at most two digits after the decimal point."
       },
-      "gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits after the decimal point.",
       "identifier": {
         "communityIsReachable": "Community not found our not reachable!",
         "required": "The recipient is a required field.",
@@ -243,8 +243,8 @@
       },
       "is-not": "You cannot send Gradidos to yourself!",
       "memo": {
-        "min": "The message should be at least {min} characters long.",
         "max": "The message should not be longer than {max} characters.",
+        "min": "The message should be at least {min} characters long.",
         "required": "The message is required."
       },
       "requiredField": "The {fieldName} field is required",
@@ -347,6 +347,7 @@
   },
   "openHours": "Open Hours",
   "pageTitle": {
+    "circles": "Gradido Circles",
     "contributions": "Create Gradido",
     "gdt": "Your GDT transactions",
     "information": "{community}",
@@ -354,7 +355,6 @@
     "send": "Send Gradidos",
     "settings": "Settings",
     "transactions": "Your transactions",
-    "circles": "Gradido Circles",
     "usersearch": "Geographic member search (beta)"
   },
   "qrCode": "QR Code",
@@ -367,8 +367,6 @@
     "warningText": "Are you still there?"
   },
   "settings": {
-    "community": "Community",
-    "emailInfo": "Cannot be changed at this time.",
     "GMS": {
       "disabled": "Data not exported to GMS",
       "enabled": "Data exported to GMS",
@@ -383,20 +381,22 @@
         "communityCoords": "Your Community Location: Lat {lat}, Lng {lng}",
         "communityLocationLabel": "Your Community-Location",
         "headline": "Geographic Location-Capturing of the User",
+        "search": "Search for a location",
         "userCoords": "Your Location: Lat {lat}, Lng {lng}",
-        "userLocationLabel": "Your Location",
+        "userLocationLabel": "Your Location"
-        "search": "Search for a location"
       },
       "naming-format": "Show Name:",
       "publish-location": {
-        "exact": "exact position",
         "approximate": "approximate position",
+        "exact": "exact position",
         "updated": "format of location for GMS updated"
       },
       "publish-name": {
         "updated": "format of name for GMS updated"
       }
     },
+    "community": "Community",
+    "emailInfo": "Cannot be changed at this time.",
     "hideAmountGDD": "Your GDD amount is hidden.",
     "hideAmountGDT": "Your GDT amount is hidden.",
     "humhub": {
@@ -448,9 +448,9 @@
       "alias-or-initials": "Username or initials (Default)",
       "alias-or-initials-tooltip": "username, if available, or the initials of the first name and last name, the first two letters in each case",
       "first": "Firstname",
-      "first-tooltip": "the first name only",
       "first-initial": "First name and initial",
       "first-initial-tooltip": "first name plus the first letter of the last name",
+      "first-tooltip": "the first name only",
       "initials": "Initials",
       "initials-tooltip": "Initials of first name and last name, i.e. the first two letters of each regardless of the existence of the user name",
       "name-full": "first name and last name",
@@ -507,9 +507,9 @@
     "send_you": "wants to send you"
   },
   "usersearch": {
+    "button": "Start user search... ",
     "headline": "Geographical User Search",
-    "text": "No matter which community you belong to, with the Geo Matching System you can find members of all communities on a map. You can filter according to offers and needs and display the users that match you.\n\nThe button opens a new browser window in which the users in your area are displayed on a map.",
+    "text": "No matter which community you belong to, with the Geo Matching System you can find members of all communities on a map. You can filter according to offers and needs and display the users that match you.\n\nThe button opens a new browser window in which the users in your area are displayed on a map."
-    "button": "Start user search... "
   },
   "via_link": "via Link",
   "welcome": "Welcome to the community"

frontend/src/locales/es.json

@@ -1,8 +1,8 @@
 {
-  "100": "100%",
-  "1000thanks": "1000 Gracias, por estar con nosotros!",
-  "125": "125%",
   "85": "85%",
+  "100": "100%",
+  "125": "125%",
+  "1000thanks": "1000 Gracias, por estar con nosotros!",
   "GDD": "GDD",
   "GDT": "GDT",
   "PersonalDetails": "Datos personales",
@@ -22,32 +22,32 @@
   },
   "back": "Volver",
   "card-circles": {
-    "headline": "Plataforma de cooperación «Círculos Gradido»",
-    "text": "Círculos locales, círculos de estudio, proyectos, ev entos y congresos",
     "allowed": {
       "button": "Abrir círculos..."
     },
+    "headline": "Plataforma de cooperación «Círculos Gradido»",
     "not-allowed": {
       "button": "Configurar..."
-    }
+    },
+    "text": "Círculos locales, círculos de estudio, proyectos, ev entos y congresos"
   },
   "card-user-search": {
-    "headline": "Búsqueda geográfica de miembros (beta)",
     "allowed": {
       "button": "Abrir búsqueda de miembros...",
       "disabled-button": "GMS offline...",
       "text": "Encuentra Miembros de todas las Comunidades en un Mapa."
     },
+    "headline": "Búsqueda geográfica de miembros (beta)",
+    "info": "Así se hace",
     "not-allowed": {
       "button": "Introducir ubicación...",
       "text": "Para encontrar otros miembros cerca de ti, ¡introduce ahora tu ubicación en el mapa!"
-    },
+    }
-    "info": "Así se hace"
   },
   "circles": {
+    "button": "Abrir Círculos...",
     "headline": "Juntos nos apoyamos - atentos a la cultura de los círculos.",
-    "text": "Haga clic en el botón para abrir la plataforma de cooperación en una nueva ventana del navegador.",
+    "text": "Haga clic en el botón para abrir la plataforma de cooperación en una nueva ventana del navegador."
-    "button": "Abrir Círculos..."
   },
   "community": {
     "admins": "Administradores",
@@ -60,8 +60,8 @@
     "moderators": "Moderadores",
     "myContributions": "Mis contribuciones al bien común",
     "noOpenContributionLinkText": "Actualmente no hay creaciones generadas por enlaces.",
-    "openContributionLinks": "Creaciones generadas por enlace",
     "openContributionLinkText": "Para créditos iniciales o fines similares, la comunidad puede crear los llamados enlaces de creación. Éstos activan creaciones automáticas que se acreditan al usuario.\nLa comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:",
+    "openContributionLinks": "Creaciones generadas por enlace",
     "other-communities": "Otras comunidades",
     "startNewsButton": "Enviar Gradidos",
     "statistic": "Estadísticas",
@@ -103,6 +103,7 @@
   },
   "copy-to-clipboard": "Copiar al portapapeles",
   "decay": {
+    "Starting_block_decay": "Startblock disminución gradual",
     "before_startblock_transaction": "Esta transacción no implica disminución en su valor.",
     "calculation_decay": "Cálculo de la disminución gradual del valor",
     "calculation_total": "Cálculo de la suma total",
@@ -111,7 +112,6 @@
     "decay_since_last_transaction": "Disminución gradual",
     "last_transaction": "Transacción anterior",
     "past_time": "Tiempo transcurrido",
-    "Starting_block_decay": "Startblock disminución gradual",
     "total": "Total",
     "types": {
       "creation": "Creado",
@@ -166,8 +166,8 @@
     "link_decay_description": "El importe del enlace se bloquea junto con la ransience máxima. Una vez que el enlace se ha canjeado, caducado o eliminado, el resto se libera de nuevo.",
     "memo": "Mensaje",
     "message": "Noticia",
-    "new_balance": "Saldo de cuenta nuevo depués de confirmación",
     "newPasswordRepeat": "Repetir contraseña nueva",
+    "new_balance": "Saldo de cuenta nuevo depués de confirmación",
     "no_gdd_available": "No dispones de GDD para enviar.",
     "password": "Contraseña",
     "passwordRepeat": "Repetir contraseña",
@@ -179,11 +179,11 @@
     "reset": "Restablecer",
     "save": "Guardar",
     "scann_code": "<strong>QR Code Scanner</strong> - Escanea el código QR de tu pareja",
-    "sender": "Remitente",
     "send_check": "Confirma tu transacción. Por favor revisa toda la información nuevamente!",
     "send_now": "Enviar ahora",
     "send_transaction_error": "Desafortunadamente, la transacción no se pudo ejecutar!",
     "send_transaction_success": "Su transacción fue ejecutada con éxito",
+    "sender": "Remitente",
     "sorry": "Disculpa",
     "thx": "Gracias",
     "time": "Tiempo",
@@ -295,6 +295,7 @@
   },
   "openHours": "Open Hours",
   "pageTitle": {
+    "circles": "Círculos Gradido",
     "contributions": "Cuchara Gradido",
     "gdt": "Tu GDT Transacciones",
     "information": "{community}",
@@ -302,7 +303,6 @@
     "send": "Enviar Gradidos",
     "settings": "Soporte",
     "transactions": "Tu Transacciones",
-    "circles": "Círculos Gradido",
     "usersearch": "Búsqueda geográfica de miembros (beta)"
   },
   "qrCode": "Código QR",
@@ -326,10 +326,10 @@
         "communityCoords": "Ubicación de tu comunidad: Lat {lat}, Lng {lng}",
         "communityLocationLabel": "Ubicación de tu comunidad",
         "headline": "Captura de ubicación geográfica del usuario",
-        "userCoords": "Tu ubicación: Lat {lat}, Lng {lng}",
-        "userLocationLabel": "Tu ubicación",
         "search": "Buscar una ubicación",
-        "success": "Ubicación guardada exitosamente"
+        "success": "Ubicación guardada exitosamente",
+        "userCoords": "Tu ubicación: Lat {lat}, Lng {lng}",
+        "userLocationLabel": "Tu ubicación"
       }
     },
     "language": {
@@ -414,9 +414,9 @@
     "send_you": "te envía"
   },
   "usersearch": {
+    "button": "Iniciar la búsqueda de usuarios...",
     "headline": "Búsqueda geográfica de usuarios",
-    "text": "No importa a qué comunidad pertenezcas, con el Geo Matching System puedes encontrar miembros de todas las comunidades en un mapa. Puedes filtrar según ofertas y requisitos y visualizar los usuarios que coinciden con tu perfil.\n\nEl botón abre una nueva ventana del navegador en la que se muestran en un mapa los usuarios de tu zona.",
+    "text": "No importa a qué comunidad pertenezcas, con el Geo Matching System puedes encontrar miembros de todas las comunidades en un mapa. Puedes filtrar según ofertas y requisitos y visualizar los usuarios que coinciden con tu perfil.\n\nEl botón abre una nueva ventana del navegador en la que se muestran en un mapa los usuarios de tu zona."
-    "button": "Iniciar la búsqueda de usuarios..."
   },
   "via_link": "atraves de un enlace",
   "welcome": "Bienvenido a la comunidad."

frontend/src/locales/fr.json

@@ -1,10 +1,10 @@
 {
+  "85": "85%",
+  "100": "100%",
+  "125": "125%",
   "(": "(",
   ")": ")",
-  "100": "100%",
   "1000thanks": "1000 mercis d'être avec nous!",
-  "125": "125%",
-  "85": "85%",
   "GDD": "GDD",
   "GDT": "GDT",
   "PersonalDetails": "Informations personnelles",
@@ -24,32 +24,32 @@
   },
   "back": "Retour",
   "card-circles": {
-    "headline": "Plate-forme de coopération «Cercles Gradido»",
-    "text": "Cercles locaux, cercles d'études, projets, événements et congrès",
     "allowed": {
       "button": "Ouvrir les cercles..."
     },
+    "headline": "Plate-forme de coopération «Cercles Gradido»",
     "not-allowed": {
       "button": "Configurer..."
-    }
+    },
+    "text": "Cercles locaux, cercles d'études, projets, événements et congrès"
   },
   "card-user-search": {
-    "headline": "Recherche géographique de membres (bêta)",
     "allowed": {
       "button": "Ouvrir la recherche de membres...",
       "disabled-button": "GMS offline...",
       "text": "Trouve des membres de toutes les communautés sur une carte."
     },
+    "headline": "Recherche géographique de membres (bêta)",
+    "info": "Comment ça marche",
     "not-allowed": {
       "button": "Indiquer ta position...",
       "text": "Pour trouver d'autres membres près de chez toi, indique dès maintenant ta position sur la carte!"
-    },
+    }
-    "info": "Comment ça marche"
   },
   "circles": {
+    "button": "Ouvrir les Cercles...",
     "headline": "Ensemble, nous nous soutenons mutuellement - attentifs à la culture du cercle.",
-    "text": "En cliquant sur le bouton, tu ouvres la plateforme de coopération dans une nouvelle fenêtre de navigation.",
+    "text": "En cliquant sur le bouton, tu ouvres la plateforme de coopération dans une nouvelle fenêtre de navigation."
-    "button": "Ouvrir les Cercles..."
   },
   "community": {
     "admins": "Administrateurs",
@@ -61,8 +61,8 @@
     "moderators": "Modérateurs",
     "myContributions": "Mes contributions",
     "noOpenContributionLinkText": "Actuellement, il n'y a pas de créations générées par lien.",
-    "openContributionLinks": "Créations générées par lien",
     "openContributionLinkText": "Pour les crédits de départ ou à des fins similaires, la communauté peut créer des \"liens de création\". Ils déclenchent des créations automatiques qui sont créditées à l'utilisateur.\nLa communauté \"{name}\" soutient actuellement {count} créations générées par lien:",
+    "openContributionLinks": "Créations générées par lien",
     "startNewsButton": "Envoyer des gradidos",
     "submitContribution": "Contribuer"
   },
@@ -106,6 +106,7 @@
   "copy-to-clipboard": "Copier dans le presse-papier",
   "creation": "Création",
   "decay": {
+    "Starting_block_decay": "Début de la décroissance",
     "before_startblock_transaction": "Cette transaction n'est pas péremptoire.",
     "calculation_decay": "Calcul de la décroissance",
     "calculation_total": "Calcul du montant total",
@@ -114,7 +115,6 @@
     "decay_since_last_transaction": "Décroissance depuis la dernière transaction",
     "last_transaction": "Dernière transaction:",
     "past_time": "Le temps a expiré",
-    "Starting_block_decay": "Début de la décroissance",
     "total": "Total",
     "types": {
       "creation": "Créé",
@@ -172,8 +172,8 @@
     "link_decay_description": "Le montant du lien est bloqué avec le dépérissement maximale. Une fois le lien utilisé, expiré ou supprimé, le reste est à nouveau débloqué.",
     "memo": "Note",
     "message": "Message",
-    "new_balance": "Montant du solde après confirmation",
     "newPasswordRepeat": "Répétez le nouveau mot de passe",
+    "new_balance": "Montant du solde après confirmation",
     "no_gdd_available": "Vous n'avez pas de GDD à envoyer.",
     "password": "Mot de passe",
     "passwordRepeat": "Répétez le mot de passe",
@@ -185,11 +185,11 @@
     "reset": "Réinitialiser",
     "save": "Sauvegarder",
     "scann_code": "<strong>QR Code Scanner</strong> - Scannez le QR code de votre partenaire",
-    "sender": "Expéditeur",
     "send_check": "Confirmez la transaction. Veuillez revérifier toutes les données svp!",
     "send_now": "Envoyez maintenant",
     "send_transaction_error": "Malheureusement, la transaction n'a pas pu être effectuée!",
     "send_transaction_success": "Votre transaction a été effectuée avec succès",
+    "sender": "Expéditeur",
     "sorry": "Désolé",
     "thx": "Merci",
     "to": "à",
@@ -303,6 +303,7 @@
   },
   "openHours": "Heures ouverte",
   "pageTitle": {
+    "circles": "Cercles Gradido",
     "contributions": "Ma communauté",
     "gdt": "Vos transactions GDT",
     "information": "{community}",
@@ -310,7 +311,6 @@
     "send": "Envoyé Gradidos",
     "settings": "Configuration",
     "transactions": "Vos transactions",
-    "circles": "Cercles Gradido",
     "usersearch": "Recherche géographique de membres (bèta)"
   },
   "qrCode": "QR Code",
@@ -334,10 +334,10 @@
         "communityCoords": "Emplacement de votre communauté : Lat {lat}, Long {lng}",
         "communityLocationLabel": "Emplacement de votre communauté",
         "headline": "Capture de la localisation géographique de l'utilisateur",
-        "userCoords": "Votre emplacement : Lat {lat}, Long {lng}",
-        "userLocationLabel": "Votre emplacement",
         "search": "Rechercher un emplacement",
-        "success": "Emplacement enregistré avec succès"
+        "success": "Emplacement enregistré avec succès",
+        "userCoords": "Votre emplacement : Lat {lat}, Long {lng}",
+        "userLocationLabel": "Votre emplacement"
       }
     },
     "hideAmountGDD": "Votre montant GDD est caché.",
@@ -422,9 +422,9 @@
     "send_you": "veut vous envoyer"
   },
   "usersearch": {
+    "button": "Commence la recherche d'utilisateurs...",
     "headline": "Recherche géographique d'utilisateurs",
-    "text": "Quelle que soit la communauté à laquelle tu appartiens, le système de géo-matching te permet de trouver des membres de toutes les communautés sur une carte géographique. Tu peux filtrer selon les offres et les besoins et afficher les utilisateurs qui te correspondent.\n\nEn cliquant sur le bouton, une nouvelle fenêtre de navigateur s'ouvre et t'affiche les utilisateurs de ton entourage sur une carte.",
+    "text": "Quelle que soit la communauté à laquelle tu appartiens, le système de géo-matching te permet de trouver des membres de toutes les communautés sur une carte géographique. Tu peux filtrer selon les offres et les besoins et afficher les utilisateurs qui te correspondent.\n\nEn cliquant sur le bouton, une nouvelle fenêtre de navigateur s'ouvre et t'affiche les utilisateurs de ton entourage sur une carte."
-    "button": "Commence la recherche d'utilisateurs..."
   },
   "via_link": "par lien",
   "welcome": "Bienvenu dans la communauté"

frontend/src/locales/nl.json

@@ -1,8 +1,8 @@
 {
-  "100": "100%",
-  "1000thanks": "1000 dank, omdat je bij ons bent!",
-  "125": "125%",
   "85": "85%",
+  "100": "100%",
+  "125": "125%",
+  "1000thanks": "1000 dank, omdat je bij ons bent!",
   "GDD": "GDD",
   "GDT": "GDT",
   "PersonalDetails": "Persoonlijke gegevens",
@@ -22,32 +22,32 @@
   },
   "back": "Terug",
   "card-circles": {
-    "headline": "Samenwerkingsplatform “Gradido Kringen”",
-    "text": "Lokale kringen, studiekringen, projecten, evenementen en congressen",
     "allowed": {
       "button": "Kringen openen..."
     },
+    "headline": "Samenwerkingsplatform “Gradido Kringen”",
     "not-allowed": {
       "button": "Configureren..."
-    }
+    },
+    "text": "Lokale kringen, studiekringen, projecten, evenementen en congressen"
   },
   "card-user-search": {
-    "headline": "Geografisch leden zoeken (bèta)",
     "allowed": {
       "button": "Leden zoeken openen...",
       "disabled-button": "GMS offline...",
       "text": "Vind leden van alle gemeenschappen op een kaart."
     },
+    "headline": "Geografisch leden zoeken (bèta)",
+    "info": "Zo gaat dat",
     "not-allowed": {
       "button": "Locatie invoeren",
       "text": "Om andere leden in jouw omgeving te vinden, voer nu je locatie in op de kaart!"
-    },
+    }
-    "info": "Zo gaat dat"
   },
   "circles": {
+    "button": "Cirkels openen...",
     "headline": "Samen ondersteunen we elkaar - mindful in de cirkelcultuur.",
-    "text": "Klik op de knop om het samenwerkingsplatform te openen in een nieuw browservenster.",
+    "text": "Klik op de knop om het samenwerkingsplatform te openen in een nieuw browservenster."
-    "button": "Cirkels openen..."
   },
   "community": {
     "admins": "Beheerders",
@@ -60,8 +60,8 @@
     "moderators": "Moderators",
     "myContributions": "Mijn bijdragen voor het algemeen belang",
     "noOpenContributionLinkText": "Er zijn momenteel geen link-gegenereerde creaties.",
-    "openContributionLinks": "Creaties gegenereerd door link",
     "openContributionLinkText": "Voor startcredits of soortgelijke doeleinden kan de community zogenaamde creatielinks maken. Deze activeren automatische creaties die worden gecrediteerd aan de gebruiker.\nDe community \"{name}\" ondersteunt momenteel {count} link-gegenereerde creaties:",
+    "openContributionLinks": "Creaties gegenereerd door link",
     "other-communities": "Verdere gemeenschappen",
     "startNewsButton": "Stuur Gradidos",
     "statistic": "Statistieken",
@@ -103,6 +103,7 @@
   },
   "copy-to-clipboard": "Kopieer naar klembord",
   "decay": {
+    "Starting_block_decay": "Startblok vergankelijkheid",
     "before_startblock_transaction": "Deze transactie heeft geen vergankelijkheid.",
     "calculation_decay": "Berekening van de vergankelijkheid",
     "calculation_total": "Berekening van het totaalbedrag",
@@ -111,7 +112,6 @@
     "decay_since_last_transaction": "Vergankelijkheid sinds de laatste transactie",
     "last_transaction": "Laatste transactie",
     "past_time": "Verlopen tijd",
-    "Starting_block_decay": "Startblok vergankelijkheid",
     "total": "Totaal",
     "types": {
       "creation": "Gecreëerd",
@@ -166,8 +166,8 @@
     "link_decay_description": "Het linkbedrag wordt geblokkeerd samen met de maximale vergankelijkheid. Nadat de link is ingewisseld, verlopen of verwijderd, wordt het resterende bedrag weer vrijgegeven.",
     "memo": "Memo",
     "message": "Bericht",
-    "new_balance": "Nieuw banksaldo na bevestiging",
     "newPasswordRepeat": "Nieuw wachtwoord herhalen",
+    "new_balance": "Nieuw banksaldo na bevestiging",
     "no_gdd_available": "Je hebt geen GDD om te versturen.",
     "password": "Wachtwoord",
     "passwordRepeat": "Wachtwoord herhalen",
@@ -179,11 +179,11 @@
     "reset": "Resetten",
     "save": "Opslaan",
     "scann_code": "<strong>QR Code Scanner</strong> - Scan de QR Code van uw partner",
-    "sender": "Afzender",
     "send_check": "Bevestig jouw transactie. Controleer alsjeblieft nogmaals alle gegevens!",
     "send_now": "Nu versturen",
     "send_transaction_error": "Helaas kon de transactie niet uitgevoerd worden!",
     "send_transaction_success": " Jouw transactie werd succesvol uitgevoerd ",
+    "sender": "Afzender",
     "sorry": "Sorry",
     "thx": "Dankjewel",
     "time": "Tijd",
@@ -295,6 +295,7 @@
   },
   "openHours": "Open Hours",
   "pageTitle": {
+    "circles": "Gradido Kringen",
     "contributions": "Gradido scoop",
     "gdt": "Your GDT transactions",
     "information": "{community}",
@@ -302,7 +303,6 @@
     "send": "Send Gradidos",
     "settings": "Settings",
     "transactions": "Your transactions",
-    "circles": "Gradido Kringen",
     "usersearch": "Geografisch leden zoeken (bèta)"
   },
   "qrCode": "QR Code",
@@ -326,10 +326,10 @@
         "communityCoords": "Locatie van je gemeenschap: Lat {lat}, Lng {lng}",
         "communityLocationLabel": "Locatie van je gemeenschap",
         "headline": "Geografische locatiebepaling van de gebruiker",
-        "userCoords": "Jouw locatie: Lat {lat}, Lng {lng}",
-        "userLocationLabel": "Jouw locatie",
         "search": "Zoek een locatie",
-        "success": "Locatie succesvol opgeslagen"
+        "success": "Locatie succesvol opgeslagen",
+        "userCoords": "Jouw locatie: Lat {lat}, Lng {lng}",
+        "userLocationLabel": "Jouw locatie"
       }
     },
     "language": {
@@ -414,9 +414,9 @@
     "send_you": "stuurt jou"
   },
   "usersearch": {
+    "button": "Start het zoeken naar gebruikers...",
     "headline": "Geografisch zoeken naar gebruikers",
-    "text": "Het maakt niet uit tot welke community je behoort, met het Geo Matching System kun je leden van alle communities vinden op een kaart. Je kunt filteren op aanbiedingen en vereisten en de gebruikers weergeven die aan je profiel voldoen.\n\nDe knop opent een nieuw browservenster waarin de gebruikers in je omgeving op een kaart worden weergegeven.",
+    "text": "Het maakt niet uit tot welke community je behoort, met het Geo Matching System kun je leden van alle communities vinden op een kaart. Je kunt filteren op aanbiedingen en vereisten en de gebruikers weergeven die aan je profiel voldoen.\n\nDe knop opent een nieuw browservenster waarin de gebruikers in je omgeving op een kaart worden weergegeven."
-    "button": "Start het zoeken naar gebruikers..."
   },
   "via_link": "via een link",
   "welcome": "Welkom in de gemeenschap"

frontend/src/locales/tr.json

@@ -1,8 +1,8 @@
 {
-  "100": "%100",
-  "1000thanks": "Bizimle olduğun için 1000lerce teşekkür!",
-  "125": "%125",
   "85": "%85",
+  "100": "%100",
+  "125": "%125",
+  "1000thanks": "Bizimle olduğun için 1000lerce teşekkür!",
   "GDD": "GDD",
   "GDT": "GDT",
   "PersonalDetails": "Kişisel bilgiler",
@@ -64,6 +64,7 @@
     "thanksYouWith": "Sana gönderiyor"
   },
   "decay": {
+    "Starting_block_decay": "Blok erimenin başlatılması ",
     "before_startblock_transaction": "Bu işlem erimeyi içermez.",
     "calculation_decay": "Erimenin hesaplanması",
     "calculation_total": "Toplam miktarın hesaplanması",
@@ -72,7 +73,6 @@
     "decay_since_last_transaction": "Son işlemden bu yana olan erime",
     "last_transaction": "Son işlem:",
     "past_time": "Geçen süre",
-    "Starting_block_decay": "Blok erimenin başlatılması ",
     "total": "Toplam",
     "types": {
       "creation": "Oluşturuldu",
@@ -123,8 +123,8 @@
     "lastname": "Soyadı",
     "memo": "Mesaj",
     "message": "Mesaj",
-    "new_balance": "Onay sonrası hesap bakiyesi",
     "newPasswordRepeat": "Yeni şifreyi tekrarla",
+    "new_balance": "Onay sonrası hesap bakiyesi",
     "no_gdd_available": "Göndermek için GDD'niz yok.",
     "password": "Şifre",
     "passwordRepeat": "Şifreyi tekrarla",
@@ -135,11 +135,11 @@
     "reset": "Sıfırla",
     "save": "Kaydet",
     "scann_code": "<strong>QR Code Scanner</strong> - Ortağınızın QR Kodunu tarayın",
-    "sender": "Gönderen",
     "send_check": "İşlemi onayla. Lütfen tüm verileri tekrar kontrol et!",
     "send_now": "Şimdi gönder",
     "send_transaction_error": "Ne yazık ki işlem gerçekleştirilemedi!",
     "send_transaction_success": "İşleminiz başarıyla tamamlandı",
+    "sender": "Gönderen",
     "sorry": "Üzgünüz",
     "thx": "Teşekkür ederiz",
     "to": "Geçerlik",
@@ -257,10 +257,10 @@
         "communityCoords": "Topluluk Konumunuz: Enlem {lat}, Boylam {lng}",
         "communityLocationLabel": "Topluluk Konumunuz",
         "headline": "Kullanıcının Coğrafi Konum Tespiti",
-        "userCoords": "Konumunuz: Enlem {lat}, Boylam {lng}",
-        "userLocationLabel": "Konumunuz",
         "search": "Konum ara",
-        "success": "Konum başarıyla kaydedildi"
+        "success": "Konum başarıyla kaydedildi",
+        "userCoords": "Konumunuz: Enlem {lat}, Boylam {lng}",
+        "userLocationLabel": "Konumunuz"
       }
     },
     "language": {