diff --git a/data/gschema/org.tuf.manager.gschema.xml b/data/gschema/org.tuf.manager.gschema.xml
index 5d8b9a8..39f7be4 100644
--- a/data/gschema/org.tuf.manager.gschema.xml
+++ b/data/gschema/org.tuf.manager.gschema.xml
@@ -2,9 +2,9 @@
false
- Should TUF Manager restore previous settings when run
+ Should TUF Manager restore previous settings when run?
- Should TUF Manager restore previous settings when run
+ Should TUF Manager restore previous settings when run?
@@ -12,9 +12,6 @@
Fan mode
The saved fan mode
- 0 is balanced
- 1 is turbo
- 2 is silent
@@ -22,10 +19,6 @@
Keyboard mode
The saved keyboard mode
- 0 is static
- 1 is breathing
- 2 is color cycle
- 3 is strobing
@@ -33,16 +26,13 @@
Keyboard speed
The saved keyboard speed
- 0 is slow
- 1 is medium
- 2 is fast
"rgb(255,0,0)"
Keyboard color
- The saved keyboard color in rgb format
+ The saved keyboard color in RGB format
diff --git a/po/es.po b/po/es.po
index 9a3943b..1169cee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tuf-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-03 22:20-0400\n"
-"PO-Revision-Date: 2020-08-03 22:22-0400\n"
+"POT-Creation-Date: 2020-08-06 20:34-0400\n"
+"PO-Revision-Date: 2020-08-06 20:37-0400\n"
"Last-Translator: Chris Cromer \n"
"Language-Team: none\n"
"Language: es\n"
@@ -19,112 +19,242 @@ msgstr ""
"X-Generator: Poedit 2.3\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: src/cli.vala:145
-msgid "Invalid arguments!\n"
-msgstr "¡Valor invalido!\n"
+#: src/cli.vala:180 src/cli.vala:287 src/cli.vala:344 src/cli.vala:362
+#: src/cli.vala:377 src/cli.vala:406 src/cli.vala:429 src/cli.vala:451
+#: src/cli.vala:471 src/gui-window.vala:109 src/gui-window.vala:125
+#: src/gui-window.vala:135 src/main.vala.in:34 src/server.vala:50
+#: src/server-main.vala:92 src/server-main.vala:122
+msgid "Error: "
+msgstr "Error: "
-#: src/cli.vala:151
+#: src/cli.vala:314
+msgid ""
+"Invalid arguments!\n"
+"\n"
+msgstr "¡Argumentos invalidos!\n"
+
+#: src/cli.vala:320
msgid "Version: "
msgstr "Versión: "
-#: src/cli.vala:161 src/gui-window.vala:86
+#: src/cli.vala:330 src/gui-window.vala:95
msgid "Client version: "
msgstr "Versión del cliente: "
-#: src/cli.vala:162 src/gui-window.vala:87
+#: src/cli.vala:331 src/gui-window.vala:96
msgid "Server version: "
msgstr "Versión del servidor: "
-#: src/cli.vala:166
-msgid "Current fan mode: Balanced\n"
-msgstr ""
-
-#: src/cli.vala:169
-msgid "Current fan mode: Turbo\n"
-msgstr ""
-
-#: src/cli.vala:172
-msgid "Current fan mode: Silent\n"
-msgstr ""
-
-#: src/cli.vala:175 src/cli.vala:193
-msgid "Error: Could not get current fan mode!\n"
-msgstr ""
-
-#: src/cli.vala:181
-msgid "Current keyboard lighting: Static\n"
-msgstr "Iluminación de teclado\n"
-
-#: src/cli.vala:184
-msgid "Current keyboard lighting: Breathing\n"
-msgstr ""
-
-#: src/cli.vala:187
-msgid "Current keyboard lighting: Color Cycle\n"
-msgstr ""
-
-#: src/cli.vala:190
-msgid "Current keyboard lighting: Strobing\n"
-msgstr "Iluminación de teclado\n"
-
-#: src/gui-window.vala:71
-msgid "The current running tuf-server version doesn't match the gui version!"
-msgstr ""
-
-#: src/gui-window.vala:96
+#: src/cli.vala:335 src/cli.vala:338 src/cli.vala:341 src/gui-window.vala:106
+#: src/gui-window.vala:160
msgid "Current fan mode: "
-msgstr ""
+msgstr "Modo de ventilador actual: "
-#: src/gui-window.vala:99
-msgid "Error: Could not get current fan mode!"
-msgstr ""
+#: src/cli.vala:335
+msgid "Balanced\n"
+msgstr "Balanceada\n"
-#: src/gui-window.vala:106
-msgid "Current keyboard mode: "
+#: src/cli.vala:338
+msgid "Turbo\n"
+msgstr "Turbo\n"
+
+#: src/cli.vala:341
+msgid "Silent\n"
+msgstr "Silenciosa\n"
+
+#: src/cli.vala:344
+msgid "Could not get current fan mode!\n"
+msgstr "¡No se pudo obtener el modo de ventilador actual!\n"
+
+#: src/cli.vala:350 src/cli.vala:353 src/cli.vala:356 src/cli.vala:359
+msgid "Current keyboard lighting: "
+msgstr "Iluminación de teclado actual: "
+
+#: src/cli.vala:350
+msgid "Static\n"
+msgstr "Estática\n"
+
+#: src/cli.vala:353
+msgid "Breathing\n"
+msgstr "Respiración\n"
+
+#: src/cli.vala:356
+msgid "Color Cycle\n"
+msgstr "Ciclo de Color\n"
+
+#: src/cli.vala:359
+msgid "Strobing\n"
+msgstr "Estroboscópica\n"
+
+#: src/cli.vala:362
+msgid "Could not get current keyboard mode!\n"
+msgstr "¡No se pudo obtener el modo de teclado actual!\n"
+
+#: src/cli.vala:368 src/cli.vala:371 src/cli.vala:374 src/gui-window.vala:132
+#: src/gui-window.vala:184
+msgid "Current keyboard speed: "
+msgstr "Velocidad del teclado actual: "
+
+#: src/cli.vala:368
+msgid "Slow\n"
+msgstr "Lenta\n"
+
+#: src/cli.vala:371
+msgid "Medium\n"
+msgstr "Media\n"
+
+#: src/cli.vala:374
+msgid "Fast\n"
+msgstr "Rapida\n"
+
+#: src/cli.vala:377
+msgid "Could not get current keyboard speed!\n"
+msgstr "¡No se pudo obtener la velocidad actual del teclado!\n"
+
+#: src/cli.vala:386 src/gui-window.vala:141 src/gui-window.vala:193
+msgid "Current keyboard color: "
+msgstr "Color de teclado actual: "
+
+#: src/cli.vala:497
+msgid "Usage:"
+msgstr "Uso:"
+
+#: src/cli.vala:497
+msgid "COMMAND [SUBCOMMAND]"
+msgstr "COMANDO [SUBCOMANDO]"
+
+#: src/cli.vala:498
+msgid "Print the version of tuf-cli\n"
+msgstr "Imprimir la versión del tuf-cli\n"
+
+#: src/cli.vala:499
+msgid "Show this help screen\n"
+msgstr "Mostrar esta pantalla de ayuda\n"
+
+#: src/cli.vala:500
+msgid "Set the fan mode\n"
+msgstr "Establecer el modo del ventilador:\n"
+
+#: src/cli.vala:501
+msgid "Set the keyboard lighting\n"
+msgstr "Iluminación de teclado\n"
+
+#: src/cli.vala:502
+msgid "Set the keyboard lighting speed\n"
+msgstr "Establecer la Iluminación de teclado\n"
+
+#: src/cli.vala:503
+msgid "Set the keyboard color\n"
+msgstr "Color del teclado\n"
+
+#: src/cli.vala:504
+msgid ""
+"Show the current config\n"
+"\n"
msgstr ""
+"Mostrar la configuración actual\n"
+"\n"
+
+#: src/cli.vala:505
+msgid "Examples:\n"
+msgstr "Ejemplos:\n"
+
+#: src/cli.vala:506
+msgid "Silence fan:"
+msgstr "Silenciar ventilador:"
+
+#: src/cli.vala:507
+msgid "Change RGB color:"
+msgstr "Cambiar el color RGB:"
+
+#: src/common.vala:41 src/common.vala:64 src/common.vala:79 src/common.vala:82
+#: src/common.vala:97 src/common.vala:100 src/common.vala:114
+#: src/common.vala:117 src/common.vala:132 src/common.vala:135
+#: src/common.vala:149 src/common.vala:152 src/common.vala:167
+#: src/common.vala:170 src/common.vala:184 src/common.vala:187
+#: src/common.vala:202 src/common.vala:205 src/gui-window.vala:79
+#: src/main.vala.in:31 src/server.vala:44 src/server.vala:140
+#: src/server.vala:201 src/server.vala:204 src/server.vala:212
+#: src/server.vala:215 src/server.vala:321 src/server.vala:324
+#: src/server.vala:332 src/server.vala:335 src/server.vala:447
+#: src/server.vala:450 src/server.vala:458 src/server.vala:461
+#: src/server.vala:559 src/server.vala:562 src/server.vala:570
+#: src/server.vala:573 src/server-main.vala:68 src/server-main.vala:88
+#, c-format
+msgid "Error: %s\n"
+msgstr "Error: %s\n"
+
+#: src/common.vala:50
+msgid "The server and client versions do not match!"
+msgstr "¡La versión del servidor y del cliente no coinciden!"
+
+#: src/gui-window.vala:86
+msgid "The current running tuf-server version doesn't match the GUI version!"
+msgstr "¡La versión actual de tuf-server no coincide con la versión de GUI!"
#: src/gui-window.vala:109
-msgid "Error: Could not get current keyboard mode!"
-msgstr ""
+msgid "Could not get current fan mode!"
+msgstr "¡No se pudo obtener el modo de ventilador actual!"
-#: src/gui-window.vala:116
-msgid "Current keyboard speed: "
-msgstr ""
-
-#: src/gui-window.vala:119
-msgid "Error: Could not get current keyboard speed!"
-msgstr ""
+#: src/gui-window.vala:122 src/gui-window.vala:175
+msgid "Current keyboard mode: "
+msgstr "Modo de teclado actual: "
#: src/gui-window.vala:125
-msgid "Current keyboard color: "
-msgstr ""
+msgid "Could not get current keyboard mode!"
+msgstr "¡No se pudo obtener el modo de teclado actual!"
+
+#: src/gui-window.vala:135
+msgid "Could not get current keyboard speed!"
+msgstr "¡No se pudo obtener la velocidad actual del teclado!"
#: src/main.vala.in:34
-msgid "Another instance of TUF Manager is already running!"
-msgstr ""
+msgid "Another instance of TUF Manager is already running!\n"
+msgstr "¡Ya se está ejecutando otra instancia de Administrador TUF!\n"
-#: src/server.vala:154 src/server.vala:217 src/server.vala:236
-#: src/server.vala:249 src/server.vala:262 src/server.vala:321
-#: src/server.vala:328 src/server.vala:335 src/server.vala:342
-#: src/server.vala:349 src/server.vala:359 src/server.vala:414
-#: src/server.vala:426 src/server.vala:433 src/server.vala:444
-#: src/server.vala:499 src/server.vala:511 src/server.vala:518
+#: src/server.vala:50
+msgid "Could not register service!\n"
+msgstr "¡No se pudo registrar el servicio!\n"
+
+#: src/server.vala:166 src/server.vala:238 src/server.vala:264
+#: src/server.vala:277 src/server.vala:290 src/server.vala:365
+#: src/server.vala:372 src/server.vala:379 src/server.vala:386
+#: src/server.vala:393 src/server.vala:411 src/server.vala:487
+#: src/server.vala:499 src/server.vala:506 src/server.vala:524
+#: src/server.vala:599 src/server.vala:611 src/server.vala:618
msgid "Failed to open stream!"
msgstr "¡Fallo al abrir stream!"
-#: src/server.vala:159 src/server.vala:241 src/server.vala:254
-#: src/server.vala:267 src/server.vala:364 src/server.vala:449
+#: src/server.vala:171 src/server.vala:269 src/server.vala:282
+#: src/server.vala:295 src/server.vala:416 src/server.vala:529
msgid "File is empty!"
msgstr "¡El archivo está vacío!"
-#: src/server.vala:164 src/server.vala:369 src/server.vala:454
+#: src/server.vala:176 src/server.vala:421 src/server.vala:534
msgid "File contains invalid value!"
msgstr "¡El archivo contiene un valor invalido!"
-#: src/server.vala:222 src/server.vala:419 src/server.vala:504
+#: src/server.vala:243 src/server.vala:492 src/server.vala:604
msgid "Invalid value!"
msgstr "¡Valor invalido!"
+#: src/server-main.vala:33
+msgid "Run the daemon in the foreground"
+msgstr "Ejecuta el daemon en primer plano"
+
+#: src/server-main.vala:69
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "Ejecute '% s --help' para ver una lista completa de las opciones de línea de comando disponibles.\n"
+
+#: src/server-main.vala:92
+msgid "Could not create pid file!\n"
+msgstr "¡No se pudo crear el archivo pid!\n"
+
+#: src/server-main.vala:122
+msgid "Could not acquire bus name!\n"
+msgstr "¡No se pudo adquirir el bus name!\n"
+
#: data/tuf-manager.desktop.in:4 data/tuf-manager.desktop.in:5
#: data/ui/tuf.manager.window.ui:41
msgid "TUF Manager"
@@ -139,48 +269,46 @@ msgstr "Software para gestionar el modo ventilador y el teclado rgb."
msgid "tuf-manager"
msgstr ""
-#: data/polkit/org.tuf.manager.policy.in:10
-msgid "Authentication is required"
-msgstr "Se requiere autenticación"
-
#: data/gschema/org.tuf.manager.gschema.xml:5
#: data/gschema/org.tuf.manager.gschema.xml:6
-msgid "Should TUF Manager restore previous settings when run"
-msgstr ""
+msgid "Should TUF Manager restore previous settings when run?"
+msgstr "¿Debe Administrador TUF restaurar la configuración anterior cuando se ejecuta?"
#: data/gschema/org.tuf.manager.gschema.xml:12
msgid "Fan mode"
-msgstr ""
+msgstr "Modo del ventilador"
#: data/gschema/org.tuf.manager.gschema.xml:13
-msgid "The saved fan mode 0 is balanced 1 is turbo 2 is silent"
-msgstr ""
+msgid "The saved fan mode"
+msgstr "El modo de ventilador guardado"
-#: data/gschema/org.tuf.manager.gschema.xml:22
+#: data/gschema/org.tuf.manager.gschema.xml:19
msgid "Keyboard mode"
msgstr "Modo del teclado"
-#: data/gschema/org.tuf.manager.gschema.xml:23
-msgid ""
-"The saved keyboard mode 0 is static 1 is breathing 2 is color cycle 3 is "
-"strobing"
-msgstr ""
+#: data/gschema/org.tuf.manager.gschema.xml:20
+msgid "The saved keyboard mode"
+msgstr "El modo de teclado guardado"
+
+#: data/gschema/org.tuf.manager.gschema.xml:26
+msgid "Keyboard speed"
+msgstr "Velocidad del teclado"
+
+#: data/gschema/org.tuf.manager.gschema.xml:27
+msgid "The saved keyboard speed"
+msgstr "La velocidad del teclado guardada"
#: data/gschema/org.tuf.manager.gschema.xml:33
-msgid "Keyboard speed"
-msgstr ""
-
-#: data/gschema/org.tuf.manager.gschema.xml:34
-msgid "The saved keyboard speed 0 is slow 1 is medium 2 is fast"
-msgstr ""
-
-#: data/gschema/org.tuf.manager.gschema.xml:43
msgid "Keyboard color"
msgstr "Color del teclado"
-#: data/gschema/org.tuf.manager.gschema.xml:44
-msgid "The saved keyboard color in rgb format"
-msgstr ""
+#: data/gschema/org.tuf.manager.gschema.xml:34
+msgid "The saved keyboard color in RGB format"
+msgstr "El color del teclado guardado en formato RGB"
+
+#: data/polkit/org.tuf.manager.policy.in:10
+msgid "Authentication is required"
+msgstr "Se requiere autenticación"
#: data/ui/tuf.manager.window.ui:73 data/ui/tuf.manager.window.ui:212
msgid "Mode"
@@ -241,23 +369,3 @@ msgstr "Silenciosa"
#: data/ui/tuf.manager.window.ui:250
msgid "Fan control"
msgstr "Control de ventilador"
-
-#~ msgid "Authentication failed!"
-#~ msgstr "¡Autenticación falló!"
-
-#~ msgid "Brightness"
-#~ msgstr "Brillo"
-
-#~ msgid "Off"
-#~ msgstr "Apagada"
-
-#~ msgid "Low"
-#~ msgstr "Baja"
-
-#~ msgid "High"
-#~ msgstr "Alta"
-
-#~ msgid "The TUF server is busy and can't handle the request at the moment!"
-#~ msgstr ""
-#~ "¡El servidor TUF está ocupado y no puede manejar la solicitud en este "
-#~ "momento!"
diff --git a/po/tuf-manager.pot b/po/tuf-manager.pot
index 2d5f61f..ab9872b 100644
--- a/po/tuf-manager.pot
+++ b/po/tuf-manager.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuf-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-03 22:20-0400\n"
+"POT-Creation-Date: 2020-08-06 20:34-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,112 +17,240 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/cli.vala:145
-msgid "Invalid arguments!\n"
+#: src/cli.vala:180 src/cli.vala:287 src/cli.vala:344 src/cli.vala:362
+#: src/cli.vala:377 src/cli.vala:406 src/cli.vala:429 src/cli.vala:451
+#: src/cli.vala:471 src/gui-window.vala:109 src/gui-window.vala:125
+#: src/gui-window.vala:135 src/main.vala.in:34 src/server.vala:50
+#: src/server-main.vala:92 src/server-main.vala:122
+msgid "Error: "
msgstr ""
-#: src/cli.vala:151
+#: src/cli.vala:314
+msgid ""
+"Invalid arguments!\n"
+"\n"
+msgstr ""
+
+#: src/cli.vala:320
msgid "Version: "
msgstr ""
-#: src/cli.vala:161 src/gui-window.vala:86
+#: src/cli.vala:330 src/gui-window.vala:95
msgid "Client version: "
msgstr ""
-#: src/cli.vala:162 src/gui-window.vala:87
+#: src/cli.vala:331 src/gui-window.vala:96
msgid "Server version: "
msgstr ""
-#: src/cli.vala:166
-msgid "Current fan mode: Balanced\n"
-msgstr ""
-
-#: src/cli.vala:169
-msgid "Current fan mode: Turbo\n"
-msgstr ""
-
-#: src/cli.vala:172
-msgid "Current fan mode: Silent\n"
-msgstr ""
-
-#: src/cli.vala:175 src/cli.vala:193
-msgid "Error: Could not get current fan mode!\n"
-msgstr ""
-
-#: src/cli.vala:181
-msgid "Current keyboard lighting: Static\n"
-msgstr ""
-
-#: src/cli.vala:184
-msgid "Current keyboard lighting: Breathing\n"
-msgstr ""
-
-#: src/cli.vala:187
-msgid "Current keyboard lighting: Color Cycle\n"
-msgstr ""
-
-#: src/cli.vala:190
-msgid "Current keyboard lighting: Strobing\n"
-msgstr ""
-
-#: src/gui-window.vala:71
-msgid "The current running tuf-server version doesn't match the gui version!"
-msgstr ""
-
-#: src/gui-window.vala:96
+#: src/cli.vala:335 src/cli.vala:338 src/cli.vala:341 src/gui-window.vala:106
+#: src/gui-window.vala:160
msgid "Current fan mode: "
msgstr ""
-#: src/gui-window.vala:99
-msgid "Error: Could not get current fan mode!"
+#: src/cli.vala:335
+msgid "Balanced\n"
msgstr ""
-#: src/gui-window.vala:106
-msgid "Current keyboard mode: "
+#: src/cli.vala:338
+msgid "Turbo\n"
msgstr ""
-#: src/gui-window.vala:109
-msgid "Error: Could not get current keyboard mode!"
+#: src/cli.vala:341
+msgid "Silent\n"
msgstr ""
-#: src/gui-window.vala:116
+#: src/cli.vala:344
+msgid "Could not get current fan mode!\n"
+msgstr ""
+
+#: src/cli.vala:350 src/cli.vala:353 src/cli.vala:356 src/cli.vala:359
+msgid "Current keyboard lighting: "
+msgstr ""
+
+#: src/cli.vala:350
+msgid "Static\n"
+msgstr ""
+
+#: src/cli.vala:353
+msgid "Breathing\n"
+msgstr ""
+
+#: src/cli.vala:356
+msgid "Color Cycle\n"
+msgstr ""
+
+#: src/cli.vala:359
+msgid "Strobing\n"
+msgstr ""
+
+#: src/cli.vala:362
+msgid "Could not get current keyboard mode!\n"
+msgstr ""
+
+#: src/cli.vala:368 src/cli.vala:371 src/cli.vala:374 src/gui-window.vala:132
+#: src/gui-window.vala:184
msgid "Current keyboard speed: "
msgstr ""
-#: src/gui-window.vala:119
-msgid "Error: Could not get current keyboard speed!"
+#: src/cli.vala:368
+msgid "Slow\n"
msgstr ""
-#: src/gui-window.vala:125
+#: src/cli.vala:371
+msgid "Medium\n"
+msgstr ""
+
+#: src/cli.vala:374
+msgid "Fast\n"
+msgstr ""
+
+#: src/cli.vala:377
+msgid "Could not get current keyboard speed!\n"
+msgstr ""
+
+#: src/cli.vala:386 src/gui-window.vala:141 src/gui-window.vala:193
msgid "Current keyboard color: "
msgstr ""
-#: src/main.vala.in:34
-msgid "Another instance of TUF Manager is already running!"
+#: src/cli.vala:497
+msgid "Usage:"
msgstr ""
-#: src/server.vala:154 src/server.vala:217 src/server.vala:236
-#: src/server.vala:249 src/server.vala:262 src/server.vala:321
-#: src/server.vala:328 src/server.vala:335 src/server.vala:342
-#: src/server.vala:349 src/server.vala:359 src/server.vala:414
-#: src/server.vala:426 src/server.vala:433 src/server.vala:444
-#: src/server.vala:499 src/server.vala:511 src/server.vala:518
+#: src/cli.vala:497
+msgid "COMMAND [SUBCOMMAND]"
+msgstr ""
+
+#: src/cli.vala:498
+msgid "Print the version of tuf-cli\n"
+msgstr ""
+
+#: src/cli.vala:499
+msgid "Show this help screen\n"
+msgstr ""
+
+#: src/cli.vala:500
+msgid "Set the fan mode\n"
+msgstr ""
+
+#: src/cli.vala:501
+msgid "Set the keyboard lighting\n"
+msgstr ""
+
+#: src/cli.vala:502
+msgid "Set the keyboard lighting speed\n"
+msgstr ""
+
+#: src/cli.vala:503
+msgid "Set the keyboard color\n"
+msgstr ""
+
+#: src/cli.vala:504
+msgid ""
+"Show the current config\n"
+"\n"
+msgstr ""
+
+#: src/cli.vala:505
+msgid "Examples:\n"
+msgstr ""
+
+#: src/cli.vala:506
+msgid "Silence fan:"
+msgstr ""
+
+#: src/cli.vala:507
+msgid "Change RGB color:"
+msgstr ""
+
+#: src/common.vala:41 src/common.vala:64 src/common.vala:79 src/common.vala:82
+#: src/common.vala:97 src/common.vala:100 src/common.vala:114
+#: src/common.vala:117 src/common.vala:132 src/common.vala:135
+#: src/common.vala:149 src/common.vala:152 src/common.vala:167
+#: src/common.vala:170 src/common.vala:184 src/common.vala:187
+#: src/common.vala:202 src/common.vala:205 src/gui-window.vala:79
+#: src/main.vala.in:31 src/server.vala:44 src/server.vala:140
+#: src/server.vala:201 src/server.vala:204 src/server.vala:212
+#: src/server.vala:215 src/server.vala:321 src/server.vala:324
+#: src/server.vala:332 src/server.vala:335 src/server.vala:447
+#: src/server.vala:450 src/server.vala:458 src/server.vala:461
+#: src/server.vala:559 src/server.vala:562 src/server.vala:570
+#: src/server.vala:573 src/server-main.vala:68 src/server-main.vala:88
+#, c-format
+msgid "Error: %s\n"
+msgstr ""
+
+#: src/common.vala:50
+msgid "The server and client versions do not match!"
+msgstr ""
+
+#: src/gui-window.vala:86
+msgid "The current running tuf-server version doesn't match the GUI version!"
+msgstr ""
+
+#: src/gui-window.vala:109
+msgid "Could not get current fan mode!"
+msgstr ""
+
+#: src/gui-window.vala:122 src/gui-window.vala:175
+msgid "Current keyboard mode: "
+msgstr ""
+
+#: src/gui-window.vala:125
+msgid "Could not get current keyboard mode!"
+msgstr ""
+
+#: src/gui-window.vala:135
+msgid "Could not get current keyboard speed!"
+msgstr ""
+
+#: src/main.vala.in:34
+msgid "Another instance of TUF Manager is already running!\n"
+msgstr ""
+
+#: src/server.vala:50
+msgid "Could not register service!\n"
+msgstr ""
+
+#: src/server.vala:166 src/server.vala:238 src/server.vala:264
+#: src/server.vala:277 src/server.vala:290 src/server.vala:365
+#: src/server.vala:372 src/server.vala:379 src/server.vala:386
+#: src/server.vala:393 src/server.vala:411 src/server.vala:487
+#: src/server.vala:499 src/server.vala:506 src/server.vala:524
+#: src/server.vala:599 src/server.vala:611 src/server.vala:618
msgid "Failed to open stream!"
msgstr ""
-#: src/server.vala:159 src/server.vala:241 src/server.vala:254
-#: src/server.vala:267 src/server.vala:364 src/server.vala:449
+#: src/server.vala:171 src/server.vala:269 src/server.vala:282
+#: src/server.vala:295 src/server.vala:416 src/server.vala:529
msgid "File is empty!"
msgstr ""
-#: src/server.vala:164 src/server.vala:369 src/server.vala:454
+#: src/server.vala:176 src/server.vala:421 src/server.vala:534
msgid "File contains invalid value!"
msgstr ""
-#: src/server.vala:222 src/server.vala:419 src/server.vala:504
+#: src/server.vala:243 src/server.vala:492 src/server.vala:604
msgid "Invalid value!"
msgstr ""
+#: src/server-main.vala:33
+msgid "Run the daemon in the foreground"
+msgstr ""
+
+#: src/server-main.vala:69
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: src/server-main.vala:92
+msgid "Could not create pid file!\n"
+msgstr ""
+
+#: src/server-main.vala:122
+msgid "Could not acquire bus name!\n"
+msgstr ""
+
#: data/tuf-manager.desktop.in:4 data/tuf-manager.desktop.in:5
#: data/ui/tuf.manager.window.ui:41
msgid "TUF Manager"
@@ -136,13 +264,9 @@ msgstr ""
msgid "tuf-manager"
msgstr ""
-#: data/polkit/org.tuf.manager.policy.in:10
-msgid "Authentication is required"
-msgstr ""
-
#: data/gschema/org.tuf.manager.gschema.xml:5
#: data/gschema/org.tuf.manager.gschema.xml:6
-msgid "Should TUF Manager restore previous settings when run"
+msgid "Should TUF Manager restore previous settings when run?"
msgstr ""
#: data/gschema/org.tuf.manager.gschema.xml:12
@@ -150,33 +274,35 @@ msgid "Fan mode"
msgstr ""
#: data/gschema/org.tuf.manager.gschema.xml:13
-msgid "The saved fan mode 0 is balanced 1 is turbo 2 is silent"
+msgid "The saved fan mode"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:22
+#: data/gschema/org.tuf.manager.gschema.xml:19
msgid "Keyboard mode"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:23
-msgid ""
-"The saved keyboard mode 0 is static 1 is breathing 2 is color cycle 3 is "
-"strobing"
+#: data/gschema/org.tuf.manager.gschema.xml:20
+msgid "The saved keyboard mode"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:33
+#: data/gschema/org.tuf.manager.gschema.xml:26
msgid "Keyboard speed"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:34
-msgid "The saved keyboard speed 0 is slow 1 is medium 2 is fast"
+#: data/gschema/org.tuf.manager.gschema.xml:27
+msgid "The saved keyboard speed"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:43
+#: data/gschema/org.tuf.manager.gschema.xml:33
msgid "Keyboard color"
msgstr ""
-#: data/gschema/org.tuf.manager.gschema.xml:44
-msgid "The saved keyboard color in rgb format"
+#: data/gschema/org.tuf.manager.gschema.xml:34
+msgid "The saved keyboard color in RGB format"
+msgstr ""
+
+#: data/polkit/org.tuf.manager.policy.in:10
+msgid "Authentication is required"
msgstr ""
#: data/ui/tuf.manager.window.ui:73 data/ui/tuf.manager.window.ui:212
diff --git a/src/cli.vala b/src/cli.vala
index 6de940c..22522a9 100644
--- a/src/cli.vala
+++ b/src/cli.vala
@@ -332,49 +332,49 @@ namespace TUFManager {
var current_setting = get_fan_mode ();
switch (current_setting) {
case 0:
- command_line.print (_ ("Current fan mode: Balanced\n"));
+ command_line.print (_ ("Current fan mode: ") + _ ("Balanced\n"));
break;
case 1:
- command_line.print (_ ("Current fan mode: Turbo\n"));
+ command_line.print (_ ("Current fan mode: ") + _ ("Turbo\n"));
break;
case 2:
- command_line.print (_ ("Current fan mode: Silent\n"));
+ command_line.print (_ ("Current fan mode: ") + _ ("Silent\n"));
break;
default:
- command_line.printerr (_ ("Error: Could not get current fan mode!\n"));
+ command_line.printerr (_ ("Error: ") + _ ("Could not get current fan mode!\n"));
break;
}
current_setting = get_keyboard_mode ();
switch (current_setting) {
case 0:
- command_line.print (_ ("Current keyboard lighting: Static\n"));
+ command_line.print (_ ("Current keyboard lighting: ") + _ ("Static\n"));
break;
case 1:
- command_line.print (_ ("Current keyboard lighting: Breathing\n"));
+ command_line.print (_ ("Current keyboard lighting: ") + _ ("Breathing\n"));
break;
case 2:
- command_line.print (_ ("Current keyboard lighting: Color Cycle\n"));
+ command_line.print (_ ("Current keyboard lighting: ") + _ ("Color Cycle\n"));
break;
case 3:
- command_line.print (_ ("Current keyboard lighting: Strobing\n"));
+ command_line.print (_ ("Current keyboard lighting: ") + _ ("Strobing\n"));
break;
default:
- command_line.printerr (_ ("Error: Could not get current keyboard mode!\n"));
+ command_line.printerr (_ ("Error: ") + _ ("Could not get current keyboard mode!\n"));
break;
}
current_setting = get_keyboard_speed ();
switch (current_setting) {
case 0:
- command_line.print (_ ("Current keyboard speed: Slow\n"));
+ command_line.print (_ ("Current keyboard speed: ") + _ ("Slow\n"));
break;
case 1:
- command_line.print (_ ("Current keyboard speed: Medium\n"));
+ command_line.print (_ ("Current keyboard speed: ") + _ ("Medium\n"));
break;
case 2:
- command_line.print (_ ("Current keyboard speed: Fast\n"));
+ command_line.print (_ ("Current keyboard speed: ") + _ ("Fast\n"));
break;
default:
- command_line.printerr (_ ("Error: Could not get current fan mode!\n"));
+ command_line.printerr (_ ("Error: ") + _ ("Could not get current keyboard speed!\n"));
break;
}
var current_color = get_keyboard_color ();
@@ -383,7 +383,7 @@ namespace TUFManager {
(uint) (Math.round (current_color.green * 255)),
(uint) (Math.round (current_color.blue * 255))
).up ();
- command_line.print (_ ("Current keyboard color: " + color_hex + "\n"));
+ command_line.print (_ ("Current keyboard color: ") + color_hex + "\n");
release_cli ();
return 0;
}
@@ -494,17 +494,17 @@ namespace TUFManager {
* @param command_line The command line currently in use to print to
*/
private void print_usage (ApplicationCommandLine command_line) {
- command_line.print ("Usage: tuf-cli COMMAND [SUBCOMMAND] ...\n\n");
- command_line.print (" version Print the version of tuf-cli\n");
- command_line.print (" help Show this help screen\n");
- command_line.print (" fan [balanced, turbo, silent] Set the fan mode\n");
- command_line.print (" lighting [static, breath, cycle, stobe] Set the keyboard lighting\n");
- command_line.print (" speed [slow, medium, fast] Set the keyboard lighting speed\n");
- command_line.print (" color [\"#XXXXXX\"] Set the keyboard color\n");
- command_line.print (" info Show the current config\n\n");
- command_line.print ("Examples:\n");
- command_line.print (" Silence fan: tuf-cli fan silent\n");
- command_line.print (" Change RGB color: tuf-cli color \"#FF0000\"\n");
+ command_line.print (_ ("Usage:") + " tuf-cli " + _ ("COMMAND [SUBCOMMAND]") + " ...\n\n");
+ command_line.print (" version " + _ ("Print the version of tuf-cli\n"));
+ command_line.print (" help " + _ ("Show this help screen\n"));
+ command_line.print (" fan [balanced, turbo, silent] " + _ ("Set the fan mode\n"));
+ command_line.print (" lighting [static, breath, cycle, stobe] " + _ ("Set the keyboard lighting\n"));
+ command_line.print (" speed [slow, medium, fast] " + _ ("Set the keyboard lighting speed\n"));
+ command_line.print (" color [\"#XXXXXX\"] " + _ ("Set the keyboard color\n"));
+ command_line.print (" info " + _ ("Show the current config\n\n"));
+ command_line.print (_ ("Examples:\n"));
+ command_line.print (" " + _ ("Silence fan:") + " tuf-cli fan silent\n");
+ command_line.print (" " + _ ("Change RGB color:") + " tuf-cli color \"#FF0000\"\n");
}
/**
diff --git a/src/common.vala b/src/common.vala
index 6fd7154..3cd8d6c 100644
--- a/src/common.vala
+++ b/src/common.vala
@@ -79,7 +79,7 @@ namespace TUFManager {
stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
return -3;
}
@@ -94,10 +94,10 @@ namespace TUFManager {
tuf_server.set_fan_mode (mode, bus_name);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
@@ -111,10 +111,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_color ();
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
return Gdk.RGBA ();
}
@@ -129,10 +129,10 @@ namespace TUFManager {
tuf_server.set_keyboard_color (color, bus_name);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
@@ -146,10 +146,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_mode ();
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
return -3;
}
@@ -164,10 +164,10 @@ namespace TUFManager {
tuf_server.set_keyboard_mode (mode, bus_name);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
@@ -181,10 +181,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_speed ();
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
return -3;
}
@@ -199,10 +199,10 @@ namespace TUFManager {
tuf_server.set_keyboard_speed (speed, bus_name);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
}
diff --git a/src/gui-window.vala b/src/gui-window.vala
index 924a892..1986e09 100644
--- a/src/gui-window.vala
+++ b/src/gui-window.vala
@@ -76,14 +76,14 @@ namespace TUFManager {
connect_tuf_server ();
}
catch (TUFError e) {
- stderr.printf ("Error: %s:\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
if (e.code == TUFError.UNMATCHED_VERSIONS) {
Gtk.MessageDialog msg;
msg = new Gtk.MessageDialog (this,
Gtk.DialogFlags.MODAL,
Gtk.MessageType.ERROR,
Gtk.ButtonsType.CLOSE,
- _ ("The current running tuf-server version doesn't match the gui version!"));
+ _ ("The current running tuf-server version doesn't match the GUI version!"));
msg.response.connect ((response_id) => {
msg.destroy ();
this.close ();
@@ -106,7 +106,7 @@ namespace TUFManager {
print (_ ("Current fan mode: ") + fan_mode.get_active_text () + "\n");
}
else {
- stderr.printf ("%s\n", _ ("Error: Could not get current fan mode!"));
+ stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current fan mode!"));
}
// Get the keyboard mode
@@ -122,7 +122,7 @@ namespace TUFManager {
print (_ ("Current keyboard mode: ") + keyboard_mode.get_active_text () + "\n");
}
else {
- stderr.printf ("%s\n", _ ("Error: Could not get current keyboard mode!"));
+ stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current keyboard mode!"));
}
// Get the keyboard speed
@@ -132,7 +132,7 @@ namespace TUFManager {
print (_ ("Current keyboard speed: ") + keyboard_speed.get_active_text () + "\n");
}
else {
- stderr.printf ("%s\n", _ ("Error: Could not get current keyboard speed!"));
+ stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current keyboard speed!"));
}
// Get the keyboard color
diff --git a/src/main.vala.in b/src/main.vala.in
index 65b1b52..4c7e486 100644
--- a/src/main.vala.in
+++ b/src/main.vala.in
@@ -31,7 +31,7 @@ namespace TUFManager {
stderr.printf (_ ("Error: %s\n"), e.message);
}
if (application.get_is_remote ()) {
- stderr.printf (_ ("Error: %s\n"), _ ("Another instance of TUF Manager is already running!"));
+ stderr.printf (_ ("Error: ") + _ ("Another instance of TUF Manager is already running!\n"));
return -1;
}
return application.run (args);
diff --git a/src/server-main.vala b/src/server-main.vala
index 18ba475..20ba852 100644
--- a/src/server-main.vala
+++ b/src/server-main.vala
@@ -75,7 +75,7 @@ namespace TUFManager {
if (pid < 0) {
Posix.exit (Posix.EXIT_FAILURE);
}
-
+
if (pid > 0) {
try {
File file = File.new_for_path ("/run/tufmanager");
@@ -89,11 +89,11 @@ namespace TUFManager {
}
var stream = FileStream.open ("/run/tufmanager/pid", "w");
if (stream == null) {
- stderr.printf (_ ("Could not create pid file!\n"));
+ stderr.printf (_ ("Error: ") + _ ("Could not create pid file!\n"));
}
else {
uint32 pidfile = pid;
- stream.puts (pidfile.to_string ());
+ stream.puts (pidfile.to_string ());
}
Posix.exit (Posix.EXIT_SUCCESS);
}
@@ -119,7 +119,7 @@ namespace TUFManager {
on_bus_acquired,
() => {},
() => {
- stderr.printf (_ ("Could not acquire bus name!\n"));
+ stderr.printf (_ ("Error: ") + _ ("Could not acquire bus name!\n"));
});
loop = new MainLoop ();
diff --git a/src/server.vala b/src/server.vala
index 0bb2012..a5b55cd 100644
--- a/src/server.vala
+++ b/src/server.vala
@@ -47,7 +47,7 @@ namespace TUFManager {
conn.register_object ("/org/tuf/manager/server", tuf_server);
}
catch (IOError e) {
- stderr.printf (_ ("Error: Could not register service\n"));
+ stderr.printf (_ ("Error: ") + _ ("Could not register service!\n"));
if (loop != null) {
loop.quit ();
}
@@ -198,10 +198,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
if (authorized) {
@@ -209,10 +209,10 @@ namespace TUFManager {
set_fan_mode_authorized (mode, sender);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
else {
@@ -318,10 +318,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
if (authorized) {
@@ -329,10 +329,10 @@ namespace TUFManager {
set_keyboard_color_authorized (color, sender);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
else {
@@ -444,10 +444,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
if (authorized) {
@@ -455,10 +455,10 @@ namespace TUFManager {
set_keyboard_mode_authorized (mode, sender);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
else {
@@ -556,10 +556,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
if (authorized) {
@@ -567,10 +567,10 @@ namespace TUFManager {
set_keyboard_speed_authorized (speed, sender);
}
catch (TUFError e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
catch (Error e) {
- stderr.printf ("Error: %s\n", e.message);
+ stderr.printf (_ ("Error: %s\n"), e.message);
}
}
else {