IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-13 16:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
ogerly 2022-09-22 10:07:27 +02:00
parent 1bcfe14d70
commit e566ae8394
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/locales/de.json
View File

@ -7,12 +7,8 @@
"contributionLinks": "Beitragslinks",
"create": "Anlegen",
"cycle": "Zyklus",
<<<<<<< HEAD
"deleteNow": "Automatische Schöpfung '{name}' löschen?",
=======
"deleteNow": "Automatische Creations '{name}' wirklich löschen?",
"deleted":"Automatische Schöpfung gelöscht!",
>>>>>>> f12288eff (add success deleted messages)
"maximumAmount": "maximaler Betrag",
"maxPerCycle": "Wiederholungen",
"memo": "Nachricht",

4
admin/src/locales/en.json
View File

@ -7,12 +7,8 @@
"contributionLinks": "Contribution Links",
"create": "Create",
"cycle": "Cycle",
<<<<<<< HEAD
"deleteNow": "Delete automatic creations '{name}'?",
=======
"deleteNow": "Do you really delete automatic creations '{name}'?",
"deleted":"Automatic creation deleted!",
>>>>>>> f12288eff (add success deleted messages)
"maximumAmount": "Maximum amount",
"maxPerCycle": "Repetition",
"memo": "Memo",