Squashed commit

Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
This commit is contained in:
Bernd Bestel
2021-07-13 19:29:23 +02:00
parent 8d2c3ae584
commit 91d8eaeb74
70 changed files with 1476 additions and 491 deletions

View File

@@ -1,7 +1,6 @@
#
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# @RubenKelevra <ruben@freifunk-nrw.de>, 2021
# Bernd Bestel <bernd@berrnd.de>, 2021
#
msgid ""
msgstr ""
@@ -9,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-09-17 10:45+0000\n"
"Last-Translator: @RubenKelevra <ruben@freifunk-nrw.de>, 2021\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2021\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,7 @@ msgstr ""
"X-Domain: grocy/chore_assignment_types\n"
msgid "no-assignment"
msgstr "keine Zuweisung"
msgstr "Niemandem zuweisen"
msgid "who-least-did-first"
msgstr "Wer es am seltensten gemacht hat zuerst"

View File

@@ -1,7 +1,6 @@
#
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# @RubenKelevra <ruben@freifunk-nrw.de>, 2021
# Bernd Bestel <bernd@berrnd.de>, 2021
#
msgid ""
msgstr ""
@@ -9,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: @RubenKelevra <ruben@freifunk-nrw.de>, 2021\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2021\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +21,7 @@ msgid "manually"
msgstr "Manuell"
msgid "dynamic-regular"
msgstr "Dynamisch-Regelmäßig"
msgstr "Dynamisch regelmäßig"
msgid "daily"
msgstr "Täglich"

View File

@@ -1,7 +1,6 @@
#
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2020
# @RubenKelevra <ruben@freifunk-nrw.de>, 2021
# Bernd Bestel <bernd@berrnd.de>, 2021
#
msgid ""
msgstr ""
@@ -9,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: @RubenKelevra <ruben@freifunk-nrw.de>, 2021\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2021\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +18,7 @@ msgstr ""
"X-Domain: grocy/demo_data\n"
msgid "Cookies"
msgstr "Kekse"
msgstr "Cookies"
msgid "Chocolate"
msgstr "Schokolade"
@@ -91,7 +90,7 @@ msgid "Cheese"
msgstr "Käse"
msgid "Cold cuts"
msgstr "Wurst-Aufschnitt"
msgstr "Aufschnitt"
msgid "Paprika"
msgstr "Paprika"
@@ -115,19 +114,19 @@ msgid "Warranty ends"
msgstr "Garantie endet"
msgid "TV remote control"
msgstr "TV-Fernbedienung"
msgstr "TV Fernbedienung"
msgid "Alarm clock"
msgstr "Wecker"
msgid "Heat remote control"
msgstr "Fernbedienung der Heizung"
msgstr "Fernbedienung Heizung"
msgid "Lawn mowed in the garden"
msgstr "Rasen im Garten gemäht"
msgid "Some good snacks"
msgstr "Gutes Knabberzeug"
msgstr "Paar gute Snacks"
msgid "Pizza dough"
msgstr "Pizzateig"
@@ -163,10 +162,10 @@ msgid "Italian"
msgstr "Italienisch"
msgid "This is the note content of the recipe ingredient"
msgstr "Dies ist die Notiz zur Zutat"
msgstr "Dies ist der Inhalt der Notiz der Zutat"
msgid "Demo User"
msgstr "Demo-Benutzer"
msgstr "Demo Benutzer"
msgid "Gram"
msgid_plural "Grams"
@@ -198,14 +197,13 @@ msgid "Fork and improve grocy"
msgstr "grocy forken und verbessern"
msgid "Find a solution for what to do when I forget the door keys"
msgstr ""
"Eine Lösung finden, was zu tun ist, wenn ich die Türschlüssel vergesse"
msgstr "Eine Lösung für \"Haustürschlüssel vergessen\" finden"
msgid "Sweets"
msgstr "Süßigkeiten"
msgid "Bakery products"
msgstr "Bäckerei-Produkte"
msgstr "Bäckerei Produkte"
msgid "Tinned food"
msgstr "Konservern"
@@ -214,7 +212,7 @@ msgid "Butchery products"
msgstr "Metzgerei"
msgid "Vegetables/Fruits"
msgstr "Obst und Gemüse"
msgstr "Obst/Gemüse"
msgid "Refrigerated products"
msgstr "Kühlregal"
@@ -294,7 +292,7 @@ msgstr[0] "Scheibe"
msgstr[1] "Scheiben"
msgid "Example userentity"
msgstr "Beispiel-Benutzerentität"
msgstr "Beispiel Benutzerentität"
msgid "This is an example user entity..."
msgstr "Dies ist eine Beispiel-Benutzerentität"
@@ -303,7 +301,7 @@ msgid "Custom field"
msgstr "Benutzerdefiniertes Feld"
msgid "Example field value..."
msgstr "Beispiel-Feldwert..."
msgstr "Beispiel Feldwert..."
msgid "Waffle rolls"
msgstr "Waffelröllchen"
@@ -330,7 +328,7 @@ msgid "current release"
msgstr "aktuelles Release"
msgid "not yet released"
msgstr "noch nicht erschienen"
msgstr "noch nicht freigegeben"
msgid "Portuguese (Brazil)"
msgstr "Portugiesisch (Brasilien)"

View File

@@ -1,7 +1,7 @@
#
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2020
# @RubenKelevra <ruben@freifunk-nrw.de>, 2021
# Bernd Bestel <bernd@berrnd.de>, 2021
#
msgid ""
msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2020-08-29 16:33+0000\n"
"Last-Translator: @RubenKelevra <ruben@freifunk-nrw.de>, 2021\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2021\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,23 +36,23 @@ msgstr "Benutzer anzeigen"
# Edit own user data / change own password
msgid "USERS_EDIT_SELF"
msgstr "Eigene Benutzerdaten bearbeiten und eigenes Passwort ändern"
msgstr "Eigene Benutzerdaten bearbeiten / eigenes Passwort ändern"
# Undo charge cycle
msgid "BATTERIES_UNDO_CHARGE_CYCLE"
msgstr "Akku-Ladezyklus rückgängig machen"
msgstr "Ladezyklus rückgängig machen"
# Track charge cycle
msgid "BATTERIES_TRACK_CHARGE_CYCLE"
msgstr "Akku-Ladezyklus erfassen"
msgstr "Ladezyklus erfassen"
# Track execution
msgid "CHORE_TRACK_EXECUTION"
msgstr "Hausarbeit-Ausführung erfassen"
msgstr "Ausführung erfassen"
# Undo execution
msgid "CHORE_UNDO_EXECUTION"
msgstr "Hausarbeit-Ausführung rückgängig machen"
msgstr "Ausführung rückgängig machen"
# Edit master data
msgid "MASTER_DATA_EDIT"
@@ -60,15 +60,15 @@ msgstr "Stammdaten bearbeiten"
# Undo execution
msgid "TASKS_UNDO_EXECUTION"
msgstr "Aufgabe-Ausführung rückgängig machen"
msgstr "Ausführung rückgängig machen"
# Mark completed
msgid "TASKS_MARK_COMPLETED"
msgstr "Aufgabe als erledigt markieren"
msgstr "Als erledigt markieren"
# Edit stock entries
msgid "STOCK_EDIT"
msgstr "Lagerbestand bearbeiten"
msgstr "Bestandseinträge bearbeiten"
# Transfer
msgid "STOCK_TRANSFER"
@@ -92,11 +92,11 @@ msgstr "Einkauf"
# Add items
msgid "SHOPPINGLIST_ITEMS_ADD"
msgstr "Einträge zur Einkaufsliste hinzufügen"
msgstr "Eintrag hinzufügen"
# Remove items
msgid "SHOPPINGLIST_ITEMS_DELETE"
msgstr "Einträge von Einkaufsliste entfernen"
msgstr "Eintrag entfernen"
# User management
msgid "USERS"
@@ -104,11 +104,11 @@ msgstr "Benutzerverwaltung"
# Stock
msgid "STOCK"
msgstr "Lager"
msgstr "Bestand"
# Shopping list
msgid "SHOPPINGLIST"
msgstr "Einkaufsliste"
msgstr "Einkaufszettel"
# Chores
msgid "CHORES"
@@ -116,7 +116,7 @@ msgstr "Hausarbeiten"
# Batteries
msgid "BATTERIES"
msgstr "Akkus"
msgstr "Batterien"
# Tasks
msgid "TASKS"
@@ -128,7 +128,7 @@ msgstr "Rezepte"
# Equipment
msgid "EQUIPMENT"
msgstr "Haushaltsgeräte"
msgstr "Ausstattung"
# Calendar
msgid "CALENDAR"

File diff suppressed because it is too large Load Diff

View File

@@ -2084,13 +2084,11 @@ msgstr ""
msgid "Download"
msgstr ""
msgid "Download stock entry grocycode"
# Example: Download *Product* grocycode
msgid "Download %s grocycode"
msgstr ""
msgid "Download product grocycode"
msgstr ""
msgid "grocycode is a unique referer to this product in your grocy instance - print it onto a label and scan it like any other barcode"
msgid "grocycode is a unique referer to this %s in your grocy instance - print it onto a label and scan it like any other barcode"
msgstr ""
# Abbreviation for "due date"
@@ -2121,13 +2119,11 @@ msgstr ""
msgid "Error while executing WebHook"
msgstr ""
msgid "Print product grocycode on label printer"
# Example: Print *Product* grocycode on label printer
msgid "Print %s grocycode on label printer"
msgstr ""
msgid "Print stock entry grocycode on label printer"
msgstr ""
msgid "Open stock entry print label in new window"
msgid "Open stock entry label in new window"
msgstr ""
msgid "Thermal printer"
@@ -2193,3 +2189,37 @@ msgstr ""
msgid "Add recipe"
msgstr ""
msgid "Copy this day"
msgstr ""
msgid "Date range"
msgstr ""
msgid "%s month"
msgid_plural "%s months"
msgstr[0] ""
msgstr[1] ""
msgid "%s year"
msgid_plural "%s years"
msgstr[0] ""
msgstr[1] ""
msgid "Display product"
msgstr ""
msgid "Copy recipe"
msgstr ""
msgid "Copy of %s"
msgstr ""
msgid "Add decimal separator automatically for price inputs"
msgstr ""
msgid "When enabled, you always have to enter the value including decimal places, the decimal separator will be automatically added based on the amount of allowed decimal places"
msgstr ""
msgid "Stock entry"
msgstr ""