Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Rotula.App/Resources/Strings.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@
<value>The printer at {0}:{1} did not answer in time. Check that it is switched on and on the same network, then try again.</value>
</data>
<data name="Print.Error.ConnectionRefused" xml:space="preserve">
<value>The device at {0}:{1} refused the connection. Check the port (Zebra printers use 9100) and that the printer's network port is enabled.</value>
<value>The device at {0}:{1} refused the connection. Check the port (most label printers use 9100) and that the printer's network port is enabled.</value>
</data>
<data name="Print.Error.HostUnreachable" xml:space="preserve">
<value>Cannot reach {0}:{1}. Check the address, the network cable or Wi-Fi, and that the printer is switched on.</value>
Expand Down Expand Up @@ -1484,7 +1484,7 @@
<value>Enter the host name or IP address of the network printer, for example 192.168.1.50.</value>
</data>
<data name="Print.Field.Port" xml:space="preserve">
<value>The port must be a whole number from 1 to 65535 (Zebra printers use 9100).</value>
<value>The port must be a whole number from 1 to 65535 (most label printers use 9100).</value>
</data>
<data name="Print.Field.Number" xml:space="preserve">
<value>{0} must be a number. Enter digits only, for example 12.</value>
Expand Down Expand Up @@ -2249,7 +2249,7 @@
<value>Welcome to Rotula</value>
</data>
<data name="Start.Subtitle" xml:space="preserve">
<value>Design a label, check it on screen and print it on your Zebra printer.</value>
<value>Design a label, check it on screen and print it on your ZPL-compatible printer.</value>
</data>
<data name="Start.New" xml:space="preserve">
<value>New label</value>
Expand Down
6 changes: 3 additions & 3 deletions src/Rotula.App/Resources/Strings.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@
<value>La impresora en {0}:{1} no respondió a tiempo. Compruebe que esté encendida y en la misma red; luego inténtelo de nuevo.</value>
</data>
<data name="Print.Error.ConnectionRefused" xml:space="preserve">
<value>El dispositivo en {0}:{1} rechazó la conexión. Compruebe el puerto (las Zebra usan 9100) y que el puerto de red de la impresora esté activado.</value>
<value>El dispositivo en {0}:{1} rechazó la conexión. Compruebe el puerto (la mayoría de las impresoras de etiquetas usan el 9100) y que el puerto de red de la impresora esté activado.</value>
</data>
<data name="Print.Error.HostUnreachable" xml:space="preserve">
<value>No se puede llegar a {0}:{1}. Revise la dirección, el cable de red o el Wi-Fi, y que la impresora esté encendida.</value>
Expand Down Expand Up @@ -1484,7 +1484,7 @@
<value>Indique el nombre de host o la dirección IP de la impresora de red, por ejemplo 192.168.1.50.</value>
</data>
<data name="Print.Field.Port" xml:space="preserve">
<value>El puerto debe ser un número entero de 1 a 65535 (las Zebra usan 9100).</value>
<value>El puerto debe ser un número entero de 1 a 65535 (la mayoría de las impresoras de etiquetas usan el 9100).</value>
</data>
<data name="Print.Field.Number" xml:space="preserve">
<value>{0} debe ser un número. Escriba solo dígitos, por ejemplo 12.</value>
Expand Down Expand Up @@ -2249,7 +2249,7 @@
<value>Bienvenido a Rotula</value>
</data>
<data name="Start.Subtitle" xml:space="preserve">
<value>Diseñe una etiqueta, revísela en pantalla e imprímala en su impresora Zebra.</value>
<value>Diseñe una etiqueta, revísela en pantalla e imprímala en su impresora compatible con ZPL.</value>
</data>
<data name="Start.New" xml:space="preserve">
<value>Nueva etiqueta</value>
Expand Down
2 changes: 1 addition & 1 deletion src/Rotula.App/Services/AppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public sealed class PrintSettings
/// <summary>Host name or IP address of a network printer.</summary>
public string Host { get; set; } = string.Empty;

/// <summary>TCP port of a network printer (9100 for Zebra).</summary>
/// <summary>TCP port of a network printer (9100 on most label printers).</summary>
public int Port { get; set; } = 9100;

/// <summary>Printhead resolution: "Dpi203", "Dpi300" or "Dpi600".</summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Rotula.App/ViewModels/PrinterSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ private static string FormatMeasure(Measure w, Measure h)
return $"{Math.Round(w.Value, 2).ToString("0.##", CultureInfo.CurrentCulture)} x {Math.Round(h.Value, 2).ToString("0.##", CultureInfo.CurrentCulture)} {unit}";
}

/// <summary>Short description of the chosen printer for summaries, for example "Zebra ZD420" or "192.168.1.50:9100".</summary>
/// <summary>Short description of the chosen printer for summaries, for example a Windows printer name or "192.168.1.50:9100".</summary>
public string Summary => UseNetwork ? $"{Host}:{PortText}" : (SelectedPrinterName ?? string.Empty);

private void LoadFromSettings()
Expand Down
Loading