From 45582302c65f2fb44869364139b4c2a3c823444a Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 24 Jul 2018 20:04:43 +0200 Subject: shorten some strings --- data/po/de.po | 179 +++++++++++++++++--------------- data/po/shopsystem.pot | 171 +++++++++++++++--------------- src/scanner-session/scannersession.vala | 24 ++--- 3 files changed, 194 insertions(+), 180 deletions(-) diff --git a/data/po/de.po b/data/po/de.po index 49b85e8..d875470 100644 --- a/data/po/de.po +++ b/data/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-01 17:19+0200\n" +"POT-Creation-Date: 2018-07-24 20:00+0200\n" "PO-Revision-Date: 2018-06-28 21:14+0200\n" "Last-Translator: Sebastian Reichel \n" "Language-Team: German\n" @@ -22,23 +22,33 @@ msgstr "" "\n" "Datumswechsel: " -#: scanner-session/scannersession.vala:289 +#: scanner-session/scannersession.vala:295 #, c-format msgid "%s bought %d items for %s €" msgstr "%s hat gerade %d Posten für %s € gekauft" -#: web/template.vala:53 web/template.vala:55 web/template.vala:57 -#: web/template.vala:59 web/template.vala:82 +#: web/template.vala:56 web/template.vala:58 web/template.vala:60 +#: web/template.vala:62 web/template.vala:87 #, c-format msgid "%s could not be loaded!" msgstr "%s konnte nicht geladen werden!" -#: web/template.vala:40 web/template.vala:43 web/template.vala:46 -#: web/template.vala:49 web/template.vala:78 +#: web/template.vala:43 web/template.vala:46 web/template.vala:49 +#: web/template.vala:52 web/template.vala:83 #, c-format msgid "%s not found!" msgstr "%s wurde nicht gefunden!" +#: scanner-session/scannersession.vala:246 +#, fuzzy, c-format +msgid "Added to 🛒: %s (%s €)" +msgstr "Zum 🛒 hinzugefügt: %s (%s €)" + +#: scanner-session/scannersession.vala:195 +#, fuzzy, c-format +msgid "Article info: %s (Member: %s €, Guest: %s €" +msgstr "Artikelinfo: %s (Mitglied: %s €, Gast: %s €" + #: pdf-invoice/pdf-invoice.vala:591 #, c-format msgid "Article name \"%s\" does not fit on a single page!" @@ -52,7 +62,7 @@ msgstr "Konnte Lock-Datei nicht lesen\n" msgid "Cannot find alsa GStreamer plugin" msgstr "GStreamer Plugin für ALSA konnte nicht gefunden werden" -#: audio/audio.vala:42 +#: audio/audio.vala:45 msgid "Cannot find playbin2 GStreamer plugin" msgstr "GStreamer Plugin playbin2 konnte nicht gefunden werden" @@ -119,33 +129,34 @@ msgstr "Konnte DBus-Service nicht registrieren\n" msgid "Could not register service: %s\n" msgstr "Konnte DBus-Servicenicht registieren: %s\n" -#: web/web.vala:1482 +#: web/web.vala:1465 msgid "Could not setup webserver!" msgstr "Konnte Webserver nicht konfigurieren!" -#: web/main.vala:65 +#: web/main.vala:81 #, c-format msgid "Could not start Webserver: %s\n" msgstr "Konnte Webserver nicht starten: %s\n" -#: pdf-stock/test.vala:26 scanner-session/scannersession.vala:300 +#: pdf-stock/test.vala:26 scanner-session/scannersession.vala:306 #, c-format msgid "DBus Error: %s" msgstr "DBus Fehler: %s" -#: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 +#: audio/main.vala:42 curses-ui/main.vala:65 database/main.vala:31 #: input-device/main.vala:33 pdf-invoice/main.vala:27 pdf-invoice/test.vala:58 -#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:52 +#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:46 +#: web/main.vala:57 web/main.vala:68 #, c-format msgid "DBus Error: %s\n" msgstr "DBus Fehler: %s\n" -#: scanner-session/scannersession.vala:304 +#: scanner-session/scannersession.vala:310 #, c-format msgid "Database Error: %s" msgstr "Datenbank Fehler: %s" -#: scanner-session/scannersession.vala:66 +#: scanner-session/scannersession.vala:67 #, c-format msgid "Error (user=%d): %s" msgstr "Fehler (Nutzer %d): %s" @@ -159,15 +170,15 @@ msgstr "Fehler beim senden des Kommandos: %s" msgid "Error!\n" msgstr "Fehler!\n" -#: curses-ui/logo.vala:44 scanner-session/scannersession.vala:178 -#: scanner-session/scannersession.vala:225 +#: curses-ui/logo.vala:44 scanner-session/scannersession.vala:184 +#: scanner-session/scannersession.vala:231 #, c-format msgid "Error: %s" msgstr "Fehler: %s" #: backup/main.vala:41 invoice/main.vala:51 invoice/main.vala:58 #: invoice/single.vala:51 invoice/single.vala:58 mail/main.vala:26 -#: web/web.vala:1143 +#: web/web.vala:1123 web/web.vala:1141 #, c-format msgid "Error: %s\n" msgstr "Fehler: %s\n" @@ -189,8 +200,8 @@ msgstr "Fehler: Konnte Datenbank nicht öffnen!" msgid "Error: could not prepare statement: %s" msgstr "Fehler: Konnte SQL-Anweisung nicht erstellen: %s" -#: scanner-session/scannersession.vala:174 -#: scanner-session/scannersession.vala:221 +#: scanner-session/scannersession.vala:180 +#: scanner-session/scannersession.vala:227 #, c-format msgid "Error: unknown product: %llu" msgstr "Fehler: unbekanntes Produkt: %llu" @@ -215,19 +226,20 @@ msgid "File Error: %s\n" msgstr "Datei Fehler: %s\n" #: scanner-session/scannersession.vala:20 +#: scanner-session/scannersession.vala:71 msgid "Guest" msgstr "Gast" -#: pdf-stock/test.vala:22 scanner-session/scannersession.vala:302 +#: pdf-stock/test.vala:22 scanner-session/scannersession.vala:308 #, c-format msgid "IO Error: %s" msgstr "EA Fehler: %s" -#: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 +#: audio/main.vala:38 curses-ui/main.vala:63 database/main.vala:27 #: input-device/main.vala:29 pdf-invoice/main.vala:29 pdf-invoice/test.vala:22 #: pdf-invoice/test.vala:60 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 -#: web/main.vala:48 +#: web/main.vala:42 web/main.vala:55 web/main.vala:66 #, c-format msgid "IO Error: %s\n" msgstr "EA Fehler: %s\n" @@ -246,8 +258,8 @@ msgstr "IOChannel: %s" msgid "Ignoring InputDevice!\n" msgstr "Eingabegerät wird ignoriert\n" -#: scanner-session/scannersession.vala:168 -#: scanner-session/scannersession.vala:215 +#: scanner-session/scannersession.vala:174 +#: scanner-session/scannersession.vala:221 msgid "Internal Error!" msgstr "Interner Fehler!" @@ -256,30 +268,32 @@ msgstr "Interner Fehler!" msgid "Invoice PDF Error: %s\n" msgstr "Datei Fehler: %s\n" -#: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 +#: curses-ui/main.vala:67 web/main.vala:44 web/main.vala:53 web/main.vala:64 #, c-format msgid "KeyFile Error: %s\n" msgstr "Schlüsseldatei Fehler: %s\n" -#: scanner-session/scannersession.vala:149 -msgid "Login as GUEST" +#: scanner-session/scannersession.vala:155 +#, fuzzy +msgid "Login as Guest" msgstr "Login als Gast" -#: scanner-session/scannersession.vala:141 +#: scanner-session/scannersession.vala:161 +#, fuzzy +msgid "Login failed (Guest)" +msgstr "Gast-Login fehlgeschlagen" + +#: scanner-session/scannersession.vala:147 #, c-format msgid "Login failed (User ID = %d)" msgstr "Login fehlgeschlagen (User ID = %d)" -#: scanner-session/scannersession.vala:155 -msgid "Login failed as GUEST" -msgstr "Gast-Login fehlgeschlagen" - #: web/websession.vala:165 #, c-format msgid "Login for user id %d failed\n" msgstr "Login für Benutzer %d fehlgeschlagen\n" -#: scanner-session/scannersession.vala:135 +#: scanner-session/scannersession.vala:141 #, c-format msgid "Login: %s (%d)" msgstr "Login: %s (%d)" @@ -304,19 +318,15 @@ msgstr "Kein Rechnungsdatum übergeben!" msgid "No invoice recipient given!" msgstr "Kein Rechnungsempfänger übergeben!" -#: scanner-session/scannersession.vala:253 -msgid "No more Items on your Shopping Cart" -msgstr "Keine weiteren Gegenstände im Einkaufswagen" - #: mail/mailer.vala:141 mail/mailer.vala:149 msgid "No such mail" msgstr "Mail wurde nicht gefunden" -#: database/database.vala:611 +#: database/database.vala:612 msgid "No such session available in database!" msgstr "Keine solche Session in der Datenbank verfügbar!" -#: database/database.vala:710 database/database.vala:722 +#: database/database.vala:711 database/database.vala:723 msgid "No such user available in database!" msgstr "Kein solcher Nutzer in der Datenbank verfügbar!" @@ -339,12 +349,17 @@ msgstr "Mögliche Werte für : temporary, final\n" msgid "Prices > 9999.99€ are not supported!" msgstr "Preise > 9999,99€ werden nicht unterstützt!" -#: database/database.vala:487 +#: database/database.vala:488 #, c-format msgid "Remove purchase of %s" msgstr "Einkaufsposten %s wurde entfernt" -#: mail/mailer.vala:180 +#: scanner-session/scannersession.vala:255 +#, c-format +msgid "Removed from 🛒: %s" +msgstr "Aus 🛒 entfernt: %s" + +#: mail/mailer.vala:182 #, c-format msgid "Reply from SMTP-Server: %s" msgstr "Antwort vom SMTP-Server: %s" @@ -354,20 +369,20 @@ msgstr "Antwort vom SMTP-Server: %s" msgid "Sending: %s\n" msgstr "Sende: %s\n" -#: curses-ui/main.vala:78 +#: curses-ui/main.vala:75 msgid "Shop System has been started" msgstr "Shop System wurde gestartet" -#: curses-ui/main.vala:84 +#: curses-ui/main.vala:81 msgid "Stopping Shop System" msgstr "Shop System wird gestoppt" -#: web/main.vala:56 +#: web/main.vala:72 #, c-format msgid "TLS certificate: %s\n" msgstr "TLS Zertifikat: %s\n" -#: web/main.vala:57 +#: web/main.vala:73 #, c-format msgid "TLS private key: %s\n" msgstr "TLS Privater Schlüssel: %s\n" @@ -381,7 +396,7 @@ msgstr "Unbekannter Nachrichten Typ" msgid "Usage: %s [timestamp]\n" msgstr "Benutzung: %s [timestamp]\n" -#: web/main.vala:55 +#: web/main.vala:71 #, c-format msgid "Web Server Port: %u\n" msgstr "Webserver Port: %u\n" @@ -390,16 +405,6 @@ msgstr "Webserver Port: %u\n" msgid "Years after 9999 are not supported!" msgstr "Jahre nach 9999 werden nicht unterstützt!" -#: scanner-session/scannersession.vala:240 -#, c-format -msgid "article added to shopping card: %s (%s €)" -msgstr "Artikel %s (%s €) wurde zum Warenkorb hinzugefügt" - -#: scanner-session/scannersession.vala:189 -#, c-format -msgid "article info: %s (Member: %s €, Guest: %s €" -msgstr "Artikelinfo: %s (Mitglied: %s €, Gast: %s €" - #: input-device/input-device.vala:249 #, c-format msgid "barcode: %s\n" @@ -409,11 +414,11 @@ msgstr "Barcode: %s\n" msgid "could not configure STARTTLS" msgstr "Konnte STARTTLS nicht konfigurieren" -#: web/template.vala:61 web/template.vala:84 +#: web/template.vala:64 web/template.vala:89 msgid "could not load templates!" msgstr "Konnte Templates nicht laden!" -#: curses-ui/main.vala:28 curses-ui/main.vala:30 +#: curses-ui/main.vala:27 curses-ui/main.vala:29 #, c-format msgid "could not play audio: %s" msgstr "Konnte Audio Datei nicht abspielen: %s" @@ -426,30 +431,26 @@ msgstr "Konnte Server nicht konfigurieren" msgid "eSMTP: Start Session failed!" msgstr "eSMTP: Session Start fehlgeschlagen!" -#: database/database.vala:370 database/database.vala:387 -#: database/database.vala:403 database/database.vala:419 -#: database/database.vala:435 database/database.vala:448 -#: database/database.vala:470 database/database.vala:492 -#: database/database.vala:500 database/database.vala:527 -#: database/database.vala:541 database/database.vala:556 -#: database/database.vala:583 database/database.vala:591 -#: database/database.vala:601 database/database.vala:638 -#: database/database.vala:675 database/database.vala:689 -#: database/database.vala:700 database/database.vala:737 -#: database/database.vala:765 database/database.vala:884 -#: database/database.vala:892 database/database.vala:913 -#: database/database.vala:919 database/database.vala:927 -#: database/database.vala:1028 database/database.vala:1079 -#: database/database.vala:1129 database/database.vala:1212 +#: database/database.vala:371 database/database.vala:388 +#: database/database.vala:404 database/database.vala:420 +#: database/database.vala:436 database/database.vala:449 +#: database/database.vala:471 database/database.vala:493 +#: database/database.vala:501 database/database.vala:528 +#: database/database.vala:542 database/database.vala:557 +#: database/database.vala:584 database/database.vala:592 +#: database/database.vala:602 database/database.vala:639 +#: database/database.vala:676 database/database.vala:690 +#: database/database.vala:701 database/database.vala:738 +#: database/database.vala:766 database/database.vala:885 +#: database/database.vala:893 database/database.vala:914 +#: database/database.vala:920 database/database.vala:928 +#: database/database.vala:983 database/database.vala:1046 +#: database/database.vala:1097 database/database.vala:1147 +#: database/database.vala:1230 #, c-format msgid "internal error: %d" msgstr "Interner Fehler: %d" -#: scanner-session/scannersession.vala:249 -#, c-format -msgid "removed last Item from Shopping Cart: %s" -msgstr "Letzter Posten wurde aus dem Warenkorb entfernt: %s" - #: serial-device/serial-device.vala:43 msgid "serial device is locked!\n" msgstr "Serielles Gerät ist blockiert!\n" @@ -462,22 +463,32 @@ msgstr "Server oder Port Konfiguration fehlt" msgid "short read!\n" msgstr "Unvollständige Daten aus Gerätedatei gelesen\n" -#: database/database.vala:490 +#: database/database.vala:491 msgid "undo not possible without purchases" msgstr "Rückgängig nicht möglich ohne Einkäufe" -#: database/database.vala:385 database/database.vala:401 -#: database/database.vala:417 database/database.vala:433 -#: database/database.vala:468 +#: database/database.vala:386 database/database.vala:402 +#: database/database.vala:418 database/database.vala:434 +#: database/database.vala:469 #, c-format msgid "unknown product: %llu" msgstr "Unbekanntes Produkt: %llu" -#: database/database.vala:1210 +#: database/database.vala:1228 #, c-format msgid "unknown rfid: %s" msgstr "Unbekannter RFID: %s" -#: database/database.vala:636 +#: database/database.vala:637 msgid "user not found" msgstr "User nicht gefunden" + +#: scanner-session/scannersession.vala:259 +msgid "🛒 is empty" +msgstr "🛒 ist leer" + +#~ msgid "No more Items on your Shopping Cart" +#~ msgstr "Keine weiteren Gegenstände im Einkaufswagen" + +#~ msgid "removed last Item from Shopping Cart: %s" +#~ msgstr "Letzter Posten wurde aus dem Warenkorb entfernt: %s" diff --git a/data/po/shopsystem.pot b/data/po/shopsystem.pot index 63da7dc..cd8e21d 100644 --- a/data/po/shopsystem.pot +++ b/data/po/shopsystem.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-01 17:19+0200\n" +"POT-Creation-Date: 2018-07-24 20:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,23 +23,33 @@ msgid "" "Date Changed: " msgstr "" -#: scanner-session/scannersession.vala:289 +#: scanner-session/scannersession.vala:295 #, c-format msgid "%s bought %d items for %s \342\202\254" msgstr "" -#: web/template.vala:53 web/template.vala:55 web/template.vala:57 -#: web/template.vala:59 web/template.vala:82 +#: web/template.vala:56 web/template.vala:58 web/template.vala:60 +#: web/template.vala:62 web/template.vala:87 #, c-format msgid "%s could not be loaded!" msgstr "" -#: web/template.vala:40 web/template.vala:43 web/template.vala:46 -#: web/template.vala:49 web/template.vala:78 +#: web/template.vala:43 web/template.vala:46 web/template.vala:49 +#: web/template.vala:52 web/template.vala:83 #, c-format msgid "%s not found!" msgstr "" +#: scanner-session/scannersession.vala:246 +#, c-format +msgid "Added to \360\237\233\222: %s (%s \342\202\254)" +msgstr "" + +#: scanner-session/scannersession.vala:195 +#, c-format +msgid "Article info: %s (Member: %s \342\202\254, Guest: %s \342\202\254" +msgstr "" + #: pdf-invoice/pdf-invoice.vala:591 #, c-format msgid "Article name \"%s\" does not fit on a single page!" @@ -53,7 +63,7 @@ msgstr "" msgid "Cannot find alsa GStreamer plugin" msgstr "" -#: audio/audio.vala:42 +#: audio/audio.vala:45 msgid "Cannot find playbin2 GStreamer plugin" msgstr "" @@ -120,33 +130,34 @@ msgstr "" msgid "Could not register service: %s\n" msgstr "" -#: web/web.vala:1482 +#: web/web.vala:1465 msgid "Could not setup webserver!" msgstr "" -#: web/main.vala:65 +#: web/main.vala:81 #, c-format msgid "Could not start Webserver: %s\n" msgstr "" -#: pdf-stock/test.vala:26 scanner-session/scannersession.vala:300 +#: pdf-stock/test.vala:26 scanner-session/scannersession.vala:306 #, c-format msgid "DBus Error: %s" msgstr "" -#: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 +#: audio/main.vala:42 curses-ui/main.vala:65 database/main.vala:31 #: input-device/main.vala:33 pdf-invoice/main.vala:27 pdf-invoice/test.vala:58 -#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:52 +#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:46 +#: web/main.vala:57 web/main.vala:68 #, c-format msgid "DBus Error: %s\n" msgstr "" -#: scanner-session/scannersession.vala:304 +#: scanner-session/scannersession.vala:310 #, c-format msgid "Database Error: %s" msgstr "" -#: scanner-session/scannersession.vala:66 +#: scanner-session/scannersession.vala:67 #, c-format msgid "Error (user=%d): %s" msgstr "" @@ -160,15 +171,15 @@ msgstr "" msgid "Error!\n" msgstr "" -#: curses-ui/logo.vala:44 scanner-session/scannersession.vala:178 -#: scanner-session/scannersession.vala:225 +#: curses-ui/logo.vala:44 scanner-session/scannersession.vala:184 +#: scanner-session/scannersession.vala:231 #, c-format msgid "Error: %s" msgstr "" #: backup/main.vala:41 invoice/main.vala:51 invoice/main.vala:58 #: invoice/single.vala:51 invoice/single.vala:58 mail/main.vala:26 -#: web/web.vala:1143 +#: web/web.vala:1123 web/web.vala:1141 #, c-format msgid "Error: %s\n" msgstr "" @@ -190,8 +201,8 @@ msgstr "" msgid "Error: could not prepare statement: %s" msgstr "" -#: scanner-session/scannersession.vala:174 -#: scanner-session/scannersession.vala:221 +#: scanner-session/scannersession.vala:180 +#: scanner-session/scannersession.vala:227 #, c-format msgid "Error: unknown product: %llu" msgstr "" @@ -216,19 +227,20 @@ msgid "File Error: %s\n" msgstr "" #: scanner-session/scannersession.vala:20 +#: scanner-session/scannersession.vala:71 msgid "Guest" msgstr "" -#: pdf-stock/test.vala:22 scanner-session/scannersession.vala:302 +#: pdf-stock/test.vala:22 scanner-session/scannersession.vala:308 #, c-format msgid "IO Error: %s" msgstr "" -#: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 +#: audio/main.vala:38 curses-ui/main.vala:63 database/main.vala:27 #: input-device/main.vala:29 pdf-invoice/main.vala:29 pdf-invoice/test.vala:22 #: pdf-invoice/test.vala:60 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 -#: web/main.vala:48 +#: web/main.vala:42 web/main.vala:55 web/main.vala:66 #, c-format msgid "IO Error: %s\n" msgstr "" @@ -247,8 +259,8 @@ msgstr "" msgid "Ignoring InputDevice!\n" msgstr "" -#: scanner-session/scannersession.vala:168 -#: scanner-session/scannersession.vala:215 +#: scanner-session/scannersession.vala:174 +#: scanner-session/scannersession.vala:221 msgid "Internal Error!" msgstr "" @@ -257,22 +269,22 @@ msgstr "" msgid "Invoice PDF Error: %s\n" msgstr "" -#: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 +#: curses-ui/main.vala:67 web/main.vala:44 web/main.vala:53 web/main.vala:64 #, c-format msgid "KeyFile Error: %s\n" msgstr "" -#: scanner-session/scannersession.vala:149 -msgid "Login as GUEST" +#: scanner-session/scannersession.vala:155 +msgid "Login as Guest" msgstr "" -#: scanner-session/scannersession.vala:141 -#, c-format -msgid "Login failed (User ID = %d)" +#: scanner-session/scannersession.vala:161 +msgid "Login failed (Guest)" msgstr "" -#: scanner-session/scannersession.vala:155 -msgid "Login failed as GUEST" +#: scanner-session/scannersession.vala:147 +#, c-format +msgid "Login failed (User ID = %d)" msgstr "" #: web/websession.vala:165 @@ -280,7 +292,7 @@ msgstr "" msgid "Login for user id %d failed\n" msgstr "" -#: scanner-session/scannersession.vala:135 +#: scanner-session/scannersession.vala:141 #, c-format msgid "Login: %s (%d)" msgstr "" @@ -305,19 +317,15 @@ msgstr "" msgid "No invoice recipient given!" msgstr "" -#: scanner-session/scannersession.vala:253 -msgid "No more Items on your Shopping Cart" -msgstr "" - #: mail/mailer.vala:141 mail/mailer.vala:149 msgid "No such mail" msgstr "" -#: database/database.vala:611 +#: database/database.vala:612 msgid "No such session available in database!" msgstr "" -#: database/database.vala:710 database/database.vala:722 +#: database/database.vala:711 database/database.vala:723 msgid "No such user available in database!" msgstr "" @@ -337,12 +345,17 @@ msgstr "" msgid "Prices > 9999.99\342\202\254 are not supported!" msgstr "" -#: database/database.vala:487 +#: database/database.vala:488 #, c-format msgid "Remove purchase of %s" msgstr "" -#: mail/mailer.vala:180 +#: scanner-session/scannersession.vala:255 +#, c-format +msgid "Removed from \360\237\233\222: %s" +msgstr "" + +#: mail/mailer.vala:182 #, c-format msgid "Reply from SMTP-Server: %s" msgstr "" @@ -352,20 +365,20 @@ msgstr "" msgid "Sending: %s\n" msgstr "" -#: curses-ui/main.vala:78 +#: curses-ui/main.vala:75 msgid "Shop System has been started" msgstr "" -#: curses-ui/main.vala:84 +#: curses-ui/main.vala:81 msgid "Stopping Shop System" msgstr "" -#: web/main.vala:56 +#: web/main.vala:72 #, c-format msgid "TLS certificate: %s\n" msgstr "" -#: web/main.vala:57 +#: web/main.vala:73 #, c-format msgid "TLS private key: %s\n" msgstr "" @@ -379,7 +392,7 @@ msgstr "" msgid "Usage: %s [timestamp]\n" msgstr "" -#: web/main.vala:55 +#: web/main.vala:71 #, c-format msgid "Web Server Port: %u\n" msgstr "" @@ -388,16 +401,6 @@ msgstr "" msgid "Years after 9999 are not supported!" msgstr "" -#: scanner-session/scannersession.vala:240 -#, c-format -msgid "article added to shopping card: %s (%s \342\202\254)" -msgstr "" - -#: scanner-session/scannersession.vala:189 -#, c-format -msgid "article info: %s (Member: %s \342\202\254, Guest: %s \342\202\254" -msgstr "" - #: input-device/input-device.vala:249 #, c-format msgid "barcode: %s\n" @@ -407,11 +410,11 @@ msgstr "" msgid "could not configure STARTTLS" msgstr "" -#: web/template.vala:61 web/template.vala:84 +#: web/template.vala:64 web/template.vala:89 msgid "could not load templates!" msgstr "" -#: curses-ui/main.vala:28 curses-ui/main.vala:30 +#: curses-ui/main.vala:27 curses-ui/main.vala:29 #, c-format msgid "could not play audio: %s" msgstr "" @@ -424,30 +427,26 @@ msgstr "" msgid "eSMTP: Start Session failed!" msgstr "" -#: database/database.vala:370 database/database.vala:387 -#: database/database.vala:403 database/database.vala:419 -#: database/database.vala:435 database/database.vala:448 -#: database/database.vala:470 database/database.vala:492 -#: database/database.vala:500 database/database.vala:527 -#: database/database.vala:541 database/database.vala:556 -#: database/database.vala:583 database/database.vala:591 -#: database/database.vala:601 database/database.vala:638 -#: database/database.vala:675 database/database.vala:689 -#: database/database.vala:700 database/database.vala:737 -#: database/database.vala:765 database/database.vala:884 -#: database/database.vala:892 database/database.vala:913 -#: database/database.vala:919 database/database.vala:927 -#: database/database.vala:1028 database/database.vala:1079 -#: database/database.vala:1129 database/database.vala:1212 +#: database/database.vala:371 database/database.vala:388 +#: database/database.vala:404 database/database.vala:420 +#: database/database.vala:436 database/database.vala:449 +#: database/database.vala:471 database/database.vala:493 +#: database/database.vala:501 database/database.vala:528 +#: database/database.vala:542 database/database.vala:557 +#: database/database.vala:584 database/database.vala:592 +#: database/database.vala:602 database/database.vala:639 +#: database/database.vala:676 database/database.vala:690 +#: database/database.vala:701 database/database.vala:738 +#: database/database.vala:766 database/database.vala:885 +#: database/database.vala:893 database/database.vala:914 +#: database/database.vala:920 database/database.vala:928 +#: database/database.vala:983 database/database.vala:1046 +#: database/database.vala:1097 database/database.vala:1147 +#: database/database.vala:1230 #, c-format msgid "internal error: %d" msgstr "" -#: scanner-session/scannersession.vala:249 -#, c-format -msgid "removed last Item from Shopping Cart: %s" -msgstr "" - #: serial-device/serial-device.vala:43 msgid "serial device is locked!\n" msgstr "" @@ -460,22 +459,26 @@ msgstr "" msgid "short read!\n" msgstr "" -#: database/database.vala:490 +#: database/database.vala:491 msgid "undo not possible without purchases" msgstr "" -#: database/database.vala:385 database/database.vala:401 -#: database/database.vala:417 database/database.vala:433 -#: database/database.vala:468 +#: database/database.vala:386 database/database.vala:402 +#: database/database.vala:418 database/database.vala:434 +#: database/database.vala:469 #, c-format msgid "unknown product: %llu" msgstr "" -#: database/database.vala:1210 +#: database/database.vala:1228 #, c-format msgid "unknown rfid: %s" msgstr "" -#: database/database.vala:636 +#: database/database.vala:637 msgid "user not found" msgstr "" + +#: scanner-session/scannersession.vala:259 +msgid "\360\237\233\222 is empty" +msgstr "" diff --git a/src/scanner-session/scannersession.vala b/src/scanner-session/scannersession.vala index 796cf93..898601b 100644 --- a/src/scanner-session/scannersession.vala +++ b/src/scanner-session/scannersession.vala @@ -29,7 +29,7 @@ public class ScannerSessionImplementation { private Cli cli; private ScannerSessionState state = ScannerSessionState.READY; - private DetailedProduct[] shoppingCard = {}; + private DetailedProduct[] shoppingCart = {}; public signal void msg(MessageType type, string message); public signal void msg_overlay(string title, string message); @@ -140,7 +140,7 @@ public class ScannerSessionImplementation { scannerResult.type = MessageType.INFO; scannerResult.message = _("Login: %s (%d)").printf(name, user); scannerResult.audioType = AudioType.LOGIN; - shoppingCard = {}; + shoppingCart = {}; state = ScannerSessionState.USER; } else { scannerResult.type = MessageType.ERROR; @@ -154,7 +154,7 @@ public class ScannerSessionImplementation { scannerResult.type = MessageType.INFO; scannerResult.message = _("Login as Guest"); scannerResult.audioType = AudioType.LOGIN; - shoppingCard = {}; + shoppingCart = {}; state = ScannerSessionState.USER; } else { scannerResult.type = MessageType.ERROR; @@ -234,7 +234,7 @@ public class ScannerSessionImplementation { return scannerResult; } - shoppingCard += p; + shoppingCart += p; Price price = p.memberprice; @@ -243,20 +243,20 @@ public class ScannerSessionImplementation { } scannerResult.type = MessageType.INFO; - scannerResult.message = _("Article added to shopping card: %s (%s €)").printf(@"$(p.name)", @"$price"); + scannerResult.message = _("Added to 🛒: %s (%s €)").printf(@"$(p.name)", @"$price"); scannerResult.audioType = AudioType.PURCHASE; state = ScannerSessionState.USER; break; case ScannerSessionCodeType.UNDO: - if(shoppingCard.length > 0){ - var removedProduct = shoppingCard[shoppingCard.length-1]; - shoppingCard = shoppingCard[0:shoppingCard.length-1]; + if(shoppingCart.length > 0){ + var removedProduct = shoppingCart[shoppingCart.length-1]; + shoppingCart = shoppingCart[0:shoppingCart.length-1]; scannerResult.type = MessageType.INFO; - scannerResult.message = _("Removed last Item from Shopping Cart: %s").printf(@"$(removedProduct.name)"); + scannerResult.message = _("Removed from 🛒: %s").printf(@"$(removedProduct.name)"); scannerResult.audioType = AudioType.INFO; } else { scannerResult.type = MessageType.INFO; - scannerResult.message = _("No more Items on your Shopping Cart"); + scannerResult.message = _("🛒 is empty"); scannerResult.audioType = AudioType.ERROR; } break; @@ -281,8 +281,8 @@ public class ScannerSessionImplementation { Price totalPrice = 0; uint8 i = 0; DetailedProduct p = DetailedProduct(); - for(i = 0; i < shoppingCard.length; i++) { - p = shoppingCard[i]; + for(i = 0; i < shoppingCart.length; i++) { + p = shoppingCart[i]; db.buy(user, p.ean); amountOfItems++; Price price = p.memberprice; -- cgit v1.2.3