pikloops-svn Mailing List for PikLoops: a code generator for delay
Brought to you by:
dionysos-sf
Menu
▾
▴
pikloops-svn — A list to follow the svn commit
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(34) |
Aug
(1) |
Sep
(34) |
Oct
(67) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(1) |
|
From: <ca...@us...> - 2012-12-18 23:03:30
|
Revision: 200
http://pikloops.svn.sourceforge.net/pikloops/?rev=200&view=rev
Author: carcam
Date: 2012-12-18 23:03:23 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Spanish translation
Modified Paths:
--------------
prog/trunk/po/es.po
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2012-10-15 09:14:26 UTC (rev 199)
+++ prog/trunk/po/es.po 2012-12-18 23:03:23 UTC (rev 200)
@@ -6,11 +6,10 @@
msgid ""
msgstr ""
"Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
-"group_id=197487&atid=961666\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=197487&atid=961666\n"
"POT-Creation-Date: 2012-10-15 11:07+0200\n"
-"PO-Revision-Date: 2007-10-15 22:07+0200\n"
-"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
+"PO-Revision-Date: 2012-12-19 00:02+0100\n"
+"Last-Translator: Carlos M. Cámara <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,10 +30,12 @@
"(C) 2007, 2012 Alain Portal\n"
"(C) 2004 JAVIER FERNANDO VARGAS G"
msgstr ""
+"(C) 2007, 2012 Alain Portal\n"
+"(C) 2004 JAVIER FERNANDO VARGAS G"
#: main.cpp:51
msgid "Alain Portal"
-msgstr ""
+msgstr "Alain Portal"
#: main.cpp:52
msgid "Author and maintainer"
@@ -42,7 +43,7 @@
#: main.cpp:54
msgid "Javier Fernando Vargas G"
-msgstr ""
+msgstr "Javier Fernando Vargas G"
#: main.cpp:55
msgid "Original author of PikLoops"
@@ -50,7 +51,7 @@
#: main.cpp:57
msgid "William J. Boucher"
-msgstr ""
+msgstr "William J. Boucher"
#: main.cpp:58
msgid ""
@@ -62,47 +63,47 @@
#: main.cpp:61
msgid "Nicolas Hadacek"
-msgstr ""
+msgstr "Nicolas Hadacek"
#: main.cpp:62
msgid "KDE4 port."
-msgstr ""
+msgstr "KDE4 port."
#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
-msgstr ""
+msgstr "Frecuencia del oscilador PIC en MHz"
#: main.cpp:69
-#, fuzzy
msgid "Requested delay"
-msgstr "Retraso (s) necesario (s)"
+msgstr "Retraso requerido"
#: main.cpp:70
msgid ""
"Time unit of the delay\n"
"Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
+"Unidad de tiempo del retraso\n"
+"Las unidades válidas son: \"s\", \"ms\" y \"us\""
#: main.cpp:100
msgid "\"%1\" isn't a valid time unit.\n"
-msgstr ""
+msgstr "\"%1\" no es una unidad de tiempo válida.\n"
#: main.cpp:101
msgid "Valid units are \"s\", \"ms\" and \"us\""
-msgstr ""
+msgstr "Las unidades válidas son: \"s\", \"ms\" y \"us\""
#: main.cpp:107
msgid "\"%1\" isn't a valid frequency value.\n"
-msgstr ""
+msgstr "\"%1\" no es un valor de frecuencia válida.\n"
#: main.cpp:113
msgid "\"%1\" isn't a valid delay value.\n"
-msgstr ""
+msgstr "\"%1\" noes un valor de retraso válido.\n"
#: mainwidgetpl.cpp:47
-#, fuzzy
msgid "Actual delay: %1%2 (%3 clock cycles)."
-msgstr "Retraso actual: %1 s (%2 ciclos de reloj)"
+msgstr "Retraso real: %1%s (%3 ciclos de reloj)"
#: mainwidgetpl.cpp:53
msgid "Input data"
@@ -114,9 +115,7 @@
#: mainwidgetpl.cpp:72
msgid "Select a standard device clock, or type a custom clock frequency."
-msgstr ""
-"Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de "
-"reloj arbitraria."
+msgstr "Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de reloj arbitraria."
#: mainwidgetpl.cpp:75
msgid "Needed delay (s)"
@@ -124,7 +123,7 @@
#: mainwidgetpl.cpp:84
msgid "Unit"
-msgstr ""
+msgstr "Unidad"
#: mainwidgetpl.cpp:101
msgid "Ouput data"
@@ -138,14 +137,14 @@
msgid "delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:137 mainwidgetpl.cpp:142
+#: mainwidgetpl.cpp:137
+#: mainwidgetpl.cpp:142
msgid "_loop"
msgstr "_bucle"
#: mainwidgetpl.cpp:138
-#, fuzzy
msgid "sub_delay_"
-msgstr "retraso_"
+msgstr "sub_retraso_"
#: mainwidgetpl.cpp:146
msgid "Delay code generated by PikLoops"
@@ -156,12 +155,11 @@
msgstr "ddd MMM-yyyy-dd hh:mm:ss"
#: mainwidgetpl.cpp:151
-#, fuzzy
msgid ""
"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
-"Tiempo de retardo = %1 con Osc = %2MHz\n"
+"Tiempo de retardo = %1%2 con Osc = %3MHz\n"
"\n"
#: mainwidgetpl.cpp:163
@@ -178,23 +176,30 @@
msgid "The lowest delay you can get have to be greater than %1s"
msgstr "El menor retraseo que puede obtener no puede ser mayor de %1s"
-#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
+#: mainwidgetpl.cpp:179
+#: mainwidgetpl.cpp:187
msgid "CounterC"
msgstr "ContadorC"
-#: mainwidgetpl.cpp:195 mainwidgetpl.cpp:207 mainwidgetpl.cpp:214
+#: mainwidgetpl.cpp:195
+#: mainwidgetpl.cpp:207
+#: mainwidgetpl.cpp:214
#: mainwidgetpl.cpp:226
msgid "CounterB"
msgstr "ContadorB"
-#: mainwidgetpl.cpp:199 mainwidgetpl.cpp:204 mainwidgetpl.cpp:218
-#: mainwidgetpl.cpp:223 mainwidgetpl.cpp:233 mainwidgetpl.cpp:238
+#: mainwidgetpl.cpp:199
+#: mainwidgetpl.cpp:204
+#: mainwidgetpl.cpp:218
+#: mainwidgetpl.cpp:223
+#: mainwidgetpl.cpp:233
+#: mainwidgetpl.cpp:238
msgid "CounterA"
msgstr "ContadorA"
#: pikloops.cpp:48
msgid "Copy &All"
-msgstr ""
+msgstr "Copiar &todo"
#: pikloops.cpp:53
msgid "Ca&lculate"
@@ -204,7 +209,7 @@
#. i18n: ectx: Menu (edit)
#: rc.cpp:3
msgid "&Edit"
-msgstr ""
+msgstr "&Editar"
#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
@@ -215,12 +220,12 @@
#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr ""
+msgstr "Su nombre"
#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr ""
+msgstr "Su email"
#~ msgid ""
#~ "_: NAME OF TRANSLATORS\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 09:14:37
|
Revision: 199
http://pikloops.svn.sourceforge.net/pikloops/?rev=199&view=rev
Author: dionysos-sf
Date: 2012-10-15 09:14:26 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Update french langage
Modified Paths:
--------------
prog/trunk/po/fr.po
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2012-10-15 09:09:33 UTC (rev 198)
+++ prog/trunk/po/fr.po 2012-10-15 09:14:26 UTC (rev 199)
@@ -2,20 +2,22 @@
# This file is put in the public domain.
#
# Alain PORTAL <ap...@un...>, 2007.
+# Alain Portal <ala...@un...>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
-"group_id=197487&atid=961666\n"
+"Report-Msgid-Bugs-To: http://sourceforge."
+"net/tracker/?group_id=197487&atid=961666\n"
"POT-Creation-Date: 2012-10-15 11:07+0200\n"
-"PO-Revision-Date: 2007-10-19 17:20+0200\n"
-"Last-Translator: Alain PORTAL <ap...@un...>\n"
-"Language-Team: Français <tr...@tr...>\n"
+"PO-Revision-Date: 2012-10-15 11:11+0200\n"
+"Last-Translator: Alain Portal <ala...@un...>\n"
+"Language-Team: French <tr...@tr...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: main.cpp:43
msgid "PikLoops"
@@ -65,7 +67,7 @@
#: main.cpp:62
msgid "KDE4 port."
-msgstr ""
+msgstr "Portage KDE4."
#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
@@ -198,7 +200,7 @@
#: pikloops.cpp:48
msgid "Copy &All"
-msgstr ""
+msgstr "Tout &copier"
#: pikloops.cpp:53
msgid "Ca&lculate"
@@ -208,7 +210,7 @@
#. i18n: ectx: Menu (edit)
#: rc.cpp:3
msgid "&Edit"
-msgstr ""
+msgstr "&Édition"
#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
@@ -219,19 +221,9 @@
#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr ""
+msgstr "Alain Portal"
#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr ""
-
-#~ msgid ""
-#~ "_: NAME OF TRANSLATORS\n"
-#~ "Your names"
-#~ msgstr "Alain Portal"
-
-#~ msgid ""
-#~ "_: EMAIL OF TRANSLATORS\n"
-#~ "Your emails"
-#~ msgstr "aportal AT univ-montp2 DOT fr"
+msgstr "ala...@un..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 09:09:42
|
Revision: 198
http://pikloops.svn.sourceforge.net/pikloops/?rev=198&view=rev
Author: dionysos-sf
Date: 2012-10-15 09:09:33 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Rebuilt strings
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2012-10-15 09:06:17 UTC (rev 197)
+++ prog/trunk/po/de.po 2012-10-15 09:09:33 UTC (rev 198)
@@ -7,14 +7,14 @@
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=197487&atid=961666\n"
-"POT-Creation-Date: 2012-10-06 19:50-0700\n"
+"POT-Creation-Date: 2012-10-15 11:07+0200\n"
"PO-Revision-Date: 2007-10-15 19:06+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#: main.cpp:43
@@ -27,7 +27,7 @@
#: main.cpp:47
msgid ""
-"(C) 2007 Alain Portal\n"
+"(C) 2007, 2012 Alain Portal\n"
"(C) 2004 JAVIER FERNANDO VARGAS G"
msgstr ""
@@ -59,34 +59,42 @@
"Ursprünglicher PicLoops Autor für Windows.\n"
" Seine Berechnungsformulare haben es möglich gemacht"
-#: main.cpp:64
+#: main.cpp:61
+msgid "Nicolas Hadacek"
+msgstr ""
+
+#: main.cpp:62
+msgid "KDE4 port."
+msgstr ""
+
+#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
msgstr ""
-#: main.cpp:65
+#: main.cpp:69
#, fuzzy
msgid "Requested delay"
msgstr "Benötigte Verzögerung(en)"
-#: main.cpp:66
+#: main.cpp:70
msgid ""
"Time unit of the delay\n"
"Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:96
+#: main.cpp:100
msgid "\"%1\" isn't a valid time unit.\n"
msgstr ""
-#: main.cpp:97
+#: main.cpp:101
msgid "Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:103
+#: main.cpp:107
msgid "\"%1\" isn't a valid frequency value.\n"
msgstr ""
-#: main.cpp:109
+#: main.cpp:113
msgid "\"%1\" isn't a valid delay value.\n"
msgstr ""
@@ -183,22 +191,32 @@
msgid "CounterA"
msgstr "ZählerA"
-#: pikloops.cpp:51
+#: pikloops.cpp:48
+msgid "Copy &All"
+msgstr ""
+
+#: pikloops.cpp:53
msgid "Ca&lculate"
msgstr "&Berechne "
-#. i18n: file: pikloopsui.rc:4
+#. i18n: file: pikloopsui.rc:6
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:3
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
-#: rc.cpp:3
+#: rc.cpp:6
msgid "&Actions"
msgstr "&Aktionen "
-#: rc.cpp:4
+#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: rc.cpp:5
+#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2012-10-15 09:06:17 UTC (rev 197)
+++ prog/trunk/po/es.po 2012-10-15 09:09:33 UTC (rev 198)
@@ -8,14 +8,14 @@
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=197487&atid=961666\n"
-"POT-Creation-Date: 2012-10-06 19:50-0700\n"
+"POT-Creation-Date: 2012-10-15 11:07+0200\n"
"PO-Revision-Date: 2007-10-15 22:07+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
-"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
"Plural-Forms: \n"
#: main.cpp:43
@@ -28,7 +28,7 @@
#: main.cpp:47
msgid ""
-"(C) 2007 Alain Portal\n"
+"(C) 2007, 2012 Alain Portal\n"
"(C) 2004 JAVIER FERNANDO VARGAS G"
msgstr ""
@@ -60,34 +60,42 @@
"Autor del PicLoops original para Windows \n"
"Sus fórmulas de cálculo lo hicieron posible."
-#: main.cpp:64
+#: main.cpp:61
+msgid "Nicolas Hadacek"
+msgstr ""
+
+#: main.cpp:62
+msgid "KDE4 port."
+msgstr ""
+
+#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
msgstr ""
-#: main.cpp:65
+#: main.cpp:69
#, fuzzy
msgid "Requested delay"
msgstr "Retraso (s) necesario (s)"
-#: main.cpp:66
+#: main.cpp:70
msgid ""
"Time unit of the delay\n"
"Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:96
+#: main.cpp:100
msgid "\"%1\" isn't a valid time unit.\n"
msgstr ""
-#: main.cpp:97
+#: main.cpp:101
msgid "Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:103
+#: main.cpp:107
msgid "\"%1\" isn't a valid frequency value.\n"
msgstr ""
-#: main.cpp:109
+#: main.cpp:113
msgid "\"%1\" isn't a valid delay value.\n"
msgstr ""
@@ -184,22 +192,32 @@
msgid "CounterA"
msgstr "ContadorA"
-#: pikloops.cpp:51
+#: pikloops.cpp:48
+msgid "Copy &All"
+msgstr ""
+
+#: pikloops.cpp:53
msgid "Ca&lculate"
msgstr "Ca&lcular"
-#. i18n: file: pikloopsui.rc:4
+#. i18n: file: pikloopsui.rc:6
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:3
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
-#: rc.cpp:3
+#: rc.cpp:6
msgid "&Actions"
msgstr "&Acciones"
-#: rc.cpp:4
+#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: rc.cpp:5
+#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2012-10-15 09:06:17 UTC (rev 197)
+++ prog/trunk/po/fr.po 2012-10-15 09:09:33 UTC (rev 198)
@@ -7,14 +7,14 @@
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=197487&atid=961666\n"
-"POT-Creation-Date: 2012-10-06 19:50-0700\n"
+"POT-Creation-Date: 2012-10-15 11:07+0200\n"
"PO-Revision-Date: 2007-10-19 17:20+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#: main.cpp:43
@@ -27,7 +27,7 @@
#: main.cpp:47
msgid ""
-"(C) 2007 Alain Portal\n"
+"(C) 2007, 2012 Alain Portal\n"
"(C) 2004 JAVIER FERNANDO VARGAS G"
msgstr ""
@@ -59,15 +59,23 @@
"Auteur original de Picloops pour Windows.\n"
"Ses formules de calcul l'ont rendu possible."
-#: main.cpp:64
+#: main.cpp:61
+msgid "Nicolas Hadacek"
+msgstr ""
+
+#: main.cpp:62
+msgid "KDE4 port."
+msgstr ""
+
+#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
msgstr "Fréquence, en MHz, de l'oscillateur du PIC"
-#: main.cpp:65
+#: main.cpp:69
msgid "Requested delay"
msgstr "Temporisation souhaitée"
-#: main.cpp:66
+#: main.cpp:70
msgid ""
"Time unit of the delay\n"
"Valid units are \"s\", \"ms\" and \"us\""
@@ -75,19 +83,19 @@
"Unité de temps de la temporisation\n"
"Les unités valides sont « s », « ms » et « us »"
-#: main.cpp:96
+#: main.cpp:100
msgid "\"%1\" isn't a valid time unit.\n"
msgstr "« %1 » n'est pas une unité de temps valide.\n"
-#: main.cpp:97
+#: main.cpp:101
msgid "Valid units are \"s\", \"ms\" and \"us\""
msgstr "Les unités valides sont « s », « ms » et « us »"
-#: main.cpp:103
+#: main.cpp:107
msgid "\"%1\" isn't a valid frequency value.\n"
msgstr "« %1 » n'est pas une valeur de fréquence valide.\n"
-#: main.cpp:109
+#: main.cpp:113
msgid "\"%1\" isn't a valid delay value.\n"
msgstr "« %1 » n'est pas une valeur de temporisation valide.\n"
@@ -171,8 +179,8 @@
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
-"La plus petite temporisation que vous pouvez obtenir doit être supérieure à "
-"%1s"
+"La plus petite temporisation que vous pouvez obtenir doit être supérieure à %"
+"1s"
#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
msgid "CounterC"
@@ -188,22 +196,32 @@
msgid "CounterA"
msgstr "Compteur_A"
-#: pikloops.cpp:51
+#: pikloops.cpp:48
+msgid "Copy &All"
+msgstr ""
+
+#: pikloops.cpp:53
msgid "Ca&lculate"
msgstr "Ca&lculer"
-#. i18n: file: pikloopsui.rc:4
+#. i18n: file: pikloopsui.rc:6
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:3
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
-#: rc.cpp:3
+#: rc.cpp:6
msgid "&Actions"
msgstr "&Actions"
-#: rc.cpp:4
+#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: rc.cpp:5
+#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2012-10-15 09:06:17 UTC (rev 197)
+++ prog/trunk/po/pikloops.pot 2012-10-15 09:09:33 UTC (rev 198)
@@ -9,11 +9,10 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=197487&atid=961666\n"
-"POT-Creation-Date: 2012-10-06 19:50-0700\n"
+"POT-Creation-Date: 2012-10-15 11:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +27,7 @@
#: main.cpp:47
msgid ""
-"(C) 2007 Alain Portal\n"
+"(C) 2007, 2012 Alain Portal\n"
"(C) 2004 JAVIER FERNANDO VARGAS G"
msgstr ""
@@ -58,33 +57,41 @@
"His Calculations Formulas made it possible."
msgstr ""
-#: main.cpp:64
+#: main.cpp:61
+msgid "Nicolas Hadacek"
+msgstr ""
+
+#: main.cpp:62
+msgid "KDE4 port."
+msgstr ""
+
+#: main.cpp:68
msgid "Frequency of the PIC oscillator in MHz"
msgstr ""
-#: main.cpp:65
+#: main.cpp:69
msgid "Requested delay"
msgstr ""
-#: main.cpp:66
+#: main.cpp:70
msgid ""
"Time unit of the delay\n"
"Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:96
+#: main.cpp:100
msgid "\"%1\" isn't a valid time unit.\n"
msgstr ""
-#: main.cpp:97
+#: main.cpp:101
msgid "Valid units are \"s\", \"ms\" and \"us\""
msgstr ""
-#: main.cpp:103
+#: main.cpp:107
msgid "\"%1\" isn't a valid frequency value.\n"
msgstr ""
-#: main.cpp:109
+#: main.cpp:113
msgid "\"%1\" isn't a valid delay value.\n"
msgstr ""
@@ -174,22 +181,32 @@
msgid "CounterA"
msgstr ""
-#: pikloops.cpp:51
+#: pikloops.cpp:48
+msgid "Copy &All"
+msgstr ""
+
+#: pikloops.cpp:53
msgid "Ca&lculate"
msgstr ""
-#. i18n: file: pikloopsui.rc:4
+#. i18n: file: pikloopsui.rc:6
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:3
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: pikloopsui.rc:10
#. i18n: ectx: Menu (Actions)
-#: rc.cpp:3
+#: rc.cpp:6
msgid "&Actions"
msgstr ""
-#: rc.cpp:4
+#: rc.cpp:7
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: rc.cpp:5
+#: rc.cpp:8
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 09:06:23
|
Revision: 197
http://pikloops.svn.sourceforge.net/pikloops/?rev=197&view=rev
Author: dionysos-sf
Date: 2012-10-15 09:06:17 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Credited Nicolas for the KDE4 port
Modified Paths:
--------------
prog/trunk/src/main.cpp
Modified: prog/trunk/src/main.cpp
===================================================================
--- prog/trunk/src/main.cpp 2012-10-15 08:31:37 UTC (rev 196)
+++ prog/trunk/src/main.cpp 2012-10-15 09:06:17 UTC (rev 197)
@@ -44,7 +44,7 @@
VERSION,
ki18n("Pic Delay Calculator"),
KAboutData::License_GPL,
- ki18n("(C) 2007 Alain Portal\n(C) 2004 JAVIER FERNANDO VARGAS G"),
+ ki18n("(C) 2007, 2012 Alain Portal\n(C) 2004 JAVIER FERNANDO VARGAS G"),
KLocalizedString(),
"http://pikloops.sf.net",
"dio...@us...");
@@ -58,6 +58,10 @@
ki18n("Author of the original PicLoops for Windows.\nHis Calculations Formulas made it possible."),
"bo...@mn...",
"http://www.mnsi.net/~boucher/emporium.htm");
+ about.addCredit(ki18n("Nicolas Hadacek"),
+ ki18n("KDE4 port."),
+ "ha...@kd...",
+ "http://www.piklab.org");
KCmdLineArgs::init(argc, argv, &about);
KCmdLineOptions options;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 08:31:46
|
Revision: 196
http://pikloops.svn.sourceforge.net/pikloops/?rev=196&view=rev
Author: dionysos-sf
Date: 2012-10-15 08:31:37 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
KDE4 icons
Modified Paths:
--------------
prog/trunk/src/pikloops.cpp
Modified: prog/trunk/src/pikloops.cpp
===================================================================
--- prog/trunk/src/pikloops.cpp 2012-10-15 08:27:33 UTC (rev 195)
+++ prog/trunk/src/pikloops.cpp 2012-10-15 08:31:37 UTC (rev 196)
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *#
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the
* Free Software Foundation, Inc.,
@@ -46,12 +46,12 @@
KAction* action = actionCollection()->addAction("copy_all", this, SLOT(slotCopy()));
action->setText(i18n("Copy &All"));
- action->setIcon(KIcon("copy"));
+ action->setIcon(KIcon("edit-copy"));
action->setShortcut(Qt::CTRL + Qt::Key_A);
action = actionCollection()->addAction("calculate", this, SLOT(slotCalculate()));
action->setText(i18n("Ca&lculate"));
- action->setIcon(KIcon("kcalc"));
+ action->setIcon(KIcon("accessories-calculator"));
action->setShortcut(Qt::CTRL + Qt::Key_L);
KStandardAction::quit(kapp, SLOT(closeAllWindows()), actionCollection());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 08:27:42
|
Revision: 195
http://pikloops.svn.sourceforge.net/pikloops/?rev=195&view=rev
Author: dionysos-sf
Date: 2012-10-15 08:27:33 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Add po files
Modified Paths:
--------------
prog/trunk/CMakeLists.txt
Modified: prog/trunk/CMakeLists.txt
===================================================================
--- prog/trunk/CMakeLists.txt 2012-10-15 08:25:39 UTC (rev 194)
+++ prog/trunk/CMakeLists.txt 2012-10-15 08:27:33 UTC (rev 195)
@@ -18,6 +18,7 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_subdirectory(src)
+add_subdirectory(po)
add_subdirectory(doc)
install(FILES ChangeLog COPYING NEWS DESTINATION share/doc/pikloops)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 08:25:48
|
Revision: 194
http://pikloops.svn.sourceforge.net/pikloops/?rev=194&view=rev
Author: dionysos-sf
Date: 2012-10-15 08:25:39 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Remove no more needed directory
Removed Paths:
-------------
prog/trunk/admin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2012-10-15 08:04:43
|
Revision: 193
http://pikloops.svn.sourceforge.net/pikloops/?rev=193&view=rev
Author: dionysos-sf
Date: 2012-10-15 08:04:32 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Usefull script to build ChangeLog
Added Paths:
-----------
prog/trunk/svn2cl.sh
Added: prog/trunk/svn2cl.sh
===================================================================
--- prog/trunk/svn2cl.sh (rev 0)
+++ prog/trunk/svn2cl.sh 2012-10-15 08:04:32 UTC (rev 193)
@@ -0,0 +1,13 @@
+#!/bin/sh
+if [[ $(whereis svn2cl) == "svn2cl:" ]]
+then
+ echo "SCRIPT WARNING!"
+ echo "svn2cl isn't installed on your machine, so, you can't use this script."
+ echo "If you want to use this script, install svn2cl."
+ echo "You can find it at: http://ch.tudelft.nl/~arthur/svn2cl/"
+ echo "but a package probably exist for your distribution."
+ echo "ChangeLog isn't changed."
+ exit 1
+fi
+
+svn2cl --authors=./authors.xml
Property changes on: prog/trunk/svn2cl.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-14 23:26:25
|
Revision: 192
http://pikloops.svn.sourceforge.net/pikloops/?rev=192&view=rev
Author: azhyd
Date: 2012-10-14 23:26:14 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
ported to KDE4
Modified Paths:
--------------
prog/trunk/INSTALL
prog/trunk/NEWS
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
prog/trunk/src/gqtextedit.cpp
prog/trunk/src/gqtextedit.h
prog/trunk/src/main.cpp
prog/trunk/src/mainwidgetpl.cpp
prog/trunk/src/mainwidgetpl.h
prog/trunk/src/pikloops.cpp
prog/trunk/src/pikloops.h
prog/trunk/src/pikloopsui.rc
Added Paths:
-----------
prog/trunk/CMakeLists.txt
prog/trunk/config.h.cmake
prog/trunk/doc/CMakeLists.txt
prog/trunk/doc/en/CMakeLists.txt
prog/trunk/doc/fr/CMakeLists.txt
prog/trunk/pikloops.kdev4
prog/trunk/po/CMakeLists.txt
prog/trunk/po/extract-messages.sh
prog/trunk/src/CMakeLists.txt
Removed Paths:
-------------
prog/trunk/Makefile.am
prog/trunk/Makefile.dist
prog/trunk/README
prog/trunk/TODO
prog/trunk/admin/Doxyfile.am
prog/trunk/admin/Doxyfile.global
prog/trunk/admin/Makefile.common
prog/trunk/admin/acinclude.m4.in
prog/trunk/admin/am_edit
prog/trunk/admin/bcheck.pl
prog/trunk/admin/compile
prog/trunk/admin/conf.change.pl
prog/trunk/admin/config.guess
prog/trunk/admin/config.pl
prog/trunk/admin/config.sub
prog/trunk/admin/configure.in.bot.end
prog/trunk/admin/configure.in.min
prog/trunk/admin/cvs.sh
prog/trunk/admin/debianrules
prog/trunk/admin/depcomp
prog/trunk/admin/deps.am
prog/trunk/admin/detect-autoconf.pl
prog/trunk/admin/doxygen.sh
prog/trunk/admin/install-sh
prog/trunk/admin/libtool.m4.in
prog/trunk/admin/ltmain.sh
prog/trunk/admin/missing
prog/trunk/admin/mkinstalldirs
prog/trunk/admin/nmcheck
prog/trunk/admin/oldinclude.m4.in
prog/trunk/admin/pkg.m4.in
prog/trunk/admin/ylwrap
prog/trunk/configure.in.in
prog/trunk/doc/Makefile.am
prog/trunk/doc/en/Makefile.am
prog/trunk/doc/fr/Makefile.am
prog/trunk/pikloops.kdevelop
prog/trunk/po/Makefile.am
prog/trunk/src/Makefile.am
prog/trunk/svn2cl.sh
Added: prog/trunk/CMakeLists.txt
===================================================================
--- prog/trunk/CMakeLists.txt (rev 0)
+++ prog/trunk/CMakeLists.txt 2012-10-14 23:26:14 UTC (rev 192)
@@ -0,0 +1,23 @@
+project(pikloops)
+set(VERSION "0.3.0")
+
+cmake_minimum_required(VERSION 2.4)
+if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+ cmake_policy(SET CMP0011 NEW)
+endif(COMMAND cmake_policy)
+
+find_package(Qt4 REQUIRED)
+set(QT_USE_QT3SUPPORT 1)
+include(${QT_USE_FILE})
+
+find_package(KDE4 REQUIRED)
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories( ${KDE4_INCLUDES})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+add_subdirectory(src)
+add_subdirectory(doc)
+
+install(FILES ChangeLog COPYING NEWS DESTINATION share/doc/pikloops)
Modified: prog/trunk/INSTALL
===================================================================
--- prog/trunk/INSTALL 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/INSTALL 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,167 +1,6 @@
-Basic Installation
-==================
+COMPILATION:
+ - "cmake ."
+ - "make"
- These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes a while. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Type `make install' to install the programs and any data files and
- documentation.
-
- 4. You can remove the program binaries and object files from the
- source code directory by typing `make clean'.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
- CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
-
-`--help'
- Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
+INSTALLATION:
+ - "make install" (as root)
Deleted: prog/trunk/Makefile.am
===================================================================
--- prog/trunk/Makefile.am 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/Makefile.am 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,29 +0,0 @@
-####### kdevelop will overwrite this part!!! (begin)##########
-
-SUBDIRS = src po doc
-
-EXTRA_DIST = admin/* AUTHORS COPYING ChangeLog INSTALL NEWS README TODO pikloops.lsm pikloops.spec
-
-####### kdevelop will overwrite this part!!! (end)############
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-
-package-messages:
- $(MAKE) -f admin/Makefile.common package-messages
- $(MAKE) -C po merge
-
-dist-hook:
- cd $(top_distdir) && perl admin/am_edit -padmin
- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
Deleted: prog/trunk/Makefile.dist
===================================================================
--- prog/trunk/Makefile.dist 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/Makefile.dist 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,14 +0,0 @@
-all:
- @echo "This Makefile is only for the CVS repository"
- @echo "This will be deleted before making the distribution"
- @echo ""
- @if test ! -d admin; then \
- echo "Please recheckout this module!" ;\
- echo "for cvs: use checkout once and after that update again" ;\
- echo "for cvsup: checkout kde-common from cvsup and" ;\
- echo " link kde-common/admin to ./admin" ;\
- exit 1 ;\
- fi
- $(MAKE) -f admin/Makefile.common cvs
-
-.SILENT:
Modified: prog/trunk/NEWS
===================================================================
--- prog/trunk/NEWS 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/NEWS 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,3 +1,6 @@
+Version 0.3.1:
+ Ported to KDE4 (Nicolas Hadacek)
+
Version 0.3.0 :
New feature: a time unit selector
New feature: delay, frequency and time unit can be add on the command line
Deleted: prog/trunk/README
===================================================================
--- prog/trunk/README 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/README 2012-10-14 23:26:14 UTC (rev 192)
@@ -1 +0,0 @@
-
Deleted: prog/trunk/TODO
===================================================================
--- prog/trunk/TODO 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/TODO 2012-10-14 23:26:14 UTC (rev 192)
@@ -1 +0,0 @@
-
Deleted: prog/trunk/admin/Doxyfile.am
===================================================================
--- prog/trunk/admin/Doxyfile.am 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/admin/Doxyfile.am 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,102 +0,0 @@
-## generate API documentation with doxygen
-apidox-am-yes:
- @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
- export DOXDATA=$(kde_libs_htmldir)/en/common ; \
- fi ; \
- abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
- test -d $(top_builddir)/apidocs || \
- ( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
- --no-modulename --installdir=$(kde_libs_htmldir)/en \
- --no-recurse $(abs_top_srcdir) . ) ; \
- cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
- --recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
- $$abs_top_srcdir $(subdir)
-
-apidox-am-toplevel-yes:
- @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
- export DOXDATA=$(kde_libs_htmldir)/en/common ; \
- fi ; \
- abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
- cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
- --no-modulename --installdir=$(kde_libs_htmldir)/en \
- $$abs_top_srcdir
-
-## Don't generate API documentation without doxygen
-apidox-am-no:
-
-apidox-am-toplevel-no:
-
-
-apidox:
- @if test "$(subdir)" != "."; then \
- $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\
- else \
- $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\
- fi
-
-
-
-install-data-local: install-apidox
-
-## install API documentation
-install-apidox:
- @if test "$(subdir)" != "."; then \
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
- if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
- echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
- $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
- fi; \
- if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
- list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
- echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
- for file in $$list; do \
- $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
- done; \
- fi; \
- else\
- if test -d $(top_builddir)/apidocs; then \
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
- list=`cd $(top_builddir)/apidocs && ls -1`; \
- echo "installing $(top_builddir)/apidocs/$$file" ;\
- echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
- for file in $$list; do \
- if test -f $(top_builddir)/apidocs/$$file; then \
- $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
- fi; \
- done ; fi; \
- fi
-
-uninstall-local: uninstall-apidox
-
-## uninstall API documentation
-uninstall-apidox:
- @if test "$(subdir)" != "."; then \
- if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
- fi \
- else \
- if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
- fi \
- fi
-
-install-apidox-recurse: install-apidox
- @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
- list='$(SUBDIRS)'; \
- for subdir in $$list; do \
- if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
- echo "Installing apidox from $$subdir"; \
- if test "$$subdir" != "."; then \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
- fi ; fi ;\
- done; \
- fi
-
-
-
-.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
-
-
-# Local Variables:
-# mode: makefile
-# End:
Deleted: prog/trunk/admin/Doxyfile.global
===================================================================
--- prog/trunk/admin/Doxyfile.global 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/admin/Doxyfile.global 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,192 +0,0 @@
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
-BRIEF_MEMBER_DESC = NO
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = YES
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = YES
-MULTILINE_CPP_IS_BRIEF = NO
-INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 4
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-SUBGROUPING = YES
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-QUIET = YES
-WARNINGS = NO
-WARN_IF_UNDOCUMENTED = NO
-WARN_IF_DOC_ERROR = YES
-WARN_FORMAT =
-WARN_LOGFILE =
-INPUT =
-FILE_PATTERNS = *.h \
- *.cpp \
- *.cc \
- *.hpp \
- *.dox \
- *.c++ \
- *.cxx \
- *.h++ \
- *.hh
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = *.moc.* \
- moc* \
- *.all_cpp.* \
- *unload.* \
- */test/* \
- */tests/* \
- *_p.h
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = NO
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-VERBATIM_HEADERS = YES
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 3
-HTML_OUTPUT =
-HTML_FILE_EXTENSION = .html
-HTML_HEADER = ../apidocs/common/header.html
-HTML_FOOTER = ../apidocs/common/footer.html
-HTML_STYLESHEET = ../apidocs/common/doxygen.css
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = YES
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-GENERATE_LATEX = NO
-LATEX_OUTPUT =
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-GENERATE_RTF = NO
-RTF_OUTPUT =
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-GENERATE_MAN = NO
-MAN_OUTPUT =
-MAN_EXTENSION = .kde3
-MAN_LINKS = YES
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = NO
-GENERATE_AUTOGEN_DEF = NO
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-ENABLE_PREPROCESSING = YES
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED = QT_VERSION=320 \
- __cplusplus \
- Q_WS_X11
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = NO
-PERL_PATH =
-CLASS_DIAGRAMS = YES
-HIDE_UNDOC_RELATIONS = NO
-HAVE_DOT = NO
-UML_LOOK = NO
-TEMPLATE_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 800
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 0
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-SEARCHENGINE = NO
-
-### KDE Settings
-ALIASES = \
- "intern=\par<b>Internal use only.</b>" \
- "reimp=\par<b>Reimplemented from superclass.</b>" \
- "obsolete=@deprecated" \
- "feature=\xrefitem features \"Feature(s)\" \"Features\"" \
- "maintainer=\xrefitem maintainers \"Maintainer(s)\" \"Maintainers\"" \
- "unmaintained=\xrefitem unmaintained \"Unmaintained\" \"Unmaintained\"" \
- "requirement=\xrefitem requirements \"Requirement(s)\" \"Requirements\"" \
- "faq=\xrefitem FAQ \"F.A.Q.\" \"F.A.Q.\"" \
- "authors=\xrefitem authors \"Author(s)\" \"Authors\"" \
- "FIXME=\xrefitem fixme \"Fixme\" \"Fixme\""
-
-HTML_ALIGN_MEMBERS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = NO
-VERBATIM_HEADERS = NO
-GENERATE_HTML = YES
-SOURCE_BROWSER = YES
-GENERATE_AUTOGEN_DEF = NO
-DETAILS_AT_TOP = YES
-SORT_MEMBER_DOCS = YES
-GENERATE_TODOLIST = YES
-IGNORE_PREFIX = K
-GENERATE_HTML = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = NO
-
-
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = YES
-
Deleted: prog/trunk/admin/Makefile.common
===================================================================
--- prog/trunk/admin/Makefile.common 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/admin/Makefile.common 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,37 +0,0 @@
-### Makefile.common
-###
-### Copyright (C) 2002 by the KDE developers
-
-### All the real work is done by the shellscript cvs.sh
-
-SHELL=/bin/sh
-
-cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
- @admindir=$(admindir); \
- if test "x$$admindir" = x; then \
- admindir=.; until test -f $$admindir/admin/cvs.sh; do \
- admindir=$$admindir/..; \
- if test `cd $$admindir && pwd` = / ; then break; fi; \
- done; \
- admindir=$$admindir/admin; \
- if test -f $$admindir/cvs.sh; then :; else \
- echo "Can't find the admin/ directory in any parent of the"; \
- echo "current directory. Please set it with admindir=..."; \
- exit 1; \
- fi; \
- fi; \
- if test "$@" = "package-merge"; then \
- MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
- $(SHELL) $$admindir/cvs.sh package-merge ;\
- else \
- MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
- fi
-
-configure.in: configure.files subdirs
-configure.files: subdirs
-
-svn: cvs
-
-.SILENT:
-
-.PHONY: svn cvs dist package-merge package-messages
Deleted: prog/trunk/admin/acinclude.m4.in
===================================================================
--- prog/trunk/admin/acinclude.m4.in 2012-10-12 18:03:19 UTC (rev 191)
+++ prog/trunk/admin/acinclude.m4.in 2012-10-14 23:26:14 UTC (rev 192)
@@ -1,5972 +0,0 @@
-## -*- autoconf -*-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (ch...@sh...)
-dnl (C) 1997,98,99 Stephan Kulow (co...@kd...)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository.
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
- # Guess where to find include files, by looking for this one X11 .h file.
- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
- # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
- /usr/X11/include \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11 \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- ac_x_includes=$ac_dir
- break
- fi
- done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
- # Check for the libraries.
-
- test -z "$x_direct_test_library" && x_direct_test_library=Xt
- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
- /usr/X11/lib${kdelibsuff} \
- /usr/X11R6/lib${kdelibsuff} \
- /usr/X11R5/lib${kdelibsuff} \
- /usr/X11R4/lib${kdelibsuff} \
- \
- /usr/lib${kdelibsuff}/X11 \
- /usr/lib${kdelibsuff}/X11R6 \
- /usr/lib${kdelibsuff}/X11R5 \
- /usr/lib${kdelibsuff}/X11R4 \
- \
- /usr/local/X11/lib${kdelibsuff} \
- /usr/local/X11R6/lib${kdelibsuff} \
- /usr/local/X11R5/lib${kdelibsuff} \
- /usr/local/X11R4/lib${kdelibsuff} \
- \
- /usr/local/lib${kdelibsuff}/X11 \
- /usr/local/lib${kdelibsuff}/X11R6 \
- /usr/local/lib${kdelibsuff}/X11R5 \
- /usr/local/lib${kdelibsuff}/X11R4 \
- \
- /usr/X386/lib${kdelibsuff} \
- /usr/x386/lib${kdelibsuff} \
- /usr/XFree86/lib${kdelibsuff}/X11 \
- \
- /usr/lib${kdelibsuff} \
- /usr/local/lib${kdelibsuff} \
- /usr/unsupported/lib${kdelibsuff} \
- /usr/athena/lib${kdelibsuff} \
- /usr/local/x11r5/lib${kdelibsuff} \
- /usr/lpp/Xamples/lib${kdelibsuff} \
- /lib/usr/lib${kdelibsuff}/X11 \
- \
- /usr/openwin/lib${kdelibsuff} \
- /usr/openwin/share/lib${kdelibsuff} \
- ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-dnl if-not-found, test-parameter, prepend-path)
-dnl
-dnl Look for program-name in list-of-dirs+$PATH.
-dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-dnl test-parameter: if set, the program is executed with this arg,
-dnl and only a successful exit code is required.
-AC_DEFUN([KDE_FIND_PATH],
-[
- AC_MSG_CHECKING([for $1])
- if test -n "$$2"; then
- kde_cv_path="$$2";
- else
- kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
- AC_CACHE_VAL(kde_cv_path_$kde_cache,
- [
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- dirs=""
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- if test -z "$6"; then dnl Append dirs in PATH (default)
- dirs="$3 $dirs"
- else dnl Prepend dirs in PATH (if 6th arg is set)
- dirs="$dirs $3"
- fi
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/$1"
- break
- fi
- else
- kde_cv_path="$dir/$1"
- break
- fi
- fi
- done
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
- ])
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
- fi
-
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($kde_cv_path)
- $2=$kde_cv_path
-
- fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
- AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
- AC_MSG_CHECKING([whether uic supports -$1 ])
- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
- AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
- [
- cat >conftest.ui <<EOT
- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
- ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
- if AC_TRY_EVAL(ac_uic_testrun); then
- eval "kde_cv_prog_uic_$kde_cache=yes"
- else
- eval "kde_cv_prog_uic_$kde_cache=no"
- fi
- rm -f conftest*
- ])
-
- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT([yes])
- :
- $3
- else
- AC_MSG_RESULT([no])
- :
- $4
- fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
-[
- AC_REQUIRE([KDE_CHECK_PERL])
- qt_bindirs=""
- for dir in $kde_qt_dirs; do
- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
- done
- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
- if test ! "$ac_qt_bindir" = "NO"; then
- qt_bindirs="$ac_qt_bindir $qt_bindirs"
- fi
-
- KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
- if test -z "$UIC_NOT_NEEDED"; then
- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
- if test -z "$UIC_PATH" ; then
- KDE_UIC_ERROR_MESSAGE
- exit 1
- else
- UIC=$UIC_PATH
-
- if test $kde_qtver = 3; then
- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
- if test x$ac_uic_supports_libpath = xyes; then
- UIC="$UIC -L \$(kde_widgetdir)"
- fi
- if test x$ac_uic_supports_nounload = xyes; then
- UIC="$UIC -nounload"
- fi
- fi
- fi
- else
- UIC="echo uic not available: "
- fi
-
- AC_SUBST(MOC)
- AC_SUBST(UIC)
-
- UIC_TR="i18n"
- if test $kde_qtver = 3; then
- UIC_TR="tr2i18n"
- fi
-
- AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
- KDE_1_CHECK_PATH_HEADERS
-
- KDE_TEST_RPATH=
-
- if test -n "$USE_RPATH"; then
-
- if test -n "$kde_libraries"; then
- KDE_TEST_RPATH="-R $kde_libraries"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
- fi
-
- if test -n "$x_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
- fi
-
- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
- fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
- kde_result=done
-else
- kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
- kde_htmldir=\"$kde_htmldir\" \
- kde_appsdir=\"$kde_appsdir\" \
- kde_icondir=\"$kde_icondir\" \
- kde_sounddir=\"$kde_sounddir\" \
- kde_datadir=\"$kde_datadir\" \
- kde_locale=\"$kde_locale\" \
- kde_cgidir=\"$kde_cgidir\" \
- kde_confdir=\"$kde_confdir\" \
- kde_kcfgdir=\"$kde_kcfgdir\" \
- kde_mimedir=\"$kde_mimedir\" \
- kde_toolbardir=\"$kde_toolbardir\" \
- kde_wallpaperdir=\"$kde_wallpaperdir\" \
- kde_templatesdir=\"$kde_templatesdir\" \
- kde_bindir=\"$kde_bindir\" \
- kde_servicesdir=\"$kde_servicesdir\" \
- kde_servicetypesdir=\"$kde_servicetypesdir\" \
- kde_moduledir=\"$kde_moduledir\" \
- kde_styledir=\"$kde_styledir\" \
- kde_widgetdir=\"$kde_widgetdir\" \
- xdg_appsdir=\"$xdg_appsdir\" \
- xdg_menudir=\"$xdg_menudir\" \
- xdg_directorydir=\"$xdg_directorydir\" \
- kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
- if test -z "$kde_htmldir"; then
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\${datadir}/applnk'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
- fi
- if test -z "$kde_sounddir"; then
- kde_sounddir='\${datadir}/sounds'
- fi
- if test -z "$kde_datadir"; then
- kde_datadir='\${datadir}/apps'
- fi
- if test -z "$kde_locale"; then
- kde_locale='\${datadir}/locale'
- fi
- if test -z "$kde_cgidir"; then
- kde_cgidir='\${exec_prefix}/cgi-bin'
- fi
- if test -z "$kde_confdir"; then
- kde_confdir='\${datadir}/config'
- fi
- if test -z "$kde_kcfgdir"; then
- kde_kcfgdir='\${datadir}/config.kcfg'
- fi
- if test -z "$kde_mimedir"; then
- kde_mimedir='\${datadir}/mimelnk'
- fi
- if test -z "$kde_toolbardir"; then
- kde_toolbardir='\${datadir}/toolbar'
- fi
- if test -z "$kde_wallpaperdir"; then
- kde_wallpaperdir='\${datadir}/wallpapers'
- fi
- if test -z "$kde_templatesdir"; then
- kde_templatesdir='\${datadir}/templates'
- fi
- if test -z "$kde_bindir"; then
- kde_bindir='\${exec_prefix}/bin'
- fi
- if test -z "$kde_servicesdir"; then
- kde_servicesdir='\${datadir}/services'
- fi
- if test -z "$kde_servicetypesdir"; then
- kde_servicetypesdir='\${datadir}/servicetypes'
- fi
- if test -z "$kde_moduledir"; then
- if test "$kde_qtver" = "2"; then
- kde_moduledir='\${libdir}/kde2'
- else
- kde_moduledir='\${libdir}/kde3'
- fi
- fi
- if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/kde3/plugins/styles'
- fi
- if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
- fi
- if test -z "$xdg_appsdir"; then
- xdg_appsdir='\${datadir}/applications/kde'
- fi
- if test -z "$xdg_menudir"; then
- xdg_menudir='\${sysconfdir}/xdg/menus'
- fi
- if test -z "$xdg_directorydir"; then
- xdg_directorydir='\${datadir}/desktop-directories'
- fi
-
- KDE_SET_PATHS(defaults)
-
-else
-
- if test $kde_qtver = 1; then
- AC_MSG_RESULT([compiling])
- KDE_1_CHECK_PATHS
- else
- AC_MSG_ERROR([path checking not yet supported for KDE 2])
- fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
- test -z "$kde_datadir" || test -z "$kde_locale" ||
- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
- test -z "$kde_kcfgdir" ||
- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
- test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
- test -z "$kde_styledir" || test -z "kde_widgetdir" ||
- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
- test "x$kde_have_all_paths" != "xyes"; then
- kde_have_all_paths=no
- fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
-[
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
- if test -n "$KDEDIRS"; then
- kde_save_IFS=$IFS
- IFS=:
- for dir in $KDEDIRS; do
- kde_default_bindirs="$dir/bin $kde_default_bindirs "
- done
- IFS=$kde_save_IFS
- fi
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
- AC_ARG_WITH(arts,
- AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
- [build_arts=$withval],
- [build_arts=yes]
- )
- AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
- if test "$build_arts" = "no"; then
- AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
- fi
-
- KDE_SET_DEFAULT_BINDIRS
- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
- if test "$build_arts" '!=' "no"; then
- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
- fi
- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
- kde32ornewer=1
- kde33ornewer=1
- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
- kde32ornewer=
- kde33ornewer=
- else
- if test "$kde_qtver" = "3"; then
- if test "$kde_qtsubver" -le 1; then
- kde32ornewer=
- fi
- if test "$kde_qtsubver" -le 2; then
- kde33ornewer=
- fi
- if test "$KDECONFIG" != "compiled"; then
- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
- kde33ornewer=
- fi
- fi
- fi
- fi
-
- if test -n "$kde32ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
- KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
- fi
- if test -n "$kde33ornewer"; then
- KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
- AC_SUBST(MAKEKDEWIDGETS)
- fi
- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-
- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
- AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
- if test "$KDE_XSL_STYLESHEET" = "NO"; then
- KDE_XSL_STYLESHEET=""
- else
- KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
- fi
- fi
-
- DCOP_DEPENDENCIES='$(DCOPIDL)'
- if test -n "$kde32ornewer"; then
- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
- AC_SUBST(KCONFIG_COMPILER)
- AC_SUBST(KCFG_DEPENDENCIES)
- AC_SUBST(DCOPIDLNG)
- fi
- AC_SUBST(DCOPIDL)
- AC_SUBST(DCOPIDL2CPP)
- AC_SUBST(DCOP_DEPENDENCIES)
- AC_SUBST(MCOPIDL)
- AC_SUBST(ARTSCCONFIG)
- AC_SUBST(MEINPROC)
- AC_SUBST(KDE_XSL_STYLESHEET)
- AC_SUBST(XMLLINT)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
- KDE_SET_DEFAULT_PATHS($1)
- kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
- # wrong values were cached, may be, we can set better ones
- kde_result=
- kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
- kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir=
- kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
- kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
- kde_have_all_paths=
- kde_styledir=
- kde_widgetdir=
- xdg_appsdir = xdg_menudir= xdg_directorydir=
- KDE_SET_DEFAULT_PATHS($1)
- eval "$kde_cv_all_paths"
- KDE_CHECK_PATHS_FOR_COMPLETENESS
- kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
- AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
- rm -f conftest*
- AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
- kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
- kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
- dnl Checks for libraries.
- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD
- AC_SUBST(LIBUTIL)
- AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
- AC_SUBST(LIBCOMPAT)
- kde_have_crypt=
- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
- AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
- AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
- kde_have_crypt=no
- ]))
- AC_SUBST(LIBCRYPT)
- if test $kde_have_crypt = yes; then
- AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
- fi
- AC_CHECK_SOCKLEN_T
- AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- AC_CHECK_LIB(dnet_stub, dnet_ntoa,
- [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
- fi
- AC_CHECK_FUNC(inet_ntoa)
- if test $ac_cv_func_inet_ntoa = no; then
- AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
- fi
- AC_CHECK_FUNC(connect)
- if test $ac_cv_func_connect = no; then
- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
- $X_EXTRA_LIBS)
- fi
-
- AC_CHECK_FUNC(remove)
- if test $ac_cv_func_remove = no; then
- AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- AC_CHECK_FUNC(shmat, ,
- AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-
- # more headers that need to be explicitly included on darwin
- AC_CHECK_HEADERS(sys/types.h stdint.h)
-
- # sys/bitypes.h is needed for uint32_t and friends on Tru64
- AC_CHECK_HEADERS(sys/bitypes.h)
-
- # darwin requires a poll emulation library
- AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
- # for some image handling on Mac OS X
- AC_CHECK_HEADERS(Carbon/Carbon.h)
-
- # CoreAudio framework
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
- AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
- FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
- ])
-
- AC_CHECK_RES_INIT
- AC_SUBST(LIB_POLL)
- AC_SUBST(FRAMEWORK_COREAUDIO)
- LIBSOCKET="$X_EXTRA_LIBS"
- AC_SUBST(LIBSOCKET)
- AC_SUBST(X_EXTRA_LIBS)
- AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
- AC_SUBST(LIBUCB)
-
- case $host in dnl this *is* LynxOS specific
- *-*-lynxos* )
- AC_MSG_CHECKING([LynxOS header file wrappers])
- [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
- AC_MSG_RESULT(disabled)
- AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
- ;;
- esac
-
- KDE_CHECK_TYPES
- KDE_CHECK_LIBDL
- KDE_CHECK_STRLCPY
- KDE_CHECK_PIE_SUPPORT
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
- embedded,
- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
- kde_use_qt_emb=$enableval,
- kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
- qtopia,
- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
- kde_use_qt_emb_palm=$enableval,
- kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
- mac,
- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
- kde_use_qt_mac=$enableval,
- kde_use_qt_mac=no
-)
-
-# used to disable x11-specific stuff on special platforms
-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
- kde_x_includes=NO
-else
- kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
- kde_x_libraries=NO
-else
- kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
- ;;
-*-*-solaris*)
- ;;
-*)
- _AC_PATH_X_XMKMF
- if test -z "$ac_x_includes"; then
- ac_x_includes="."
- fi
- if test -z "$ac_x_libraries"; then
- ac_x_libraries="/usr/lib${kdelibsuff}"
- fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
- kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
- kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
- AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
- AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
- kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
- AC_MSG_RESULT($have_x)
- no_x=yes
-else
- AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
- X_INCLUDES=""
- x_includes="."; dnl better than nothing :-
- else
- x_includes=$kde_x_includes
- X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
- X_LDFLAGS=""
- x_libraries="/usr/lib"; dnl better than nothing :-
- else
- x_libraries=$kde_x_libraries
- X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols. So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-# --i...@ul..., kb...@cs....
-AC_CHECK_LIB(ICE, IceConnectionNumber,
- [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
- AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
- dnl We're using QT Embedded
- CPPFLAGS=-DQWS
- CXXFLAGS="$CXXFLAGS -fno-rtti"
- QTE_NORTTI="-fno-rtti -DQWS"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
- dnl be included to get the information) --Sam
- CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
- CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_QT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
- QStringList *t = new QStringList();
- Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
- QString s;
- s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
- (void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
- return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
- # Current default Qt version: 3.3
- kde_qtver=3
- kde_qtsubver=3
-else
- kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
- # following is the check if subversion isnt found in passed argument
- if test "$kde_qtsubver" = "$1"; then
- kde_qtsubver=1
- fi
- kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
- if test "$kde_qtver" = "1"; then
- kde_qtsubver=42
- fi
-fi
-
-if test -z "$2"; then
- if test "$kde_qtver" = "2"; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_minversion=">= Qt 2.2.2"
- else
- kde_qt_minversion=">= Qt 2.0.2"
- fi
- fi
- if test "$kde_qtver" = "3"; then
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
- kde_qt_minversion=">= Qt 3.3 and < 4.0"
- ...
[truncated message content] |
|
From: <dio...@us...> - 2012-10-12 18:03:25
|
Revision: 191
http://pikloops.svn.sourceforge.net/pikloops/?rev=191&view=rev
Author: dionysos-sf
Date: 2012-10-12 18:03:19 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
Add Nicolas Hadacek for svn2cl
Modified Paths:
--------------
prog/trunk/authors.xml
Modified: prog/trunk/authors.xml
===================================================================
--- prog/trunk/authors.xml 2007-10-21 13:08:05 UTC (rev 190)
+++ prog/trunk/authors.xml 2012-10-12 18:03:19 UTC (rev 191)
@@ -15,4 +15,7 @@
<author uid="carcam">
Carlos M. Cámara <cmcamara+PIKLOOPS AT gmail DOT com>
</author>
+ <author uid="azhyd">
+ Nicolas Hadacek <hadacek AT kde DOT org>
+ </author>
</authors>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-21 13:08:02
|
Revision: 190
http://pikloops.svn.sourceforge.net/pikloops/?rev=190&view=rev
Author: dionysos-sf
Date: 2007-10-21 06:08:05 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Fix typo
Modified Paths:
--------------
web/trunk/po/fr.po
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-21 13:01:53 UTC (rev 189)
+++ web/trunk/po/fr.po 2007-10-21 13:08:05 UTC (rev 190)
@@ -8,7 +8,7 @@
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-21 14:59+0200\n"
-"PO-Revision-Date: 2007-10-21 15:00+0200\n"
+"PO-Revision-Date: 2007-10-21 15:07+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -327,7 +327,7 @@
"these packages."
msgstr ""
"Merci beaucoup à <a href=\"mailto:hadacek AT kde DOT org\">Nicolas Hadacek</"
-"a>, le mainteneur de <a href=\"http://piklab.sf.net/\">Piklab</a> , qui a "
+"a>, le mainteneur de <a href=\"http://piklab.sf.net/\">Piklab</a>, qui a "
"construit ces paquetages."
#: ../download.php:26
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-21 13:01:49
|
Revision: 189
http://pikloops.svn.sourceforge.net/pikloops/?rev=189&view=rev
Author: dionysos-sf
Date: 2007-10-21 06:01:53 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
web/trunk/po/de.po
web/trunk/po/es.po
web/trunk/po/fr.po
web/trunk/po/pikloops-web.pot
Modified: web/trunk/po/de.po
===================================================================
--- web/trunk/po/de.po 2007-10-21 12:59:40 UTC (rev 188)
+++ web/trunk/po/de.po 2007-10-21 13:01:53 UTC (rev 189)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PikLoops 0.2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 17:06+0200\n"
+"POT-Creation-Date: 2007-10-21 14:59+0200\n"
"PO-Revision-Date: 2007-07-24 21:11+0100\n"
"Last-Translator: Lukas Brausch <gro...@ar...>\n"
"Language-Team: German\n"
@@ -252,8 +252,8 @@
msgid "Binaries"
msgstr "Binaries"
-#: ../download.php:19 ../index.php:23 ../index.php:25
-msgid "17 october 2007"
+#: ../download.php:19
+msgid "21 october 2007"
msgstr ""
#: ../download.php:21
@@ -441,6 +441,10 @@
msgid "Release date:"
msgstr "Versions-Datum:"
+#: ../index.php:23 ../index.php:25
+msgid "17 october 2007"
+msgstr ""
+
#: ../index.php:26
msgid "GPG key:"
msgstr "GPG Schlüssel:"
Modified: web/trunk/po/es.po
===================================================================
--- web/trunk/po/es.po 2007-10-21 12:59:40 UTC (rev 188)
+++ web/trunk/po/es.po 2007-10-21 13:01:53 UTC (rev 189)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 17:06+0200\n"
+"POT-Creation-Date: 2007-10-21 14:59+0200\n"
"PO-Revision-Date: 2007-09-29 18:55+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
@@ -263,9 +263,9 @@
msgid "Binaries"
msgstr ""
-#: ../download.php:19 ../index.php:23 ../index.php:25
+#: ../download.php:19
#, fuzzy
-msgid "17 october 2007"
+msgid "21 october 2007"
msgstr "21 de septiembre del 2007"
#: ../download.php:21
@@ -447,6 +447,11 @@
msgid "Release date:"
msgstr ""
+#: ../index.php:23 ../index.php:25
+#, fuzzy
+msgid "17 october 2007"
+msgstr "21 de septiembre del 2007"
+
#: ../index.php:26
msgid "GPG key:"
msgstr ""
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-21 12:59:40 UTC (rev 188)
+++ web/trunk/po/fr.po 2007-10-21 13:01:53 UTC (rev 189)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 17:06+0200\n"
-"PO-Revision-Date: 2007-10-18 17:07+0200\n"
+"POT-Creation-Date: 2007-10-21 14:59+0200\n"
+"PO-Revision-Date: 2007-10-21 15:00+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -115,7 +115,9 @@
msgid ""
"To be able to compile the program, you have to build the './configure' "
"script with the following command:"
-msgstr "Pour pouvoir compiler le programme, vous devez d'abord générer le script « ./configure » avec la commande suivante :"
+msgstr ""
+"Pour pouvoir compiler le programme, vous devez d'abord générer le script "
+"« ./configure » avec la commande suivante :"
#: ../contribute.php:32
msgid ""
@@ -290,9 +292,9 @@
msgid "Binaries"
msgstr "Binaires"
-#: ../download.php:19 ../index.php:23 ../index.php:25
-msgid "17 october 2007"
-msgstr "17 octobre 2007"
+#: ../download.php:19
+msgid "21 october 2007"
+msgstr "21 octobre 2007"
#: ../download.php:21
msgid "Not a lot binaries avaliable for the moment."
@@ -485,6 +487,10 @@
msgid "Release date:"
msgstr "Mise à jour :"
+#: ../index.php:23 ../index.php:25
+msgid "17 october 2007"
+msgstr "17 octobre 2007"
+
#: ../index.php:26
msgid "GPG key:"
msgstr "Clé publique GPG :"
Modified: web/trunk/po/pikloops-web.pot
===================================================================
--- web/trunk/po/pikloops-web.pot 2007-10-21 12:59:40 UTC (rev 188)
+++ web/trunk/po/pikloops-web.pot 2007-10-21 13:01:53 UTC (rev 189)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 17:06+0200\n"
+"POT-Creation-Date: 2007-10-21 14:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -227,8 +227,8 @@
msgid "Binaries"
msgstr ""
-#: ../download.php:19 ../index.php:23 ../index.php:25
-msgid "17 october 2007"
+#: ../download.php:19
+msgid "21 october 2007"
msgstr ""
#: ../download.php:21
@@ -410,6 +410,10 @@
msgid "Release date:"
msgstr ""
+#: ../index.php:23 ../index.php:25
+msgid "17 october 2007"
+msgstr ""
+
#: ../index.php:26
msgid "GPG key:"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-21 12:59:37
|
Revision: 188
http://pikloops.svn.sourceforge.net/pikloops/?rev=188&view=rev
Author: dionysos-sf
Date: 2007-10-21 05:59:40 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Add Mandriva rpms
Modified Paths:
--------------
web/trunk/download.php
Modified: web/trunk/download.php
===================================================================
--- web/trunk/download.php 2007-10-19 15:21:12 UTC (rev 187)
+++ web/trunk/download.php 2007-10-21 12:59:40 UTC (rev 188)
@@ -16,7 +16,7 @@
$DOWNLOAD_BINARIES=_("Binaries");
$PAGE_LAST_UPDATE=_("Last page update:");
- $DOWNLOAD_LAST_UPDATE=_("17 october 2007");
+ $DOWNLOAD_LAST_UPDATE=_("21 october 2007");
$DOWNLOAD_MESSAGE_02=_("Not a lot binaries avaliable for the moment.");
$DOWNLOAD_MESSAGE_03=_("Feel free to build binary for your distribution and contact me, I'll put it here.");
@@ -71,6 +71,12 @@
<div class="file-list">
<ul>
<li style="background-image: url('images/logos/rpm-logo-icon-30x30.png');">
+ <a href="http://downloads.sourceforge.net/pikloops/pikloops-0.2.5-1mdv2007.i586.rpm">pikloops-0.2.5-1mdv2007.i586.rpm</a>
+ </li>
+ <li style="background-image: url('images/logos/rpm-logo-icon-30x30.png');">
+ <a href="http://downloads.sourceforge.net/pikloops/pikloops-0.2.5-1mdv2007.src.rpm">pikloops-0.2.5-1mdv2007.src.rpm</a>
+ </li>
+ <li style="background-image: url('images/logos/rpm-logo-icon-30x30.png');">
<a href="http://downloads.sourceforge.net/pikloops/pikloops-0.2.4-1mdk.i586.rpm">pikloops-0.2.4-1mdk.i586.rpm</a>
</li>
<li style="background-image: url('images/logos/rpm-logo-icon-30x30.png');">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-19 15:21:11
|
Revision: 187
http://pikloops.svn.sourceforge.net/pikloops/?rev=187&view=rev
Author: dionysos-sf
Date: 2007-10-19 08:21:12 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2007-10-19 15:20:12 UTC (rev 186)
+++ prog/trunk/po/de.po 2007-10-19 15:21:12 UTC (rev 187)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 16:11+0200\n"
+"POT-Creation-Date: 2007-10-19 17:20+0200\n"
"PO-Revision-Date: 2007-10-15 19:06+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
@@ -25,23 +25,38 @@
msgid "Ca&lculate"
msgstr "&Berechne "
-#: main.cpp:30
+#: main.cpp:33
msgid "Pic Delay Calculator"
msgstr "Pic Verzögerungs Berechner"
-#: main.cpp:41
+#: main.cpp:40
+msgid "Frequency of the PIC oscillator in MHz"
+msgstr ""
+
+#: main.cpp:42
+#, fuzzy
+msgid "Requested delay"
+msgstr "Benötigte Verzögerung(en)"
+
+#: main.cpp:44
+msgid ""
+"Time unit of the delay\n"
+"Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:57
msgid "PikLoops"
msgstr "PikLoops"
-#: main.cpp:50
+#: main.cpp:66
msgid "Author and maintainer"
msgstr "Autor und Maintainer"
-#: main.cpp:53
+#: main.cpp:69
msgid "Original author of PikLoops"
msgstr "Ursprünglicher Autor von PikLoops"
-#: main.cpp:56
+#: main.cpp:72
msgid ""
"Author of the original PicLoops for Windows.\n"
"His Calculations Formulas made it possible."
@@ -49,6 +64,22 @@
"Ursprünglicher PicLoops Autor für Windows.\n"
" Seine Berechnungsformulare haben es möglich gemacht"
+#: main.cpp:106
+msgid "\"%1\" isn't a valid time unit.\n"
+msgstr ""
+
+#: main.cpp:107
+msgid "Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:114
+msgid "\"%1\" isn't a valid frequency value.\n"
+msgstr ""
+
+#: main.cpp:121
+msgid "\"%1\" isn't a valid delay value.\n"
+msgstr ""
+
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -61,63 +92,63 @@
"Your emails"
msgstr "gro...@ar..."
-#: mainwidgetpl.cpp:47
+#: mainwidgetpl.cpp:48
#, fuzzy
msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr "Aktuelle Verzögerung: %1 s (%2 Zyklen)."
-#: mainwidgetpl.cpp:53
+#: mainwidgetpl.cpp:54
msgid "Input data"
msgstr "Eingabe Daten"
-#: mainwidgetpl.cpp:54
+#: mainwidgetpl.cpp:55
msgid "Frequency (MHz)"
msgstr "Frequenz (MHz)"
-#: mainwidgetpl.cpp:62
+#: mainwidgetpl.cpp:73
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr "Wähle eine Standard Uhr aus oder gib eine Frequenz ein "
-#: mainwidgetpl.cpp:65
+#: mainwidgetpl.cpp:76
msgid "Needed delay (s)"
msgstr "Benötigte Verzögerung(en)"
-#: mainwidgetpl.cpp:71
+#: mainwidgetpl.cpp:84
msgid "Unit"
msgstr ""
-#: mainwidgetpl.cpp:80
+#: mainwidgetpl.cpp:101
msgid "Ouput data"
msgstr "Ausgabe Daten"
-#: mainwidgetpl.cpp:82
+#: mainwidgetpl.cpp:103
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Kopiere diesen Code oder füge ihn durch \"drag and drop\" in deinen Editor "
"ein"
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:133
msgid "delay_"
msgstr "delay_"
-#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
+#: mainwidgetpl.cpp:137 mainwidgetpl.cpp:142
msgid "_loop"
msgstr "_loop"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:138
#, fuzzy
msgid "sub_delay_"
msgstr "delay_"
-#: mainwidgetpl.cpp:125
+#: mainwidgetpl.cpp:146
msgid "Delay code generated by PikLoops"
msgstr "Laufzeit Code generiert von PikLoops"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:148
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd yyyy-MMM-dd hh:mm:ss"
-#: mainwidgetpl.cpp:130
+#: mainwidgetpl.cpp:151
#, fuzzy
msgid ""
"Time Delay = %1%2 with Osc = %3MHz\n"
@@ -126,31 +157,31 @@
"Zeitverzögerung = %1s mit Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:142
+#: mainwidgetpl.cpp:163
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
-#: mainwidgetpl.cpp:146
+#: mainwidgetpl.cpp:167
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr ""
-#: mainwidgetpl.cpp:151
+#: mainwidgetpl.cpp:172
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
-#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
+#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
msgid "CounterC"
msgstr "ZählerC"
-#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
-#: mainwidgetpl.cpp:205
+#: mainwidgetpl.cpp:195 mainwidgetpl.cpp:207 mainwidgetpl.cpp:214
+#: mainwidgetpl.cpp:226
msgid "CounterB"
msgstr "ZählerB"
-#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
-#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
+#: mainwidgetpl.cpp:199 mainwidgetpl.cpp:204 mainwidgetpl.cpp:218
+#: mainwidgetpl.cpp:223 mainwidgetpl.cpp:233 mainwidgetpl.cpp:238
msgid "CounterA"
msgstr "ZählerA"
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-19 15:20:12 UTC (rev 186)
+++ prog/trunk/po/es.po 2007-10-19 15:21:12 UTC (rev 187)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 16:11+0200\n"
+"POT-Creation-Date: 2007-10-19 17:20+0200\n"
"PO-Revision-Date: 2007-10-15 22:07+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
@@ -26,23 +26,38 @@
msgid "Ca&lculate"
msgstr "Ca&lcular"
-#: main.cpp:30
+#: main.cpp:33
msgid "Pic Delay Calculator"
msgstr "Cálculo del retraso del Pic"
-#: main.cpp:41
+#: main.cpp:40
+msgid "Frequency of the PIC oscillator in MHz"
+msgstr ""
+
+#: main.cpp:42
+#, fuzzy
+msgid "Requested delay"
+msgstr "Retraso (s) necesario (s)"
+
+#: main.cpp:44
+msgid ""
+"Time unit of the delay\n"
+"Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:57
msgid "PikLoops"
msgstr "PikLoops"
-#: main.cpp:50
+#: main.cpp:66
msgid "Author and maintainer"
msgstr "Autor y mantenedor"
-#: main.cpp:53
+#: main.cpp:69
msgid "Original author of PikLoops"
msgstr "Autor original de PikLoops"
-#: main.cpp:56
+#: main.cpp:72
msgid ""
"Author of the original PicLoops for Windows.\n"
"His Calculations Formulas made it possible."
@@ -50,6 +65,22 @@
"Autor del PicLoops original para Windows \n"
"Sus fórmulas de cálculo lo hicieron posible."
+#: main.cpp:106
+msgid "\"%1\" isn't a valid time unit.\n"
+msgstr ""
+
+#: main.cpp:107
+msgid "Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:114
+msgid "\"%1\" isn't a valid frequency value.\n"
+msgstr ""
+
+#: main.cpp:121
+msgid "\"%1\" isn't a valid delay value.\n"
+msgstr ""
+
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -62,63 +93,63 @@
"Your emails"
msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
-#: mainwidgetpl.cpp:47
+#: mainwidgetpl.cpp:48
#, fuzzy
msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr "Retraso actual: %1 s (%2 ciclos de reloj)"
-#: mainwidgetpl.cpp:53
+#: mainwidgetpl.cpp:54
msgid "Input data"
msgstr "Datos de entrada"
-#: mainwidgetpl.cpp:54
+#: mainwidgetpl.cpp:55
msgid "Frequency (MHz)"
msgstr "Frecuencia (MHz)"
-#: mainwidgetpl.cpp:62
+#: mainwidgetpl.cpp:73
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
"Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de "
"reloj arbitraria."
-#: mainwidgetpl.cpp:65
+#: mainwidgetpl.cpp:76
msgid "Needed delay (s)"
msgstr "Retraso (s) necesario (s)"
-#: mainwidgetpl.cpp:71
+#: mainwidgetpl.cpp:84
msgid "Unit"
msgstr ""
-#: mainwidgetpl.cpp:80
+#: mainwidgetpl.cpp:101
msgid "Ouput data"
msgstr "Datos de salida"
-#: mainwidgetpl.cpp:82
+#: mainwidgetpl.cpp:103
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr "Copie y pegue este código, o simplemente arrástrelo hasta su editor."
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:133
msgid "delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
+#: mainwidgetpl.cpp:137 mainwidgetpl.cpp:142
msgid "_loop"
msgstr "_bucle"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:138
#, fuzzy
msgid "sub_delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:125
+#: mainwidgetpl.cpp:146
msgid "Delay code generated by PikLoops"
msgstr "Código de retardo generado por PikLoops"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:148
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd MMM-yyyy-dd hh:mm:ss"
-#: mainwidgetpl.cpp:130
+#: mainwidgetpl.cpp:151
#, fuzzy
msgid ""
"Time Delay = %1%2 with Osc = %3MHz\n"
@@ -127,31 +158,31 @@
"Tiempo de retardo = %1 con Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:142
+#: mainwidgetpl.cpp:163
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr "PikLoops no pudo calcular el retraso que solicitó.\n"
-#: mainwidgetpl.cpp:146
+#: mainwidgetpl.cpp:167
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr "El mayor retraso que puede obtener no debe superar %1s"
-#: mainwidgetpl.cpp:151
+#: mainwidgetpl.cpp:172
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr "El menor retraseo que puede obtener no puede ser mayor de %1s"
-#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
+#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
msgid "CounterC"
msgstr "ContadorC"
-#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
-#: mainwidgetpl.cpp:205
+#: mainwidgetpl.cpp:195 mainwidgetpl.cpp:207 mainwidgetpl.cpp:214
+#: mainwidgetpl.cpp:226
msgid "CounterB"
msgstr "ContadorB"
-#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
-#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
+#: mainwidgetpl.cpp:199 mainwidgetpl.cpp:204 mainwidgetpl.cpp:218
+#: mainwidgetpl.cpp:223 mainwidgetpl.cpp:233 mainwidgetpl.cpp:238
msgid "CounterA"
msgstr "ContadorA"
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2007-10-19 15:20:12 UTC (rev 186)
+++ prog/trunk/po/fr.po 2007-10-19 15:21:12 UTC (rev 187)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 16:11+0200\n"
-"PO-Revision-Date: 2007-10-18 16:12+0200\n"
+"POT-Creation-Date: 2007-10-19 17:20+0200\n"
+"PO-Revision-Date: 2007-10-19 17:20+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -25,23 +25,39 @@
msgid "Ca&lculate"
msgstr "Ca&lculer"
-#: main.cpp:30
+#: main.cpp:33
msgid "Pic Delay Calculator"
msgstr "Calculateur de temporisation pour Pic"
-#: main.cpp:41
+#: main.cpp:40
+msgid "Frequency of the PIC oscillator in MHz"
+msgstr "Fréquence, en MHz, de l'oscillateur du PIC"
+
+#: main.cpp:42
+msgid "Requested delay"
+msgstr "Temporisation souhaitée"
+
+#: main.cpp:44
+msgid ""
+"Time unit of the delay\n"
+"Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+"Unité de temps de la temporisation\n"
+"Les unités valides sont « s », « ms » et « us »"
+
+#: main.cpp:57
msgid "PikLoops"
msgstr "PikLoops"
-#: main.cpp:50
+#: main.cpp:66
msgid "Author and maintainer"
msgstr "Auteur et mainteneur"
-#: main.cpp:53
+#: main.cpp:69
msgid "Original author of PikLoops"
msgstr "Auteur original de PikLoops"
-#: main.cpp:56
+#: main.cpp:72
msgid ""
"Author of the original PicLoops for Windows.\n"
"His Calculations Formulas made it possible."
@@ -49,6 +65,22 @@
"Auteur original de Picloops pour Windows.\n"
"Ses formules de calcul l'ont rendu possible."
+#: main.cpp:106
+msgid "\"%1\" isn't a valid time unit.\n"
+msgstr "« %1 » n'est pas une unité de temps valide.\n"
+
+#: main.cpp:107
+msgid "Valid units are \"s\", \"ms\" and \"us\""
+msgstr "Les unités valides sont « s », « ms » et « us »"
+
+#: main.cpp:114
+msgid "\"%1\" isn't a valid frequency value.\n"
+msgstr "« %1 » n'est pas une valeur de fréquence valide.\n"
+
+#: main.cpp:121
+msgid "\"%1\" isn't a valid delay value.\n"
+msgstr "« %1 » n'est pas une valeur de temporisation valide.\n"
+
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -61,63 +93,63 @@
"Your emails"
msgstr "aportal AT univ-montp2 DOT fr"
-#: mainwidgetpl.cpp:47
+#: mainwidgetpl.cpp:48
msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr "Temporisation actuelle : %1%2 (%3 cycles d'horloge)"
-#: mainwidgetpl.cpp:53
+#: mainwidgetpl.cpp:54
msgid "Input data"
msgstr "Données d'entrée"
-#: mainwidgetpl.cpp:54
+#: mainwidgetpl.cpp:55
msgid "Frequency (MHz)"
msgstr "Fréquence (MHz)"
-#: mainwidgetpl.cpp:62
+#: mainwidgetpl.cpp:73
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
"Choisissez une horloge standard ou bien entrez une valeur de fréquence "
"d'horloge personnalisée."
-#: mainwidgetpl.cpp:65
+#: mainwidgetpl.cpp:76
msgid "Needed delay (s)"
msgstr "Temporisation souhaitée (s)"
-#: mainwidgetpl.cpp:71
+#: mainwidgetpl.cpp:84
msgid "Unit"
msgstr "Unité"
-#: mainwidgetpl.cpp:80
+#: mainwidgetpl.cpp:101
msgid "Ouput data"
msgstr "Données de sortie"
-#: mainwidgetpl.cpp:82
+#: mainwidgetpl.cpp:103
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Copiez et collez ce code ou bien effectuez un glissé/déposé dans votre "
"éditeur."
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:133
msgid "delay_"
msgstr "temporisation_"
-#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
+#: mainwidgetpl.cpp:137 mainwidgetpl.cpp:142
msgid "_loop"
msgstr "_boucle"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:138
msgid "sub_delay_"
msgstr "sous_temporisation_"
-#: mainwidgetpl.cpp:125
+#: mainwidgetpl.cpp:146
msgid "Delay code generated by PikLoops"
msgstr "Code de temporisation généré par PikLoops"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:148
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "dddd dd MMMM yyyy hh:mm:ss"
-#: mainwidgetpl.cpp:130
+#: mainwidgetpl.cpp:151
msgid ""
"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
@@ -125,35 +157,35 @@
"Durée temporisation = %1%2 avec Osc = %3MHz\n"
"\n"
-#: mainwidgetpl.cpp:142
+#: mainwidgetpl.cpp:163
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
"Pikloops n'a pas été capable de calculer la temporisation que vous "
"souhaitiez.\n"
-#: mainwidgetpl.cpp:146
+#: mainwidgetpl.cpp:167
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr "La plus grande temporisation que vous pouvez obtenir ne doit pas excéder %1s"
-#: mainwidgetpl.cpp:151
+#: mainwidgetpl.cpp:172
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
"La plus petite temporisation que vous pouvez obtenir doit être supérieure à %"
"1s"
-#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
+#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
msgid "CounterC"
msgstr "Compteur_C"
-#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
-#: mainwidgetpl.cpp:205
+#: mainwidgetpl.cpp:195 mainwidgetpl.cpp:207 mainwidgetpl.cpp:214
+#: mainwidgetpl.cpp:226
msgid "CounterB"
msgstr "Compteur_B"
-#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
-#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
+#: mainwidgetpl.cpp:199 mainwidgetpl.cpp:204 mainwidgetpl.cpp:218
+#: mainwidgetpl.cpp:223 mainwidgetpl.cpp:233 mainwidgetpl.cpp:238
msgid "CounterA"
msgstr "Compteur_A"
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2007-10-19 15:20:12 UTC (rev 186)
+++ prog/trunk/po/pikloops.pot 2007-10-19 15:21:12 UTC (rev 187)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-18 16:11+0200\n"
+"POT-Creation-Date: 2007-10-19 17:20+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -25,28 +25,58 @@
msgid "Ca&lculate"
msgstr ""
-#: main.cpp:30
+#: main.cpp:33
msgid "Pic Delay Calculator"
msgstr ""
-#: main.cpp:41
+#: main.cpp:40
+msgid "Frequency of the PIC oscillator in MHz"
+msgstr ""
+
+#: main.cpp:42
+msgid "Requested delay"
+msgstr ""
+
+#: main.cpp:44
+msgid ""
+"Time unit of the delay\n"
+"Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:57
msgid "PikLoops"
msgstr ""
-#: main.cpp:50
+#: main.cpp:66
msgid "Author and maintainer"
msgstr ""
-#: main.cpp:53
+#: main.cpp:69
msgid "Original author of PikLoops"
msgstr ""
-#: main.cpp:56
+#: main.cpp:72
msgid ""
"Author of the original PicLoops for Windows.\n"
"His Calculations Formulas made it possible."
msgstr ""
+#: main.cpp:106
+msgid "\"%1\" isn't a valid time unit.\n"
+msgstr ""
+
+#: main.cpp:107
+msgid "Valid units are \"s\", \"ms\" and \"us\""
+msgstr ""
+
+#: main.cpp:114
+msgid "\"%1\" isn't a valid frequency value.\n"
+msgstr ""
+
+#: main.cpp:121
+msgid "\"%1\" isn't a valid delay value.\n"
+msgstr ""
+
#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -59,88 +89,88 @@
"Your emails"
msgstr ""
-#: mainwidgetpl.cpp:47
+#: mainwidgetpl.cpp:48
msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr ""
-#: mainwidgetpl.cpp:53
+#: mainwidgetpl.cpp:54
msgid "Input data"
msgstr ""
-#: mainwidgetpl.cpp:54
+#: mainwidgetpl.cpp:55
msgid "Frequency (MHz)"
msgstr ""
-#: mainwidgetpl.cpp:62
+#: mainwidgetpl.cpp:73
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
-#: mainwidgetpl.cpp:65
+#: mainwidgetpl.cpp:76
msgid "Needed delay (s)"
msgstr ""
-#: mainwidgetpl.cpp:71
+#: mainwidgetpl.cpp:84
msgid "Unit"
msgstr ""
-#: mainwidgetpl.cpp:80
+#: mainwidgetpl.cpp:101
msgid "Ouput data"
msgstr ""
-#: mainwidgetpl.cpp:82
+#: mainwidgetpl.cpp:103
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:133
msgid "delay_"
msgstr ""
-#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
+#: mainwidgetpl.cpp:137 mainwidgetpl.cpp:142
msgid "_loop"
msgstr ""
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:138
msgid "sub_delay_"
msgstr ""
-#: mainwidgetpl.cpp:125
+#: mainwidgetpl.cpp:146
msgid "Delay code generated by PikLoops"
msgstr ""
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:148
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr ""
-#: mainwidgetpl.cpp:130
+#: mainwidgetpl.cpp:151
msgid ""
"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
-#: mainwidgetpl.cpp:142
+#: mainwidgetpl.cpp:163
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
-#: mainwidgetpl.cpp:146
+#: mainwidgetpl.cpp:167
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr ""
-#: mainwidgetpl.cpp:151
+#: mainwidgetpl.cpp:172
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
-#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
+#: mainwidgetpl.cpp:179 mainwidgetpl.cpp:187
msgid "CounterC"
msgstr ""
-#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
-#: mainwidgetpl.cpp:205
+#: mainwidgetpl.cpp:195 mainwidgetpl.cpp:207 mainwidgetpl.cpp:214
+#: mainwidgetpl.cpp:226
msgid "CounterB"
msgstr ""
-#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
-#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
+#: mainwidgetpl.cpp:199 mainwidgetpl.cpp:204 mainwidgetpl.cpp:218
+#: mainwidgetpl.cpp:223 mainwidgetpl.cpp:233 mainwidgetpl.cpp:238
msgid "CounterA"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-19 15:20:08
|
Revision: 186
http://pikloops.svn.sourceforge.net/pikloops/?rev=186&view=rev
Author: dionysos-sf
Date: 2007-10-19 08:20:12 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Rewording
Modified Paths:
--------------
prog/trunk/src/main.cpp
Modified: prog/trunk/src/main.cpp
===================================================================
--- prog/trunk/src/main.cpp 2007-10-19 15:13:34 UTC (rev 185)
+++ prog/trunk/src/main.cpp 2007-10-19 15:20:12 UTC (rev 186)
@@ -111,14 +111,14 @@
optFrequency = argFrequency.toDouble(&conversionIsOk);
if ( conversionIsOk == FALSE ) {
- QString msgError = QString(i18n("\"%1\" isn't a valid frequency.\n")).arg(argFrequency);
+ QString msgError = QString(i18n("\"%1\" isn't a valid frequency value.\n")).arg(argFrequency);
qDebug(msgError);
parseOptionFailed=TRUE;
}
optDelay = argDelay.toDouble(&conversionIsOk);
if ( conversionIsOk == FALSE ) {
- QString msgError = QString(i18n("\"%1\" isn't a valid delay.\n")).arg(argDelay);
+ QString msgError = QString(i18n("\"%1\" isn't a valid delay value.\n")).arg(argDelay);
qDebug(msgError);
parseOptionFailed=TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-19 15:13:31
|
Revision: 185
http://pikloops.svn.sourceforge.net/pikloops/?rev=185&view=rev
Author: dionysos-sf
Date: 2007-10-19 08:13:34 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
New feature: delay, frequency and time unit can be add on the command line
Modified Paths:
--------------
prog/trunk/src/Makefile.am
Modified: prog/trunk/src/Makefile.am
===================================================================
--- prog/trunk/src/Makefile.am 2007-10-19 15:13:07 UTC (rev 184)
+++ prog/trunk/src/Makefile.am 2007-10-19 15:13:34 UTC (rev 185)
@@ -64,3 +64,4 @@
$(XGETTEXT) $$LIST -o $(podir)/pikloops.pot; \
fi
+noinst_HEADERS = options.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-19 15:13:06
|
Revision: 184
http://pikloops.svn.sourceforge.net/pikloops/?rev=184&view=rev
Author: dionysos-sf
Date: 2007-10-19 08:13:07 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
New feature: delay, frequency and time unit can be add on the command line
Modified Paths:
--------------
prog/trunk/NEWS
prog/trunk/src/main.cpp
prog/trunk/src/mainwidgetpl.cpp
Added Paths:
-----------
prog/trunk/src/options.h
Modified: prog/trunk/NEWS
===================================================================
--- prog/trunk/NEWS 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/NEWS 2007-10-19 15:13:07 UTC (rev 184)
@@ -1,5 +1,6 @@
Version 0.3.0 :
New feature: a time unit selector
+ New feature: delay, frequency and time unit can be add on the command line
Don't display trailing zeroes
Version 0.2.5 :
Modified: prog/trunk/src/main.cpp
===================================================================
--- prog/trunk/src/main.cpp 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/src/main.cpp 2007-10-19 15:13:07 UTC (rev 184)
@@ -26,17 +26,33 @@
#include <kcmdlineargs.h>
#include <klocale.h>
+extern double optFrequency;
+extern double optDelay;
+extern double optUnit;
static const char description[] = I18N_NOOP("Pic Delay Calculator");
static const char version[] = VERSION;
static KCmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
+
+ { "f", 0, 0 },
+ { "frequency <frequency>", I18N_NOOP("Frequency of the PIC oscillator in MHz"), "4.0" },
+ { "d", 0, 0 },
+ { "delay <delay>", I18N_NOOP("Requested delay"), "1.0" },
+ { "u", 0, 0 },
+ { "time-unit <unit>", I18N_NOOP("Time unit of the delay\nValid units are \"s\", \"ms\" and \"us\""), "ms" },
KCmdLineLastOption
};
int main(int argc, char **argv)
{
+ QCString argFrequency;
+ QCString argDelay;
+ QCString argUnit;
+ bool parseOptionFailed=FALSE;
+ bool conversionIsOk;
+
KAboutData about("pikloops",
I18N_NOOP("PikLoops"),
version,
@@ -73,6 +89,40 @@
/// @todo do something with the command line args here
+ argFrequency = args->getOption("frequency");
+ argDelay = args->getOption("delay");
+ argUnit = args->getOption("time-unit");
+
+ if ( qstrcmp (argUnit, "s") == 0 ) {
+ optUnit = 1.0 ;
+ }
+ else if ( qstrcmp (argUnit, "ms") == 0 ) {
+ optUnit = 0.001 ;
+ }
+ else if ( qstrcmp (argUnit, "us") == 0 ) {
+ optUnit = 0.000001 ;
+ }
+ else {
+ QString msgError = QString(i18n("\"%1\" isn't a valid time unit.\n")).arg(argUnit);
+ msgError += i18n("Valid units are \"s\", \"ms\" and \"us\"");
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
+ optFrequency = argFrequency.toDouble(&conversionIsOk);
+ if ( conversionIsOk == FALSE ) {
+ QString msgError = QString(i18n("\"%1\" isn't a valid frequency.\n")).arg(argFrequency);
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
+ optDelay = argDelay.toDouble(&conversionIsOk);
+ if ( conversionIsOk == FALSE ) {
+ QString msgError = QString(i18n("\"%1\" isn't a valid delay.\n")).arg(argDelay);
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
mainWin = new PiKLoops();
app.setMainWidget( mainWin );
@@ -82,7 +132,9 @@
args->clear();
}
+ if ( parseOptionFailed==FALSE ) {
// mainWin has WDestructiveClose flag by default, so it will delete itself.
- return app.exec();
+ return app.exec();
+ }
}
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-19 15:13:07 UTC (rev 184)
@@ -20,6 +20,7 @@
* */
#include "mainwidgetpl.h"
+#include "options.h"
#include <qlayout.h>
#include <qlabel.h>
#include <qtextedit.h>
@@ -43,7 +44,7 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(4.00, 1.00, 0.001);
+ loopValues = new PiKDelay(optFrequency, optDelay, optUnit);
statusMessage = i18n("Actual delay: %1%2 (%3 clock cycles).") ;
setSpacing(3) ;
@@ -58,13 +59,25 @@
"32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
- clock->setCurrentItem(2) ;
+
+ for (int i=0; items[i]!=0; i++) {
+ if ( QString("%1").arg(*items[i],0,'g',-1).toDouble() == optFrequency ) {
+ clock->setCurrentItem(i) ;
+ }
+ }
+
+ if ( clock->currentText().toDouble() != optFrequency ) {
+ clock->insertItem(QString("%1").arg(optFrequency,0,'f',8),-1);
+ clock->setCurrentItem(10) ;
+ }
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
(new QHBox(grinput))->setMinimumWidth(10) ;
new QLabel(i18n("Needed delay (s)"), grinput) ;
delay = new KRestrictedLine (grinput,"delay editor","0123456789.") ;
- delay->setText("1");
+
+ delay->setText(QString("%1").arg(optDelay,0,'g',-1));
+
delay->setMinimumWidth(60);
(new QHBox(grinput))->setMinimumWidth(10) ;
@@ -73,8 +86,16 @@
static const char* units_items[] = { "s", "ms", "us", 0};
units->insertStrList( units_items );
units->setEditable(false) ;
- units->setCurrentItem(1) ;
+ if ( optUnit == 1.0 ) {
+ units->setCurrentItem(0) ;
+ }
+ else if ( optUnit == 0.000001 ) {
+ units->setCurrentItem(2) ;
+ }
+ else {
+ units->setCurrentItem(1) ;
+ }
// output
QVGroupBox *groutput = new QVGroupBox( i18n("Ouput data") , this) ;
Added: prog/trunk/src/options.h
===================================================================
--- prog/trunk/src/options.h (rev 0)
+++ prog/trunk/src/options.h 2007-10-19 15:13:07 UTC (rev 184)
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2007 - Alain Portal <aportal AT univ-montp2 DOT fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * */
+
+#ifndef OPTIONS_H
+#define OPTIONS_H
+
+
+ double optFrequency;
+ double optDelay;
+ double optUnit;
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 15:08:31
|
Revision: 183
http://pikloops.svn.sourceforge.net/pikloops/?rev=183&view=rev
Author: dionysos-sf
Date: 2007-10-18 08:08:33 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
web/trunk/po/de.po
web/trunk/po/es.po
web/trunk/po/fr.po
web/trunk/po/pikloops-web.pot
Modified: web/trunk/po/de.po
===================================================================
--- web/trunk/po/de.po 2007-10-18 15:08:18 UTC (rev 182)
+++ web/trunk/po/de.po 2007-10-18 15:08:33 UTC (rev 183)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PikLoops 0.2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 17:28+0200\n"
+"POT-Creation-Date: 2007-10-18 17:06+0200\n"
"PO-Revision-Date: 2007-07-24 21:11+0100\n"
"Last-Translator: Lukas Brausch <gro...@ar...>\n"
"Language-Team: German\n"
@@ -38,20 +38,16 @@
msgid "Trap 2: the date format"
msgstr ""
-#: ../contribute.php:20
-msgid "Trap 3: the PIC assembler instructions"
-msgstr ""
-
-#: ../contribute.php:22 ../download.php:18 ../index.php:24 ../links.php:19
+#: ../contribute.php:21 ../download.php:18 ../index.php:24 ../links.php:19
#: ../manual.php:16 ../screenshot.php:17
msgid "Last page update:"
msgstr "Letzte Seiten-Aktualisierung:"
-#: ../contribute.php:23
-msgid "21 september 2007"
+#: ../contribute.php:22
+msgid "18 october 2007"
msgstr ""
-#: ../contribute.php:25
+#: ../contribute.php:24
msgid ""
"You would want to contribute to PikLoops? Not a problem, every help is "
"welcome!"
@@ -59,11 +55,11 @@
"Du möchtest etwas zu PikLoops beitragen? Kein Problem, jede Hilfe ist "
"willkommen!"
-#: ../contribute.php:26
+#: ../contribute.php:25
msgid "A good idea would be you subscribe to the development mailing list."
msgstr "Es ist eine gute Idee, die Entwickler-Mailingliste zu abonnieren."
-#: ../contribute.php:27
+#: ../contribute.php:26
msgid ""
"To subscribe to the development mailing list, go to the <a href=\"https://"
"lists.sourceforge.net/lists/listinfo/pikloops-devel\" >https://lists."
@@ -75,7 +71,7 @@
"lists.sourceforge.net/lists/listinfo/pikloops-devel</a> Seite und fülle die "
"relevanten Felder aus."
-#: ../contribute.php:28
+#: ../contribute.php:27
msgid ""
"When you'll get the confirmation of your subscription, you could post mails "
"on the <a href=\"mailto:pikloops-devel AT lists DOT sourceforge DOT net\" "
@@ -87,7 +83,7 @@
"devel AT lists DOT sourceforge DOT net</a> "
"schreiben."
-#: ../contribute.php:29
+#: ../contribute.php:28
msgid ""
"You can of course contact me at <a href=\"mailto:dionysos-sf AT users DOT "
"sourceforge DOT net\" >dionysos AT users DOT "
@@ -97,7 +93,7 @@
"sourceforge DOT net\" >dionysos AT users DOT "
"sourceforge DOT net</a> kontaktieren."
-#: ../contribute.php:30
+#: ../contribute.php:29
msgid ""
"If you want to know where is currently the development, just get the svn "
"repository:"
@@ -105,13 +101,19 @@
"Wenn du wissen möchtest wie es momentan um die Entwicklung steht, solltest "
"du dir das SVN Verzeichnis anschauen:"
-#: ../contribute.php:31
+#: ../contribute.php:30
#, fuzzy
msgid ""
"This will create the 'pikloops/prog/trunk' directory in the current "
"directory."
msgstr "Dies erzeugt das 'pikloops/prog' Verzeichnis im aktuellen Verzeichnis."
+#: ../contribute.php:31
+msgid ""
+"To be able to compile the program, you have to build the './configure' "
+"script with the following command:"
+msgstr ""
+
#: ../contribute.php:32
msgid ""
"Developers who have a SourceForget.net username and a write access on the "
@@ -238,27 +240,6 @@
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:57
-msgid ""
-"There are several strings in which some \"words\" don't have to be "
-"translated because these \"words\" are PIC instructions. Here are such "
-"strings:"
-msgstr ""
-
-#: ../contribute.php:58
-msgid ""
-"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
-"don't have to be translated. You can translate 'CounterD' (and others, there "
-"are two occurences for each) but be sure to don't make typo mistake between "
-"pair because this will break the PIC code."
-msgstr ""
-
-#: ../contribute.php:59
-msgid ""
-"If you aren't in ease with these strings, don't translate them or just copy "
-"the original."
-msgstr ""
-
#: ../download.php:14 ../include/menu.inc.php:8
msgid "Download"
msgstr "Herunterladen"
Modified: web/trunk/po/es.po
===================================================================
--- web/trunk/po/es.po 2007-10-18 15:08:18 UTC (rev 182)
+++ web/trunk/po/es.po 2007-10-18 15:08:33 UTC (rev 183)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 17:28+0200\n"
+"POT-Creation-Date: 2007-10-18 17:06+0200\n"
"PO-Revision-Date: 2007-09-29 18:55+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
@@ -44,33 +44,30 @@
msgid "Trap 2: the date format"
msgstr "Trampa 2: El formato de la fecha"
-#: ../contribute.php:20
-msgid "Trap 3: the PIC assembler instructions"
-msgstr "Trampa 3: Las instrucciones de ensamblador del PIC"
-
-#: ../contribute.php:22 ../download.php:18 ../index.php:24 ../links.php:19
+#: ../contribute.php:21 ../download.php:18 ../index.php:24 ../links.php:19
#: ../manual.php:16 ../screenshot.php:17
msgid "Last page update:"
msgstr "Última actualización de la página:"
-#: ../contribute.php:23
-msgid "21 september 2007"
+#: ../contribute.php:22
+#, fuzzy
+msgid "18 october 2007"
msgstr "21 de septiembre del 2007"
-#: ../contribute.php:25
+#: ../contribute.php:24
msgid ""
"You would want to contribute to PikLoops? Not a problem, every help is "
"welcome!"
msgstr ""
"¿Quieres contribuir con Pikloops? ¡Sin problemas, toda ayuda es bienvenida!"
-#: ../contribute.php:26
+#: ../contribute.php:25
msgid "A good idea would be you subscribe to the development mailing list."
msgstr ""
"Una buena idea sería que te suscribieras a la lista de correo de los "
"desarrolladores."
-#: ../contribute.php:27
+#: ../contribute.php:26
msgid ""
"To subscribe to the development mailing list, go to the <a href=\"https://"
"lists.sourceforge.net/lists/listinfo/pikloops-devel\" >https://lists."
@@ -82,7 +79,7 @@
">https://lists.sourceforge.net/lists/listinfo/pikloops-devel</a> y rellena "
"los camposnecesarios."
-#: ../contribute.php:28
+#: ../contribute.php:27
msgid ""
"When you'll get the confirmation of your subscription, you could post mails "
"on the <a href=\"mailto:pikloops-devel AT lists DOT sourceforge DOT net\" "
@@ -94,7 +91,7 @@
"sourceforge DOT net\" >pikloops-devel AT lists DOT "
"sourceforge DOT net</a>."
-#: ../contribute.php:29
+#: ../contribute.php:28
msgid ""
"You can of course contact me at <a href=\"mailto:dionysos-sf AT users DOT "
"sourceforge DOT net\" >dionysos AT users DOT "
@@ -104,7 +101,7 @@
"users DOT sourceforge DOT net\" >dionysos AT users DOT "
"sourceforge DOT net</a>."
-#: ../contribute.php:30
+#: ../contribute.php:29
msgid ""
"If you want to know where is currently the development, just get the svn "
"repository:"
@@ -112,13 +109,19 @@
"Si quieres saber en qué punto se encuentra actualmente el desarrollo tan "
"sólo obtén la copia del repositorio de svn:"
-#: ../contribute.php:31
+#: ../contribute.php:30
#, fuzzy
msgid ""
"This will create the 'pikloops/prog/trunk' directory in the current "
"directory."
msgstr "Esto creará el directorio 'pikloops/prog' en el directorio actual."
+#: ../contribute.php:31
+msgid ""
+"To be able to compile the program, you have to build the './configure' "
+"script with the following command:"
+msgstr ""
+
#: ../contribute.php:32
msgid ""
"Developers who have a SourceForget.net username and a write access on the "
@@ -248,27 +251,6 @@
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:57
-msgid ""
-"There are several strings in which some \"words\" don't have to be "
-"translated because these \"words\" are PIC instructions. Here are such "
-"strings:"
-msgstr ""
-
-#: ../contribute.php:58
-msgid ""
-"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
-"don't have to be translated. You can translate 'CounterD' (and others, there "
-"are two occurences for each) but be sure to don't make typo mistake between "
-"pair because this will break the PIC code."
-msgstr ""
-
-#: ../contribute.php:59
-msgid ""
-"If you aren't in ease with these strings, don't translate them or just copy "
-"the original."
-msgstr ""
-
#: ../download.php:14 ../include/menu.inc.php:8
msgid "Download"
msgstr ""
@@ -633,3 +615,9 @@
msgid ""
"There is only one screenshot because there is only one view in PikLoops ;-)"
msgstr ""
+
+#~ msgid "Trap 3: the PIC assembler instructions"
+#~ msgstr "Trampa 3: Las instrucciones de ensamblador del PIC"
+
+#~ msgid "21 september 2007"
+#~ msgstr "21 de septiembre del 2007"
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-18 15:08:18 UTC (rev 182)
+++ web/trunk/po/fr.po 2007-10-18 15:08:33 UTC (rev 183)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 17:28+0200\n"
-"PO-Revision-Date: 2007-10-17 17:33+0200\n"
+"POT-Creation-Date: 2007-10-18 17:06+0200\n"
+"PO-Revision-Date: 2007-10-18 17:07+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -40,20 +40,16 @@
msgid "Trap 2: the date format"
msgstr "Piège N°2 : le format de date"
-#: ../contribute.php:20
-msgid "Trap 3: the PIC assembler instructions"
-msgstr "Piège N°3 : les instructions PIC en assembleur"
-
-#: ../contribute.php:22 ../download.php:18 ../index.php:24 ../links.php:19
+#: ../contribute.php:21 ../download.php:18 ../index.php:24 ../links.php:19
#: ../manual.php:16 ../screenshot.php:17
msgid "Last page update:"
msgstr "Dernière mise à jour de la page :"
-#: ../contribute.php:23
-msgid "21 september 2007"
-msgstr "21 septembre 2007"
+#: ../contribute.php:22
+msgid "18 october 2007"
+msgstr "18 octobre 2007"
-#: ../contribute.php:25
+#: ../contribute.php:24
msgid ""
"You would want to contribute to PikLoops? Not a problem, every help is "
"welcome!"
@@ -61,13 +57,13 @@
"Vous souhaitez contribuer à PikLoops ? Aucun problème, toute aide est "
"la bienvenue !"
-#: ../contribute.php:26
+#: ../contribute.php:25
msgid "A good idea would be you subscribe to the development mailing list."
msgstr ""
"Une bonne idée serait de vous inscrire sur la liste de diffusion de "
"développement."
-#: ../contribute.php:27
+#: ../contribute.php:26
msgid ""
"To subscribe to the development mailing list, go to the <a href=\"https://"
"lists.sourceforge.net/lists/listinfo/pikloops-devel\" >https://lists."
@@ -79,7 +75,7 @@
"lists.sourceforge.net/lists/listinfo/pikloops-devel</a> et remplissez les "
"champs nécessaires."
-#: ../contribute.php:28
+#: ../contribute.php:27
msgid ""
"When you'll get the confirmation of your subscription, you could post mails "
"on the <a href=\"mailto:pikloops-devel AT lists DOT sourceforge DOT net\" "
@@ -91,7 +87,7 @@
"DOT sourceforge DOT net\">pikloops-devel AT lists DOT "
"sourceforge DOT net</a>."
-#: ../contribute.php:29
+#: ../contribute.php:28
msgid ""
"You can of course contact me at <a href=\"mailto:dionysos-sf AT users DOT "
"sourceforge DOT net\" >dionysos AT users DOT "
@@ -101,7 +97,7 @@
"dionysos AT users DOT sourceforge DOT net\" >dionysos AT "
"users DOT sourceforge DOT net</a>."
-#: ../contribute.php:30
+#: ../contribute.php:29
msgid ""
"If you want to know where is currently the development, just get the svn "
"repository:"
@@ -109,12 +105,18 @@
"Si vous souhaitez savoir où en est le développement, vous n'avez qu'à "
"récupérer le dépôt SVN :"
-#: ../contribute.php:31
+#: ../contribute.php:30
msgid ""
"This will create the 'pikloops/prog/trunk' directory in the current "
"directory."
msgstr "Cela créera le répertoire « pikloops/prog/trunk » dans le répertoire courant."
+#: ../contribute.php:31
+msgid ""
+"To be able to compile the program, you have to build the './configure' "
+"script with the following command:"
+msgstr "Pour pouvoir compiler le programme, vous devez d'abord générer le script « ./configure » avec la commande suivante :"
+
#: ../contribute.php:32
msgid ""
"Developers who have a SourceForget.net username and a write access on the "
@@ -130,8 +132,8 @@
"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
msgstr ""
-"Vous pouvez également naviguer dans le <a href=\"http://pikloops.svn.sourceforge."
-"net/viewvc/pikloops/prog/trunk/\" >dépôt</a>."
+"Vous pouvez également naviguer dans le <a href=\"http://pikloops.svn."
+"sourceforge.net/viewvc/pikloops/prog/trunk/\" >dépôt</a>."
#: ../contribute.php:35
msgid ""
@@ -276,37 +278,6 @@
msgid "As an example, here is my choice for the french translation:"
msgstr "Par exemple, voici mon choix pour la traduction française :"
-#: ../contribute.php:57
-msgid ""
-"There are several strings in which some \"words\" don't have to be "
-"translated because these \"words\" are PIC instructions. Here are such "
-"strings:"
-msgstr ""
-"Il y a plusieurs chaînes dans lesquelles certains « mots » ne "
-"doivent pas être traduits car ces « mots » sont des instructions "
-"PIC. Voici de telles chaînes :"
-
-#: ../contribute.php:58
-msgid ""
-"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
-"don't have to be translated. You can translate 'CounterD' (and others, there "
-"are two occurences for each) but be sure to don't make typo mistake between "
-"pair because this will break the PIC code."
-msgstr ""
-"Dans ces chaînes, « movwf », « decfsz » et « "
-"goto » sont des instructions PIC et ne doivent pas être traduites. Vous "
-"pouvez traduire « CounterD » (et les autres, il y a deux "
-"occurrences pour chacun) mais assurez-vous de ne pas faire d'erreur "
-"typographique entre les paires car cela casserait le code PIC."
-
-#: ../contribute.php:59
-msgid ""
-"If you aren't in ease with these strings, don't translate them or just copy "
-"the original."
-msgstr ""
-"Si vous n'êtes pas à l'aise avec ces chaînes, ne les traduisez pas ou bien "
-"copiez la chaîne originale."
-
#: ../download.php:14 ../include/menu.inc.php:8
msgid "Download"
msgstr "Téléchargement"
Modified: web/trunk/po/pikloops-web.pot
===================================================================
--- web/trunk/po/pikloops-web.pot 2007-10-18 15:08:18 UTC (rev 182)
+++ web/trunk/po/pikloops-web.pot 2007-10-18 15:08:33 UTC (rev 183)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 17:28+0200\n"
+"POT-Creation-Date: 2007-10-18 17:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -40,30 +40,26 @@
msgid "Trap 2: the date format"
msgstr ""
-#: ../contribute.php:20
-msgid "Trap 3: the PIC assembler instructions"
-msgstr ""
-
-#: ../contribute.php:22 ../download.php:18 ../index.php:24 ../links.php:19
+#: ../contribute.php:21 ../download.php:18 ../index.php:24 ../links.php:19
#: ../manual.php:16 ../screenshot.php:17
msgid "Last page update:"
msgstr ""
-#: ../contribute.php:23
-msgid "21 september 2007"
+#: ../contribute.php:22
+msgid "18 october 2007"
msgstr ""
-#: ../contribute.php:25
+#: ../contribute.php:24
msgid ""
"You would want to contribute to PikLoops? Not a problem, every help is "
"welcome!"
msgstr ""
-#: ../contribute.php:26
+#: ../contribute.php:25
msgid "A good idea would be you subscribe to the development mailing list."
msgstr ""
-#: ../contribute.php:27
+#: ../contribute.php:26
msgid ""
"To subscribe to the development mailing list, go to the <a href=\"https://"
"lists.sourceforge.net/lists/listinfo/pikloops-devel\" >https://lists."
@@ -71,7 +67,7 @@
"fields."
msgstr ""
-#: ../contribute.php:28
+#: ../contribute.php:27
msgid ""
"When you'll get the confirmation of your subscription, you could post mails "
"on the <a href=\"mailto:pikloops-devel AT lists DOT sourceforge DOT net\" "
@@ -79,25 +75,31 @@
"net</a> list."
msgstr ""
-#: ../contribute.php:29
+#: ../contribute.php:28
msgid ""
"You can of course contact me at <a href=\"mailto:dionysos-sf AT users DOT "
"sourceforge DOT net\" >dionysos AT users DOT "
"sourceforge DOT net</a>."
msgstr ""
-#: ../contribute.php:30
+#: ../contribute.php:29
msgid ""
"If you want to know where is currently the development, just get the svn "
"repository:"
msgstr ""
-#: ../contribute.php:31
+#: ../contribute.php:30
msgid ""
"This will create the 'pikloops/prog/trunk' directory in the current "
"directory."
msgstr ""
+#: ../contribute.php:31
+msgid ""
+"To be able to compile the program, you have to build the './configure' "
+"script with the following command:"
+msgstr ""
+
#: ../contribute.php:32
msgid ""
"Developers who have a SourceForget.net username and a write access on the "
@@ -213,27 +215,6 @@
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:57
-msgid ""
-"There are several strings in which some \"words\" don't have to be "
-"translated because these \"words\" are PIC instructions. Here are such "
-"strings:"
-msgstr ""
-
-#: ../contribute.php:58
-msgid ""
-"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
-"don't have to be translated. You can translate 'CounterD' (and others, there "
-"are two occurences for each) but be sure to don't make typo mistake between "
-"pair because this will break the PIC code."
-msgstr ""
-
-#: ../contribute.php:59
-msgid ""
-"If you aren't in ease with these strings, don't translate them or just copy "
-"the original."
-msgstr ""
-
#: ../download.php:14 ../include/menu.inc.php:8
msgid "Download"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 15:08:16
|
Revision: 182
http://pikloops.svn.sourceforge.net/pikloops/?rev=182&view=rev
Author: dionysos-sf
Date: 2007-10-18 08:08:18 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Add info on how to build ./configure.
Modified Paths:
--------------
web/trunk/contribute.php
Modified: web/trunk/contribute.php
===================================================================
--- web/trunk/contribute.php 2007-10-18 15:00:19 UTC (rev 181)
+++ web/trunk/contribute.php 2007-10-18 15:08:18 UTC (rev 182)
@@ -28,6 +28,7 @@
$CONTRIBUTE_MESSAGE_05=_("You can of course contact me at <a href=\"mailto:dionysos-sf AT users DOT sourceforge DOT net\" >dionysos AT users DOT sourceforge DOT net</a>.");
$CONTRIBUTE_MESSAGE_06=_("If you want to know where is currently the development, just get the svn repository:");
$CONTRIBUTE_MESSAGE_07=_("This will create the 'pikloops/prog/trunk' directory in the current directory.");
+ $CONTRIBUTE_MESSAGE_070=_("To be able to compile the program, you have to build the './configure' script with the following command:");
$CONTRIBUTE_MESSAGE_08=_("Developers who have a SourceForget.net username and a write access on the PikLoops SVN have to use the following command to be able to commit their future changes:");
$CONTRIBUTE_MESSAGE_09=_("You can also browse through the <a href=\"http://pikloops.svn.sourceforge.net/viewvc/pikloops/prog/trunk/\" >repository</a>.");
@@ -69,6 +70,8 @@
<p><?php echo $CONTRIBUTE_MESSAGE_06 ?></p>
<p class="full_cli">svn co https://pikloops.svn.sourceforge.net/svnroot/pikloops/prog pikloops/prog/trunk</p>
<p><?php echo $CONTRIBUTE_MESSAGE_07 ?></p>
+ <p><?php echo $CONTRIBUTE_MESSAGE_070 ?></p>
+ <p class="full_cli">make -f Makefile.dist</p>
<p><?php echo $CONTRIBUTE_MESSAGE_08 ?></p>
<p class="full_cli">svn co svn+ssh://use...@pi.../svnroot/pikloops/prog/trunk pikloops/prog/trunk</p>
<p><?php echo $CONTRIBUTE_MESSAGE_09 ?></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 15:00:15
|
Revision: 181
http://pikloops.svn.sourceforge.net/pikloops/?rev=181&view=rev
Author: dionysos-sf
Date: 2007-10-18 08:00:19 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
PIC instructions are no more translatable.
Modified Paths:
--------------
web/trunk/contribute.php
Modified: web/trunk/contribute.php
===================================================================
--- web/trunk/contribute.php 2007-10-18 14:42:31 UTC (rev 180)
+++ web/trunk/contribute.php 2007-10-18 15:00:19 UTC (rev 181)
@@ -17,10 +17,9 @@
$CONTRIBUTE_I18N_TRAPS=_("The traps in the translation");
$CONTRIBUTE_I18N_TRAPS01=_("Trap 1: the translation credit");
$CONTRIBUTE_I18N_TRAPS02=_("Trap 2: the date format");
- $CONTRIBUTE_I18N_TRAPS03=_("Trap 3: the PIC assembler instructions");
$PAGE_LAST_UPDATE=_("Last page update:");
- $CONTRIBUTE_LAST_UPDATE=_("21 september 2007");
+ $CONTRIBUTE_LAST_UPDATE=_("18 october 2007");
$CONTRIBUTE_MESSAGE_01=_("You would want to contribute to PikLoops? Not a problem, every help is welcome!");
$CONTRIBUTE_MESSAGE_02=_("A good idea would be you subscribe to the development mailing list.");
@@ -54,9 +53,6 @@
$CONTRIBUTE_MESSAGE_222=_("'dd' will be replaced by the day number in the month, 'dddd' will be replaced by the day full name (e.g. 'Saturday') and 'ddd' will be replaced by the day short name (e.g. 'Sat'). Same goes for month.");
$CONTRIBUTE_MESSAGE_223=_("As an example, here is my choice for the french translation:");
- $CONTRIBUTE_MESSAGE_230=_("There are several strings in which some \"words\" don't have to be translated because these \"words\" are PIC instructions. Here are such strings:");
- $CONTRIBUTE_MESSAGE_231=_("In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and don't have to be translated. You can translate 'CounterD' (and others, there are two occurences for each) but be sure to don't make typo mistake between pair because this will break the PIC code.");
- $CONTRIBUTE_MESSAGE_232=_("If you aren't in ease with these strings, don't translate them or just copy the original.");
?>
<div id="entete">
<h1><?php echo $CONTRIBUTE_WELCOME ?></h1>
@@ -127,18 +123,6 @@
<p class="listing">#: mainwidgetpl.cpp:108</p>
<p class="listing">msgid "ddd yyyy-MMM-dd hh:mm:ss"</p>
<p class="listing">msgstr "dddd dd MMMM yyyy hh:mm:ss"</p>
-
- <h3><?php echo $CONTRIBUTE_I18N_TRAPS03 ?></h3>
- <p><?php echo $CONTRIBUTE_MESSAGE_230 ?></p>
- <p class="listing">#: mainwidgetpl.cpp:119</p>
- <p class="listing">msgid "\tmovwf \tCounterD\n"</p>
- <p class="listing"> </p>
- <p class="listing">#: mainwidgetpl.cpp:143</p>
- <p class="listing">msgid ""</p>
- <p class="listing">"\tdecfsz \tCounterD,1\n"</p>
- <p class="listing">"\tgoto \t%1 \n"</p>
- <p><?php echo $CONTRIBUTE_MESSAGE_231 ?></p>
- <p><?php echo $CONTRIBUTE_MESSAGE_232 ?></p>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 14:42:28
|
Revision: 180
http://pikloops.svn.sourceforge.net/pikloops/?rev=180&view=rev
Author: dionysos-sf
Date: 2007-10-18 07:42:31 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
New release
Modified Paths:
--------------
prog/trunk/configure.in.in
Modified: prog/trunk/configure.in.in
===================================================================
--- prog/trunk/configure.in.in 2007-10-18 14:12:48 UTC (rev 179)
+++ prog/trunk/configure.in.in 2007-10-18 14:42:31 UTC (rev 180)
@@ -1,6 +1,6 @@
#MIN_CONFIG(3)
-AM_INIT_AUTOMAKE(pikloops,0.2.5)
+AM_INIT_AUTOMAKE(pikloops,0.3.0)
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 14:12:45
|
Revision: 179
http://pikloops.svn.sourceforge.net/pikloops/?rev=179&view=rev
Author: dionysos-sf
Date: 2007-10-18 07:12:48 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2007-10-18 14:11:09 UTC (rev 178)
+++ prog/trunk/po/de.po 2007-10-18 14:12:48 UTC (rev 179)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"POT-Creation-Date: 2007-10-18 16:11+0200\n"
"PO-Revision-Date: 2007-10-15 19:06+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
@@ -15,6 +15,16 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Aktionen "
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "&Berechne "
+
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Pic Verzögerungs Berechner"
@@ -39,14 +49,21 @@
"Ursprünglicher PicLoops Autor für Windows.\n"
" Seine Berechnungsformulare haben es möglich gemacht"
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Aktionen "
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Lukas Brausch"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gro...@ar..."
+
#: mainwidgetpl.cpp:47
-msgid "Actual delay: %1 s (%2 clock cycles)."
+#, fuzzy
+msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr "Aktuelle Verzögerung: %1 s (%2 Zyklen)."
#: mainwidgetpl.cpp:53
@@ -66,88 +83,76 @@
msgstr "Benötigte Verzögerung(en)"
#: mainwidgetpl.cpp:71
+msgid "Unit"
+msgstr ""
+
+#: mainwidgetpl.cpp:80
msgid "Ouput data"
msgstr "Ausgabe Daten"
-#: mainwidgetpl.cpp:73
+#: mainwidgetpl.cpp:82
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Kopiere diesen Code oder füge ihn durch \"drag and drop\" in deinen Editor "
"ein"
-#: mainwidgetpl.cpp:101
+#: mainwidgetpl.cpp:112
msgid "delay_"
msgstr "delay_"
-#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
-msgid "_sec"
-msgstr "_sec"
-
-#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
msgid "_loop"
msgstr "_loop"
-#: mainwidgetpl.cpp:105
+#: mainwidgetpl.cpp:117
#, fuzzy
msgid "sub_delay_"
msgstr "delay_"
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:125
msgid "Delay code generated by PikLoops"
msgstr "Laufzeit Code generiert von PikLoops"
-#: mainwidgetpl.cpp:114
+#: mainwidgetpl.cpp:127
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd yyyy-MMM-dd hh:mm:ss"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:130
+#, fuzzy
msgid ""
-"Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
"Zeitverzögerung = %1s mit Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:142
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
-#: mainwidgetpl.cpp:131
+#: mainwidgetpl.cpp:146
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr ""
-#: mainwidgetpl.cpp:136
+#: mainwidgetpl.cpp:151
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
-#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
+#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
msgid "CounterC"
msgstr "ZählerC"
-#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
-#: mainwidgetpl.cpp:192
+#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
+#: mainwidgetpl.cpp:205
msgid "CounterB"
msgstr "ZählerB"
-#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
-#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
+#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
+#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
msgid "CounterA"
msgstr "ZählerA"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Lukas Brausch"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gro...@ar..."
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "&Berechne "
+#~ msgid "_sec"
+#~ msgstr "_sec"
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-18 14:11:09 UTC (rev 178)
+++ prog/trunk/po/es.po 2007-10-18 14:12:48 UTC (rev 179)
@@ -7,15 +7,25 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"POT-Creation-Date: 2007-10-18 16:11+0200\n"
"PO-Revision-Date: 2007-10-15 22:07+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: "
+"Plural-Forms: \n"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Acciones"
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "Ca&lcular"
+
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Cálculo del retraso del Pic"
@@ -40,14 +50,21 @@
"Autor del PicLoops original para Windows \n"
"Sus fórmulas de cálculo lo hicieron posible."
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Acciones"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Carlos M. Cámara Mora"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
+
#: mainwidgetpl.cpp:47
-msgid "Actual delay: %1 s (%2 clock cycles)."
+#, fuzzy
+msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr "Retraso actual: %1 s (%2 ciclos de reloj)"
#: mainwidgetpl.cpp:53
@@ -69,87 +86,74 @@
msgstr "Retraso (s) necesario (s)"
#: mainwidgetpl.cpp:71
+msgid "Unit"
+msgstr ""
+
+#: mainwidgetpl.cpp:80
msgid "Ouput data"
msgstr "Datos de salida"
-#: mainwidgetpl.cpp:73
+#: mainwidgetpl.cpp:82
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr "Copie y pegue este código, o simplemente arrástrelo hasta su editor."
-#: mainwidgetpl.cpp:101
+#: mainwidgetpl.cpp:112
msgid "delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
-msgid "_sec"
-msgstr "_seg"
-
-#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
msgid "_loop"
msgstr "_bucle"
-#: mainwidgetpl.cpp:105
+#: mainwidgetpl.cpp:117
#, fuzzy
msgid "sub_delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:125
msgid "Delay code generated by PikLoops"
msgstr "Código de retardo generado por PikLoops"
-#: mainwidgetpl.cpp:114
+#: mainwidgetpl.cpp:127
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd MMM-yyyy-dd hh:mm:ss"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:130
+#, fuzzy
msgid ""
-"Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
"Tiempo de retardo = %1 con Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:142
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr "PikLoops no pudo calcular el retraso que solicitó.\n"
-#: mainwidgetpl.cpp:131
+#: mainwidgetpl.cpp:146
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr "El mayor retraso que puede obtener no debe superar %1s"
-#: mainwidgetpl.cpp:136
+#: mainwidgetpl.cpp:151
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr "El menor retraseo que puede obtener no puede ser mayor de %1s"
-#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
+#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
msgid "CounterC"
msgstr "ContadorC"
-#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
-#: mainwidgetpl.cpp:192
+#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
+#: mainwidgetpl.cpp:205
msgid "CounterB"
msgstr "ContadorB"
-#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
-#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
+#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
+#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
msgid "CounterA"
msgstr "ContadorA"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Carlos M. Cámara Mora"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "Ca&lcular"
-
+#~ msgid "_sec"
+#~ msgstr "_seg"
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2007-10-18 14:11:09 UTC (rev 178)
+++ prog/trunk/po/fr.po 2007-10-18 14:12:48 UTC (rev 179)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-15 19:07+0200\n"
-"PO-Revision-Date: 2007-10-15 19:08+0200\n"
+"POT-Creation-Date: 2007-10-18 16:11+0200\n"
+"PO-Revision-Date: 2007-10-18 16:12+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,16 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Actions"
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "Ca&lculer"
+
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Calculateur de temporisation pour Pic"
@@ -39,15 +49,21 @@
"Auteur original de Picloops pour Windows.\n"
"Ses formules de calcul l'ont rendu possible."
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Actions"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Alain Portal"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aportal AT univ-montp2 DOT fr"
+
#: mainwidgetpl.cpp:47
-msgid "Actual delay: %1 s (%2 clock cycles)."
-msgstr "Temporisation actuelle : %1 s (%2 cycles d'horloge)"
+msgid "Actual delay: %1%2 (%3 clock cycles)."
+msgstr "Temporisation actuelle : %1%2 (%3 cycles d'horloge)"
#: mainwidgetpl.cpp:53
msgid "Input data"
@@ -68,90 +84,76 @@
msgstr "Temporisation souhaitée (s)"
#: mainwidgetpl.cpp:71
+msgid "Unit"
+msgstr "Unité"
+
+#: mainwidgetpl.cpp:80
msgid "Ouput data"
msgstr "Données de sortie"
-#: mainwidgetpl.cpp:73
+#: mainwidgetpl.cpp:82
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Copiez et collez ce code ou bien effectuez un glissé/déposé dans votre "
"éditeur."
-#: mainwidgetpl.cpp:101
+#: mainwidgetpl.cpp:112
msgid "delay_"
msgstr "temporisation_"
-#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
-msgid "_sec"
-msgstr "_sec"
-
-#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
msgid "_loop"
msgstr "_boucle"
-#: mainwidgetpl.cpp:105
+#: mainwidgetpl.cpp:117
msgid "sub_delay_"
msgstr "sous_temporisation_"
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:125
msgid "Delay code generated by PikLoops"
msgstr "Code de temporisation généré par PikLoops"
-#: mainwidgetpl.cpp:114
+#: mainwidgetpl.cpp:127
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "dddd dd MMMM yyyy hh:mm:ss"
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:130
msgid ""
-"Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
-"Durée temporisation = %1s avec Osc = %2MHz\n"
+"Durée temporisation = %1%2 avec Osc = %3MHz\n"
"\n"
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:142
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
"Pikloops n'a pas été capable de calculer la temporisation que vous "
"souhaitiez.\n"
-#: mainwidgetpl.cpp:131
+#: mainwidgetpl.cpp:146
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr "La plus grande temporisation que vous pouvez obtenir ne doit pas excéder %1s"
-#: mainwidgetpl.cpp:136
+#: mainwidgetpl.cpp:151
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
-msgstr "La plus petite temporisation que vous pouvez obtenir doit être supérieure à %1s"
+msgstr ""
+"La plus petite temporisation que vous pouvez obtenir doit être supérieure à %"
+"1s"
-#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
+#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
msgid "CounterC"
msgstr "Compteur_C"
-#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
-#: mainwidgetpl.cpp:192
+#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
+#: mainwidgetpl.cpp:205
msgid "CounterB"
msgstr "Compteur_B"
-#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
-#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
+#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
+#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
msgid "CounterA"
msgstr "Compteur_A"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Alain Portal"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aportal AT univ-montp2 DOT fr"
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "Ca&lculer"
-
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2007-10-18 14:11:09 UTC (rev 178)
+++ prog/trunk/po/pikloops.pot 2007-10-18 14:12:48 UTC (rev 179)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"POT-Creation-Date: 2007-10-18 16:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -15,6 +15,16 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr ""
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr ""
+
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr ""
@@ -37,14 +47,20 @@
"His Calculations Formulas made it possible."
msgstr ""
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
+#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
msgstr ""
+#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: mainwidgetpl.cpp:47
-msgid "Actual delay: %1 s (%2 clock cycles)."
+msgid "Actual delay: %1%2 (%3 clock cycles)."
msgstr ""
#: mainwidgetpl.cpp:53
@@ -64,83 +80,67 @@
msgstr ""
#: mainwidgetpl.cpp:71
+msgid "Unit"
+msgstr ""
+
+#: mainwidgetpl.cpp:80
msgid "Ouput data"
msgstr ""
-#: mainwidgetpl.cpp:73
+#: mainwidgetpl.cpp:82
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
-#: mainwidgetpl.cpp:101
+#: mainwidgetpl.cpp:112
msgid "delay_"
msgstr ""
-#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
-msgid "_sec"
-msgstr ""
-
-#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:116 mainwidgetpl.cpp:121
msgid "_loop"
msgstr ""
-#: mainwidgetpl.cpp:105
+#: mainwidgetpl.cpp:117
msgid "sub_delay_"
msgstr ""
-#: mainwidgetpl.cpp:112
+#: mainwidgetpl.cpp:125
msgid "Delay code generated by PikLoops"
msgstr ""
-#: mainwidgetpl.cpp:114
+#: mainwidgetpl.cpp:127
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr ""
-#: mainwidgetpl.cpp:117
+#: mainwidgetpl.cpp:130
msgid ""
-"Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1%2 with Osc = %3MHz\n"
"\n"
msgstr ""
-#: mainwidgetpl.cpp:127
+#: mainwidgetpl.cpp:142
msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
-#: mainwidgetpl.cpp:131
+#: mainwidgetpl.cpp:146
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
msgstr ""
-#: mainwidgetpl.cpp:136
+#: mainwidgetpl.cpp:151
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
msgstr ""
-#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
+#: mainwidgetpl.cpp:158 mainwidgetpl.cpp:166
msgid "CounterC"
msgstr ""
-#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
-#: mainwidgetpl.cpp:192
+#: mainwidgetpl.cpp:174 mainwidgetpl.cpp:186 mainwidgetpl.cpp:193
+#: mainwidgetpl.cpp:205
msgid "CounterB"
msgstr ""
-#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
-#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
+#: mainwidgetpl.cpp:178 mainwidgetpl.cpp:183 mainwidgetpl.cpp:197
+#: mainwidgetpl.cpp:202 mainwidgetpl.cpp:212 mainwidgetpl.cpp:217
msgid "CounterA"
msgstr ""
-
-#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 14:11:07
|
Revision: 178
http://pikloops.svn.sourceforge.net/pikloops/?rev=178&view=rev
Author: dionysos-sf
Date: 2007-10-18 07:11:09 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
New feature: time unit selector. Change number display format
Modified Paths:
--------------
prog/trunk/NEWS
prog/trunk/src/mainwidgetpl.cpp
prog/trunk/src/mainwidgetpl.h
prog/trunk/src/pikdelay.cpp
prog/trunk/src/pikdelay.h
Modified: prog/trunk/NEWS
===================================================================
--- prog/trunk/NEWS 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/NEWS 2007-10-18 14:11:09 UTC (rev 178)
@@ -1,3 +1,7 @@
+Version 0.3.0 :
+ New feature: a time unit selector
+ Don't display trailing zeroes
+
Version 0.2.5 :
Fix bug in delay calculation
Modify delay calculation management
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-18 14:11:09 UTC (rev 178)
@@ -43,8 +43,8 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(4.00, 1.00);
- statusMessage = i18n("Actual delay: %1 s (%2 clock cycles).") ;
+ loopValues = new PiKDelay(4.00, 1.00, 0.001);
+ statusMessage = i18n("Actual delay: %1%2 (%3 clock cycles).") ;
setSpacing(3) ;
setMargin(6) ;
@@ -61,12 +61,21 @@
clock->setCurrentItem(2) ;
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
- (new QHBox(grinput))->setMinimumWidth(40) ;
+ (new QHBox(grinput))->setMinimumWidth(10) ;
new QLabel(i18n("Needed delay (s)"), grinput) ;
delay = new KRestrictedLine (grinput,"delay editor","0123456789.") ;
delay->setText("1");
delay->setMinimumWidth(60);
+ (new QHBox(grinput))->setMinimumWidth(10) ;
+ new QLabel(i18n("Unit"), grinput) ;
+ units = new QComboBox(grinput) ;
+ static const char* units_items[] = { "s", "ms", "us", 0};
+ units->insertStrList( units_items );
+ units->setEditable(false) ;
+ units->setCurrentItem(1) ;
+
+
// output
QVGroupBox *groutput = new QVGroupBox( i18n("Ouput data") , this) ;
CodeText = new GQTextEdit(groutput,"code displayer");
@@ -74,10 +83,12 @@
CodeText->setReadOnly(true);
cycles = new QLabel(statusMessage
- .arg(loopValues->getTimeDelay(),0,'f',8)
+ .arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
.arg((loopValues->getMachineCycles()),0,'f',0) , groutput ) ;
connect(clock, SIGNAL(activated(const QString &)), this, SLOT(ClockChanged(const QString &)));
+ connect(units, SIGNAL(activated(const QString &)), this, SLOT(UnitChanged(const QString &)));
connect(delay, SIGNAL(returnPressed()), this, SLOT(TimeDelayChanged()));
connect(delay, SIGNAL(lostFocus()), this, SLOT(TimeDelayChanged()));
@@ -100,11 +111,13 @@
// set label names
QString routineName = i18n("delay_") ;
routineName += delay->text() ;
- routineName += i18n("_sec") ;
+ routineName += "_" ;
+ routineName += units->currentText() ;
QString loopName = routineName + i18n("_loop") ;
QString subRoutineName = i18n("sub_delay_") ;
subRoutineName += delay->text() ;
- subRoutineName += i18n("_sec") ;
+ subRoutineName += "_" ;
+ subRoutineName += units->currentText() ;
QString loopSubRoutineName = subRoutineName + i18n("_loop") ;
// generate comments
@@ -114,8 +127,10 @@
tmpCode += QDateTime::currentDateTime().toString(i18n("ddd yyyy-MMM-dd hh:mm:ss")) ;
tmpCode += ")\n; " ;
- tmpCode += QString(i18n("Time Delay = %1s with Osc = %2MHz\n\n")).
- arg(loopValues->getTimeDelay(),0,'f',8).arg(loopValues->getClockFrequency(),0,'f',8);
+ tmpCode += QString(i18n("Time Delay = %1%2 with Osc = %3MHz\n\n"))
+ .arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
+ .arg(loopValues->getClockFrequency(),0,'g',-1);
tmpCode += routineName ;
tmpCode += "\n" ;
@@ -205,8 +220,9 @@
}
}
// update status line
- cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
- .arg((loopValues->getMachineCycles()),0,'f',0) ) ;
+ cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
+ .arg((loopValues->getMachineCycles()),0,'f',0) ) ;
CodeText->setText(tmpCode);
CodeText->setFocus();
@@ -246,6 +262,29 @@
refreshWidget();
}
+
+/*!
+ \fn MainWidgetPL::UnitChanged()
+ */
+void MainWidgetPL::UnitChanged(const QString& s)
+{
+ double tmp;
+
+ if ( s == "s" ) {
+ tmp = 1.0;
+ }
+ else if ( s == "us" ) {
+ tmp = 0.000001;
+ }
+ else {
+ tmp = 0.001;
+ }
+
+ loopValues->setTimeUnit(tmp) ;
+ loopValues->Refresh();
+ refreshWidget();
+}
+
#include "mainwidgetpl.moc"
Modified: prog/trunk/src/mainwidgetpl.h
===================================================================
--- prog/trunk/src/mainwidgetpl.h 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/mainwidgetpl.h 2007-10-18 14:11:09 UTC (rev 178)
@@ -50,6 +50,7 @@
private:
PiKDelay *loopValues;
QComboBox *clock;
+ QComboBox *units;
QTextEdit *CodeText;
QLabel *cycles;
KRestrictedLine *delay;
@@ -61,6 +62,7 @@
protected slots:
void ClockChanged(const QString &);
+ void UnitChanged(const QString &);
void TimeDelayChanged();
public slots:
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/pikdelay.cpp 2007-10-18 14:11:09 UTC (rev 178)
@@ -23,10 +23,11 @@
#include <math.h>
-PiKDelay::PiKDelay(double ClkF, double TmDly)
+PiKDelay::PiKDelay(double ClkF, double TmDly, double TmUnt)
{
setClockFrequency(ClkF);
setTimeDelay(TmDly);
+ setTimeUnit(TmUnt);
Refresh();
}
@@ -43,7 +44,7 @@
{
CounterA = CounterB = CounterC = -1;
Overflow = 0 ;
- MachineCycleTime = 4.0/(ClockFrequency*1000000.0);
+ MachineCycleTime = 4.0/(ClockFrequency*1000000.0*TimeUnit);
MachineCycles = floor(TimeDelay/MachineCycleTime);
if ( MachineCycles < MACHINE_CYCLE_MIN ) {
@@ -128,6 +129,20 @@
/*!
+ \fn PiKDelay::setTimeUnit(double = 0.001)
+ */
+void PiKDelay::setTimeUnit(double TU)
+{
+ if ( TU == 1.0 || TU == 0.000001 ) {
+ TimeUnit = TU;
+ }
+ else {
+ TimeUnit = 0.001;
+ }
+}
+
+
+/*!
\fn PiKDelay::getMachineCycles()
*/
double PiKDelay::getMachineCycles()
Modified: prog/trunk/src/pikdelay.h
===================================================================
--- prog/trunk/src/pikdelay.h 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/pikdelay.h 2007-10-18 14:11:09 UTC (rev 178)
@@ -32,11 +32,12 @@
class PiKDelay{
public:
- PiKDelay(double = 4.00, double = 1.00);
+ PiKDelay(double = 4.00, double = 1.00, double = 0.001);
~PiKDelay();
void setClockFrequency(double);
void setTimeDelay(double);
+ void setTimeUnit(double);
double getMachineCycles();
double getTimeDelay();
double getClockFrequency();
@@ -50,6 +51,7 @@
private:
double ClockFrequency;
double TimeDelay;
+ double TimeUnit;
double MachineCycles;
double MachineCycleTime;
int CounterA;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 15:34:46
|
Revision: 177
http://pikloops.svn.sourceforge.net/pikloops/?rev=177&view=rev
Author: dionysos-sf
Date: 2007-10-17 08:34:50 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Fix typo
Modified Paths:
--------------
web/trunk/po/fr.po
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-17 15:30:54 UTC (rev 176)
+++ web/trunk/po/fr.po 2007-10-17 15:34:50 UTC (rev 177)
@@ -8,7 +8,7 @@
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-17 17:28+0200\n"
-"PO-Revision-Date: 2007-10-17 17:29+0200\n"
+"PO-Revision-Date: 2007-10-17 17:33+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -130,7 +130,7 @@
"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
msgstr ""
-"Vous pouvez également naviguer dans la <a href=\"http://pikloops.svn.sourceforge."
+"Vous pouvez également naviguer dans le <a href=\"http://pikloops.svn.sourceforge."
"net/viewvc/pikloops/prog/trunk/\" >dépôt</a>."
#: ../contribute.php:35
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 15:30:53
|
Revision: 176
http://pikloops.svn.sourceforge.net/pikloops/?rev=176&view=rev
Author: dionysos-sf
Date: 2007-10-17 08:30:54 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
web/trunk/po/de.po
web/trunk/po/es.po
web/trunk/po/fr.po
web/trunk/po/pikloops-web.pot
Modified: web/trunk/po/de.po
===================================================================
--- web/trunk/po/de.po 2007-10-17 15:30:37 UTC (rev 175)
+++ web/trunk/po/de.po 2007-10-17 15:30:54 UTC (rev 176)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PikLoops 0.2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 13:58+0200\n"
+"POT-Creation-Date: 2007-10-17 17:28+0200\n"
"PO-Revision-Date: 2007-07-24 21:11+0100\n"
"Last-Translator: Lukas Brausch <gro...@ar...>\n"
"Language-Team: German\n"
@@ -106,8 +106,10 @@
"du dir das SVN Verzeichnis anschauen:"
#: ../contribute.php:31
+#, fuzzy
msgid ""
-"This will create the 'pikloops/prog' directory in the current directory."
+"This will create the 'pikloops/prog/trunk' directory in the current "
+"directory."
msgstr "Dies erzeugt das 'pikloops/prog' Verzeichnis im aktuellen Verzeichnis."
#: ../contribute.php:32
@@ -117,7 +119,13 @@
"future changes:"
msgstr ""
-#: ../contribute.php:34
+#: ../contribute.php:33 ../index.php:35
+msgid ""
+"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
+"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
+msgstr ""
+
+#: ../contribute.php:35
#, fuzzy
msgid ""
"The more important help I need is translation. If you like to translate "
@@ -127,11 +135,11 @@
"Wenn Sie Pikloops in Ihrer Muttersprache möchten, dann kontaktieren Sie "
"mich, um die Sprache zu reservieren."
-#: ../contribute.php:35
+#: ../contribute.php:36
msgid "There isn't a lot of strings in the PikLoops GUI."
msgstr "Es sind nicht viele Strings in der PikLoops GUI."
-#: ../contribute.php:36
+#: ../contribute.php:37
msgid ""
"You can also, if you want, translate the documentation which is in the KDE "
"docbook format."
@@ -139,11 +147,11 @@
"Sie können auch, wenn Sie wollen, die Dokumentation übersetzen, welche im "
"KDE DOCBOOK Format ist."
-#: ../contribute.php:37
+#: ../contribute.php:38
msgid "For both, you have to get the PikLoops svn repository."
msgstr "Für beides, müssen Sie das PikLoops svn Repository beziehen."
-#: ../contribute.php:38
+#: ../contribute.php:39
msgid ""
"And if you think that my english isn't very good (you're probably "
"right ;-)), feel free to send me some fixes!"
@@ -151,7 +159,7 @@
"Wenn du der Meinung bist, dass die Übersetzung fehlerhaft ist (hast du wohl "
"recht ;-); sende mir ruhig einige Verbesserungen!"
-#: ../contribute.php:39
+#: ../contribute.php:40
msgid ""
"Web site can be translated also. I wrote it to easier translator work! Web "
"site strings are avaliable in po file like the PikLoops GUI."
@@ -160,45 +168,45 @@
"Arbeit der Übersetzer zu erleichtern. Die Strings der Webseite sind in der "
"po Datei, wie die PikLoops GUI, verfügbar."
-#: ../contribute.php:40
+#: ../contribute.php:41
msgid "There is also a svn repository for the web site:"
msgstr "Es existiert auch ein svn Repository für die Webseite:"
-#: ../contribute.php:41
+#: ../contribute.php:42
msgid "This will create the 'pikloops/web' directory in the current directory."
msgstr "Dies erzeugt das 'pikloops/web' Verzeichnis im aktuellen Verzeichnis."
-#: ../contribute.php:42
+#: ../contribute.php:43
msgid ""
"If you intend to become a PikLoops translator, your are greatly encouraged "
"to subscribe to the <a href=\"https://lists.sourceforge.net/lists/listinfo/"
"pikloops-l10n\" >translation mailing list</a>."
msgstr ""
-#: ../contribute.php:44
+#: ../contribute.php:45
msgid "There are several possible traps in the program translation."
msgstr ""
-#: ../contribute.php:46
+#: ../contribute.php:47
msgid ""
"Somewhere in the po file, you'll find the following string related to "
"translation credit:"
msgstr ""
-#: ../contribute.php:47
+#: ../contribute.php:48
msgid ""
"As explain in the <a href=\"http://l10n.kde.org/docs/translation-howto/gui-"
"peculiarities.html\" >KDE translation HOWTO</a>, strings that begin with \"_:"
"\" are context information strings and don't have to be translated."
msgstr ""
-#: ../contribute.php:48
+#: ../contribute.php:49
msgid ""
"So, in the corresponding 'msgstr', just put your name. This is the same "
"thing for the 'msgid' that hold the translator email."
msgstr ""
-#: ../contribute.php:49
+#: ../contribute.php:50
msgid ""
"If there is more than one translator for the same po file, make up a comma "
"separated list without space (translator1,translator2,translator3). Same "
@@ -206,38 +214,38 @@
"empty (address1,,address3). It then would look as follows:"
msgstr ""
-#: ../contribute.php:51
+#: ../contribute.php:52
msgid ""
"Somewhere else in the po file, you'll find the following string which is a "
"date format string:"
msgstr ""
-#: ../contribute.php:52
+#: ../contribute.php:53
msgid ""
"In this string, the letters don't have to be translated as its induce the "
"date formatting. But you are allowed to change the format if your know what "
"you do."
msgstr ""
-#: ../contribute.php:53
+#: ../contribute.php:54
msgid ""
"'dd' will be replaced by the day number in the month, 'dddd' will be "
"replaced by the day full name (e.g. 'Saturday') and 'ddd' will be replaced "
"by the day short name (e.g. 'Sat'). Same goes for month."
msgstr ""
-#: ../contribute.php:54
+#: ../contribute.php:55
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:56
+#: ../contribute.php:57
msgid ""
"There are several strings in which some \"words\" don't have to be "
"translated because these \"words\" are PIC instructions. Here are such "
"strings:"
msgstr ""
-#: ../contribute.php:57
+#: ../contribute.php:58
msgid ""
"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
"don't have to be translated. You can translate 'CounterD' (and others, there "
@@ -245,7 +253,7 @@
"pair because this will break the PIC code."
msgstr ""
-#: ../contribute.php:58
+#: ../contribute.php:59
msgid ""
"If you aren't in ease with these strings, don't translate them or just copy "
"the original."
@@ -515,7 +523,7 @@
"Wenn Sie die neuste Entwicklungs-Version möchten, checken Sie das Pikloops "
"SVN-Repository aus."
-#: ../index.php:35
+#: ../index.php:36
msgid ""
"I don't know ;-). So, you can subscribe to the announcement mailing list, a "
"very low traffic list. Go to the <a href=\"https://lists.sourceforge.net/"
Modified: web/trunk/po/es.po
===================================================================
--- web/trunk/po/es.po 2007-10-17 15:30:37 UTC (rev 175)
+++ web/trunk/po/es.po 2007-10-17 15:30:54 UTC (rev 176)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 13:58+0200\n"
+"POT-Creation-Date: 2007-10-17 17:28+0200\n"
"PO-Revision-Date: 2007-09-29 18:55+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
@@ -113,8 +113,10 @@
"sólo obtén la copia del repositorio de svn:"
#: ../contribute.php:31
+#, fuzzy
msgid ""
-"This will create the 'pikloops/prog' directory in the current directory."
+"This will create the 'pikloops/prog/trunk' directory in the current "
+"directory."
msgstr "Esto creará el directorio 'pikloops/prog' en el directorio actual."
#: ../contribute.php:32
@@ -124,8 +126,14 @@
"future changes:"
msgstr ""
-#: ../contribute.php:34
+#: ../contribute.php:33 ../index.php:35
msgid ""
+"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
+"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
+msgstr ""
+
+#: ../contribute.php:35
+msgid ""
"The more important help I need is translation. If you like to translate "
"PikLoops in your mother language, feel free to contact me to reserve it."
msgstr ""
@@ -133,11 +141,11 @@
"tu idioma, siéntete libre de contactar conmigo para que pueda asignarte a la "
"traducción."
-#: ../contribute.php:35
+#: ../contribute.php:36
msgid "There isn't a lot of strings in the PikLoops GUI."
msgstr "No hay muchas cadenas de texto en la interfaz gráfica de PikLoops."
-#: ../contribute.php:36
+#: ../contribute.php:37
msgid ""
"You can also, if you want, translate the documentation which is in the KDE "
"docbook format."
@@ -145,12 +153,12 @@
"Si quieres también puedes traducir la documentación que está en el formato "
"docbook de KDE."
-#: ../contribute.php:37
+#: ../contribute.php:38
msgid "For both, you have to get the PikLoops svn repository."
msgstr ""
"Para ambas cosas tendrás que obtener una copia del repositorio de Pikloops."
-#: ../contribute.php:38
+#: ../contribute.php:39
msgid ""
"And if you think that my english isn't very good (you're probably "
"right ;-)), feel free to send me some fixes!"
@@ -158,7 +166,7 @@
"Y si crees que la versión española no es muy buena (probablemente tengas "
"razón ;-)), por favor ¡envíame tus correcciones!"
-#: ../contribute.php:39
+#: ../contribute.php:40
msgid ""
"Web site can be translated also. I wrote it to easier translator work! Web "
"site strings are avaliable in po file like the PikLoops GUI."
@@ -168,26 +176,26 @@
"sitio web están disponibles en ficheros po, al igual que las cadenas de la "
"interfaz gráfica."
-#: ../contribute.php:40
+#: ../contribute.php:41
msgid "There is also a svn repository for the web site:"
msgstr "También hay un repositorio svn para el sitio web:"
-#: ../contribute.php:41
+#: ../contribute.php:42
msgid "This will create the 'pikloops/web' directory in the current directory."
msgstr "Esto creará el directorio 'pikloops/web' en el directorio actual."
-#: ../contribute.php:42
+#: ../contribute.php:43
msgid ""
"If you intend to become a PikLoops translator, your are greatly encouraged "
"to subscribe to the <a href=\"https://lists.sourceforge.net/lists/listinfo/"
"pikloops-l10n\" >translation mailing list</a>."
msgstr ""
-#: ../contribute.php:44
+#: ../contribute.php:45
msgid "There are several possible traps in the program translation."
msgstr "Hay muchas posibles trampas en la traducción del programa."
-#: ../contribute.php:46
+#: ../contribute.php:47
msgid ""
"Somewhere in the po file, you'll find the following string related to "
"translation credit:"
@@ -195,20 +203,20 @@
"En algún lugar del fichero po, encontrarás la siguiente cadena relacionada "
"con los agradecimientos de la traducción:"
-#: ../contribute.php:47
+#: ../contribute.php:48
msgid ""
"As explain in the <a href=\"http://l10n.kde.org/docs/translation-howto/gui-"
"peculiarities.html\" >KDE translation HOWTO</a>, strings that begin with \"_:"
"\" are context information strings and don't have to be translated."
msgstr ""
-#: ../contribute.php:48
+#: ../contribute.php:49
msgid ""
"So, in the corresponding 'msgstr', just put your name. This is the same "
"thing for the 'msgid' that hold the translator email."
msgstr ""
-#: ../contribute.php:49
+#: ../contribute.php:50
msgid ""
"If there is more than one translator for the same po file, make up a comma "
"separated list without space (translator1,translator2,translator3). Same "
@@ -216,38 +224,38 @@
"empty (address1,,address3). It then would look as follows:"
msgstr ""
-#: ../contribute.php:51
+#: ../contribute.php:52
msgid ""
"Somewhere else in the po file, you'll find the following string which is a "
"date format string:"
msgstr ""
-#: ../contribute.php:52
+#: ../contribute.php:53
msgid ""
"In this string, the letters don't have to be translated as its induce the "
"date formatting. But you are allowed to change the format if your know what "
"you do."
msgstr ""
-#: ../contribute.php:53
+#: ../contribute.php:54
msgid ""
"'dd' will be replaced by the day number in the month, 'dddd' will be "
"replaced by the day full name (e.g. 'Saturday') and 'ddd' will be replaced "
"by the day short name (e.g. 'Sat'). Same goes for month."
msgstr ""
-#: ../contribute.php:54
+#: ../contribute.php:55
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:56
+#: ../contribute.php:57
msgid ""
"There are several strings in which some \"words\" don't have to be "
"translated because these \"words\" are PIC instructions. Here are such "
"strings:"
msgstr ""
-#: ../contribute.php:57
+#: ../contribute.php:58
msgid ""
"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
"don't have to be translated. You can translate 'CounterD' (and others, there "
@@ -255,7 +263,7 @@
"pair because this will break the PIC code."
msgstr ""
-#: ../contribute.php:58
+#: ../contribute.php:59
msgid ""
"If you aren't in ease with these strings, don't translate them or just copy "
"the original."
@@ -504,7 +512,7 @@
"PikLoops SVN repository."
msgstr ""
-#: ../index.php:35
+#: ../index.php:36
msgid ""
"I don't know ;-). So, you can subscribe to the announcement mailing list, a "
"very low traffic list. Go to the <a href=\"https://lists.sourceforge.net/"
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-17 15:30:37 UTC (rev 175)
+++ web/trunk/po/fr.po 2007-10-17 15:30:54 UTC (rev 176)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 13:58+0200\n"
-"PO-Revision-Date: 2007-10-17 13:59+0200\n"
+"POT-Creation-Date: 2007-10-17 17:28+0200\n"
+"PO-Revision-Date: 2007-10-17 17:29+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -110,8 +110,10 @@
"récupérer le dépôt SVN :"
#: ../contribute.php:31
-msgid "This will create the 'pikloops/prog' directory in the current directory."
-msgstr "Cela créera le répertoire « pikloops/prog » dans le répertoire courant."
+msgid ""
+"This will create the 'pikloops/prog/trunk' directory in the current "
+"directory."
+msgstr "Cela créera le répertoire « pikloops/prog/trunk » dans le répertoire courant."
#: ../contribute.php:32
msgid ""
@@ -123,8 +125,16 @@
"écriture sur le SVN PikLoops doivent utiliser la commande suivante afin de "
"pourvoir envoyer ultérieurement leurs modifications :"
-#: ../contribute.php:34
+#: ../contribute.php:33 ../index.php:35
msgid ""
+"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
+"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
+msgstr ""
+"Vous pouvez également naviguer dans la <a href=\"http://pikloops.svn.sourceforge."
+"net/viewvc/pikloops/prog/trunk/\" >dépôt</a>."
+
+#: ../contribute.php:35
+msgid ""
"The more important help I need is translation. If you like to translate "
"PikLoops in your mother language, feel free to contact me to reserve it."
msgstr ""
@@ -132,13 +142,13 @@
"souhaitez traduire PikLoops dans votre langue maternelle, n'hésitez pas à me "
"contacter pour réserver la traduction."
-#: ../contribute.php:35
+#: ../contribute.php:36
msgid "There isn't a lot of strings in the PikLoops GUI."
msgstr ""
"Il n'y a pas beaucoup de chaînes à traduire dans l'interface graphique de "
"PikLoops."
-#: ../contribute.php:36
+#: ../contribute.php:37
msgid ""
"You can also, if you want, translate the documentation which is in the KDE "
"docbook format."
@@ -146,11 +156,11 @@
"Vous pouvez également, si vous le souhaitez, traduire la documentation qui "
"est au format docbook KDE."
-#: ../contribute.php:37
+#: ../contribute.php:38
msgid "For both, you have to get the PikLoops svn repository."
msgstr "Pour les deux, vous devez récupérer le dépôt svn de PikLoops."
-#: ../contribute.php:38
+#: ../contribute.php:39
msgid ""
"And if you think that my english isn't very good (you're probably "
"right ;-)), feel free to send me some fixes!"
@@ -158,7 +168,7 @@
"Et si vous pensez que mon anglais n'est pas terrible (vous avez probablement "
"raison ;-)), n'hésitez pas à m'envoyer des corrections !"
-#: ../contribute.php:39
+#: ../contribute.php:40
msgid ""
"Web site can be translated also. I wrote it to easier translator work! Web "
"site strings are avaliable in po file like the PikLoops GUI."
@@ -168,15 +178,15 @@
"disponibles sous forme de fichier po tout comme l'interface graphique de "
"PikLoops."
-#: ../contribute.php:40
+#: ../contribute.php:41
msgid "There is also a svn repository for the web site:"
msgstr "Il existe également un dépôt svn pour le site web :"
-#: ../contribute.php:41
+#: ../contribute.php:42
msgid "This will create the 'pikloops/web' directory in the current directory."
msgstr "Cela créera le répertoire « pikloops/web » dans le répertoire courant."
-#: ../contribute.php:42
+#: ../contribute.php:43
msgid ""
"If you intend to become a PikLoops translator, your are greatly encouraged "
"to subscribe to the <a href=\"https://lists.sourceforge.net/lists/listinfo/"
@@ -187,11 +197,11 @@
"sourceforge.net/lists/listinfo/pikloops-l10n\" >liste de diffusion des "
"traducteurs</a>."
-#: ../contribute.php:44
+#: ../contribute.php:45
msgid "There are several possible traps in the program translation."
msgstr "Il y a plusieurs pièges possibles dans la traduction du programme."
-#: ../contribute.php:46
+#: ../contribute.php:47
msgid ""
"Somewhere in the po file, you'll find the following string related to "
"translation credit:"
@@ -199,7 +209,7 @@
"Quelque part dans le fichier po, vous trouverez les chaînes de caractères "
"suivantes relatives au crédit des traducteurs :"
-#: ../contribute.php:47
+#: ../contribute.php:48
msgid ""
"As explain in the <a href=\"http://l10n.kde.org/docs/translation-howto/gui-"
"peculiarities.html\" >KDE translation HOWTO</a>, strings that begin with \"_:"
@@ -210,7 +220,7 @@
"chaînes qui commencent « _: » sont des chaînes d'information de "
"contexte et ne doivent donc pas être traduites."
-#: ../contribute.php:48
+#: ../contribute.php:49
msgid ""
"So, in the corresponding 'msgstr', just put your name. This is the same "
"thing for the 'msgid' that hold the translator email."
@@ -219,7 +229,7 @@
"C'est la même chose pour le champ « msgid » qui contient le "
"courriel du traducteur."
-#: ../contribute.php:49
+#: ../contribute.php:50
msgid ""
"If there is more than one translator for the same po file, make up a comma "
"separated list without space (translator1,translator2,translator3). Same "
@@ -232,7 +242,7 @@
"ignorez le courriel d'un traducteur, laissez le champ correspondant vide "
"(courriel1,,courriel3). Cela ressemblera alors à :"
-#: ../contribute.php:51
+#: ../contribute.php:52
msgid ""
"Somewhere else in the po file, you'll find the following string which is a "
"date format string:"
@@ -240,7 +250,7 @@
"Autre part dans le fichier po, vous trouverez la chaîne de caractère "
"suivante qui une chaîne de format de date :"
-#: ../contribute.php:52
+#: ../contribute.php:53
msgid ""
"In this string, the letters don't have to be translated as its induce the "
"date formatting. But you are allowed to change the format if your know what "
@@ -250,7 +260,7 @@
"impliquent le formatage de la date. Mais vous pouvez modifier le format si "
"vous savez ce que vous faites."
-#: ../contribute.php:53
+#: ../contribute.php:54
msgid ""
"'dd' will be replaced by the day number in the month, 'dddd' will be "
"replaced by the day full name (e.g. 'Saturday') and 'ddd' will be replaced "
@@ -262,11 +272,11 @@
"jour (par exemple, « Sam »). C'est la même chose avec le formatage "
"du mois."
-#: ../contribute.php:54
+#: ../contribute.php:55
msgid "As an example, here is my choice for the french translation:"
msgstr "Par exemple, voici mon choix pour la traduction française :"
-#: ../contribute.php:56
+#: ../contribute.php:57
msgid ""
"There are several strings in which some \"words\" don't have to be "
"translated because these \"words\" are PIC instructions. Here are such "
@@ -276,7 +286,7 @@
"doivent pas être traduits car ces « mots » sont des instructions "
"PIC. Voici de telles chaînes :"
-#: ../contribute.php:57
+#: ../contribute.php:58
msgid ""
"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
"don't have to be translated. You can translate 'CounterD' (and others, there "
@@ -289,7 +299,7 @@
"occurrences pour chacun) mais assurez-vous de ne pas faire d'erreur "
"typographique entre les paires car cela casserait le code PIC."
-#: ../contribute.php:58
+#: ../contribute.php:59
msgid ""
"If you aren't in ease with these strings, don't translate them or just copy "
"the original."
@@ -567,7 +577,7 @@
"Si vous souhaitez obtenir la dernière version de développement, vous pouvez "
"récupérer le dépôt SVN de PikLoops."
-#: ../index.php:35
+#: ../index.php:36
msgid ""
"I don't know ;-). So, you can subscribe to the announcement mailing list, a "
"very low traffic list. Go to the <a href=\"https://lists.sourceforge.net/"
Modified: web/trunk/po/pikloops-web.pot
===================================================================
--- web/trunk/po/pikloops-web.pot 2007-10-17 15:30:37 UTC (rev 175)
+++ web/trunk/po/pikloops-web.pot 2007-10-17 15:30:54 UTC (rev 176)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-17 13:58+0200\n"
+"POT-Creation-Date: 2007-10-17 17:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -94,7 +94,8 @@
#: ../contribute.php:31
msgid ""
-"This will create the 'pikloops/prog' directory in the current directory."
+"This will create the 'pikloops/prog/trunk' directory in the current "
+"directory."
msgstr ""
#: ../contribute.php:32
@@ -104,77 +105,83 @@
"future changes:"
msgstr ""
-#: ../contribute.php:34
+#: ../contribute.php:33 ../index.php:35
msgid ""
+"You can also browse through the <a href=\"http://pikloops.svn.sourceforge."
+"net/viewvc/pikloops/prog/trunk/\" >repository</a>."
+msgstr ""
+
+#: ../contribute.php:35
+msgid ""
"The more important help I need is translation. If you like to translate "
"PikLoops in your mother language, feel free to contact me to reserve it."
msgstr ""
-#: ../contribute.php:35
+#: ../contribute.php:36
msgid "There isn't a lot of strings in the PikLoops GUI."
msgstr ""
-#: ../contribute.php:36
+#: ../contribute.php:37
msgid ""
"You can also, if you want, translate the documentation which is in the KDE "
"docbook format."
msgstr ""
-#: ../contribute.php:37
+#: ../contribute.php:38
msgid "For both, you have to get the PikLoops svn repository."
msgstr ""
-#: ../contribute.php:38
+#: ../contribute.php:39
msgid ""
"And if you think that my english isn't very good (you're probably "
"right ;-)), feel free to send me some fixes!"
msgstr ""
-#: ../contribute.php:39
+#: ../contribute.php:40
msgid ""
"Web site can be translated also. I wrote it to easier translator work! Web "
"site strings are avaliable in po file like the PikLoops GUI."
msgstr ""
-#: ../contribute.php:40
+#: ../contribute.php:41
msgid "There is also a svn repository for the web site:"
msgstr ""
-#: ../contribute.php:41
+#: ../contribute.php:42
msgid "This will create the 'pikloops/web' directory in the current directory."
msgstr ""
-#: ../contribute.php:42
+#: ../contribute.php:43
msgid ""
"If you intend to become a PikLoops translator, your are greatly encouraged "
"to subscribe to the <a href=\"https://lists.sourceforge.net/lists/listinfo/"
"pikloops-l10n\" >translation mailing list</a>."
msgstr ""
-#: ../contribute.php:44
+#: ../contribute.php:45
msgid "There are several possible traps in the program translation."
msgstr ""
-#: ../contribute.php:46
+#: ../contribute.php:47
msgid ""
"Somewhere in the po file, you'll find the following string related to "
"translation credit:"
msgstr ""
-#: ../contribute.php:47
+#: ../contribute.php:48
msgid ""
"As explain in the <a href=\"http://l10n.kde.org/docs/translation-howto/gui-"
"peculiarities.html\" >KDE translation HOWTO</a>, strings that begin with \"_:"
"\" are context information strings and don't have to be translated."
msgstr ""
-#: ../contribute.php:48
+#: ../contribute.php:49
msgid ""
"So, in the corresponding 'msgstr', just put your name. This is the same "
"thing for the 'msgid' that hold the translator email."
msgstr ""
-#: ../contribute.php:49
+#: ../contribute.php:50
msgid ""
"If there is more than one translator for the same po file, make up a comma "
"separated list without space (translator1,translator2,translator3). Same "
@@ -182,38 +189,38 @@
"empty (address1,,address3). It then would look as follows:"
msgstr ""
-#: ../contribute.php:51
+#: ../contribute.php:52
msgid ""
"Somewhere else in the po file, you'll find the following string which is a "
"date format string:"
msgstr ""
-#: ../contribute.php:52
+#: ../contribute.php:53
msgid ""
"In this string, the letters don't have to be translated as its induce the "
"date formatting. But you are allowed to change the format if your know what "
"you do."
msgstr ""
-#: ../contribute.php:53
+#: ../contribute.php:54
msgid ""
"'dd' will be replaced by the day number in the month, 'dddd' will be "
"replaced by the day full name (e.g. 'Saturday') and 'ddd' will be replaced "
"by the day short name (e.g. 'Sat'). Same goes for month."
msgstr ""
-#: ../contribute.php:54
+#: ../contribute.php:55
msgid "As an example, here is my choice for the french translation:"
msgstr ""
-#: ../contribute.php:56
+#: ../contribute.php:57
msgid ""
"There are several strings in which some \"words\" don't have to be "
"translated because these \"words\" are PIC instructions. Here are such "
"strings:"
msgstr ""
-#: ../contribute.php:57
+#: ../contribute.php:58
msgid ""
"In these strings, 'movwf', 'decfsz' and 'goto' are PIC instructions and "
"don't have to be translated. You can translate 'CounterD' (and others, there "
@@ -221,7 +228,7 @@
"pair because this will break the PIC code."
msgstr ""
-#: ../contribute.php:58
+#: ../contribute.php:59
msgid ""
"If you aren't in ease with these strings, don't translate them or just copy "
"the original."
@@ -469,7 +476,7 @@
"PikLoops SVN repository."
msgstr ""
-#: ../index.php:35
+#: ../index.php:36
msgid ""
"I don't know ;-). So, you can subscribe to the announcement mailing list, a "
"very low traffic list. Go to the <a href=\"https://lists.sourceforge.net/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
