Changeset 527

Timestamp:

05/20/09 09:41:28 (3 years ago)

Author:

uncle_fungus

Message:

Made state variable thread-safe

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/po/cs_CZ.gmo (modified) (previous)
• trunk/po/cs_CZ.po (modified) (5 diffs)
• trunk/po/de_DE.gmo (modified) (previous)
• trunk/po/de_DE.po (modified) (11 diffs)
• trunk/po/en_GB.gmo (modified) (previous)
• trunk/po/en_GB.po (modified) (5 diffs)
• trunk/po/es_ES.gmo (modified) (previous)
• trunk/po/es_ES.po (modified) (9 diffs)
• trunk/po/fahmon.pot (modified) (5 diffs)
• trunk/po/fr_FR.gmo (modified) (previous)
• trunk/po/fr_FR.po (modified) (8 diffs)
• trunk/po/it_IT.gmo (modified) (previous)
• trunk/po/it_IT.po (modified) (8 diffs)
• trunk/po/nb_NB.gmo (modified) (previous)
• trunk/po/nb_NB.po (modified) (5 diffs)
• trunk/po/nl_NL.gmo (modified) (previous)
• trunk/po/nl_NL.po (modified) (6 diffs)
• trunk/po/pl_PL.gmo (modified) (previous)
• trunk/po/pl_PL.po (modified) (15 diffs)
• trunk/po/pt_BR.gmo (modified) (previous)
• trunk/po/pt_BR.po (modified) (8 diffs)
• trunk/po/pt_PT.gmo (modified) (previous)
• trunk/po/pt_PT.po (modified) (10 diffs)
• trunk/po/ru_RU.gmo (modified) (previous)
• trunk/po/ru_RU.po (modified) (9 diffs)
• trunk/po/sv_SE.gmo (modified) (previous)
• trunk/po/sv_SE.po (modified) (5 diffs)
• trunk/src/client.cpp (modified) (15 diffs)
• trunk/src/include/client.h (modified) (3 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-SVN
+
+    General
+
+      Other
+
+      * Fixed a number of thread safety issue which caused intermittent crashes
+        and generally undesirable behaviour.
-
-    Linux

trunk/po/cs_CZ.po

@@ -9 +9 @@
-"Project-Id-Version: cs_CZ\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-28 13:41+0100\n"
-"Last-Translator: Martin Bednar <serafean@gmail.com>\n"
@@ -163 +163 @@
-msgstr "NeznámÜ klient"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -170 +170 @@
-msgstr "Neznámé"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Log nenahrán"
-
-5
+6
-msgid "anonymous"
-msgstr "Anonymní"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -190 +190 @@
-msgstr "Není k dispozici"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Sloşka %s neexistuje nebo ji nelze číst"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "Nelze znovu načíst %s (FAHlog.txt neexistuje)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Znovu načítám %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Nastala chyba při načítání %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Nastala chyba při načítání %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Nastala chyba při načítání %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Nastala chyba při načítání %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "%s znovu načteno"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "Hodnotu postupu v souboru %s nelze najít/analyzovat"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "Nelze načíst verzi jádra v %s"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Nelze uloÅŸit %s jelikoÅŸ neexistuje"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Nelze vytvořit sloÅŸku %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Nelze kopírovat %s do %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s dělá obrázek %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "Nelze určit číslo obrázku pro %s (toto není problém)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s je v neznámém stavu (Nelze najít hotovÜ obrázek)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s je zastaven (\"Folding@Home Client Shutdown.\"nalezeno v logu)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s byl pozastaven"
-
-8
+9
-#, c-format
-msgid ""
@@ -289 +289 @@
-"hotového obrázku)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s byl označen jako majíc nesynchronizované hodiny"
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "y%s se zdá zablokovanÜ : UplynulÜ čas je %um a limit je %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/de_DE.po

@@ -3 +3 @@
-"Project-Id-Version: FahMon Translation - de_DE 1.1.b1\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-04-05 20:46+0100\n"
-"Last-Translator: Mark Gerber <mark.gerber@web.de>\n"
@@ -169 +169 @@
-msgstr "Unbekannter Client"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -176 +176 @@
-msgstr "Unbekannt"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Log nicht geladen!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonym"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -196 +196 @@
-msgstr "k. A."
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
@@ -202 +202 @@
-
-# "Neu laden" oder "laden" wÃŒrde das im Deutschen nicht gut wiedergeben. Deswegen: "reload" -> "abfragen"
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s kann nicht abgefragt werden (FAHlog.txt nicht vorhanden)."
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "%s wird abgefragt."
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Fehler beim Lesen von %sFAHlog.txt."
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Fehler beim Lesen von %squeue.dat."
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Fehler beim Lesen von %s."
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Fehler beim Lesen von %sunitinfo.txt."
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "Neuladen von %s abgeschlossen."
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
@@ -243 +243 @@
-"Der Fortschrittswert kann in der Datei %s nicht gefunden/analysiert werden."
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
@@ -249 +249 @@
-"Die Core-Version kann in der Datei %s nicht gefunden/analysiert werden."
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "%s kann nicht gespeichert werden, da es nicht existiert."
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Das Verzeichnis %s kann nicht erstellt werden."
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "%s kann nicht nach %s kopiert werden."
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s arbeitet am Frame %u."
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "FÃŒr %s kann (noch) keine Frame-Nummer festgestellt werden."
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -280 +280 @@
-
-# "Angehalten" finde ich keine gute Übersetzung. Das wÃŒrde auch auf eine Pause passen.
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -286 +286 @@
-
-# Eine passendes deutsches Verb zu finden ist hier schwierig. "Pausieren"? "Der Client pausiert"? Nein!
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s ist im Pause-Zustand"
-
-8
+9
-#, c-format
-msgid ""
@@ -300 +300 @@
-"vervollstÀndigtem Frame kann nicht festgestellt werden)."
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
@@ -306 +306 @@
-
-# Das "Limit" ist auch im Deutschen gÀngig.
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s scheint zu hÀngen: verstrichene Zeit ist %um und Limit ist %um."
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/en_GB.po

@@ -8 +8 @@
-"Project-Id-Version: en_GB\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-23 01:11+0000\n"
-"Last-Translator: Andrew Schofield <andrew_s@fahmon.net>\n"
@@ -161 +161 @@
-msgstr "Unknown client"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -168 +168 @@
-msgstr "Unknown"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Log not loaded!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonymous"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -188 +188 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Directory %s does not exist or cannot be read!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s cannot be reloaded! (FAHlog.txt does not exist)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Reloading %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Error while reading %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Error while reading %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Error while reading %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Error while reading %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "Finished Reloading %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "The progress value in file %s could not be found/parsed"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "The core version in file %s could not be found/parsed"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Unable to save %s because it does not exist"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Unable to create directory %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Unable to copy %s to %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s is on frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "Cannot determine frame number for %s (this isn't a problem)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s has an unknown state (Unable to find a complete frame)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s has been paused"
-
-8
+9
-#, c-format
-msgid ""
@@ -287 +287 @@
-"last completed frame)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s has been marked as having a asynchronous clock."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s seems to have hung : Elapsed time is %um and limit is %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/es_ES.po

@@ -8 +8 @@
-"Project-Id-Version: es_ES\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2008-10-30 00:13+0000\n"
-"Last-Translator: Antonio Lucendo <alt_alm@hotmail.com>\n"
@@ -164 +164 @@
-msgstr "Cliente desconocido"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -171 +171 @@
-msgstr "Desconocido"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "¡No se cargó el registro!"
-
-5
+6
-msgid "anonymous"
-msgstr "Anónimo"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -191 +191 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "¡El directorio %s no existe o no se puede leer!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Volviendo a cargar %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "¡No se puede leer %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "¡No se puede leer %squeue.dat!"
-
-2
+3
-#, fuzzy, c-format
-msgid "Error while reading %s"
-msgstr "¡No se puede leer %squeue.dat!"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "¡No se puede leer %sunitinfo.txt!"
-
-6
+7
-#, fuzzy, c-format
-msgid "Finished Reloading %s"
-msgstr "Volviendo a cargar %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "No se pudo encontrar el valor de progreso en el archivo %s"
-
-4
+5
-#, fuzzy, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "No se pudo encontrar el valor de progreso en el archivo %s"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "No se puede guardar %s porque no existe"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "No se puede crear el directorio %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "No se puede copiar %s en %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s va por el cuadro %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -268 +268 @@
-"problema)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -274 +274 @@
-"%s está en un estado desconocido (No se puede encontrar un cuadro completo)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -280 +280 @@
-"%s está detenido (Se encontró la línea \"Folding@Home Client Shutdown.\")"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr ""
-
-8
+9
-#, c-format
-msgid ""
@@ -294 +294 @@
-"transcurrido desde el último cuadro completado)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s se ha marcado como que tiene un reloj asíncrono."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
@@ -305 +305 @@
-"%s parece haberse colgado : El tiempo transcurrido es %um y el límite es %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/fahmon.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -161 +161 @@
-msgstr ""
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -168 +168 @@
-msgstr ""
-
-2
+3
-msgid "Log not loaded!"
-msgstr ""
-
-5
+6
-msgid "anonymous"
-msgstr ""
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -188 +188 @@
-msgstr ""
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr ""
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr ""
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr ""
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr ""
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr ""
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr ""
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr ""
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr ""
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr ""
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr ""
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr ""
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr ""
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr ""
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr ""
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr ""
-
-8
+9
-#, c-format
-msgid ""
@@ -285 +285 @@
-msgstr ""
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr ""
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/fr_FR.po

@@ -8 +8 @@
-"Project-Id-Version: fr_FR\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-25 21:27+0000\n"
-"Last-Translator: Johan Serre <Unknown>\n"
@@ -162 +162 @@
-msgstr "Client inconnu"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -169 +169 @@
-msgstr "Inconnu"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Log non chargé!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonyme"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -189 +189 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Le dossier %s n'existe pas ou ne peut pas être lu!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s ne peut pas être rechargé (FAHlog.txt n'existe pas)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Rechargement %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Erreur durant la lecture de %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Erreur durant la lecture de %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Erreur lors de la lecture de %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Erreur durant la lecture de %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "le rechargement de %s est terminé"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "La valeur de progression du fichier %s ne peut pas étre trouvée/parsée"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "La version du coeur dans le fichier %s n'a pu être trouvée / analysée"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Impossible de sauvegarder %s car il n'existe pas"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Impossible de créer le dossier %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Impossible de copier %s vers %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s Est a la frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -266 +266 @@
-"problÚme)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s a un état inconnu (Impossible de trouver une frame compléte)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -277 +277 @@
-"%s est stoppé (La ligne \"Folding@Home Client Shutdown.\" a été trouvée)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s a été mis(e) en pause"
-
-8
+9
-#, c-format
-msgid ""
@@ -291 +291 @@
-"écoulé depuis la derniére frame terminée)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s est indiqué comme ayant une horloge désynchronisée."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
@@ -302 +302 @@
-"%s semble être en pause : Le temps écoulé est de %um et la limite est %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/it_IT.po

@@ -9 +9 @@
-"Project-Id-Version: it-IT\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2008-02-25 12:46+0100\n"
-"Last-Translator: Zurgo <zurgo@virgilio.it>\n"
@@ -163 +163 @@
-msgstr "Client sconosciuto"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -170 +170 @@
-msgstr "Sconosciuto"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Registro non caricato!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonimo"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -190 +190 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "La directory %s non esiste o non può essere letta!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Ricaricamento %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Errore durante la lettura del file %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Errore durante la lettura del file %squeue.dat"
-
-2
+3
-#, fuzzy, c-format
-msgid "Error while reading %s"
-msgstr "Errore durante la lettura del file %squeue.dat"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Errore durante la lettura del file %sunitinfo.txt!"
-
-6
+7
-#, fuzzy, c-format
-msgid "Finished Reloading %s"
-msgstr "Ricaricamento %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "Il valore del progresso nel file %s non può essere trovato/analizzato"
-
-4
+5
-#, fuzzy, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "Il valore del progresso nel file %s non può essere trovato/analizzato"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Impossibile salvare %s perchÚ il file non esiste"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Impossibile creare la directory %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Impossibile copiare %s to %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s Ú nel frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "Impossibile determinare il numero di frames di %s (non Ú un problema)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -271 +271 @@
-"%s si trova in uno stato sconosciuto (Impossibile trovare un frame completo)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -277 +277 @@
-"%s Ú fermato (La linea  \"Folding@Home Client Shutdown.\" Ú stata travata)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr ""
-
-8
+9
-#, c-format
-msgid ""
@@ -291 +291 @@
-"impiegato valido dall'ultimo frame completo)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s Ú stato contrassegnato come asincronizzazione dell'orologio"
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
@@ -302 +302 @@
-"%s sembra essere in pausa: il tempo di elaborazione Ú %um e il limite Ú %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/nb_NB.po

@@ -8 +8 @@
-"Project-Id-Version: fahmon\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2008-11-22 12:38+0000\n"
-"Last-Translator: Kenneth Langdalen <Unknown>\n"
@@ -162 +162 @@
-msgstr "Ukjent klient"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -169 +169 @@
-msgstr "Ukjent"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Logg ikke lastet!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonym"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -189 +189 @@
-msgstr "Ikke tilgjengelig"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Katalogen %s finnes ikke eller kan ikke leses!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr ""
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Feil ved lesing av %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Feil ved lesing av %squeue.dat!"
-
-2
+3
-#, fuzzy, c-format
-msgid "Error while reading %s"
-msgstr "Feil ved lesing av %squeue.dat!"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Feil ved lesing av %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr ""
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr ""
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr ""
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Kunne ikke opprette katalogen %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Kunne ikke kopiere %s til %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr ""
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr ""
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr ""
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s er stoppet (fant raden \"Folding@Home Client Shutdown.\")"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s er midlertidig stanset"
-
-8
+9
-#, c-format
-msgid ""
@@ -286 +286 @@
-msgstr ""
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s er markert med en usynkronisert klokke"
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/nl_NL.po

@@ -9 +9 @@
-"Project-Id-Version: nl_NL\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-20 16:40+0000\n"
-"Last-Translator: Bastien van 't Wel <bastien@vantwel.nl>\n"
@@ -163 +163 @@
-msgstr "Onbekende client"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -170 +170 @@
-msgstr "Onbekend"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Logbestand niet geladen!"
-
-5
+6
-msgid "anonymous"
-msgstr "anoniem"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -190 +190 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Directory %s bestaat niet of kan niet gelezen worden!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s kan niet opnieuw worden herladen (FAHlog.txt bestaat niet)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Herladen %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Fout tijdens lezen van %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Fout tijdens lezen van %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Fout tijdens lezen van %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Fout tijdens lezen van %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "%s is herladen"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "De voortgang in bestand %s kan niet gevonden of weergegeven worden"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "De core versie in bestand %s kan niet worden gevonden/geanalyseerd"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Onmogelijk om %s op te slaan omdat deze niet bestaat"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Onmogelijk om directory %s aan te maken"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Onmogelijk om %s naar %s te kopiëren"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s is op frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "Kan geen framenummer vinden voor %s (is geen probleem)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -271 +271 @@
-"%s heeft een onbekende status (Niet mogelijk om een compleet frame te vinden)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s is gestopt (De regel \"Folding@Home Client Shutdown.\" is gevonden)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s is gepauzeerd"
-
-8
+9
-#, c-format
-msgid ""
@@ -290 +290 @@
-"vinden sinds het laatst afgeronde frame)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s is gemarkeerd dat deze een asynchrone klok heeft."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s lijkt te hangen: Verstreken tijd is %um en de limiet is %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/pl_PL.po

@@ -9 +9 @@
-"Project-Id-Version: pl_PL\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-22 23:57+0100\n"
-"Last-Translator: Mariusz Pociask <mariusz-pociask@o2.pl>\n"
@@ -167 +167 @@
-msgstr "Nieznany klient"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -174 +174 @@
-msgstr "Nieznany"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Plik dziennika nie został wczytany!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonimowy"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -194 +194 @@
-msgstr "niedostępny"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Katalog %s nie istnieje lub nie moÅŒna go odczytać!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "Nie moÅŒna odczytać statusu %s! (brak pliku FAHlog.txt)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Odczyt statusu %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
@@ -215 +215 @@
-d podczas odczytu %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
@@ -221 +221 @@
-d podczas odczytu %squeue.dat"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
@@ -227 +227 @@
-d podczas odczytu %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
@@ -233 +233 @@
-d podczas odczytu %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "Odczyt statusu %s zakończony"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "Wskaźnik postępu w pliku %s nie został odnaleziony/rozpoznany"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "Wersja rdzenia w pliku %s nie została odnaleziona/rozpoznana"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Nie moÅŒna zapisać %s - nie istnieje"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Nie moÅŒna utworzyć katalogu %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Nie moÅŒna skopiować %s do %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
@@ -269 +269 @@
- %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -275 +275 @@
-"Nie moÅŒna określić numeru ramki dla %s (to jeszcze nie oznacza problemu)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -281 +281 @@
-"%s znajduje się w niewiadomym stanie (Nie odnaleziono ukończonej ramki)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -287 +287 @@
-czony (Znaleziono wpis \"Folding@Home Client Shutdown.\")"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s został wstrzymany"
-
-8
+9
-#, c-format
-msgid ""
@@ -301 +301 @@
-"przetworzeniu poprzedniej ramki)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
@@ -307 +307 @@
-cy rozsynchronizowany zegar."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
@@ -313 +313 @@
-"%s wydaje się być zawieszony : Czas przetwarzania to %um, a graniczny to %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/pt_BR.po

@@ -9 +9 @@
-"Project-Id-Version: pt_BR\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2008-02-03 11:48-0300\n"
-"Last-Translator: Custódio Marcelino de Jesus <custodiomdj@gmail.com>\n"
@@ -162 +162 @@
-msgstr "Cliente Desconhecido"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -169 +169 @@
-msgstr "Desconhecido"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Registro não carregado!"
-
-5
+6
-msgid "anonymous"
-msgstr "anÃŽnimo"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -189 +189 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "O diretório %s não existe ou não pode ser lido!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr ""
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Recarregando %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Erro na leitura do %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Erro na leitura do %squeue.dat!"
-
-2
+3
-#, fuzzy, c-format
-msgid "Error while reading %s"
-msgstr "Erro na leitura do %squeue.dat!"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Erro na leitura do %sunitinfo.txt!"
-
-6
+7
-#, fuzzy, c-format
-msgid "Finished Reloading %s"
-msgstr "Recarregando %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "O valor da progressão do arquivo %s não pÎde ser encontrado/processado"
-
-4
+5
-#, fuzzy, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "O valor da progressão do arquivo %s não pÎde ser encontrado/processado"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Impossível gravar %s porque este não existe"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Impossível criar o diretório %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Impossível copiar %s para %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s está no frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -265 +265 @@
-"Impossível determinar o número do frame para %s (isto não é um problema)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s tem um estado desconhecido (impossível encontrar um frame completo)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -276 +276 @@
-"%s foi parado (A linha \"Folding@Home Client Shutdown.\" foi encontrada)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr ""
-
-8
+9
-#, c-format
-msgid ""
@@ -290 +290 @@
-"desde a última frame completa)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s foi marcado como tendo um relógio assíncrono."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
@@ -301 +301 @@
-"%s parece não estar avançando : o tempo decorrido é %um e o limite é %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/pt_PT.po

@@ -9 +9 @@
-"Project-Id-Version: pt_PT\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-20 23:03+0100\n"
-"Last-Translator: Filipe Rodrigues <shello@shello.org>\n"
@@ -163 +163 @@
-msgstr "Cliente Desconhecido"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -170 +170 @@
-msgstr "Desconhecido"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Registo não carregado!"
-
-5
+6
-msgid "anonymous"
-msgstr "anónimo"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -190 +190 @@
-msgstr "N/A"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "A directoria %s não existe ou não pode ser lida!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s não pode ser recarregado (FAHlog.txt não existe)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "Recarregando %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Erro na leitura do %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Erro na leitura do %squeue.dat!"
-
-2
+3
-#, fuzzy, c-format
-msgid "Error while reading %s"
-msgstr "Erro na leitura do %squeue.dat!"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Erro na leitura do %sunitinfo.txt!"
-
-6
+7
-#, fuzzy, c-format
-msgid "Finished Reloading %s"
-msgstr "Recarregando %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
@@ -236 +236 @@
-"O valor da progressão do ficheiro %s não pÎde ser encontrado/processado"
-
-4
+5
-#, fuzzy, c-format
-msgid "The core version in file %s could not be found/parsed"
@@ -242 +242 @@
-"O valor da progressão do ficheiro %s não pÎde ser encontrado/processado"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Impossível gravar %s porque este não existe"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Impossível criar directoria %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Impossível copiar %s para %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s está no frame %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -268 +268 @@
-"Impossível determinar o número do frame para %s (isto não é um problema)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
@@ -275 +275 @@
-"completo)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
@@ -281 +281 @@
-"%s foi parado (A linha \"Folding@Home Client Shutdown.\" foi encontrada)"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s foi suspenso"
-
-8
+9
-#, c-format
-msgid ""
@@ -295 +295 @@
-"desde a última frame completa)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s foi marcado como tendo um relógio assíncrono."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s parece estar bloqueado : o tempo decorrido é %um e o limite é %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/ru_RU.po

@@ -8 +8 @@
-"Project-Id-Version: ru_RU\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-20 23:16+0300\n"
-"Last-Translator: Evgeniy aka Behc <tsc.behc@gmail.com>\n"
@@ -164 +164 @@
-msgstr "НеОзвестМый клОеМт"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -171 +171 @@
-msgstr "НеОзвестМП"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "ЛПг Ме загружеМ!"
-
-5
+6
-msgid "anonymous"
-msgstr "аМПМОЌ"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -191 +191 @@
-msgstr "Н/А"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Папка %s Птсутствует ОлО Ме ЌПжет быть прПчОтаМа!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s МевПзЌПжМП перечОтать! (FAHlog.txt Ме существует)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "ОбМПвОть %s"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "ОшОбка чтеМОя %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "ОшОбка чтеМОя %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "ОшОбка чтеМОя %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "ОшОбка чтеМОя %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "ОбМПвОть %s"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "ЗМачеМОе прПгресса в файле %s Ме МайЎеМП/ПбрабПтаМП"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "ЗМачеМОе прПгресса в файле %s Ме МайЎеМП/Ме ПбрабПтаМП"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
@@ -247 +247 @@
-раМОть %s пПтПЌу чтП ПМ Ме сПзЎаМ."
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "НевПзЌПжМП сПзЎать папку %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "НевПзЌПжМП скПпОрПвать %s в %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
@@ -263 +263 @@
-ПЎОтся Ма шаге %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
@@ -269 +269 @@
-"НевПзЌПжМП ПпреЎелОть кПлОчествП шагПв Ўля %s (этП Ме является прПблеЌПй)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s МеОзвестМый статус (НевПзЌПжМП МайтО закПМчеММый шаг)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s ПстаМПвлеМ (НайЎеМа стрПка \"Folding@Home Client Shutdown.\" )"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s прОПстаМПвлеМ"
-
-8
+9
-#, c-format
-msgid ""
@@ -293 +293 @@
-"пП пПслеЎМеЌу выпПлМеММПЌу шагу)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
@@ -300 +300 @@
-рПММПй МастрПйкПй часПв."
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s вПзЌПжМП завОс: ВреЌя ПкПМчаМОя расчета %um О лОЌОт вреЌеМО %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/po/sv_SE.po

@@ -9 +9 @@
-"Project-Id-Version: sv_SE\n"
-"Report-Msgid-Bugs-To: andrew_s@fahmon.net\n"
-13 21:26
+20 15:38
-"PO-Revision-Date: 2009-03-30 18:45+0100\n"
-"Last-Translator: Olof Persson <floffe@gmail.com>\n"
@@ -164 +164 @@
-msgstr "OkÀnd klient"
-
-7 src/client.cpp:105
+8 src/client.cpp:106
-#: src/listViewClients.cpp:674 src/listViewClients.cpp:708
-#: src/mainDialog.cpp:533 src/mainDialog.cpp:534 src/mainDialog.cpp:535
@@ -171 +171 @@
-msgstr "OkÀnd"
-
-2
+3
-msgid "Log not loaded!"
-msgstr "Logg ej inlÀst!"
-
-5
+6
-msgid "anonymous"
-msgstr "anonym"
-
-0
+1
-#: src/mainDialog.cpp:501 src/mainDialog.cpp:506 src/mainDialog.cpp:507
-#: src/mainDialog.cpp:508 src/mainDialog.cpp:509 src/mainDialog.cpp:510
@@ -191 +191 @@
-msgstr "Ej tillgÀnglig"
-
-0
+1
-#, c-format
-msgid "Directory %s does not exist or cannot be read!"
-msgstr "Katalogen %s finns inte eller kan inte lÀsas!"
-
-3
+4
-#, c-format
-msgid "%s cannot be reloaded! (FAHlog.txt does not exist)"
-msgstr "%s kan inte laddas om! (FAHlog.txt finns inte)"
-
-6
+7
-#, c-format
-msgid "Reloading %s"
-msgstr "LÀser in %s igen"
-
-3
+4
-#, c-format
-msgid "Error while reading %sFAHlog.txt!"
-msgstr "Fel vid inlÀsning av %sFAHlog.txt!"
-
-1
+2
-#, c-format
-msgid "Error while reading %squeue.dat"
-msgstr "Fel vid inlÀsning av %squeue.dat!"
-
-2
+3
-#, c-format
-msgid "Error while reading %s"
-msgstr "Fel vid inlÀsning av %s"
-
-8
+9
-#, c-format
-msgid "Error while reading %sunitinfo.txt!"
-msgstr "Fel vid inlÀsning av %sunitinfo.txt!"
-
-6
+7
-#, c-format
-msgid "Finished Reloading %s"
-msgstr "Uppdatering av %s lyckad"
-
-1
+2
-#, c-format
-msgid "The progress value in file %s could not be found/parsed"
-msgstr "Förloppet kunde inte utlÀsas ur %s"
-
-4
+5
-#, c-format
-msgid "The core version in file %s could not be found/parsed"
-msgstr "KÀrnversionen i %s hittades inte"
-
-79
+80
-#, c-format
-msgid "Unable to save %s because it does not exist"
-msgstr "Kunde inte spara %s för att den inte finns"
-
-6
+7
-#, c-format
-msgid "Unable to create directory %s"
-msgstr "Kunde inte skapa katalogen %s"
-
-599
+600
-#, c-format
-msgid "Unable to copy %s to %s"
-msgstr "Kunde inte kopiera %s till %s"
-
-4
+5
-#, c-format
-msgid "%s is on frame %u"
-msgstr "%s Àr på bildruta %u"
-
-8
+9
-#, c-format
-msgid "Cannot determine frame number for %s (this isn't a problem)"
-msgstr "Kan inte bestÀmma bildruta för %s (det hÀr Àr inget problem)"
-
-2
+3
-#, c-format
-msgid "%s has an unknown state (Unable to find a complete frame)"
-msgstr "%s Àr i okÀnt tillstånd (kunde inte hitta en hel bildruta)"
-
-1
+2
-#, c-format
-msgid "%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"
-msgstr "%s Àr stoppad (hittade raden \"Folding@Home Client Shutdown.\")"
-
-29
+30
-#, c-format
-msgid "%s has been paused"
-msgstr "%s Àr pausad"
-
-8
+9
-#, c-format
-msgid ""
@@ -290 +290 @@
-"avklarade bildruta)"
-
-6
+7
-#, c-format
-msgid "%s has been marked as having a asynchronous clock."
-msgstr "%s har flaggats för en asynkron klocka"
-
-1
+2
-#, c-format
-msgid "%s seems to have hung : Elapsed time is %um and limit is %um"
-msgstr "%s verkar ha hÀngt sig : %um har förflutit och grÀnsen Àr %um"
-
-6
+7
-#, c-format
-msgid "%s seems to be inactive : Elapsed time is %um and limit is %um"

trunk/src/client.cpp

@@ -44 +44 @@
-wxMutex Client::mMutexXYZFiles;
-
+wxMutex Client::mMutexReadWrite;
-
-Client::Client(wxString const &name, wxString const &location, bool enabled, bool VM)
@@ -91 +92 @@
-{
-        mLog            = _("Log not loaded!");
-mState          = ST_INACCESSIBLE
+SetState(ST_INACCESSIBLE)
-        mProgress       = 0;
-        mUserName       = _("anonymous");
@@ -149 +150 @@
-        {
-                mLog = wxString::Format(_("Directory %s does not exist or cannot be read!"), mLocation.c_str());
-mState = ST_INACCESSIBLE
+SetState(ST_INACCESSIBLE)
-                _LogMsgError(mLog);
-                return;
@@ -160 +161 @@
-        else
-        {
-mState = ST_INACCESSIBLE
+SetState(ST_INACCESSIBLE)
-                _LogMsgError(wxString::Format(_("%s cannot be reloaded! (FAHlog.txt does not exist)"), mName.c_str()));
-                return;
@@ -173 +174 @@
-                mLog = wxString::Format(_("Error while reading %sFAHlog.txt!"), mLocation.c_str());
-                _LogMsgError(mLog);
-mState = ST_INACCESSIBLE
+SetState(ST_INACCESSIBLE)
-                return;
-        }
@@ -291 +292 @@
-        // If current project is valid and is found in the benchmarks database, then grab the PPD
-        // Needs to check state too, no point getting PPD for stopped or dead clients.
-mState != ST_STOPPED && mState != ST_INACCESSIBLE && mState != ST_HUNG && mState
+GetState() != ST_STOPPED && GetState() != ST_INACCESSIBLE && GetState() != ST_HUNG && GetState()
-        {
-                if (project != INVALID_PROJECT_ID)
@@ -360 +361 @@
-                }
-        }
-mState != ST_INACCESSIBLE && lastFrame != NULL && mState != ST_STOPPED && mState
+GetState() != ST_INACCESSIBLE && lastFrame != NULL && GetState() != ST_STOPPED && GetState()
-        {
-                if (project != INVALID_PROJECT_ID)
@@ -809 +810 @@
-        if(lastFrame == NULL)
-        {
-mState = ST_INACTIVE
+SetState(ST_INACTIVE)
-                _LogMsgInfo(wxString::Format(_("%s has an unknown state (Unable to find a complete frame)"), mName.c_str()), false);
-                return;
@@ -818 +819 @@
-        if(lastFrame->ClientIsStopped())
-        {
-mState = ST_STOPPED
+SetState(ST_STOPPED)
-                _LogMsgInfo(wxString::Format(_("%s is stopped (The line \"Folding@Home Client Shutdown.\" was found)"), mName.c_str()), false);
-                return;
@@ -826 +827 @@
-        if(lastFrame->ClientIsPaused())
-        {
-mState = ST_PAUSED
+SetState(ST_PAUSED)
-                _LogMsgInfo(wxString::Format(_("%s has been paused"), mName.c_str()), false);
-                return;
@@ -835 +836 @@
-        if(lastFrame->GetElapsedSeconds() == 0)
-        {
-mState = ST_INACTIVE
+SetState(ST_INACTIVE)
-                _LogMsgInfo(wxString::Format(_("%s has an unknown state (Unable to extract a valid elapsed time since the last completed frame)"), mName.c_str()), false);
-                return;
@@ -843 +844 @@
-        if(lastFrame->GetElapsedSeconds() == 65535 && !mVM)
-        {
-mState = ST_ASYNCH
+SetState(ST_ASYNCH)
-                _LogMsgInfo(wxString::Format(_("%s has been marked as having a asynchronous clock."), mName.c_str()), false);
-                return;
@@ -872 +873 @@
-        if(lastFrame->GetElapsedSeconds() < trigger || mVM)
-        {
-mState = ST_RUNNING
+SetState(ST_RUNNING)
-        }
-        else
@@ -878 +879 @@
-                if(lastFrame->GetElapsedSeconds() > 2 * trigger)
-                {
-mState = ST_HUNG
+SetState(ST_HUNG)
-                        _LogMsgWarning(wxString::Format(_("%s seems to have hung : Elapsed time is %um and limit is %um"), mName.c_str(), lastFrame->GetElapsedSeconds()/60, trigger/30), false);
-                }
-                else
-                {
-mState = ST_INACTIVE
+SetState(ST_INACTIVE)
-                        _LogMsgInfo(wxString::Format(_("%s seems to be inactive : Elapsed time is %um and limit is %um"), mName.c_str(), lastFrame->GetElapsedSeconds()/60, trigger/60), false);
-                }
@@ -912 +913 @@
-        return wxString::Format(_T("%s%u"), _T(FMC_URL_FAHINFO), GetProjectId());
-}
+
+
+void Client::SetState(State value)
+{
+        wxMutexLocker lock(Client::mMutexReadWrite);
+        mState = value;
+}
+
+const Client::State Client::GetState(void) const
+{
+        wxMutexLocker lock(mMutexReadWrite);
+        return mState;
+}

trunk/src/include/client.h

@@ -62 +62 @@
-
-        static wxMutex mMutexXYZFiles; /**< Access lock for saving xyz files */
+
+        static wxMutex mMutexReadWrite; /**< Make read/write variables thread-safe */
-
-        ETA        mETA; /**< ETA for project client is working on */
@@ -141 +143 @@
-        void SaveXYZFile(void) const;
-
+        void SetState(State value);
+
+        const State GetState(void) const;
+
-
-public:
@@ -221 +227 @@
-
-        // -- 'Getters' --
-mState
-mState
-mState
-mState
-mState
-mState
-mState
+GetState()
+GetState()
+GetState()
+GetState()
+GetState()
+GetState()
+GetState()
-        wxString          GetName(void)                 const {return mName;} /**< Returns client name */
-        wxString          GetLocation(void)             const {return mLocation;} /**< Returns client location */