Update translation files

internal/translations/catalog.go

@@ -42,31 +42,31 @@ var messageKeyToIndex = map[string]int{
 	"\tbackend: %v":  11,
 	"\texport: %s":   0,
 	"\timport: %s\n": 1,
+	"%v: %v":         52,
 	"Aborted":        8,
 	"Access token":   19,
 	"Access token received, you can use %v now.\n": 28,
 	"Append to file": 21,
 	"Backend":        36,
-	"Check for duplicate listens on import (slower)": 47,
+	"Check for duplicate listens on import (slower)": 45,
 	"Client ID":     15,
 	"Client secret": 16,
 	"Delete the service configuration \"%v\"?": 7,
-	"Directory path": 49,
+	"Directory path": 47,
-	"Disable auto correction of submitted listens":     24,
+	"Disable auto correction of submitted listens":           24,
-	"During the import the following errors occurred:": 41,
-	"Error: %v":                                              42,
 	"Error: OAuth state mismatch":                            27,
 	"Failed reading config: %v":                              2,
 	"File path":                                              20,
 	"From timestamp: %v (%v)":                                38,
-	"Ignore listens in incognito mode":                       50,
+	"Ignore listens in incognito mode":                       48,
-	"Ignore skipped listens":                                 51,
+	"Ignore skipped listens":                                 49,
-	"Ignored duplicate listen %v: \"%v\" by %v (%v)":         48,
+	"Ignored duplicate listen %v: \"%v\" by %v (%v)":         46,
 	"Import failed, last reported timestamp was %v (%s)":     39,
+	"Import log:":                                            51,
 	"Imported %v of %v %s into %v.":                          40,
 	"Include skipped listens":                                25,
-	"Latest timestamp: %v (%v)":                              43,
+	"Latest timestamp: %v (%v)":                              41,
-	"Minimum playback duration for skipped tracks (seconds)": 52,
+	"Minimum playback duration for skipped tracks (seconds)": 50,
 	"No":                                33,
 	"Playlist title":                    22,
 	"Saved service %v using backend %v": 5,
@@ -88,10 +88,10 @@ var messageKeyToIndex = map[string]int{
 	"exporting":                                                 29,
 	"importing":                                                 30,
 	"invalid timestamp string \"%v\"":                           53,
-	"key must only consist of A-Za-z0-9_-":                      45,
+	"key must only consist of A-Za-z0-9_-":                      43,
-	"no configuration file defined, cannot write config":        44,
+	"no configuration file defined, cannot write config":        42,
 	"no existing service configurations":                        34,
-	"no service configuration \"%v\"":                           46,
+	"no service configuration \"%v\"":                           44,
 	"unknown backend \"%s\"":                                    14,
 }
 
@@ -108,13 +108,13 @@ var deIndex = []uint32{ // 55 elements
 	// Entry 20 - 3F
 	0x000003ba, 0x000003bd, 0x000003c2, 0x000003eb,
 	0x000003f3, 0x000003fb, 0x00000424, 0x00000442,
-	0x0000047f, 0x000004aa, 0x000004e1, 0x000004ef,
+	0x0000047f, 0x000004aa, 0x000004cd, 0x0000051e,
-	0x00000512, 0x00000563, 0x0000059a, 0x000005c1,
+	0x00000555, 0x0000057c, 0x0000057c, 0x0000057c,
-	0x000005c1, 0x000005c1, 0x000005c1, 0x000005c1,
+	0x0000057c, 0x0000057c, 0x0000057c, 0x0000057c,
-	0x000005c1, 0x000005c1, 0x000005c1,
+	0x0000057c, 0x0000057c, 0x0000057c,
 } // Size: 244 bytes
 
-const deData string = "" + // Size: 1473 bytes
+const deData string = "" + // Size: 1404 bytes
 	"\x04\x01\x09\x00\x0e\x02Export: %[1]s\x04\x01\x09\x01\x0a\x0e\x02Import:" +
 	" %[1]s\x02Fehler beim Lesen der Konfiguration: %[1]v\x02Servicename\x02e" +
 	"in Service mit diesem Namen existiert bereits\x02Service %[1]v mit dem B" +
@@ -134,11 +134,10 @@ const deData string = "" + // Size: 1473 bytes
 	"tehenden Servicekonfigurationen\x02Service\x02Backend\x02Übertrage %[1]s" +
 	" von %[2]s nach %[3]s...\x02Ab Zeitstempel: %[1]v (%[2]v)\x02Import fehl" +
 	"geschlagen, letzter Zeitstempel war %[1]v (%[2]s)\x02%[1]v von %[2]v %[3" +
-	"]s in %[4]v importiert.\x02Während des Imports sind folgende Fehler aufg" +
+	"]s in %[4]v importiert.\x02Letzter Zeitstempel: %[1]v (%[2]v)\x02keine K" +
-	"etreten:\x02Fehler: %[1]v\x02Letzter Zeitstempel: %[1]v (%[2]v)\x02keine" +
+	"onfigurationsdatei definiert, Konfiguration kann nicht geschrieben werde" +
-	" Konfigurationsdatei definiert, Konfiguration kann nicht geschrieben wer" +
+	"n\x02Schlüssel darf nur die Zeichen A-Za-z0-9_- beinhalten\x02keine Serv" +
-	"den\x02Schlüssel darf nur die Zeichen A-Za-z0-9_- beinhalten\x02keine Se" +
+	"icekonfiguration „%[1]v“"
-	"rvicekonfiguration „%[1]v“"
 
 var enIndex = []uint32{ // 55 elements
 	// Entry 0 - 1F
@@ -153,13 +152,13 @@ var enIndex = []uint32{ // 55 elements
 	// Entry 20 - 3F
 	0x0000032f, 0x00000333, 0x00000336, 0x00000359,
 	0x00000361, 0x00000369, 0x00000393, 0x000003b1,
-	0x000003ea, 0x00000414, 0x00000445, 0x00000452,
+	0x000003ea, 0x00000414, 0x00000434, 0x00000467,
-	0x00000472, 0x000004a5, 0x000004ca, 0x000004eb,
+	0x0000048c, 0x000004ad, 0x000004dc, 0x00000515,
-	0x0000051a, 0x00000553, 0x00000562, 0x00000583,
+	0x00000524, 0x00000545, 0x0000055c, 0x00000593,
-	0x0000059a, 0x000005d1, 0x000005f2,
+	0x0000059f, 0x000005ac, 0x000005cd,
 } // Size: 244 bytes
 
-const enData string = "" + // Size: 1522 bytes
+const enData string = "" + // Size: 1485 bytes
 	"\x04\x01\x09\x00\x0e\x02export: %[1]s\x04\x01\x09\x01\x0a\x0e\x02import:" +
 	" %[1]s\x02Failed reading config: %[1]v\x02Service name\x02a service with" +
 	" this name already exists\x02Saved service %[1]v using backend %[2]v\x02" +
@@ -177,14 +176,13 @@ const enData string = "" + // Size: 1522 bytes
 	"ing\x02done\x02Yes\x02No\x02no existing service configurations\x02Servic" +
 	"e\x02Backend\x02Transferring %[1]s from %[2]s to %[3]s...\x02From timest" +
 	"amp: %[1]v (%[2]v)\x02Import failed, last reported timestamp was %[1]v (" +
-	"%[2]s)\x02Imported %[1]v of %[2]v %[3]s into %[4]v.\x02During the import" +
+	"%[2]s)\x02Imported %[1]v of %[2]v %[3]s into %[4]v.\x02Latest timestamp:" +
-	" the following errors occurred:\x02Error: %[1]v\x02Latest timestamp: %[1" +
+	" %[1]v (%[2]v)\x02no configuration file defined, cannot write config\x02" +
-	"]v (%[2]v)\x02no configuration file defined, cannot write config\x02key " +
+	"key must only consist of A-Za-z0-9_-\x02no service configuration \x22%[1" +
-	"must only consist of A-Za-z0-9_-\x02no service configuration \x22%[1]v" +
+	"]v\x22\x02Check for duplicate listens on import (slower)\x02Ignored dupl" +
-	"\x22\x02Check for duplicate listens on import (slower)\x02Ignored duplic" +
+	"icate listen %[1]v: \x22%[2]v\x22 by %[3]v (%[4]v)\x02Directory path\x02" +
-	"ate listen %[1]v: \x22%[2]v\x22 by %[3]v (%[4]v)\x02Directory path\x02Ig" +
+	"Ignore listens in incognito mode\x02Ignore skipped listens\x02Minimum pl" +
-	"nore listens in incognito mode\x02Ignore skipped listens\x02Minimum play" +
+	"ayback duration for skipped tracks (seconds)\x02Import log:\x02%[1]v: %[" +
-	"back duration for skipped tracks (seconds)\x02invalid timestamp string " +
+	"2]v\x02invalid timestamp string \x22%[1]v\x22"
-	"\x22%[1]v\x22"
 
-	// Total table size 3483 bytes (3KiB); checksum: 43313DBC
+	// Total table size 3377 bytes (3KiB); checksum: 6715024

internal/translations/locales/de/messages.gotext.json

@@ -255,6 +255,50 @@
             "message": "Unique playlist identifier",
             "translation": "Eindeutige Playlist-ID"
         },
+        {
+            "id": "Check for duplicate listens on import (slower)",
+            "message": "Check for duplicate listens on import (slower)",
+            "translation": ""
+        },
+        {
+            "id": "Ignored duplicate listen {ListenedAt}: \"{TrackName}\" by {ArtistName} ({RecordingMbid})",
+            "message": "Ignored duplicate listen {ListenedAt}: \"{TrackName}\" by {ArtistName} ({RecordingMbid})",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "ListenedAt",
+                    "string": "%[1]v",
+                    "type": "time.Time",
+                    "underlyingType": "struct{wall uint64; ext int64; loc *time.Location}",
+                    "argNum": 1,
+                    "expr": "l.ListenedAt"
+                },
+                {
+                    "id": "TrackName",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "l.TrackName"
+                },
+                {
+                    "id": "ArtistName",
+                    "string": "%[3]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 3,
+                    "expr": "l.ArtistName()"
+                },
+                {
+                    "id": "RecordingMbid",
+                    "string": "%[4]v",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.MBID",
+                    "underlyingType": "string",
+                    "argNum": 4,
+                    "expr": "l.RecordingMbid"
+                }
+            ]
+        },
         {
             "id": "Disable auto correction of submitted listens",
             "message": "Disable auto correction of submitted listens",
@@ -265,6 +309,26 @@
             "message": "Include skipped listens",
             "translation": "Übersprungene Titel einbeziehen"
         },
+        {
+            "id": "Directory path",
+            "message": "Directory path",
+            "translation": ""
+        },
+        {
+            "id": "Ignore listens in incognito mode",
+            "message": "Ignore listens in incognito mode",
+            "translation": ""
+        },
+        {
+            "id": "Ignore skipped listens",
+            "message": "Ignore skipped listens",
+            "translation": ""
+        },
+        {
+            "id": "Minimum playback duration for skipped tracks (seconds)",
+            "message": "Minimum playback duration for skipped tracks (seconds)",
+            "translation": ""
+        },
         {
             "id": "Visit the URL for authorization: {Url}",
             "message": "Visit the URL for authorization: {Url}",
@@ -303,23 +367,23 @@
         {
             "id": "exporting",
             "message": "exporting",
+            "translation": "exportiere",
             "translatorComment": "Copied from source.",
-            "fuzzy": true,
+            "fuzzy": true
-            "translation": "exportiere"
         },
         {
             "id": "importing",
             "message": "importing",
+            "translation": "importiere",
             "translatorComment": "Copied from source.",
-            "fuzzy": true,
+            "fuzzy": true
-            "translation": "importiere"
         },
         {
             "id": "done",
             "message": "done",
+            "translation": "fertig",
             "translatorComment": "Copied from source.",
-            "fuzzy": true,
+            "fuzzy": true
-            "translation": "fertig"
         },
         {
             "id": "Yes",
@@ -459,22 +523,45 @@
             ]
         },
         {
-            "id": "During the import the following errors occurred:",
+            "id": "Import log:",
-            "message": "During the import the following errors occurred:",
+            "message": "Import log:",
-            "translation": "Während des Imports sind folgende Fehler aufgetreten:"
+            "translation": ""
         },
         {
-            "id": "Error: {Err}",
+            "id": "{Type}: {Message}",
-            "message": "Error: {Err}",
+            "message": "{Type}: {Message}",
-            "translation": "Fehler: {Err}",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "Err",
+                    "id": "Type",
+                    "string": "%[1]v",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.LogEntryType",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "entry.Type"
+                },
+                {
+                    "id": "Message",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "entry.Message"
+                }
+            ]
+        },
+        {
+            "id": "invalid timestamp string \"{FlagValue}\"",
+            "message": "invalid timestamp string \"{FlagValue}\"",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "FlagValue",
                     "string": "%[1]v",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "err"
+                    "expr": "flagValue"
                 }
             ]
         },
@@ -525,4 +612,4 @@
             ]
         }
     ]
-}
+}

internal/translations/locales/de/out.gotext.json

@@ -523,22 +523,30 @@
             ]
         },
         {
-            "id": "During the import the following errors occurred:",
+            "id": "Import log:",
-            "message": "During the import the following errors occurred:",
+            "message": "Import log:",
-            "translation": "Während des Imports sind folgende Fehler aufgetreten:"
+            "translation": ""
         },
         {
-            "id": "Error: {Err}",
+            "id": "{Type}: {Message}",
-            "message": "Error: {Err}",
+            "message": "{Type}: {Message}",
-            "translation": "Fehler: {Err}",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "Err",
+                    "id": "Type",
                     "string": "%[1]v",
-                    "type": "string",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.LogEntryType",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "err"
+                    "expr": "entry.Type"
+                },
+                {
+                    "id": "Message",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "entry.Message"
                 }
             ]
         },

internal/translations/locales/en/messages.gotext.json

@@ -303,6 +303,54 @@
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
+        {
+            "id": "Check for duplicate listens on import (slower)",
+            "message": "Check for duplicate listens on import (slower)",
+            "translation": "Check for duplicate listens on import (slower)",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "Ignored duplicate listen {ListenedAt}: \"{TrackName}\" by {ArtistName} ({RecordingMbid})",
+            "message": "Ignored duplicate listen {ListenedAt}: \"{TrackName}\" by {ArtistName} ({RecordingMbid})",
+            "translation": "Ignored duplicate listen {ListenedAt}: \"{TrackName}\" by {ArtistName} ({RecordingMbid})",
+            "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ListenedAt",
+                    "string": "%[1]v",
+                    "type": "time.Time",
+                    "underlyingType": "struct{wall uint64; ext int64; loc *time.Location}",
+                    "argNum": 1,
+                    "expr": "l.ListenedAt"
+                },
+                {
+                    "id": "TrackName",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "l.TrackName"
+                },
+                {
+                    "id": "ArtistName",
+                    "string": "%[3]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 3,
+                    "expr": "l.ArtistName()"
+                },
+                {
+                    "id": "RecordingMbid",
+                    "string": "%[4]v",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.MBID",
+                    "underlyingType": "string",
+                    "argNum": 4,
+                    "expr": "l.RecordingMbid"
+                }
+            ],
+            "fuzzy": true
+        },
         {
             "id": "Disable auto correction of submitted listens",
             "message": "Disable auto correction of submitted listens",
@@ -317,6 +365,34 @@
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
+        {
+            "id": "Directory path",
+            "message": "Directory path",
+            "translation": "Directory path",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "Ignore listens in incognito mode",
+            "message": "Ignore listens in incognito mode",
+            "translation": "Ignore listens in incognito mode",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "Ignore skipped listens",
+            "message": "Ignore skipped listens",
+            "translation": "Ignore skipped listens",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "Minimum playback duration for skipped tracks (seconds)",
+            "message": "Minimum playback duration for skipped tracks (seconds)",
+            "translation": "Minimum playback duration for skipped tracks (seconds)",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
         {
             "id": "Visit the URL for authorization: {Url}",
             "message": "Visit the URL for authorization: {Url}",
@@ -535,25 +611,50 @@
             "fuzzy": true
         },
         {
-            "id": "During the import the following errors occurred:",
+            "id": "Import log:",
-            "message": "During the import the following errors occurred:",
+            "message": "Import log:",
-            "translation": "During the import the following errors occurred:",
+            "translation": "Import log:",
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
         {
-            "id": "Error: {Err}",
+            "id": "{Type}: {Message}",
-            "message": "Error: {Err}",
+            "message": "{Type}: {Message}",
-            "translation": "Error: {Err}",
+            "translation": "{Type}: {Message}",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Err",
+                    "id": "Type",
+                    "string": "%[1]v",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.LogEntryType",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "entry.Type"
+                },
+                {
+                    "id": "Message",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "entry.Message"
+                }
+            ],
+            "fuzzy": true
+        },
+        {
+            "id": "invalid timestamp string \"{FlagValue}\"",
+            "message": "invalid timestamp string \"{FlagValue}\"",
+            "translation": "invalid timestamp string \"{FlagValue}\"",
+            "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "FlagValue",
                     "string": "%[1]v",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "err"
+                    "expr": "flagValue"
                 }
             ],
             "fuzzy": true
@@ -613,4 +714,4 @@
             "fuzzy": true
         }
     ]
-}
+}

internal/translations/locales/en/out.gotext.json

@@ -611,25 +611,33 @@
             "fuzzy": true
         },
         {
-            "id": "During the import the following errors occurred:",
+            "id": "Import log:",
-            "message": "During the import the following errors occurred:",
+            "message": "Import log:",
-            "translation": "During the import the following errors occurred:",
+            "translation": "Import log:",
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
         {
-            "id": "Error: {Err}",
+            "id": "{Type}: {Message}",
-            "message": "Error: {Err}",
+            "message": "{Type}: {Message}",
-            "translation": "Error: {Err}",
+            "translation": "{Type}: {Message}",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Err",
+                    "id": "Type",
                     "string": "%[1]v",
-                    "type": "string",
+                    "type": "go.uploadedlobster.com/scotty/internal/models.LogEntryType",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "err"
+                    "expr": "entry.Type"
+                },
+                {
+                    "id": "Message",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "entry.Message"
                 }
             ],
             "fuzzy": true