Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joseph C. <tex...@us...> - 2005-02-07 08:06:30
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16543/skins/default Modified Files: administration-page.thtml advanced-page.thtml bar-chart-widget.thtml corpus-page.thtml history-page.thtml magnet-page.thtml pop3-configuration-panel.thtml pop3-security-panel.thtml style.css windows-configuration.thtml xmlrpc-local.thtml Log Message: A bunch of skin updates. Current version of config bar is now skinned on Default, Windows, and OceanBlue. Some changes may cause side effects with existing skins, those we are keeping will be fixed. Index: pop3-security-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pop3-security-panel.thtml 6 Jan 2005 14:57:05 -0000 1.7 --- pop3-security-panel.thtml 7 Feb 2005 08:05:51 -0000 1.8 *************** *** 11,15 **** <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="pop3_local" value="1" /> --- 11,15 ---- <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="pop3_local" value="1" /> *************** *** 19,23 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="pop3_local" value="2" /> --- 19,23 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="pop3_local" value="2" /> Index: pop3-configuration-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-configuration-panel.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pop3-configuration-panel.thtml 6 Jan 2005 14:57:05 -0000 1.6 --- pop3-configuration-panel.thtml 7 Feb 2005 08:05:51 -0000 1.7 *************** *** 69,73 **** <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="pop3_force_fork" value="1" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> --- 69,73 ---- <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="submit toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="pop3_force_fork" value="1" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> *************** *** 80,84 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="pop3_force_fork" value="0" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> --- 80,84 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="pop3_force_fork" value="0" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> Index: bar-chart-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bar-chart-widget.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bar-chart-widget.thtml 14 Jan 2005 09:30:24 -0000 1.3 --- bar-chart-widget.thtml 7 Feb 2005 08:05:51 -0000 1.4 *************** *** 39,43 **** <TMPL_IF NAME="bar_if_percent"> ! <td bgcolor="<TMPL_VAR NAME="bar_bucket_color">" title="<TMPL_VAR NAME="bar_bucket_name2"> (<TMPL_VAR NAME="bar_width">)" width="<TMPL_VAR NAME="bar_width">%"> <img src="<TMPL_VAR NAME="Skin_Root">pix.gif" alt="" height="20" width="1" /> </td> --- 39,43 ---- <TMPL_IF NAME="bar_if_percent"> ! <td bgcolor="<TMPL_VAR NAME="bar_bucket_color">" title="<TMPL_VAR NAME="bar_bucket_name2"> (<TMPL_VAR NAME="bar_width">)" width="<TMPL_VAR NAME="bar_width">%" height="20"> <img src="<TMPL_VAR NAME="Skin_Root">pix.gif" alt="" height="20" width="1" /> </td> Index: xmlrpc-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xmlrpc-local.thtml 6 Jan 2005 14:57:05 -0000 1.3 --- xmlrpc-local.thtml 7 Feb 2005 08:05:51 -0000 1.4 *************** *** 11,15 **** <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="toggleOn" id="securityAcceptXMLRPCOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="xmlrpc_local" value="1" /> --- 11,15 ---- <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptXMLRPCOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="xmlrpc_local" value="1" /> *************** *** 19,23 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="securityAcceptXMLRPCOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="xmlrpc_local" value="2" /> --- 19,23 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptXMLRPCOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="xmlrpc_local" value="2" /> Index: advanced-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/advanced-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** advanced-page.thtml 14 Jan 2005 20:43:19 -0000 1.10 --- advanced-page.thtml 7 Feb 2005 08:05:51 -0000 1.11 *************** *** 24,28 **** </table> ! <div class="advancedWidgets"> <form action="/advanced" method="post"> --- 24,28 ---- </table> ! <p /> <div class="advancedWidgets"> <form action="/advanced" method="post"> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** magnet-page.thtml 6 Feb 2005 02:07:05 -0000 1.8 --- magnet-page.thtml 7 Feb 2005 08:05:51 -0000 1.9 *************** *** 74,81 **** </td> <td align="center"> ! <input type="submit" class="deleteButton" name="update" value="<TMPL_VAR NAME="Localize_Update">" /> </td> <td align="center"> ! <input type="submit" class="deleteButton" name="delete" value="<TMPL_VAR NAME="Localize_Remove">" /> </td> </tr> --- 74,81 ---- </td> <td align="center"> ! <input type="submit" class="submit deleteButton" name="update" value="<TMPL_VAR NAME="Localize_Update">" /> </td> <td align="center"> ! <input type="submit" class="submit deleteButton" name="delete" value="<TMPL_VAR NAME="Localize_Remove">" /> </td> </tr> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** history-page.thtml 7 Feb 2005 03:44:59 -0000 1.52 --- history-page.thtml 7 Feb 2005 08:05:51 -0000 1.53 *************** *** 126,130 **** <th scope="col" align="center"> ! <input type="submit" class="reclassifyButton" name="change" value="<TMPL_VAR NAME="Localize_Reclassify">" /> </th> --- 126,130 ---- <th scope="col" align="center"> ! <input type="submit" class="submit reclassifyButton" name="change" value="<TMPL_VAR NAME="Localize_Reclassify">" /> </th> *************** *** 191,195 **** <TMPL_IF NAME="History_If_Reclassified"> <TMPL_VAR NAME="Localize_History_Reclassified"> ! <input type="submit" class="undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> <TMPL_ELSE> --- 191,195 ---- <TMPL_IF NAME="History_If_Reclassified"> <TMPL_VAR NAME="Localize_History_Reclassified"> ! <input type="submit" class="submit undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> <TMPL_ELSE> *************** *** 243,247 **** </td> <td align="center"> ! <input type="submit" class="reclassifyButton" name="change" value="<TMPL_VAR NAME="Localize_Reclassify">" /> </td> </tr> --- 243,247 ---- </td> <td align="center"> ! <input type="submit" class="submit reclassifyButton" name="change" value="<TMPL_VAR NAME="Localize_Reclassify">" /> </td> </tr> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** style.css 7 Feb 2005 03:44:59 -0000 1.11 --- style.css 7 Feb 2005 08:05:51 -0000 1.12 *************** *** 70,73 **** --- 70,78 ---- } + .menuLink { + display: block; + width: 100%; + } + /*********************************************************/ /* Table Settings */ *************** *** 224,231 **** } - .advancedWidgets { - margin-top: 1em; - } - /*********************************************************/ /* Config Bars */ --- 229,232 ---- *************** *** 246,254 **** .configBarOption { - display: inline; border: 1px solid #CCCC99; padding: 0.3em; - margin: 0.1em 0.3em; white-space: nowrap; float: left; } --- 247,255 ---- .configBarOption { border: 1px solid #CCCC99; + margin: 0.3em; padding: 0.3em; white-space: nowrap; + display: inline; float: left; } *************** *** 259,263 **** } ! .checkLabel { border: 1px solid #CCCC99; } --- 260,264 ---- } ! .checkLabel { border: 1px solid #CCCC99; } Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** corpus-page.thtml 6 Feb 2005 02:10:04 -0000 1.16 --- corpus-page.thtml 7 Feb 2005 08:05:51 -0000 1.17 *************** *** 177,181 **** </td> <td> ! <input type="submit" name="bucket_settings" value="<TMPL_VAR NAME="Localize_ApplyChanges">" /> </td> </tr> --- 177,181 ---- </td> <td> ! <input type="submit" class="submit" name="bucket_settings" value="<TMPL_VAR NAME="Localize_ApplyChanges">" /> </td> </tr> *************** *** 248,252 **** <br /> ! (<TMPL_VAR NAME="Localize_Bucket_LastReset">: <TMPL_VAR NAME="Corpus_Last_Reset"> ) </TMPL_IF> --- 248,252 ---- <br /> ! <TMPL_VAR NAME="Localize_Bucket_LastReset">: <TMPL_VAR NAME="Corpus_Last_Reset"> </TMPL_IF> Index: windows-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/windows-configuration.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** windows-configuration.thtml 6 Jan 2005 14:57:05 -0000 1.2 --- windows-configuration.thtml 7 Feb 2005 08:05:51 -0000 1.3 *************** *** 14,18 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="windowConsoleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="windows_console" value="0" /> --- 14,18 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="windowConsoleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="windows_console" value="0" /> *************** *** 22,26 **** <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="toggleOn" id="windowConsoleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="windows_console" value="1" /> --- 22,26 ---- <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="submit toggleOn" id="windowConsoleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="windows_console" value="1" /> *************** *** 53,57 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="windows_trayicon" value="0" /> --- 53,57 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="windows_trayicon" value="0" /> *************** *** 61,65 **** <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="windows_trayicon" value="1" /> --- 61,65 ---- <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="submit toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="windows_trayicon" value="1" /> Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** administration-page.thtml 14 Jan 2005 20:43:18 -0000 1.3 --- administration-page.thtml 7 Feb 2005 08:05:50 -0000 1.4 *************** *** 19,23 **** <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="toggleOn" id="securityAcceptHTTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="localui" value="1" /> --- 19,23 ---- <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptHTTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="localui" value="1" /> *************** *** 27,31 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="securityAcceptHTTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="localui" value="2" /> --- 27,31 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptHTTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="localui" value="2" /> *************** *** 56,60 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="update_check" value="1" /> --- 56,60 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="update_check" value="1" /> *************** *** 62,66 **** <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> ! <input type="submit" class="toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="update_check" value="2" /> --- 62,66 ---- <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> ! <input type="submit" class="submit toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="update_check" value="2" /> *************** *** 84,88 **** <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="send_stats" value="1" /> --- 84,88 ---- <TMPL_VAR NAME="Localize_Yes"> </span> ! <input type="submit" class="submit toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="send_stats" value="1" /> *************** *** 92,96 **** <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="send_stats" value="2" /> --- 92,96 ---- <TMPL_VAR NAME="Localize_No"> </span> ! <input type="submit" class="submit toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="send_stats" value="2" /> |
|
From: Joseph C. <tex...@us...> - 2005-02-07 08:06:05
|
Update of /cvsroot/popfile/engine/skins/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16543/skins/windows Modified Files: style.css Log Message: A bunch of skin updates. Current version of config bar is now skinned on Default, Windows, and OceanBlue. Some changes may cause side effects with existing skins, those we are keeping will be fixed. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/windows/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** style.css 10 Aug 2004 02:18:32 -0000 1.5 --- style.css 7 Feb 2005 08:05:52 -0000 1.6 *************** *** 1,374 **** ! /* ! Windows skin emulates the look and feel of the Windows GUI without loading any ! graphics. Almost all the colors are system colors so the skin fits right in ! with your color scheme. It looks best by far in Mozilla 1.3+ on any OS. IE 6 ! is ok but doesn't show the full effect, IE 5 is ugly but usable. Opera 7.10 ! and KDE Konqueror 3.04 are pretty good. Konqueror 2, and Mac OS9 IE 5 are not ! bad. Its does well on OS X's Safari 1.0 beta, Opera, and IE 5. It seems on ! most Mac browsers the "title bar" is not working correctly due to the way ! they handle system colors. ! ! Original design by Joseph Connors (TexasFett) <wi...@te...>, ! but wouldn't look nearly as good without Dan Martin (Kraelen). Thanks Dan. ! ! CSS2 sytle comments are below the line they apply to. CSS1 style comments are ! hacks to make the skin look better on IE and Konqueror since they ignore CSS1 ! commenting. But that means its not fully valid CSS2. ! ! 03-29-03: Last Major Update ! 04-19-03: Fix menu visited color on IE 6 - version accepted into POPFile 0.19 ! 05-03-03: Center footer better and add "icon" in Mozilla, maybe Opera head fix ! 05-05-03: Changed a lot of head stuff, got rid of absolute positioning ! 05-21-03: Did what I could to fix the changes 0.19 RC3 made to the footer ! 08-06-04: Add support for some new 0.22 classes and some code improvements ! */ ! ! body { ! background-color: Background; ! font: caption; ! /* set the system fonts for everything. */ ! margin: 1%; ! margin-bottom: 1em; ! } ! ! .shell { ! border-style: outset; ! border-color: ActiveBorder; ! border-width: 2px; ! background-color: ThreeDFace; ! width: 100%; ! padding: 0; ! } ! ! .shellTop { ! width: 100%; ! padding: 0; ! margin: 0; ! border: 0; ! border-collapse: collapse; ! } ! ! .shellLeft, .shellRight { ! display: none; ! } ! ! .shellTopRow, .shellTopLeft, .shellTopCenter, .shellTopRight { ! display: none; ! } ! ! .shellBottomRow, .shellBottomLeft, .shellBottomRight { ! display: none; ! } ! ! .naked { ! color: ButtonText; ! background-color: transparent; ! font-weight: normal; ! } ! ! td.naked { ! padding: 0; ! margin: 0; ! border: 0; ! } ! ! a:link { ! color: darkblue; ! text-decoration: none; ! } ! ! a:visited { ! color: darkblue; ! text-decoration: none; ! } ! ! A:link:hover, A:visited:hover { ! text-decoration: underline; ! } ! ! submit { ! color: ButtonText; ! background-color: ThreeDFace; ! } ! ! table.head { ! width: 100%; ! color: ButtonText; ! background-color: ActiveCaption; ! border: 2px outset ActiveBorder; ! margin: 0; ! } ! ! td.settingsPanel { ! border: 2px groove ActiveBorder; ! padding: 5px; ! } ! ! .head { ! font-weight: bold; ! color: CaptionText; ! margin: 0; ! } ! ! .head a { ! text-decoration: none; ! color: ActiveCaption; ! // color: CaptionText; ! /* hack that fixes head on IE and Konq */ ! vertical-align: middle; ! } ! ! .head a:after { ! /* Close button in Mozilla */ ! content:" X "; ! font-weight: bold; ! border: 1px outset ActiveBorder; ! color: ButtonText; ! background-color: ButtonFace; ! } ! ! td.head:before { ! /* POPFile "icon" for Mozilla */ ! content:"@ "; ! font-weight: bold; ! color: red; ! background-color: transparent; ! } ! ! .head a:hover { ! color: red; ! text-decoration: none; ! } ! ! .menu { ! padding: 0; ! margin: 0; ! } ! ! table.menu { ! padding-top: 5px; ! } ! ! .menu A, .menu A:hover { ! color: ButtonText; ! text-decoration: none; ! font-weight: normal; ! } ! ! .menuSelected { ! padding: 0; ! } ! ! .menuSelected a { ! Color: ButtonText; ! background-color: ThreeDFace; ! border-style: outset outset none; ! border-color: ActiveBorder; ! border-width: 2px; ! padding-top: 1px; ! padding-left: 5px; ! padding-right: 5px; ! padding-bottom: 6px; ! text-decoration: none; ! -moz-border-radius-topleft: 5px; ! -moz-border-radius-topright: 5px; ! } ! ! .menuStandard { ! padding: 0; ! padding-top: 6px; ! padding-bottom: 1px; ! } ! ! .menuStandard a { ! color: ButtonText; ! background-color: ThreeDFace; ! border-style: outset outset none; ! border-color: ActiveBorder; ! border-width: 2px; ! padding-top: 1px; ! padding-left: 5px; ! padding-right: 5px; ! padding-bottom: 1px; ! text-decoration: none; ! -moz-border-radius-topleft: 5px; ! -moz-border-radius-topright: 5px; ! } ! ! .menuSpacer { ! display: none; ! } ! ! .menuIndent { ! display: none; ! } ! ! .menuStandard a:hover, .menuSelected a:hover { ! /* required for Konqueror to not show default hover color */ ! text-decoration: none; ! color: ButtonText; ! } ! ! .menuStandard a:visited, .menuSelected a:visited { ! /* required for IE 6 to leave the visited menu text black */ ! text-decoration: none; ! color: ButtonText; ! } ! ! h2 { ! font-weight: bold; ! font-size: 1.2em; ! } ! ! tr.rowEven { ! background-color: transparent; ! /* If you would like more color try lightblue. */ ! } ! ! tr.rowOdd { ! background-color: lightgrey; ! /* Try AppWorkspace if you would like a system color along with transparent */ ! } ! ! tr.rowHighlighted { ! background-color: InfoBackground; ! } ! ! tr.rowOdd:hover, tr.rowEven:hover { ! background-color: InfoBackground; ! } ! ! .footer { ! color: InfoText; ! border: 1px solid black; ! background-color: InfoBackground; ! font-weight: normal; ! margin: auto; ! /* this gives actual table centering in some browsers */ ! margin-top: 1em; ! text-align: center; ! /* this works in IE 6 */ ! } ! ! td.footerBody { ! text-align: center; ! padding-top: 2px; ! padding-bottom: 2px; ! } ! ! table.footer br { ! display: none; ! } ! ! .bottomLink { ! margin: 1em; ! } ! ! .bottomLink img { ! display: none; ! } ! ! td.stabColor01 { ! border: 1px outset ActiveBorder; ! } ! ! td.accuracy0to49 { ! background-color: red; ! color: black; ! } ! ! td.accuracy50to93 { ! background-color: yellow; ! color: black; ! } ! ! td.accuracy94to100 { ! background-color: green; ! color: black; ! } ! ! td.historyNavigatorTop { ! text-align: right; ! padding-right: 0.5em; ! } ! ! td.historyNavigatorBottom { ! text-align: right; ! padding-right: 0.5em; ! padding-bottom: 1em; ! } ! ! .historyWidgetsTop { ! border-top: none; ! border-bottom: none; ! width: 100%; ! } ! ! .historyTable { ! border-top: none; ! border-bottom: none; ! width: 100%; ! } ! ! .openMessageTable, .lookupResultsTable { ! border-width: 2px; ! border-style: inset; ! } ! ! .openMessageCloser { ! text-align: right; ! font-size: larger; ! font-weight: bold; ! } ! ! .openMessageBody { ! font-size: 1em; ! text-align: left; ! } ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! div.securityExplanation { ! margin-left: 0.8em; ! margin-right: 0.8em; ! margin-bottom: 0.8em; ! margin-top: 0; ! font-size: 95%; ! } ! ! div.helpMessage { ! background-color: InfoBackground; ! border: 1px solid black; ! padding: 0.4em; ! margin: 0.3em; ! padding-bottom: 0; ! } ! ! span.graphFont { ! font-size: 95%; ! } ! ! tr.rowBoundary { ! background-color: InfoBackground; ! } ! ! /* - uncomment this section if you want On text to be bold ! .bucketsWidgetStateOn, .configWidgetStateOn, .securityWidgetStateOn { ! font-weight: bold; ! } ! */ ! ! /* - uncomment this section for small version and adjust the percent as needed ! * { ! font-size: 98%; ! } ! */ --- 1,382 ---- ! /* ! Windows skin emulates the look and feel of the Windows GUI without loading any ! graphics. Almost all the colors are system colors so the skin fits right in ! with your color scheme. It looks best by far in Mozilla 1.3+ on any OS. IE 6 ! is ok but doesn't show the full effect, IE 5 is ugly but usable. Opera 7.10 ! and KDE Konqueror 3.04 are pretty good. Konqueror 2, and Mac OS9 IE 5 are not ! bad. Its does well on OS X's Safari 1.0 beta, Opera, and IE 5. It seems on ! most Mac browsers the "title bar" is not working correctly due to the way ! they handle system colors. ! ! Original design by Joseph Connors (TexasFett) <wi...@te...>, ! but wouldn't look nearly as good without Dan Martin (Kraelen). Thanks Dan. ! ! CSS2 sytle comments are below the line they apply to. CSS1 style comments are ! hacks to make the skin look better on IE and Konqueror since they ignore CSS1 ! commenting. But that means its not fully valid CSS2. ! ! 03-29-03: Last Major Update ! 04-19-03: Fix menu visited color on IE 6 - version accepted into POPFile 0.19 ! 05-03-03: Center footer better and add "icon" in Mozilla, maybe Opera head fix ! 05-05-03: Changed a lot of head stuff, got rid of absolute positioning ! 05-21-03: Did what I could to fix the changes 0.19 RC3 made to the footer ! 08-06-04: Add support for some new 0.22 classes and some code improvements ! */ ! ! body { ! background-color: Background; ! font: caption; ! /* set the system fonts for everything. */ ! margin: 1%; ! margin-bottom: 1em; ! } ! ! .shell { ! border-style: outset; ! border-color: ActiveBorder; ! border-width: 2px; ! background-color: ThreeDFace; ! width: 100%; ! padding: 0; ! } ! ! .shellTop { ! width: 100%; ! padding: 0; ! margin: 0; ! border: 0; ! border-collapse: collapse; ! } ! ! .shellLeft, .shellRight { ! display: none; ! } ! ! .shellTopRow, .shellTopLeft, .shellTopCenter, .shellTopRight { ! display: none; ! } ! ! .shellBottomRow, .shellBottomLeft, .shellBottomRight { ! display: none; ! } ! ! .naked { ! color: ButtonText; ! background-color: transparent; ! font-weight: normal; ! } ! ! td.naked { ! padding: 0; ! margin: 0; ! border: 0; ! } ! ! a:link { ! color: darkblue; ! text-decoration: none; ! } ! ! a:visited { ! color: darkblue; ! text-decoration: none; ! } ! ! A:link:hover, A:visited:hover { ! text-decoration: underline; ! } ! ! submit { ! color: ButtonText; ! background-color: ThreeDFace; ! } ! ! table.head { ! width: 100%; ! color: ButtonText; ! background-color: ActiveCaption; ! border: 2px outset ActiveBorder; ! margin: 0; ! } ! ! td.settingsPanel { ! border: 2px groove ActiveBorder; ! padding: 5px; ! } ! ! .head { ! font-weight: bold; ! color: CaptionText; ! margin: 0; ! } ! ! .head a { ! text-decoration: none; ! color: ActiveCaption; ! // color: CaptionText; ! /* hack that fixes head on IE and Konq */ ! vertical-align: middle; ! } ! ! .head a:after { ! /* Close button in Mozilla */ ! content:" X "; ! font-weight: bold; ! border: 1px outset ActiveBorder; ! color: ButtonText; ! background-color: ButtonFace; ! } ! ! td.head:before { ! /* POPFile "icon" for Mozilla */ ! content:"@ "; ! font-weight: bold; ! color: red; ! background-color: transparent; ! } ! ! .head a:hover { ! color: red; ! text-decoration: none; ! } ! ! .menu { ! padding: 0; ! margin: 0; ! } ! ! table.menu { ! padding-top: 5px; ! } ! ! .menu A, .menu A:hover { ! color: ButtonText; ! text-decoration: none; ! font-weight: normal; ! } ! ! .menuSelected { ! padding: 0; ! } ! ! .menuSelected a { ! Color: ButtonText; ! background-color: ThreeDFace; ! border-style: outset outset none; ! border-color: ActiveBorder; ! border-width: 2px; ! padding-top: 1px; ! padding-left: 5px; ! padding-right: 5px; ! padding-bottom: 6px; ! text-decoration: none; ! -moz-border-radius-topleft: 5px; ! -moz-border-radius-topright: 5px; ! } ! ! .menuStandard { ! padding: 0; ! padding-top: 6px; ! padding-bottom: 1px; ! } ! ! .menuStandard a { ! color: ButtonText; ! background-color: ThreeDFace; ! border-style: outset outset none; ! border-color: ActiveBorder; ! border-width: 2px; ! padding-top: 1px; ! padding-left: 5px; ! padding-right: 5px; ! padding-bottom: 1px; ! text-decoration: none; ! -moz-border-radius-topleft: 5px; ! -moz-border-radius-topright: 5px; ! } ! ! .menuSpacer { ! display: none; ! } ! ! .menuIndent { ! display: none; ! } ! ! .menuStandard a:hover, .menuSelected a:hover { ! /* required for Konqueror to not show default hover color */ ! text-decoration: none; ! color: ButtonText; ! } ! ! .menuStandard a:visited, .menuSelected a:visited { ! /* required for IE 6 to leave the visited menu text black */ ! text-decoration: none; ! color: ButtonText; ! } ! ! h2 { ! font-weight: bold; ! font-size: 1.2em; ! } ! ! tr.rowEven { ! background-color: transparent; ! /* If you would like more color try lightblue. */ ! } ! ! tr.rowOdd { ! background-color: lightgrey; ! /* Try AppWorkspace if you would like a system color along with transparent */ ! } ! ! tr.rowHighlighted { ! background-color: InfoBackground; ! } ! ! tr.rowOdd:hover, tr.rowEven:hover { ! background-color: InfoBackground; ! } ! ! .footer { ! color: InfoText; ! border: 1px solid black; ! background-color: InfoBackground; ! font-weight: normal; ! margin: auto; ! /* this gives actual table centering in some browsers */ ! margin-top: 1em; ! text-align: center; ! /* this works in IE 6 */ ! } ! ! td.footerBody { ! text-align: center; ! padding-top: 2px; ! padding-bottom: 2px; ! } ! ! table.footer br { ! display: none; ! } ! ! .bottomLink { ! margin: 1em; ! } ! ! .bottomLink img { ! display: none; ! } ! ! td.stabColor01 { ! border: 1px outset ActiveBorder; ! } ! ! td.historyNavigatorTop { ! text-align: right; ! padding-right: 0.5em; ! } ! ! td.historyNavigatorBottom { ! text-align: right; ! padding-right: 0.5em; ! padding-bottom: 1em; ! } ! ! .historyWidgetsTop { ! border-top: none; ! border-bottom: none; ! width: 100%; ! } ! ! .historyTable { ! border-top: none; ! border-bottom: none; ! width: 100%; ! } ! ! .openMessageTable, .lookupResultsTable { ! border-width: 2px; ! border-style: inset; ! } ! ! .openMessageCloser { ! text-align: right; ! font-size: larger; ! font-weight: bold; ! } ! ! .openMessageBody { ! font-size: 1em; ! text-align: left; ! } ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! div.securityExplanation { ! margin-left: 0.8em; ! margin-right: 0.8em; ! margin-bottom: 0.8em; ! margin-top: 0; ! font-size: 95%; ! } ! ! div.helpMessage { ! background-color: InfoBackground; ! border: 1px solid black; ! padding: 0.4em; ! margin: 0.3em; ! padding-bottom: 0; ! } ! ! span.graphFont { ! font-size: 95%; ! } ! ! tr.rowBoundary { ! background-color: InfoBackground; ! } ! ! table.settingsTable + br { ! display: none; ! } ! ! .configBar { ! border: 2px groove ActiveBorder; ! background-color: transparent; ! } ! ! .configBarOption { ! border: 2px groove ActiveBorder; ! margin: 0.3em; ! padding: 5px; ! white-space: nowrap; ! display: inline; ! float: left; ! } ! ! .toggleConfigBar { ! float: right; ! border: 0; ! } ! ! /* - uncomment this section if you want On text to be bold ! .bucketsWidgetStateOn, .configWidgetStateOn, .securityWidgetStateOn { ! font-weight: bold; ! } ! */ ! ! /* - uncomment this section for small version and adjust the percent as needed ! * { ! font-size: 98%; ! } ! */ |
|
From: Joseph C. <tex...@us...> - 2005-02-07 08:06:04
|
Update of /cvsroot/popfile/engine/skins/oceanblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16543/skins/oceanblue Modified Files: common-middle.thtml style.css Log Message: A bunch of skin updates. Current version of config bar is now skinned on Default, Windows, and OceanBlue. Some changes may cause side effects with existing skins, those we are keeping will be fixed. Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/oceanblue/common-middle.thtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common-middle.thtml 13 Aug 2004 04:12:47 -0000 1.1 --- common-middle.thtml 7 Feb 2005 08:05:52 -0000 1.2 *************** *** 36,48 **** <a class="menuLink" href="/magnets?session=<TMPL_VAR NAME="Session_Key">&start_magnet=0"><TMPL_VAR NAME="Localize_Header_Magnets"></a> </li> ! <li class="<TMPL_VAR NAME="Common_Middle_Tab3">"> ! <a class="menuLink" href="/configuration?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Configuration"></a> ! </li> <li class="<TMPL_VAR NAME="Common_Middle_Tab4">"> ! <a class="menuLink" href="/security?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Security"></a> </li> <li class="<TMPL_VAR NAME="Common_Middle_Tab5">"> <a class="menuLink" href="/advanced?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </li> </ul> </div> --- 36,48 ---- <a class="menuLink" href="/magnets?session=<TMPL_VAR NAME="Session_Key">&start_magnet=0"><TMPL_VAR NAME="Localize_Header_Magnets"></a> </li> ! ! <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <li class="<TMPL_VAR NAME="Common_Middle_Tab4">"> ! <a class="menuLink" href="/administration?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </li> <li class="<TMPL_VAR NAME="Common_Middle_Tab5">"> <a class="menuLink" href="/advanced?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </li> + </TMPL_IF> </ul> </div> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/oceanblue/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** style.css 30 Jan 2005 08:56:20 -0000 1.5 --- style.css 7 Feb 2005 08:05:52 -0000 1.6 *************** *** 106,109 **** --- 106,113 ---- } + .settingsTable + br { + display: none; + } + .settingsPanel { color: white; *************** *** 369,370 **** --- 373,396 ---- * html .shell {height: 1%;} /* End hide from IE5-mac */ + + .configBar { + background-color: transparent; + } + + .configBar td { + border: 1px solid #2175bc; + } + + .configBarOption { + border: 1px solid #2175bc; + margin: 0.3em; + padding: 5px; + white-space: nowrap; + display: inline; + float: left; + } + + .toggleConfigBar { + float: right; + border: 0; + } |
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2647/skins/default Modified Files: common-after-configuration.thtml common-before-configuration.thtml configuration-bar.thtml history-bar.thtml history-page.thtml style.css Log Message: The config bar is getting better. Hiding still only works on History page. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configuration-bar.thtml 6 Feb 2005 11:10:47 -0000 1.7 --- configuration-bar.thtml 7 Feb 2005 03:44:59 -0000 1.8 *************** *** 1,4 **** ! <tr> ! <td class="settingsPanel configBar" width="100%" align="center"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="configBarOption"> --- 1,4 ---- ! <tr> ! <td> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="configBarOption"> *************** *** 71,74 **** </div> </form> ! </td> ! </tr> --- 71,74 ---- </div> </form> ! </td> ! </tr> Index: common-before-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-before-configuration.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common-before-configuration.thtml 14 Jan 2005 20:43:19 -0000 1.2 --- common-before-configuration.thtml 7 Feb 2005 03:44:59 -0000 1.3 *************** *** 1,7 **** ! </td> ! <td class="shellRight"></td> ! </tr> ! <tr> ! <td class="shellLeft"></td> ! <td> ! <table class="settingsTable" width="100%" cellpadding="10%" cellspacing="0"> --- 1 ---- ! <table class="configBar" cellspacing="0" width="100%"> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** history-page.thtml 6 Feb 2005 11:10:47 -0000 1.51 --- history-page.thtml 7 Feb 2005 03:44:59 -0000 1.52 *************** *** 308,316 **** <TMPL_INCLUDE NAME="common-before-configuration.thtml"> - <TMPL_IF NAME="If_Show_Config_Bars"> <TMPL_INCLUDE NAME="history-bar.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> <TMPL_ELSE> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="toggleConfigBar"> --- 308,316 ---- <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_IF NAME="If_Show_Config_Bars"> <TMPL_INCLUDE NAME="history-bar.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> <TMPL_ELSE> + <tr><td> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="toggleConfigBar"> *************** *** 319,323 **** </div> </form> ! </TMPL_IF> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> --- 319,323 ---- </div> </form> ! </td></tr> </TMPL_IF> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** style.css 6 Feb 2005 11:10:47 -0000 1.10 --- style.css 7 Feb 2005 03:44:59 -0000 1.11 *************** *** 233,236 **** --- 233,242 ---- .configBar { background-color: #DFDFAF; + border: 1px solid #CCCC99; + margin-top: 0.5em; + } + + .configBar td { + border: 1px solid #CCCC99; } *************** *** 250,253 **** --- 256,260 ---- .toggleConfigBar { float: right; + border: 0; } Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** history-bar.thtml 6 Feb 2005 11:10:47 -0000 1.9 --- history-bar.thtml 7 Feb 2005 03:44:59 -0000 1.10 *************** *** 1,5 **** ! <tr> ! ! <td class="settingsPanel configBar" width="100%" align="center"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> --- 1,4 ---- ! <tr> ! <td> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> *************** *** 76,81 **** </TMPL_IF> </div> - </form> ! ! </tr> --- 75,79 ---- </TMPL_IF> </div> </form> ! </td> ! </tr> Index: common-after-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-after-configuration.thtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common-after-configuration.thtml 14 Jan 2005 20:43:19 -0000 1.1 --- common-after-configuration.thtml 7 Feb 2005 03:44:59 -0000 1.2 *************** *** 1,3 **** ! </table> </td> <td class="shellRight"></td> --- 1,5 ---- ! </td> ! </tr> ! </table> </td> <td class="shellRight"></td> |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:19:22
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11546 Added Files: getssl.nsh Log Message: Add SSL download/install capability to the main POPFile installer. --- NEW FILE: getssl.nsh --- #-------------------------------------------------------------------------- # # getssl.nsh --- This NSIS 'include' file is used by the POPFile installer (installer.nsi) # and by the 'SSL Setup' wizard (add-ons\addssl.nsi) to download and install # SSL support for POPFile. If the optional SSL support is required, the # installer will download the necessary files during the installation. The # 'SSL Setup' wizard can be used to add SSL support to an existing POPFile # 0.22 (or later) installation. This 'include' file ensures that these two # programs download and install the same SSL files. # # Copyright (c) 2005 John Graham-Cumming # # This file is part of POPFile # # POPFile 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. # # POPFile 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 POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #-------------------------------------------------------------------------- # This product downloads software developed by the OpenSSL Project for use # in the OpenSSL Toolkit (http://www.openssl.org/) #-------------------------------------------------------------------------- ; This version of the script has been tested with the "NSIS 2" compiler (final), ; released 7 February 2004, with no "official" NSIS patches applied. ;------------------------------------------------ ; This script requires the 'untgz' NSIS plugin ;------------------------------------------------ ; This script uses a special NSIS plugin (untgz) to extract files from the *.tar.gz archives. ; ; The 'NSIS Archives' page for the 'untgz' plugin (description, example and download links): ; http://nsis.sourceforge.net/archive/nsisweb.php?page=74&instances=0,32 ; ; Alternative download links can be found at the 'untgz' author's site: ; http://www.darklogic.org/win32/nsis/plugins/ ; ; To compile this script, copy the 'untgz.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\). The 'untgz' source and example files can be unzipped to the ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. ; ; Tested with versions 1.0.5, 1.0.6 and 1.0.7 of the 'untgz' plugin. #-------------------------------------------------------------------------- # URLs used to download the necessary SSL support archives and files # (all from the University of Winnipeg Repository) #-------------------------------------------------------------------------- ; To check if the target computer is connected to the Internet, we ping this address: !define C_UWR_URL_TO_PING "http://theoryx5.uwinnipeg.ca/" ; In addition to some extra Perl modules, POPFile's SSL support needs two OpenSSL DLLs. !define C_UWR_IO_SOCKET_SSL "http://theoryx5.uwinnipeg.ca/ppms/x86/IO-Socket-SSL.tar.gz" !define C_UWR_NET_SSLEAY "http://theoryx5.uwinnipeg.ca/ppms/x86/Net_SSLeay.pm.tar.gz" !define C_UWR_DLL_SSLEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/ssleay32.dll" !define C_UWR_DLL_LIBEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/libeay32.dll" #-------------------------------------------------------------------------- # User Registers (Global) #-------------------------------------------------------------------------- Var G_SSL_FILEURL ; full URL used to download SSL file Var G_PLS_FIELD_2 ; used to customise translated text strings #-------------------------------------------------------------------------- # Installer Section: POPFile SSL Support #-------------------------------------------------------------------------- !ifdef INSTALLER Section /o "SSL Support" SecSSL !else Section "SSL Support" SecSSL !endif !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result Push ${L_RESULT} SetDetailsPrint textonly DetailPrint "$(PFI_LANG_PROG_CHECKINTERNET) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" SetDetailsPrint listonly !define FLAG_ICC_FORCE_CONNECTION 0x00000001 ; The system call result is returned in 'r10' (i.e. in $R0) System::Call "wininet::InternetCheckConnection( \ t '${C_UWR_URL_TO_PING}', \ i ${FLAG_ICC_FORCE_CONNECTION}, i 0) i .r10" StrCmp ${L_RESULT} "error" no_ie3 StrCmp ${L_RESULT} "0" no_connection DetailPrint "InternetCheckConnection: online (${L_RESULT})" Goto download no_ie3: DetailPrint "InternetCheckConnection: no IE3" Goto manual_connect no_connection: DetailPrint "InternetCheckConnection: offline" manual_connect: DetailPrint "InternetCheckConnection: manual connect requested" MessageBox MB_OKCANCEL|MB_ICONINFORMATION "$(PFI_LANG_MB_INTERNETCONNECT)" IDOK download DetailPrint "InternetCheckConnection: cancelled by user" !ifdef INSTALLER Goto exit !else Goto error_exit !endif download: ; Download the archives and OpenSSL DLLs Push "${C_UWR_IO_SOCKET_SSL}" Call GetSSLFile Push "${C_UWR_NET_SSLEAY}" Call GetSSLFile Push "${C_UWR_DLL_SSLEAY32}" Call GetSSLFile Push "${C_UWR_DLL_LIBEAY32}" Call GetSSLFile ; Now install the files required for SSL support StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\IO\Socket" DetailPrint "" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "IO-Socket-SSL.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" StrCmp ${L_RESULT} "success" label_a error_exit label_a: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "SSLeay.pm" StrCmp ${L_RESULT} "success" label_b error_exit label_b: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net\SSLeay" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "Handle.pm" StrCmp ${L_RESULT} "success" label_c error_exit label_c: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\auto\Net\SSLeay" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "OpenSSL DLL" DetailPrint "$(PFI_LANG_PROG_FILECOPY)" SetDetailsPrint listonly CopyFiles /SILENT "$PLUGINSDIR\ssleay32.dll" "$G_PLS_FIELD_1\ssleay32.dll" CopyFiles /SILENT "$PLUGINSDIR\libeay32.dll" "$G_PLS_FIELD_1\libeay32.dll" DetailPrint "" SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractV -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" -x ".exists" "*.html" "*.pl" "*.pm" -- StrCmp ${L_RESULT} "success" check_bs_file error_exit: SetDetailsPrint listonly DetailPrint "" SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_UNPACKFAIL)" SetDetailsPrint listonly DetailPrint "" MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MB_UNPACKFAIL)" !ifdef INSTALLER Goto exit !else Call GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" DetailPrint "----------------------------------------------------" Abort !endif check_bs_file: ; 'untgz' versions earlier than 1.0.6 (released 28 November 2004) are unable to extract ; empty files so this script creates the empty 'SSLeay.bs' file if necessary ; (to ensure all of the $G_MPLIBDIR\auto\Net\SSLeay\SSLeay.* files exist) IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" done: DetailPrint "" !ifdef INSTALLER exit: SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !endif Pop ${L_RESULT} !undef L_RESULT SectionEnd #-------------------------------------------------------------------------- # Installer Function: GetSSLFile # # Inputs: # (top of stack) - full URL used to download the SSL file # Outputs: # none #-------------------------------------------------------------------------- !define C_NSISDL_TRANSLATIONS "/TRANSLATE '$(PFI_LANG_NSISDL_DOWNLOADING)' '$(PFI_LANG_NSISDL_CONNECTING)' '$(PFI_LANG_NSISDL_SECOND)' '$(PFI_LANG_NSISDL_MINUTE)' '$(PFI_LANG_NSISDL_HOUR)' '$(PFI_LANG_NSISDL_PLURAL)' '$(PFI_LANG_NSISDL_PROGRESS)' '$(PFI_LANG_NSISDL_REMAINING)'" Function GetSSLFile Pop $G_SSL_FILEURL StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL Push $G_PLS_FIELD_1 Call StrBackSlash Call GetParent Pop $G_PLS_FIELD_2 StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2 IntOp $G_PLS_FIELD_2 $G_PLS_FIELD_2 + 1 StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1" "" $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "$G_SSL_FILEURL" $G_PLS_FIELD_2 DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" NSISdl::download ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" Pop $G_PLS_FIELD_2 StrCmp $G_PLS_FIELD_2 "success" file_received SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_1)" SetDetailsPrint listonly DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_NSISDLFAIL_1)${MB_NL}$(PFI_LANG_MB_NSISDLFAIL_2)" SetDetailsPrint listonly DetailPrint "" !ifdef ADDSSL Call GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" DetailPrint "----------------------------------------------------" Abort !endif file_received: FunctionEnd #-------------------------------------------------------------------------- # End of 'getssl.nsh' #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:17:03
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10310 Modified Files: installer.nsi Log Message: Display a new "Setup Summary" page which gives the user a chance to change the settings before installing POPFile. Also added the ability to download and install the SSL support files (just like the "SSL Setup" wizard). Use the new "repaired" language strings. Show all of the optional components instead of forcing the user to open the list by clicking on it. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.250 retrieving revision 1.251 diff -C2 -d -r1.250 -r1.251 *** installer.nsi 18 Jan 2005 00:07:48 -0000 1.250 --- installer.nsi 6 Feb 2005 23:16:53 -0000 1.251 *************** *** 496,499 **** --- 496,506 ---- ;--------------------------------------------------- + ; Installer Page - Show user what we are about to do and get permission to proceed + ; (this is the last page shown before the installation starts) + ;--------------------------------------------------- + + Page custom GetPermissionToInstall + + ;--------------------------------------------------- ; Installer Page - Install POPFile PROGRAM files ;--------------------------------------------------- *************** *** 609,612 **** --- 616,620 ---- ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" ReserveFile "${NSISDIR}\Plugins\System.dll" + ReserveFile "${NSISDIR}\Plugins\untgz.dll" ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" ReserveFile "ioG.ini" *************** *** 1587,1591 **** ;-------------------------------------------------------------------------- ! ; Install Perl modules: base.pm, bytes.pm the Encode collection and Text::Kakasi ;-------------------------------------------------------------------------- --- 1595,1599 ---- ;-------------------------------------------------------------------------- ! ; Install Perl modules: base.pm, bytes.pm, the Encode collection and Text::Kakasi ;-------------------------------------------------------------------------- *************** *** 1614,1618 **** !endif ! SubSection "Optional modules" SubSecOptional #-------------------------------------------------------------------------- --- 1622,1626 ---- !endif ! SubSection /e "Optional modules" SubSecOptional #-------------------------------------------------------------------------- *************** *** 1749,1752 **** --- 1757,1780 ---- SectionEnd + #-------------------------------------------------------------------------- + # Installer Section: (optional) SSL Support for POPFile (default = not selected) + # + # If this component is selected, the installer downloads and installs the extra + # Perl modules and the necessary OpenSSL libraries required to support SSL access + # access to mail servers. The installer waits until all of these extra files have + # been downloaded before installing any of them. If the download attempt fails, the + # installation will continue (since SSL support is an optional feature). A later + # attempt can be made by running the stand-alone 'SSL Setup' wizard to download + # and install only these extra SSL support files. + # + # Note: The 'getssl.nsh' file includes more than just the 'Section' code. + # + # The 'getssl.nsh' file is used by the 'SSL Setup' wizard to ensure it + # handles the downloading and installation of the SSL support files in the + # same way as the main POPFile installer. + #-------------------------------------------------------------------------- + + !include "getssl.nsh" + SubSectionEnd *************** *** 1768,1771 **** --- 1796,1800 ---- !insertmacro MUI_DESCRIPTION_TEXT ${SecIMAP} $(DESC_SecIMAP) !insertmacro MUI_DESCRIPTION_TEXT ${SecSOCKS} $(DESC_SecSOCKS) + !insertmacro MUI_DESCRIPTION_TEXT ${SecSSL} $(DESC_SecSSL) !ifndef NO_KAKASI !insertmacro MUI_DESCRIPTION_TEXT ${SecKakasi} "Kakasi (used to process Japanese email)" *************** *** 1813,1825 **** !define L_TEMP $R9 - !define L_VERSION $R8 Push ${L_TEMP} - Push ${L_VERSION} Call GetIEVersion ! Pop ${L_VERSION} ! StrCpy ${L_TEMP} ${L_VERSION} 1 StrCmp ${L_TEMP} '?' not_good IntCmp ${L_TEMP} 5 exit not_good exit --- 1842,1852 ---- !define L_TEMP $R9 Push ${L_TEMP} Call GetIEVersion ! Pop $G_PLS_FIELD_1 ! StrCpy ${L_TEMP} $G_PLS_FIELD_1 1 StrCmp ${L_TEMP} '?' not_good IntCmp ${L_TEMP} 5 exit not_good exit *************** *** 1832,1844 **** !insertmacro PFI_IO_TEXT "ioG.ini" "1" \ ! "$(PFI_LANG_PERLREQ_IO_TEXT_1)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_2)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_3)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_4)" !insertmacro PFI_IO_TEXT "ioG.ini" "2" \ ! "$(PFI_LANG_PERLREQ_IO_TEXT_5) ${L_VERSION}${IO_NL}${IO_NL}\ ! $(PFI_LANG_PERLREQ_IO_TEXT_6)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_7)" !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_PERLREQ_TITLE)" " " --- 1859,1871 ---- !insertmacro PFI_IO_TEXT "ioG.ini" "1" \ ! "$(PFI_LANG_PERLREQ_IO_TEXT_A)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_B)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_C)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_D)" !insertmacro PFI_IO_TEXT "ioG.ini" "2" \ ! "$(PFI_LANG_PERLREQ_IO_TEXT_E)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_F)\ ! $(PFI_LANG_PERLREQ_IO_TEXT_G)" !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_PERLREQ_TITLE)" " " *************** *** 1847,1855 **** exit: - Pop ${L_VERSION} Pop ${L_TEMP} !undef L_TEMP ! !undef L_VERSION FunctionEnd --- 1874,2007 ---- exit: Pop ${L_TEMP} !undef L_TEMP ! ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Installer Function: GetPermissionToInstall ! # (this is the last page shown before the installation starts) ! # ! # Display the information collected from the user to show what we are about to do. ! # The 'Back' button can be used to navigate to earlier pages if the user wishes to ! # change this information (i.e. select/deselect a component or change the install folder) ! #-------------------------------------------------------------------------- ! ! Function GetPermissionToInstall ! ! !define L_TEMP $R9 ! ! Push ${L_TEMP} ! ! ; This is a very simple custom page so we create the INI file here ! ! ; Ensure custom page matches the selected language (left-to-right or right-to-left order) ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Settings" "RTL" "$(^RTL)" ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Settings" "NumFields" "1" ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Type" "text" ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Left" "0" ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Right" "300" ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Top" "0" ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Bottom" "140" ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "Flags" "MULTILINE|HSCROLL|VSCROLL|READONLY" ! ! !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_SUMMARY_TITLE)" "$(PFI_LANG_SUMMARY_SUBTITLE)" ! ! ; The entires in the "Basic" and "Optional" component lists are indented a little ! ! !define C_NLT "${IO_NL}\t" ! ! IfFileExists "$G_ROOTDIR\popfile.pl" upgrade ! StrCpy ${L_TEMP} "$(PFI_LANG_SUMMARY_NEWLOCN)" ! GetDlgItem $G_DLGITEM $HWNDPARENT 1 ! SendMessage $G_DLGITEM ${WM_SETTEXT} 0 "STR:$(^InstallBtn)" ! Goto start_summary ! ! upgrade: ! StrCpy ${L_TEMP} "$(PFI_LANG_SUMMARY_UPGRADELOCN)" ! GetDlgItem $G_DLGITEM $HWNDPARENT 1 ! SendMessage $G_DLGITEM ${WM_SETTEXT} 0 "STR:$(PFI_LANG_INST_BTN_UPGRADE)" ! ! start_summary: ! StrCpy $G_PLS_FIELD_1 "${L_TEMP}${IO_NL}${IO_NL}\ ! $(PFI_LANG_SUMMARY_BASICLIST)${IO_NL}${C_NLT}\ ! $(PFI_LANG_SUMMARY_POPFILECORE)${C_NLT}\ ! $(PFI_LANG_SUMMARY_MINPERL)${C_NLT}\ ! $(PFI_LANG_SUMMARY_DEFAULTSKIN)${C_NLT}\ ! $(PFI_LANG_SUMMARY_DEFAULTLANG)" ! ! ; Now use the current component selections to update the data we will display, ! ! !insertmacro SectionNotSelected ${SecSkins} check_langs ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRASKINS)" ! ! check_langs: ! !insertmacro SectionNotSelected ${SecLangs} check_kakasi ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRALANGS)" ! ! check_kakasi: ! !ifndef NO_KAKASI ! !insertmacro SectionNotSelected ${SecKakasi} end_basic ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_KAKASI)" ! ! end_basic: ! !endif ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${IO_NL}${IO_NL}\ ! $(PFI_LANG_SUMMARY_OPTIONLIST)${IO_NL}" ! ! ; Check the optional components in alphabetic order ! ! StrCpy ${L_TEMP} "${C_NLT}$(PFI_LANG_SUMMARY_NONE)" ! ! !insertmacro SectionNotSelected ${SecIMAP} check_nntp ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_IMAP)" ! ! check_nntp: ! !insertmacro SectionNotSelected ${SecNNTP} check_smtp ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_NNTP)" ! ! check_smtp: ! !insertmacro SectionNotSelected ${SecSMTP} check_socks ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_SMTP)" ! ! check_socks: ! !insertmacro SectionNotSelected ${SecSOCKS} check_ssl ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_SOCKS)" ! ! check_ssl: ! !insertmacro SectionNotSelected ${SecSSL} check_xmlrpc ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_SSL)" ! ! check_xmlrpc: ! !insertmacro SectionNotSelected ${SecXMLRPC} end_optional ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_XMLRPC)" ! ! end_optional: ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${L_TEMP}${IO_NL}${IO_NL}\ ! $(PFI_LANG_SUMMARY_BACKBUTTON)" ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "State" $G_PLS_FIELD_1 ! ! ; Set focus to the button labelled "Install" or "Upgrade" (instead of the "Summary" data) ! ! !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioData.ini" ! Pop ${L_TEMP} ! GetDlgItem $G_DLGITEM $HWNDPARENT 1 ! SendMessage $HWNDPARENT ${WM_NEXTDLGCTL} $G_DLGITEM 1 ! !insertmacro MUI_INSTALLOPTIONS_SHOW ! ! Pop ${L_TEMP} ! ! !undef L_TEMP FunctionEnd *************** *** 3324,3334 **** MessageBox MB_YESNO|MB_ICONQUESTION "$(PFI_LANG_UN_MBREMDIR_1)" IDNO exit ! DetailPrint "$(PFI_LANG_UN_LOG_DELUSERDIR)" Delete "$G_ROOTDIR\*.*" RMDir /r $G_ROOTDIR IfFileExists "$G_ROOTDIR\*.*" 0 exit ! DetailPrint "$(PFI_LANG_UN_LOG_DELUSERERR)" ! MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_UN_MBREMERR_1): $G_ROOTDIR $(PFI_LANG_UN_MBREMERR_2)" exit: --- 3476,3486 ---- MessageBox MB_YESNO|MB_ICONQUESTION "$(PFI_LANG_UN_MBREMDIR_1)" IDNO exit ! DetailPrint "$(PFI_LANG_UN_LOG_DELROOTDIR)" Delete "$G_ROOTDIR\*.*" RMDir /r $G_ROOTDIR IfFileExists "$G_ROOTDIR\*.*" 0 exit ! DetailPrint "$(PFI_LANG_UN_LOG_DELROOTERR)" ! StrCpy $G_PLS_FIELD_1 $G_ROOTDIR ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_UN_MBREMERR_A)" exit: |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:12:47
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9882 Modified Files: pfi-library.nsh Log Message: Macros now grouped according to the scripts which use them, with some conditional compilation used. New SQLite functions added, including one to run a command supplied via the stack. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** pfi-library.nsh 20 Jan 2005 15:37:16 -0000 1.58 --- pfi-library.nsh 6 Feb 2005 23:12:35 -0000 1.59 *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.3" #-------------------------------------------------------------------------- --- 57,61 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.4" #-------------------------------------------------------------------------- *************** *** 154,363 **** !endif ;-------------------------------------------------------------------------- ! ; Used in 'adduser.nsi' to select the POPFile UI language according to the language used ! ; for the installation process (NSIS language names differ from those used by POPFile's UI) ;-------------------------------------------------------------------------- ! !macro UI_LANG_CONFIG PFI_SETTING UI_SETTING ! !insertmacro PFI_UNIQUE_ID ! StrCmp $LANGUAGE ${LANG_${PFI_SETTING}} 0 skip_${PFI_UNIQUE_ID} ! IfFileExists "$G_ROOTDIR\languages\${UI_SETTING}.msg" 0 lang_done ! StrCpy ${L_LANG} "${UI_SETTING}" ! Goto lang_save ! skip_${PFI_UNIQUE_ID}: !macroend ! #-------------------------------------------------------------------------- ! # ! # Macros used when writing log files during 'Outlook' and 'Outlook Express' account processing ! # ! #-------------------------------------------------------------------------- - !macro OECONFIG_LOG_ENTRY LOGTYPE VALUE WIDTH !insertmacro PFI_UNIQUE_ID ! Push $R9 ! Push $R8 ! StrCpy $R9 "${VALUE}" ! StrLen $R8 $R9 ! IntCmp $R8 ${WIDTH} copy_${PFI_UNIQUE_ID} 0 copy_${PFI_UNIQUE_ID} ! StrCpy $R9 "$R9 " ${WIDTH} ! copy_${PFI_UNIQUE_ID}: ! FileWrite $G_${LOGTYPE}_HANDLE "$R9 " ! Pop $R8 ! Pop $R9 ! !macroend ! !macro OOECONFIG_BEFORE_LOG VALUE WIDTH ! !insertmacro OECONFIG_LOG_ENTRY "OOECONFIG" "${VALUE}" "${WIDTH}" !macroend - !macro OOECONFIG_CHANGES_LOG VALUE WIDTH - !insertmacro OECONFIG_LOG_ENTRY "OOECHANGES" "${VALUE}" "${WIDTH}" - !macroend ! #-------------------------------------------------------------------------- # ! # Macro used by 'installer.nsi' when rearranging existing minimal Perl system # ! #-------------------------------------------------------------------------- ! !macro MinPerlMove SUBFOLDER ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "$G_ROOTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID} ! Rename "$G_ROOTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! #-------------------------------------------------------------------------- ! # ! # Macro used by 'installer.nsi' when rearranging existing skins ! # ! #-------------------------------------------------------------------------- ! !macro SkinMove OLDNAME NEWNAME ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "$G_ROOTDIR\skins\${OLDNAME}.css" 0 skip_${PFI_UNIQUE_ID} ! CreateDirectory "$G_ROOTDIR\skins\${NEWNAME}" ! Rename "$G_ROOTDIR\skins\${OLDNAME}.css" "$G_ROOTDIR\skins\${NEWNAME}\style.css" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! #-------------------------------------------------------------------------- ! # ! # Macro used by 'installer.nsi' when uninstalling the new style skins ! # ! #-------------------------------------------------------------------------- ! !macro DeleteSkin FOLDER ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\*.css" ! Delete "${FOLDER}\*.gif" ! Delete "${FOLDER}\*.png" ! Delete "${FOLDER}\*.thtml" ! RMDir "${FOLDER}" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! #-------------------------------------------------------------------------- ! # ! # Macro used by 'adduser.nsi' to ensure current skin selection uses lowercase ! # ! #-------------------------------------------------------------------------- ! !macro SkinCaseChange OLDNAME NEWNAME ! !insertmacro PFI_UNIQUE_ID ! StrCmp ${L_SKIN} "${OLDNAME}" 0 skip_${PFI_UNIQUE_ID} ! StrCpy ${L_SKIN} "${NEWNAME}" ! Goto save_skin_setting ! skip_${PFI_UNIQUE_ID}: ! !macroend ! #-------------------------------------------------------------------------- ! # ! # Macro used by 'adduser.nsi' to update HKCU registry data using HKLM data ! # ! #-------------------------------------------------------------------------- - !macro Copy_HKLM_to_HKCU VAR NAME - - ReadRegStr ${VAR} HKLM "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "${NAME}" - WriteRegStr HKCU "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "${NAME}" ${VAR} ! !macroend ! ! #-------------------------------------------------------------------------- # ! # Macro used to preserve up to 3 backup copies of a file # ! # (Note: input file will be "removed" by renaming it) ! #-------------------------------------------------------------------------- ;-------------------------------------------------------------------------- ! ; This version generates uses 'DetailsPrint' to generate more meaningful log entries ;-------------------------------------------------------------------------- ! !macro BACKUP_123_DP FOLDER FILE !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\${FILE}" 0 continue_${PFI_UNIQUE_ID} ! SetDetailsPrint none ! IfFileExists "${FOLDER}\${FILE}.bk1" 0 the_first_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk2" 0 the_second_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk3" 0 the_third_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\${FILE}.bk3" ! the_third_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk2" "${FOLDER}\${FILE}.bk3" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk3' updated" ! SetDetailsPrint none ! the_second_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk1" "${FOLDER}\${FILE}.bk2" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk2' updated" ! SetDetailsPrint none ! the_first_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}" "${FOLDER}\${FILE}.bk1" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk1' updated" ! continue_${PFI_UNIQUE_ID}: !macroend ;-------------------------------------------------------------------------- ! ; This version does not include any 'DetailsPrint' instructions ;-------------------------------------------------------------------------- ! !macro BACKUP_123 FOLDER FILE !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\${FILE}" 0 continue_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk1" 0 the_first_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk2" 0 the_second_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk3" 0 the_third_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\${FILE}.bk3" ! the_third_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk2" "${FOLDER}\${FILE}.bk3" ! the_second_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk1" "${FOLDER}\${FILE}.bk2" ! the_first_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}" "${FOLDER}\${FILE}.bk1" - continue_${PFI_UNIQUE_ID}: !macroend #============================================================================================== # ! # Functions used only during installation of POPFile or User Data files (in alphabetic order) # # Installer Function: GetIEVersion --- 154,395 ---- !endif + #-------------------------------------------------------------------------- + # + # Macros used to preserve up to 3 backup copies of a file + # + # (Note: input file will be "removed" by renaming it) + #-------------------------------------------------------------------------- + ;-------------------------------------------------------------------------- ! ; This version generates uses 'DetailsPrint' to generate more meaningful log entries ;-------------------------------------------------------------------------- ! !macro BACKUP_123_DP FOLDER FILE ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\${FILE}" 0 continue_${PFI_UNIQUE_ID} ! SetDetailsPrint none ! IfFileExists "${FOLDER}\${FILE}.bk1" 0 the_first_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk2" 0 the_second_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk3" 0 the_third_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\${FILE}.bk3" ! ! the_third_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk2" "${FOLDER}\${FILE}.bk3" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk3' updated" ! SetDetailsPrint none ! ! the_second_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk1" "${FOLDER}\${FILE}.bk2" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk2' updated" ! SetDetailsPrint none ! ! the_first_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}" "${FOLDER}\${FILE}.bk1" ! SetDetailsPrint listonly ! DetailPrint "Backup file '${FILE}.bk1' updated" ! ! continue_${PFI_UNIQUE_ID}: !macroend ! ;-------------------------------------------------------------------------- ! ; This version does not include any 'DetailsPrint' instructions ! ;-------------------------------------------------------------------------- ! ! !macro BACKUP_123 FOLDER FILE !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\${FILE}" 0 continue_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk1" 0 the_first_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk2" 0 the_second_${PFI_UNIQUE_ID} ! IfFileExists "${FOLDER}\${FILE}.bk3" 0 the_third_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\${FILE}.bk3" ! the_third_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk2" "${FOLDER}\${FILE}.bk3" ! the_second_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}.bk1" "${FOLDER}\${FILE}.bk2" ! the_first_${PFI_UNIQUE_ID}: ! Rename "${FOLDER}\${FILE}" "${FOLDER}\${FILE}.bk1" ! continue_${PFI_UNIQUE_ID}: !macroend ! #============================================================================== # ! # Macros used only by the 'installer.nsi' script: # ! # MinPerlMove ! # SkinMove ! # DeleteSkin ! # SectionNotSelected ! #============================================================================== ! !ifdef INSTALLER | TRANSLATOR ! ;-------------------------------------------------------------------------- ! ; 'installer.nsi' macro used when rearranging existing minimal Perl system ! ;-------------------------------------------------------------------------- ! !macro MinPerlMove SUBFOLDER ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "$G_ROOTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID} ! Rename "$G_ROOTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! ;-------------------------------------------------------------------------- ! ; 'installer.nsi' macro used when rearranging existing skins ! ;-------------------------------------------------------------------------- ! !macro SkinMove OLDNAME NEWNAME ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "$G_ROOTDIR\skins\${OLDNAME}.css" 0 skip_${PFI_UNIQUE_ID} ! CreateDirectory "$G_ROOTDIR\skins\${NEWNAME}" ! Rename "$G_ROOTDIR\skins\${OLDNAME}.css" "$G_ROOTDIR\skins\${NEWNAME}\style.css" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! ;-------------------------------------------------------------------------- ! ; 'installer.nsi' macro used when uninstalling the new style skins ! ;-------------------------------------------------------------------------- ! !macro DeleteSkin FOLDER ! !insertmacro PFI_UNIQUE_ID ! IfFileExists "${FOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID} ! Delete "${FOLDER}\*.css" ! Delete "${FOLDER}\*.gif" ! Delete "${FOLDER}\*.png" ! Delete "${FOLDER}\*.thtml" ! RMDir "${FOLDER}" ! skip_${PFI_UNIQUE_ID}: ! !macroend ! ;-------------------------------------------------------------------------- ! ; 'installer.nsi' macro used when generating data for the "Setup Summary" page ! ;-------------------------------------------------------------------------- ! !macro SectionNotSelected SECTION JUMPIFNOTSELECTED ! !insertmacro PFI_UNIQUE_ID ! !insertmacro SectionFlagIsSet "${SECTION}" "${SF_SELECTED}" "selected_${PFI_UNIQUE_ID}" "${JUMPIFNOTSELECTED}" ! selected_${PFI_UNIQUE_ID}: ! !macroend ! !endif ! #============================================================================== # ! # Macros used only by the 'adduser.nsi' script: # ! # UI_LANG_CONFIG ! # OECONFIG_LOG_ENTRY ! # OOECONFIG_BEFORE_LOG ! # OOECONFIG_CHANGES_LOG ! # SkinCaseChange ! # Copy_HKLM_to_HKCU ! #============================================================================== + !ifdef ADDUSER | TRANSLATOR_AUW ;-------------------------------------------------------------------------- ! ; 'adduser.nsi' macro used to select the POPFile UI language according to the language used ! ; for the installation process (NSIS language names differ from those used by POPFile's UI) ;-------------------------------------------------------------------------- ! !macro UI_LANG_CONFIG PFI_SETTING UI_SETTING ! !insertmacro PFI_UNIQUE_ID + StrCmp $LANGUAGE ${LANG_${PFI_SETTING}} 0 skip_${PFI_UNIQUE_ID} + IfFileExists "$G_ROOTDIR\languages\${UI_SETTING}.msg" 0 lang_done + StrCpy ${L_LANG} "${UI_SETTING}" + Goto lang_save + + skip_${PFI_UNIQUE_ID}: + !macroend + + ;-------------------------------------------------------------------------- + ; 'adduser.nsi' macros used to make 'Outlook' & 'Outlook Express' account log files + ;-------------------------------------------------------------------------- + + !macro OECONFIG_LOG_ENTRY LOGTYPE VALUE WIDTH !insertmacro PFI_UNIQUE_ID ! Push $R9 ! Push $R8 ! StrCpy $R9 "${VALUE}" ! StrLen $R8 $R9 ! IntCmp $R8 ${WIDTH} copy_${PFI_UNIQUE_ID} 0 copy_${PFI_UNIQUE_ID} ! StrCpy $R9 "$R9 " ${WIDTH} ! copy_${PFI_UNIQUE_ID}: ! FileWrite $G_${LOGTYPE}_HANDLE "$R9 " ! Pop $R8 ! Pop $R9 ! !macroend ! !macro OOECONFIG_BEFORE_LOG VALUE WIDTH ! !insertmacro OECONFIG_LOG_ENTRY "OOECONFIG" "${VALUE}" "${WIDTH}" ! !macroend ! ! !macro OOECONFIG_CHANGES_LOG VALUE WIDTH ! !insertmacro OECONFIG_LOG_ENTRY "OOECHANGES" "${VALUE}" "${WIDTH}" !macroend ;-------------------------------------------------------------------------- ! ; 'adduser.nsi' macro used to ensure current skin selection uses lowercase ;-------------------------------------------------------------------------- ! !macro SkinCaseChange OLDNAME NEWNAME !insertmacro PFI_UNIQUE_ID ! StrCmp ${L_SKIN} "${OLDNAME}" 0 skip_${PFI_UNIQUE_ID} ! StrCpy ${L_SKIN} "${NEWNAME}" ! Goto save_skin_setting ! skip_${PFI_UNIQUE_ID}: ! !macroend ! ;-------------------------------------------------------------------------- ! ; 'adduser.nsi' macro used to update HKCU registry data using HKLM data ! ;-------------------------------------------------------------------------- ! ! !macro Copy_HKLM_to_HKCU VAR NAME ! ! ReadRegStr ${VAR} HKLM "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "${NAME}" ! WriteRegStr HKCU "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "${NAME}" ${VAR} !macroend + !endif + + #============================================================================================== # ! # Functions used only during 'installation' (i.e. not used by any 'uninstall' operations): # # Installer Function: GetIEVersion *************** *** 774,777 **** --- 806,813 ---- # Uninstaller Function: un.CheckIfLocked # + # Macro: CheckSQLiteIntegrity + # Installer Function: CheckSQLiteIntegrity + # Uninstaller Function: un.CheckSQLiteIntegrity + # # Macro: FindLockedPFE # Installer Function: FindLockedPFE *************** *** 842,845 **** --- 878,885 ---- # Uninstaller Function: un.RequestPFIUtilsShutdown # + # Macro: RunSQLiteCommand + # Installer Function: RunSQLiteCommand + # Uninstaller Function: un.RunSQLiteCommand + # # Macro: ServiceCall # Installer Function: ServiceCall *************** *** 965,968 **** --- 1005,1063 ---- #-------------------------------------------------------------------------- + # Macro: CheckSQLiteIntegrity + # + # The installation process and the uninstall process may both need a function which + # uses the SQLite command-line utility to perform a database integrity check. This macro + # makes maintenance easier by ensuring that both processes use identical functions, with + # the only difference being their names. + # + # NOTE: + # The !insertmacro CheckSQLiteIntegrity "" and !insertmacro CheckSQLiteIntegrity "un." + # commands are included in this file so the NSIS script can use 'Call CheckSQLiteIntegrity' + # and 'Call un.CheckSQLiteIntegrity' without additional preparation. + # + # Inputs: + # (top of stack) - full pathname of the SQLite database file + # + # Outputs: + # (top of stack) - the result from the SQLite command-line utility ('ok' expected) + # If the result is enclosed in parentheses then an error occurred. + # + # Usage (after macro has been 'inserted'): + # + # Push "popfile.db" + # Call CheckSQLiteIntegrity + # Pop $R0 + # + # ($R0 will be "ok" if the popfile.db file passes the integrity check) + #-------------------------------------------------------------------------- + + !macro CheckSQLiteIntegrity UN + Function ${UN}CheckSQLiteIntegrity + + Push "pragma integrity_check;" + Call ${UN}RunSQLiteCommand + + FunctionEnd + !macroend + + #-------------------------------------------------------------------------- + # Installer Function: CheckSQLiteIntegrity + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + ;!insertmacro CheckSQLiteIntegrity "" + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.CheckSQLiteIntegrity + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + ;!insertmacro CheckSQLiteIntegrity "un." + + + #-------------------------------------------------------------------------- # Macro: FindLockedPFE # *************** *** 2819,2872 **** Function ${UN}GetSQLiteSchemaVersion ! !define L_DATABASE $R9 ; name of the SQLite database file ! !define L_RESULT $R8 ; string returned on top of the stack ! !define L_SQLITEPATH $R7 ; path to sqlite.exe utility ! !define L_SQLITEUTIL $R6 ; used to run relevant SQLite utility ! !define L_STATUS $R5 ; status code returned by SQLite utility ! ! Exch ${L_DATABASE} ! Push ${L_RESULT} ! Exch ! Push ${L_SQLITEPATH} ! Push ${L_SQLITEUTIL} ! Push ${L_STATUS} ! ! Push ${L_DATABASE} ! Call ${UN}GetSQLiteFormat ! Pop ${L_RESULT} ! StrCpy ${L_SQLITEUTIL} "sqlite.exe" ! StrCmp ${L_RESULT} "2.x" look_for_sqlite ! StrCpy ${L_SQLITEUTIL} "sqlite3.exe" ! StrCmp ${L_RESULT} "3.x" look_for_sqlite ! Goto exit ! ! look_for_sqlite: ! StrCpy ${L_SQLITEPATH} "$EXEDIR" ! IfFileExists "${L_SQLITEPATH}\${L_SQLITEUTIL}" run_sqlite ! StrCpy ${L_SQLITEPATH} "$PLUGINSDIR" ! IfFileExists "${L_SQLITEPATH}\${L_SQLITEUTIL}" run_sqlite ! StrCpy ${L_RESULT} "(cannot find '${L_SQLITEUTIL}' in '$EXEDIR' or '$PLUGINSDIR')" ! Goto exit ! ! run_sqlite: ! nsExec::ExecToStack '"${L_SQLITEPATH}\${L_SQLITEUTIL}" "${L_DATABASE}" "select version from popfile;"' ! Pop ${L_STATUS} ! Call ${UN}TrimNewlines ! Pop ${L_RESULT} ! StrCmp ${L_STATUS} "0" exit ! StrCpy ${L_RESULT} "(${L_RESULT})" ! ! exit: ! Pop ${L_STATUS} ! Pop ${L_SQLITEUTIL} ! Pop ${L_SQLITEPATH} ! Pop ${L_DATABASE} ! Exch ${L_RESULT} ! ! !undef L_DATABASE ! !undef L_RESULT ! !undef L_SQLITEPATH ! !undef L_SQLITEUTIL ! !undef L_STATUS FunctionEnd --- 2914,2919 ---- Function ${UN}GetSQLiteSchemaVersion ! Push "select version from popfile;" ! Call ${UN}RunSQLiteCommand FunctionEnd *************** *** 3129,3132 **** --- 3176,3291 ---- #-------------------------------------------------------------------------- + # Macro: RunSQLiteCommand + # + # The installation process and the uninstall process may both need a function which uses the + # SQLite command-line utility to run a single command, such as an integrity check. This macro + # makes maintenance easier by ensuring that both processes use identical functions, with the + # only difference being their names. + # + # NOTE: + # The !insertmacro RunSQLiteCommand "" and !insertmacro RunSQLiteCommand "un." + # commands are included in this file so the NSIS script can use 'Call RunSQLiteCommand' + # and 'Call un.RunSQLiteCommand' without additional preparation. + # + # Inputs: + # (top of stack) - the command to be passed to the SQLite command-line utility + # (top of stack - 1) - full pathname of the SQLite database file + # + # Outputs: + # (top of stack) - the result string returned by the SQLite command-line utility + # If the result is enclosed in parentheses then an error occurred. + # + # Usage (after macro has been 'inserted'): + # + # Push "popfile.db" + # Push "pragma integrity_check;" + # Call RunSQLiteCommand + # Pop $R0 + # + # ($R0 will be "ok" if the popfile.db file passes the integrity check) + #-------------------------------------------------------------------------- + + !macro RunSQLiteCommand UN + Function ${UN}RunSQLiteCommand + + !define L_COMMAND $R9 ; the command to be run by the SQLite command-line utility + !define L_DATABASE $R8 ; name of the SQLite database file + !define L_RESULT $R7 ; string returned on top of the stack + !define L_SQLITEPATH $R6 ; path to sqlite.exe utility + !define L_SQLITEUTIL $R5 ; used to run relevant SQLite utility + !define L_STATUS $R4 ; status code returned by SQLite utility + + Exch ${L_COMMAND} + Exch + Exch ${L_DATABASE} + Push ${L_RESULT} + Exch 2 + Push ${L_SQLITEPATH} + Push ${L_SQLITEUTIL} + Push ${L_STATUS} + + Push ${L_DATABASE} + Call ${UN}GetSQLiteFormat + Pop ${L_RESULT} + StrCpy ${L_SQLITEUTIL} "sqlite.exe" + StrCmp ${L_RESULT} "2.x" look_for_sqlite + StrCpy ${L_SQLITEUTIL} "sqlite3.exe" + StrCmp ${L_RESULT} "3.x" look_for_sqlite + Goto exit + + look_for_sqlite: + StrCpy ${L_SQLITEPATH} "$EXEDIR" + IfFileExists "${L_SQLITEPATH}\${L_SQLITEUTIL}" run_sqlite + StrCpy ${L_SQLITEPATH} "$PLUGINSDIR" + IfFileExists "${L_SQLITEPATH}\${L_SQLITEUTIL}" run_sqlite + StrCpy ${L_RESULT} "(cannot find '${L_SQLITEUTIL}' in '$EXEDIR' or '$PLUGINSDIR')" + Goto exit + + run_sqlite: + nsExec::ExecToStack '"${L_SQLITEPATH}\${L_SQLITEUTIL}" "${L_DATABASE}" "${L_COMMAND}"' + Pop ${L_STATUS} + Call ${UN}TrimNewlines + Pop ${L_RESULT} + StrCmp ${L_STATUS} "0" exit + StrCpy ${L_RESULT} "(${L_RESULT})" + + exit: + Pop ${L_STATUS} + Pop ${L_SQLITEUTIL} + Pop ${L_SQLITEPATH} + Pop ${L_COMMAND} + Pop ${L_DATABASE} + Exch ${L_RESULT} + + !undef L_COMMAND + !undef L_DATABASE + !undef L_RESULT + !undef L_SQLITEPATH + !undef L_SQLITEUTIL + !undef L_STATUS + + FunctionEnd + !macroend + + !ifdef ADDUSER | BACKUP | RESTORE + #-------------------------------------------------------------------------- + # Installer Function: RunSQLiteCommand + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + !insertmacro RunSQLiteCommand "" + !endif + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.RunSQLiteCommand + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + ;!insertmacro RunSQLiteCommand "un." + + + #-------------------------------------------------------------------------- # Macro: ServiceCall # *************** *** 3632,3636 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: StrBackSlash --- 3791,3795 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: StrBackSlash |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:10:32
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9733 Added Files: zerobyte.file Log Message: Add SSL download/install capability to the main POPFile installer. --- NEW FILE: zerobyte.file --- |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:08:57
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9064 Modified Files: adduser.nsi CBP.nsh Log Message: Updated to use the "repaired" language strings (instead of "broken" ones). Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** adduser.nsi 20 Jan 2005 15:37:15 -0000 1.68 --- adduser.nsi 6 Feb 2005 23:08:44 -0000 1.69 *************** *** 181,185 **** Name "POPFile User" ! !define C_PFI_VERSION "0.2.64" ; Mention the wizard's version number in the titles of the installer & uninstaller windows --- 181,185 ---- Name "POPFile User" ! !define C_PFI_VERSION "0.2.65" ; Mention the wizard's version number in the titles of the installer & uninstaller windows *************** *** 260,263 **** --- 260,264 ---- Var G_PLS_FIELD_1 ; used to customize translated text strings + Var G_PLS_FIELD_2 ; used to customize translated text strings (used in 'CBP.nsh' file) ; NSIS provides 20 general purpose user registers: *************** *** 848,852 **** DetailPrint "$(PFI_LANG_INST_PROG_REGSET)" SetDetailsPrint listonly ! IfFileExists "$G_USERDIR\*.*" userdir_exists ClearErrors --- 849,853 ---- DetailPrint "$(PFI_LANG_INST_PROG_REGSET)" SetDetailsPrint listonly ! IfFileExists "$G_USERDIR\*.*" userdir_exists ClearErrors *************** *** 912,916 **** ; (1) $G_ROOTDIR is initialized by the 'PFIGUIInit' function ; (2) $G_USERDIR is normally initialized by the 'User Data' DIRECTORY page ! ReadRegStr ${L_TEMP} HKLM "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" Push ${L_TEMP} --- 913,917 ---- ; (1) $G_ROOTDIR is initialized by the 'PFIGUIInit' function ; (2) $G_USERDIR is normally initialized by the 'User Data' DIRECTORY page ! ReadRegStr ${L_TEMP} HKLM "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" Push ${L_TEMP} *************** *** 918,929 **** Pop ${L_TEMP} StrCmp $G_ROOTDIR ${L_TEMP} 0 update_author ! ; The version data in the registry applies to the POPFile programs we have found, so copy it ! !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Major Version" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Minor Version" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Revision" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile RevStatus" ! update_author: WriteRegStr HKCU "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "adduser.exe" --- 919,930 ---- Pop ${L_TEMP} StrCmp $G_ROOTDIR ${L_TEMP} 0 update_author ! ; The version data in the registry applies to the POPFile programs we have found, so copy it ! !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Major Version" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Minor Version" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile Revision" !insertmacro Copy_HKLM_to_HKCU "${L_TEMP}" "POPFile RevStatus" ! update_author: WriteRegStr HKCU "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "adduser.exe" *************** *** 1049,1059 **** MessageBox MB_YESNO|MB_ICONQUESTION \ ! "POPFile 'stopwords' $(PFI_LANG_MBSTPWDS_1)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_3) 'stopwords.bak')\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_4) 'stopwords.default')" IDNO copy_default_stopwords IfFileExists "$G_USERDIR\stopwords.bak" 0 make_backup SetFileAttributes "$G_USERDIR\stopwords.bak" NORMAL --- 1050,1060 ---- MessageBox MB_YESNO|MB_ICONQUESTION \ ! "$(PFI_LANG_MBSTPWDS_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_C)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBSTPWDS_D)" IDNO copy_default_stopwords IfFileExists "$G_USERDIR\stopwords.bak" 0 make_backup SetFileAttributes "$G_USERDIR\stopwords.bak" NORMAL *************** *** 1985,1991 **** Push ${L_RESULT} ! ; Strip trailing slashes (if any) from the path selected by the user ! Push $INSTDIR Pop $INSTDIR --- 1986,1992 ---- Push ${L_RESULT} ! ; Strip trailing slashes (if any) from the path selected by the user ! Push $INSTDIR Pop $INSTDIR *************** *** 2568,2576 **** bad_pop3: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"$G_POP3$\"'.\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBPOP3_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBPOP3_3)" Goto bad_exit --- 2569,2577 ---- bad_pop3: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_OPTIONS_MBPOP3_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBPOP3_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBPOP3_C)" Goto bad_exit *************** *** 2585,2593 **** bad_gui: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_OPTIONS_MBGUI_1) $\"$G_GUI$\".\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBGUI_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBGUI_3)" Goto bad_exit --- 2586,2594 ---- bad_gui: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_OPTIONS_MBGUI_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBGUI_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_OPTIONS_MBGUI_C)" Goto bad_exit *************** *** 3045,3049 **** FileOpen $G_OOECHANGES_HANDLE "$G_USERDIR\expchanges.txt" a FileSeek $G_OOECHANGES_HANDLE 0 END ! FileWrite $G_OOECHANGES_HANDLE "[$G_WINUSERNAME] $(PFI_LANG_ExpCFG_LOG_AFTER) (${L_TEMP})\ ${MB_NL}${MB_NL}" !insertmacro OOECONFIG_CHANGES_LOG "$(PFI_LANG_EXPCFG_LOG_IDENTITY)" 20 --- 3046,3050 ---- FileOpen $G_OOECHANGES_HANDLE "$G_USERDIR\expchanges.txt" a FileSeek $G_OOECHANGES_HANDLE 0 END ! FileWrite $G_OOECHANGES_HANDLE "[$G_WINUSERNAME] $(PFI_LANG_EXPCFG_LOG_AFTER) (${L_TEMP})\ ${MB_NL}${MB_NL}" !insertmacro OOECONFIG_CHANGES_LOG "$(PFI_LANG_EXPCFG_LOG_IDENTITY)" 20 *************** *** 5251,5255 **** Goto do_not_show_banner ; sic! ! show_banner: !endif Banner::show /NOUNLOAD /set 76 "$(PFI_LANG_LAUNCH_BANNER_1)" "$(PFI_LANG_LAUNCH_BANNER_2)" --- 5252,5256 ---- Goto do_not_show_banner ; sic! ! show_banner: !endif Banner::show /NOUNLOAD /set 76 "$(PFI_LANG_LAUNCH_BANNER_1)" "$(PFI_LANG_LAUNCH_BANNER_2)" *************** *** 6144,6149 **** IfFileExists "$G_USERDIR\*.*" 0 tidy_up DetailPrint "$(PFI_LANG_UN_LOG_DELUSERERR)" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_UN_MBREMERR_1): $G_USERDIR $(PFI_LANG_UN_MBREMERR_2)" tidy_up: --- 6145,6151 ---- IfFileExists "$G_USERDIR\*.*" 0 tidy_up DetailPrint "$(PFI_LANG_UN_LOG_DELUSERERR)" + StrCpy $G_PLS_FIELD_1 $G_USERDIR MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_UN_MBREMERR_A))" tidy_up: Index: CBP.nsh =================================================================== RCS file: /cvsroot/popfile/windows/CBP.nsh,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** CBP.nsh 8 Jan 2005 14:44:56 -0000 1.34 --- CBP.nsh 6 Feb 2005 23:08:44 -0000 1.35 *************** *** 1377,1396 **** !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_1)" goto update_lists zero_so_far: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_2)" goto update_lists just_one: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_3)" goto update_lists at_the_limit: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_4) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_IO_MSG_5)" update_lists: --- 1377,1397 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_A)" goto update_lists zero_so_far: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_B)" goto update_lists just_one: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_C)" goto update_lists at_the_limit: + StrCpy $G_PLS_FIELD_1 "${CBP_C_MAX_BNCOUNT}" !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_D)" update_lists: *************** *** 1578,1601 **** name_exists: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBDUPERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBDUPERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDUPERR_3)" goto get_next_bucket_cmd too_many: MessageBox MB_OK|MB_ICONINFORMATION \ ! "$(PFI_LANG_CBP_MBMAXERR_1) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAXERR_3) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)" goto get_next_bucket_cmd bad_name: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBNAMERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBNAMERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_3)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_4)" goto get_next_bucket_cmd --- 1579,1605 ---- name_exists: + StrCpy $G_PLS_FIELD_1 "${CBP_L_CREATE_NAME}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBDUPERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDUPERR_B)" goto get_next_bucket_cmd too_many: + StrCpy $G_PLS_FIELD_1 "${CBP_C_MAX_BNCOUNT}" MessageBox MB_OK|MB_ICONINFORMATION \ ! "$(PFI_LANG_CBP_MBMAXERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAXERR_B)" goto get_next_bucket_cmd bad_name: + StrCpy $G_PLS_FIELD_1 "${CBP_L_CREATE_NAME}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBNAMERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_C)" goto get_next_bucket_cmd *************** *** 1603,1612 **** IntCmp ${CBP_L_COUNT} 0 need_buckets IntCmp ${CBP_L_COUNT} 1 too_few MessageBox MB_YESNO|MB_ICONQUESTION \ ! "${CBP_L_COUNT} $(PFI_LANG_CBP_MBDONE_1)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_3)" IDYES finished_buckets goto get_next_bucket_cmd --- 1607,1617 ---- IntCmp ${CBP_L_COUNT} 0 need_buckets IntCmp ${CBP_L_COUNT} 1 too_few + StrCpy $G_PLS_FIELD_1 "${CBP_L_COUNT}" MessageBox MB_YESNO|MB_ICONQUESTION \ ! "$(PFI_LANG_CBP_MBDONE_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_C)" IDYES finished_buckets goto get_next_bucket_cmd *************** *** 1632,1640 **** Pop ${CBP_L_RESULT} StrCmp ${CBP_L_RESULT} "0" finished_now MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBMAKERR_1) ${CBP_L_RESULT} $(PFI_LANG_CBP_MBMAKERR_2) ${CBP_L_COUNT} \ ! $(PFI_LANG_CBP_MBMAKERR_3)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAKERR_4)" finished_now: --- 1637,1646 ---- Pop ${CBP_L_RESULT} StrCmp ${CBP_L_RESULT} "0" finished_now + StrCpy $G_PLS_FIELD_1 "${CBP_L_RESULT}" + StrCpy $G_PLS_FIELD_2 "${CBP_L_COUNT}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBMAKERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAKERR_B)" finished_now: |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:04:47
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7716 Modified Files: Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: Added strings for the new "Setup Summary" page and the new SSL download and install section. Sorted the strings to clarify where they are used. Repaired 14 "broken" strings: PFI_LANG_UN_MBREMERR_A = PFI_LANG_UN_MBREMERR_1 + ": $G_PLS_FIELD_1 " + PFI_LANG_UN_MBREMERR_2 PFI_LANG_PERLREQ_IO_TEXT_E = PFI_LANG_PERLREQ_IO_TEXT_5 + " $G_PLS_FIELD_1${IO_NL}${IO_NL}" PFI_LANG_MBSTPWDS_A = "POPFile 'stopwords' " + PFI_LANG_MBSTPWDS_1 PFI_LANG_MBSTPWDS_C = PFI_LANG_MBSTPWDS_3 + " 'stopwords.bak')" PFI_LANG_MBSTPWDS_D = PFI_LANG_MBSTPWDS_4 + " 'stopwords.default')" PFI_LANG_OPTIONS_MBPOP3_A = PFI_LANG_OPTIONS_MBPOP3_1 + " '$G_POP3'." PFI_LANG_OPTIONS_MBGUI_A = PFI_LANG_OPTIONS_MBGUI_1 + " '$G_GUI'." PFI_LANG_CBP_IO_MSG_D = PFI_LANG_CBP_IO_MSG_4 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_IO_MSG_5 PFI_LANG_CBP_MBDUPERR_A = PFI_LANG_CBP_MBDUPERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBDUPERR_2 PFI_LANG_CBP_MBMAXERR_A = PFI_LANG_CBP_MBMAXERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBMAXERR_B = PFI_LANG_CBP_MBMAXERR_3 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBNAMERR_A = PFI_LANG_CBP_MBNAMERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBNAMERR_2 PFI_LANG_CBP_MBDONE_A = "$G_PLS_FIELD_1 " + PFI_LANG_CBP_MBDONE_1 PFI_LANG_CBP_MBMAKERR_A = PFI_LANG_CBP_MBMAKERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAKERR_2 + " $G_PLS_FIELD_2 " + PFI_LANG_CBP_MBMAKERR_3 If the repaired string was part of a group, the entire group was renamed to keep the names consistent (renaming used to help catch out-of-date references). Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Swedish-pfi.nsh 8 Jan 2005 11:23:36 -0000 1.45 --- Swedish-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Swedish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Slovak-pfi.nsh 8 Jan 2005 11:23:35 -0000 1.45 --- Slovak-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Slovak" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** TradChinese-pfi.nsh 8 Jan 2005 11:23:36 -0000 1.46 --- TradChinese-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.47 *************** *** 3,10 **** # # This file contains the "TradChinese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1142 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Russian-pfi.nsh 8 Jan 2005 11:23:35 -0000 1.45 --- Russian-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Russian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Ukrainian-pfi.nsh 8 Jan 2005 11:23:36 -0000 1.45 --- Ukrainian-pfi.nsh 6 Feb 2005 23:04:29 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Ukrainian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Turkish-pfi.nsh 8 Jan 2005 11:23:36 -0000 1.34 --- Turkish-pfi.nsh 6 Feb 2005 23:04:29 -0000 1.35 *************** *** 3,10 **** # # This file contains the "Turkish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1142 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Spanish-pfi.nsh 8 Jan 2005 11:23:35 -0000 1.50 --- Spanish-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.51 *************** *** 3,10 **** # # This file contains the "Spanish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1176 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** SimpChinese-pfi.nsh 8 Jan 2005 11:23:35 -0000 1.45 --- SimpChinese-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 *************** *** 3,10 **** # # This file contains the "SimpChinese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1142 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-02-06 23:00:06
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6809 Modified Files: Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Log Message: Added strings for the new "Setup Summary" page and the new SSL download and install section. Sorted the strings to clarify where they are used. Repaired 14 "broken" strings: PFI_LANG_UN_MBREMERR_A = PFI_LANG_UN_MBREMERR_1 + ": $G_PLS_FIELD_1 " + PFI_LANG_UN_MBREMERR_2 PFI_LANG_PERLREQ_IO_TEXT_E = PFI_LANG_PERLREQ_IO_TEXT_5 + " $G_PLS_FIELD_1${IO_NL}${IO_NL}" PFI_LANG_MBSTPWDS_A = "POPFile 'stopwords' " + PFI_LANG_MBSTPWDS_1 PFI_LANG_MBSTPWDS_C = PFI_LANG_MBSTPWDS_3 + " 'stopwords.bak')" PFI_LANG_MBSTPWDS_D = PFI_LANG_MBSTPWDS_4 + " 'stopwords.default')" PFI_LANG_OPTIONS_MBPOP3_A = PFI_LANG_OPTIONS_MBPOP3_1 + " '$G_POP3'." PFI_LANG_OPTIONS_MBGUI_A = PFI_LANG_OPTIONS_MBGUI_1 + " '$G_GUI'." PFI_LANG_CBP_IO_MSG_D = PFI_LANG_CBP_IO_MSG_4 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_IO_MSG_5 PFI_LANG_CBP_MBDUPERR_A = PFI_LANG_CBP_MBDUPERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBDUPERR_2 PFI_LANG_CBP_MBMAXERR_A = PFI_LANG_CBP_MBMAXERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBMAXERR_B = PFI_LANG_CBP_MBMAXERR_3 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBNAMERR_A = PFI_LANG_CBP_MBNAMERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBNAMERR_2 PFI_LANG_CBP_MBDONE_A = "$G_PLS_FIELD_1 " + PFI_LANG_CBP_MBDONE_1 PFI_LANG_CBP_MBMAKERR_A = PFI_LANG_CBP_MBMAKERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAKERR_2 + " $G_PLS_FIELD_2 " + PFI_LANG_CBP_MBMAKERR_3 If the repaired string was part of a group, the entire group was renamed to keep the names consistent (renaming used to help catch out-of-date references). Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Portuguese-pfi.nsh 8 Jan 2005 11:20:30 -0000 1.45 --- Portuguese-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Portuguese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Italian-pfi.nsh 8 Jan 2005 11:20:29 -0000 1.35 --- Italian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.36 *************** *** 3,10 **** # # This file contains the "Italian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1142 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Japanese-pfi.nsh 8 Jan 2005 11:20:29 -0000 1.56 --- Japanese-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.57 *************** *** 3,10 **** # # This file contains the "Japanese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1177 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "±s·éÉÍuLZvðNbNµÄº³¢B" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "ÊÌ 'Corpus Conversion Monitor' ªùÉN®Å·I" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' Í POPFile CXg[[ÌêÅ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "G[: Corpus Ï·f[^t@Cª¶ÝµÜ¹ñI" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "G[: POPFile ÌpXª©Â©èܹñB" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Corpus Ï·ÌvZXðN®ÉG[ª¶µÜµ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Corpus Ï·ÌvZXÉv½IÈG[ª¶µÜµ½I" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "\zcèÔ: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "ª" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(ÅÌt@CªÏ·³êéÌðÒÁĢܷB)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "$G_BUCKET_COUNT ÂÌoPct@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "$G_ELAPSED_TIME.$G_DECPLACES ªoßB Æ $G_STILL_TO_DO ÂÌt@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "$G_ELAPSED_TIME.$G_DECPLACES ªoßB Æ1ÂÌt@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus ÌÏ·ÉÍ $G_ELAPSED_TIME.$G_DECPLACES ª©©èܵ½B" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** PortugueseBR-pfi.nsh 21 Jan 2005 12:56:05 -0000 1.62 --- PortugueseBR-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.63 *************** *** 3,10 **** # # This file contains the "PortugueseBR" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1176 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Clique em Cancelar para continuar" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Uma outra cópia do 'Monitor de Conversão do Corpus' já está rodando!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "O 'Monitor de Conversão do Corpus' é parte do instalador do POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Erro: o arquivo de dados da conversão do Corpus não existe!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Erro: falta o caminho do POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Ocorreu um erro ao iniciar o processo de conversão do corpus" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Ocorreu um erro fatal durante o processo de conversão do corpus!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Tempo restante estimado: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutos" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(esperando pelo primeiro arquivo a ser convertido)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Existem $G_BUCKET_COUNT arquivos de balde para serem convertidos" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Depois de $G_ELAPSED_TIME.$G_DECPLACES minutos existem $G_STILL_TO_DO arquivos para converter" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Depois de $G_ELAPSED_TIME.$G_DECPLACES minutos existe um arquivo para converter" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "A Conversão do Corpus levou $G_ELAPSED_TIME.$G_DECPLACES minutos" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Hungarian-pfi.nsh 8 Jan 2005 11:20:29 -0000 1.45 --- Hungarian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Hungarian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Polish-pfi.nsh 8 Jan 2005 11:20:30 -0000 1.38 --- Polish-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.39 *************** *** 3,10 **** # # This file contains the "Polish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Greek-pfi.nsh 8 Jan 2005 11:20:29 -0000 1.37 --- Greek-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.38 *************** *** 3,10 **** # # This file contains the "Greek" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Norwegian-pfi.nsh 8 Jan 2005 11:20:30 -0000 1.31 --- Norwegian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.32 *************** *** 3,10 **** # # This file contains the "Norwegian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Korean-pfi.nsh 8 Jan 2005 11:20:29 -0000 1.46 --- Korean-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.47 *************** *** 3,10 **** # # This file contains the "Korean" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1177 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-02-06 22:55:47
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5866 Modified Files: Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Log Message: Added strings for the new "Setup Summary" page and the new SSL download and install section. Sorted the strings to clarify where they are used. Repaired 14 "broken" strings: PFI_LANG_UN_MBREMERR_A = PFI_LANG_UN_MBREMERR_1 + ": $G_PLS_FIELD_1 " + PFI_LANG_UN_MBREMERR_2 PFI_LANG_PERLREQ_IO_TEXT_E = PFI_LANG_PERLREQ_IO_TEXT_5 + " $G_PLS_FIELD_1${IO_NL}${IO_NL}" PFI_LANG_MBSTPWDS_A = "POPFile 'stopwords' " + PFI_LANG_MBSTPWDS_1 PFI_LANG_MBSTPWDS_C = PFI_LANG_MBSTPWDS_3 + " 'stopwords.bak')" PFI_LANG_MBSTPWDS_D = PFI_LANG_MBSTPWDS_4 + " 'stopwords.default')" PFI_LANG_OPTIONS_MBPOP3_A = PFI_LANG_OPTIONS_MBPOP3_1 + " '$G_POP3'." PFI_LANG_OPTIONS_MBGUI_A = PFI_LANG_OPTIONS_MBGUI_1 + " '$G_GUI'." PFI_LANG_CBP_IO_MSG_D = PFI_LANG_CBP_IO_MSG_4 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_IO_MSG_5 PFI_LANG_CBP_MBDUPERR_A = PFI_LANG_CBP_MBDUPERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBDUPERR_2 PFI_LANG_CBP_MBMAXERR_A = PFI_LANG_CBP_MBMAXERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBMAXERR_B = PFI_LANG_CBP_MBMAXERR_3 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAXERR_2 PFI_LANG_CBP_MBNAMERR_A = PFI_LANG_CBP_MBNAMERR_1 + " '$G_PLS_FIELD_1' " + PFI_LANG_CBP_MBNAMERR_2 PFI_LANG_CBP_MBDONE_A = "$G_PLS_FIELD_1 " + PFI_LANG_CBP_MBDONE_1 PFI_LANG_CBP_MBMAKERR_A = PFI_LANG_CBP_MBMAKERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAKERR_2 + " $G_PLS_FIELD_2 " + PFI_LANG_CBP_MBMAKERR_3 If the repaired string was part of a group, the entire group was renamed to keep the names consistent (renaming used to help catch out-of-date references). Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Danish-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.45 --- Danish-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Danish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Czech-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.40 --- Czech-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.41 *************** *** 3,10 **** # # This file contains the "Czech" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Dutch-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.45 --- Dutch-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Dutch" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** French-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.47 --- French-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.48 *************** *** 3,10 **** # # This file contains the "French" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1177 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Cliquez 'Annuler' pour continuer" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Une autre instance de 'Corpus Conversion Monitor' est déjà en cours d'exécution !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' fait partie de l'installateur de POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Erreur : le fichier de données de la conversion de Corpus n'existe pas !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Erreur : chemin d'accès à POPFile manquant" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Une erreur est survenue lors du lancement du processus de conversion de corpus" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Une erreur fatale est survenue lors du processus de conversion de corpus !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Temps restant estimé : " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(attente du premier fichier à convertir)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Il y a $G_BUCKET_COUNT fichiers de catégories à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Après $G_ELAPSED_TIME.$G_DECPLACES minutes, il reste $G_STILL_TO_DO fichiers à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Après $G_ELAPSED_TIME.$G_DECPLACES minutes il reste un fichier à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "La conversion de Corpus a pris $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** German-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.50 --- German-pfi.nsh 6 Feb 2005 22:55:34 -0000 1.51 *************** *** 3,10 **** # # This file contains the "German" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1190 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Bitte klicken Sie auf Abbrechen, um fortzufahren." ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Eine andere Version der Corpus Konvertierung läuft bereits!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "Die 'Corpus Konvertierung' ist Teil des POPFile Installationsprogramms" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Fehler: Konvertierungsdatendatei existiert nicht!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Fehler: POPFile Pfad nicht gefunden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Ein Fehler ist beim Start des Konvertierungsprozesses aufgetreten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Ein schwerer Fehler ist während der Konvertierung des Corpus aufgetreten!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Geschätzte Wartezeit: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "Minuten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(warte auf Konvertierung der ersten Datei)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Es müssen insgesamt $G_BUCKET_COUNT Dateien konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Nach $G_ELAPSED_TIME.$G_DECPLACES Minuten müssen noch $G_STILL_TO_DO Dateien konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Nach $G_ELAPSED_TIME.$G_DECPLACES Minuten muß noch eine Datei konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Die Konvertierung dauerte $G_ELAPSED_TIME.$G_DECPLACES Minuten" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Arabic-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.18 --- Arabic-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.19 *************** *** 3,10 **** # # This file contains the "Arabic" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2004-2005 John Graham-Cumming --- 3,10 ---- # [...1175 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "ÇáÑÌÇÁ ÇáÖÛØ Úáì ÅáÛÇÁ ááãÊÇÈÚÉ" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "äÓÎÉ ÃÎÑì ãä 'Corpus Conversion Monitor' ÊÚãá ãÓÈÞÇð !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' ÚÈÇÑÉ Úä ÞÓã ãä ãäÕøÈ POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Îáá: ãáÝÇÊ ÊÍæíá ãÚáæãÇÊ ÇáãÏæøäÉ ÛíÑ ãæÌæÏÉ !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Îáá: áã íÊã ÇáÚËæÑ Úáì ãÓÇÑ POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "áÞÏ ÍÕá Îáá ÃËäÇÁ ÊÔÛíá ÚãáíÉ ÊÍæíá ÇáãÏæøäÉ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "ÇáÒãä ÇáãÊÈÞí: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "ÏÞÇÆÞ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(ÅäÊÙÇÑ ÊÍæíá ÇáãáÝ ÇáÃæá)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "åäÇß $G_BUCKET_COUNT ÏáÇÁ áíÊã ÊÍæíáåÇ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "ÈÚÏ $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ íÊÈÞì åäÇß $G_STILL_TO_DO ãáÝÇÊ ááÊÍæíá" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "ÈÚÏ $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ íÈÞì åäÇß ãáÝ æÇÍÏ áíÊã ÊÍæíáå" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "ÅÓÊÛÑÞÊ ÚãáíÉ ÊÍæíá ÇáãÏæøäÉ Åáì $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** English-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.47 --- English-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.48 *************** *** 3,10 **** # # This file contains the "English" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1123 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Bulgarian-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.45 --- Bulgarian-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.46 *************** *** 3,12 **** # # This file contains the "Bulgarian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile [...1136 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Finnish-pfi.nsh 8 Jan 2005 11:17:19 -0000 1.45 --- Finnish-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.46 *************** *** 3,10 **** # # This file contains the "Finnish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # # Copyright (c) 2003-2005 John Graham-Cumming --- 3,10 ---- # [...1132 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- |
|
From: Joseph C. <tex...@us...> - 2005-02-06 11:11:02
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18136/skins/default Modified Files: configuration-bar.thtml history-bar.thtml history-page.thtml style.css Log Message: Another attempt at the config bar. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configuration-bar.thtml 31 Jan 2005 08:38:27 -0000 1.6 --- configuration-bar.thtml 6 Feb 2005 11:10:47 -0000 1.7 *************** *** 67,71 **** </div> ! <div class="configBarOption"> <input type="submit" class="submit" name="hide_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" /> </div> --- 67,71 ---- </div> ! <div class="configBarOption toggleConfigBar"> <input type="submit" class="submit" name="hide_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" /> </div> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** history-page.thtml 31 Jan 2005 09:42:10 -0000 1.50 --- history-page.thtml 6 Feb 2005 11:10:47 -0000 1.51 *************** *** 240,244 **** <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> ! <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll">" /> </td> <td align="center"> --- 240,244 ---- <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> ! <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> </td> <td align="center"> *************** *** 308,311 **** --- 308,312 ---- <TMPL_INCLUDE NAME="common-before-configuration.thtml"> + <TMPL_IF NAME="If_Show_Config_Bars"> <TMPL_INCLUDE NAME="history-bar.thtml"> *************** *** 313,319 **** <TMPL_ELSE> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> </TMPL_IF> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> --- 314,323 ---- <TMPL_ELSE> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="toggleConfigBar"> ! <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! </div> </form> + </TMPL_IF> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** history-bar.thtml 31 Jan 2005 08:38:27 -0000 1.8 --- history-bar.thtml 6 Feb 2005 11:10:47 -0000 1.9 *************** *** 14,18 **** <div class="configBarOption"> ! <label class="configurationLabel" for="configUIPort"> <TMPL_VAR NAME="Localize_Configuration_Fields">: </label> --- 14,18 ---- <div class="configBarOption"> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Configuration_Fields">: </label> *************** *** 22,26 **** <TMPL_IF NAME="Configuration_Field_Visible"> ! <span class="addHistory"><input type="checkbox" id="<TMPL_VAR NAME="Configuration_Field_Name">" class="checkbox" name="<TMPL_VAR NAME="Configuration_Field_Name">"> <TMPL_VAR NAME="Configuration_Localized_Field_Name"> </span> <TMPL_ELSE> --- 22,26 ---- <TMPL_IF NAME="Configuration_Field_Visible"> ! <span class="checkLabel"><input type="checkbox" id="<TMPL_VAR NAME="Configuration_Field_Name">" class="checkbox" name="<TMPL_VAR NAME="Configuration_Field_Name">"> <TMPL_VAR NAME="Configuration_Localized_Field_Name"> </span> <TMPL_ELSE> *************** *** 62,67 **** <input name="history_days" id="configHistoryDays" type="text" size="3" maxlength="3" value="<TMPL_VAR NAME="Configuration_History_Days">" /> ! <input type="checkbox" class="checkbox" name="purge_history" value="<TMPL_VAR NAME="Localize_History_Purge">" /> ! <TMPL_VAR NAME="Localize_History_Purge"> <input type="submit" class="submit" name="update_history_days" value="<TMPL_VAR NAME="Localize_Apply">" /> --- 62,67 ---- <input name="history_days" id="configHistoryDays" type="text" size="3" maxlength="3" value="<TMPL_VAR NAME="Configuration_History_Days">" /> ! <span class="checkLabel"><input type="checkbox" class="checkbox" name="purge_history" value="<TMPL_VAR NAME="Localize_History_Purge">" /> ! <TMPL_VAR NAME="Localize_History_Purge"></span> <input type="submit" class="submit" name="update_history_days" value="<TMPL_VAR NAME="Localize_Apply">" /> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** style.css 19 Jan 2005 08:41:27 -0000 1.9 --- style.css 6 Feb 2005 11:10:47 -0000 1.10 *************** *** 1,266 **** ! /*********************************************************/ ! /* Main Body */ ! ! body { ! color: #000000; ! background-color: #FFFFFF; ! font-family: sans-serif; ! font-size: 100%; ! } ! ! /*********************************************************/ ! /* Shell structure */ ! ! .shell, .shellTop { ! color: #000000; ! background-color: #EDEDCA; ! border: 3px #CCCC99 solid; ! } ! ! table.head { ! width: 100%; ! } ! ! td.head { ! font-weight: normal; ! font-size: 1.8em; ! } ! ! table.footer { ! width: 100%; ! } ! ! td.footerBody { ! text-align: center; ! } ! ! td.naked { ! padding: 0; ! margin: 0; ! border: 0; ! } ! ! td.logo2menuSpace { ! height: 0.8em; ! } ! ! /*********************************************************/ ! /* Menu Settings */ ! ! .menu { ! font-size: 1.2em; ! font-weight: bold; ! width: 100%; ! } ! ! .menuSelected { ! color: #000000; ! background-color: #CCCC99; ! width: 14%; ! } ! ! .menuStandard { ! color: #000000; ! background-color: #EDEDCA; ! width: 14%; ! } ! ! .menuIndent { ! width: 8%; ! } ! ! /*********************************************************/ ! /* Table Settings */ ! ! .settingsTable { ! border: 1px solid #CCCC99; ! } ! ! .settingsPanel { ! border: 1px solid #CCCC99; ! } ! ! .openMessageTable { ! border: 3px solid #CCCC99; ! } ! ! td.openMessageBody { ! text-align: left; ! } ! ! td.openMessageCloser { ! text-align: right; ! } ! ! tr.rowEven { ! color: #000000; ! background-color: #EDEDCA; ! } ! ! tr.rowOdd { ! color: #000000; ! background-color: #DFDFAF; ! } ! ! tr.rowHighlighted { ! color: #000000; ! background-color: #B7B7B7; ! } ! ! tr.rowBoundary { ! color: #000000; ! background-color: #AFAF7F; ! } ! ! .lookupResultsTable { ! border: 3px solid #CCCC99; ! } ! ! tr.rowBoundary { ! background-color: #CCCC99; ! } ! ! /*********************************************************/ ! /* Graphics */ ! ! td.accuracy0to49 { ! background-color: red; ! color: black; ! } ! ! td.accuracy50to93 { ! background-color: yellow; ! color: black; ! } ! ! td.accuracy94to100 { ! background-color: green; ! color: black; ! } ! ! span.graphFont { ! font-size: x-small; ! } ! ! /*********************************************************/ ! /* Messages */ ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! div.helpMessage { ! background-color: #DFDFAF; ! border: 2px solid #CCCC99; ! padding: 0.4em; ! padding-bottom: 0; ! } ! ! /*********************************************************/ ! /* Form Labels */ ! ! .historyLabel { ! font-weight: bold; ! } ! ! .historyLabelSort { ! font-weight: bold; ! font-style: normal; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configurationLabel { ! font-weight: bold; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! .bucketsWidgetStateOn, .bucketsWidgetStateOff { ! font-weight: bold; ! } ! ! .configWidgetStateOn, .configWidgetStateOff { ! font-weight: bold; ! } ! ! .securityWidgetStateOn, .securityWidgetStateOff { ! font-weight: bold; ! } ! ! /*********************************************************/ ! /* Positioning */ ! ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; ! } ! ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! .historyNavigatorTop, .historyNavigatorBottom { ! text-align: right; ! } ! ! .magnetsTable caption { ! text-align: left; ! } ! ! .advancedWidgets { ! margin-top: 1em; ! } ! ! /*********************************************************/ ! /* Config Bars */ ! ! .configBar { ! background-color: #DFDFAF; ! } ! ! .configBar form { ! margin: 0; ! } ! ! .configBarOption { ! display: inline; ! float: left; ! border: 1px solid #CCCC99; ! padding: 0.1em; ! margin: 0.2em 1em; ! } ! ! .addHistory { ! border: 1px solid #CCCC99; ! } --- 1,256 ---- ! /*********************************************************/ ! /* Main Body */ ! ! body { ! color: #000000; ! background-color: #FFFFFF; ! font-family: sans-serif; ! font-size: 100%; ! } ! ! /*********************************************************/ ! /* Shell structure */ ! ! .shell, .shellTop { ! color: #000000; ! background-color: #EDEDCA; ! border: 3px #CCCC99 solid; ! } ! ! table.head { ! width: 100%; ! } ! ! td.head { ! font-weight: normal; ! font-size: 1.8em; ! } ! ! table.footer { ! width: 100%; ! } ! ! td.footerBody { ! text-align: center; ! } ! ! td.naked { ! padding: 0; ! margin: 0; ! border: 0; ! } ! ! td.logo2menuSpace { ! height: 0.8em; ! } ! ! /*********************************************************/ ! /* Menu Settings */ ! ! .menu { ! font-size: 1.2em; ! font-weight: bold; ! width: 100%; ! } ! ! .menuSelected { ! color: #000000; ! background-color: #CCCC99; ! width: 14%; ! } ! ! .menuStandard { ! color: #000000; ! background-color: #EDEDCA; ! width: 14%; ! } ! ! .menuIndent { ! width: 8%; ! } ! ! /*********************************************************/ ! /* Table Settings */ ! ! .settingsTable { ! border: 1px solid #CCCC99; ! } ! ! .settingsPanel { ! border: 1px solid #CCCC99; ! } ! ! .openMessageTable { ! border: 3px solid #CCCC99; ! } ! ! td.openMessageBody { ! text-align: left; ! } ! ! td.openMessageCloser { ! text-align: right; ! } ! ! tr.rowEven { ! color: #000000; ! background-color: #EDEDCA; ! } ! ! tr.rowOdd { ! color: #000000; ! background-color: #DFDFAF; ! } ! ! tr.rowHighlighted { ! color: #000000; ! background-color: #B7B7B7; ! } ! ! tr.rowBoundary { ! color: #000000; ! background-color: #AFAF7F; ! } ! ! .lookupResultsTable { ! border: 3px solid #CCCC99; ! } ! ! tr.rowBoundary { ! background-color: #CCCC99; ! } ! ! /*********************************************************/ ! /* Graphics */ ! ! span.graphFont { ! font-size: x-small; ! } ! ! /*********************************************************/ ! /* Messages */ ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! div.helpMessage { ! background-color: #DFDFAF; ! border: 2px solid #CCCC99; ! padding: 0.4em; ! padding-bottom: 0; ! } ! ! /*********************************************************/ ! /* Form Labels */ ! ! .historyLabel { ! font-weight: bold; ! } ! ! .historyLabelSort { ! font-weight: bold; ! font-style: normal; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configurationLabel { ! font-weight: bold; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! .bucketsWidgetStateOn, .bucketsWidgetStateOff { ! font-weight: bold; ! } ! ! .configWidgetStateOn, .configWidgetStateOff { ! font-weight: bold; ! } ! ! .securityWidgetStateOn, .securityWidgetStateOff { ! font-weight: bold; ! } ! ! /*********************************************************/ ! /* Positioning */ ! ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; ! } ! ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! .historyNavigatorTop, .historyNavigatorBottom { ! text-align: right; ! } ! ! .magnetsTable caption { ! text-align: left; ! } ! ! .advancedWidgets { ! margin-top: 1em; ! } ! ! /*********************************************************/ ! /* Config Bars */ ! ! .configBar { ! background-color: #DFDFAF; ! } ! ! .configBar form { ! margin: 0; ! } ! ! .configBarOption { ! display: inline; ! border: 1px solid #CCCC99; ! padding: 0.3em; ! margin: 0.1em 0.3em; ! white-space: nowrap; ! float: left; ! } ! ! .toggleConfigBar { ! float: right; ! } ! ! .checkLabel { ! border: 1px solid #CCCC99; ! } |
|
From: Joseph C. <tex...@us...> - 2005-02-06 02:10:14
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29242/skins/default Modified Files: corpus-page.thtml Log Message: Remove empty columns seperating options. Change alignment on some columns. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** corpus-page.thtml 30 Jan 2005 09:10:48 -0000 1.15 --- corpus-page.thtml 6 Feb 2005 02:10:04 -0000 1.16 *************** *** 12,16 **** </form> </div> ! </TMPL_IF> --- 12,16 ---- </form> </div> ! <br /> </TMPL_IF> *************** *** 36,40 **** <table width="100%" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> ! <th colspan="13" align="left"> <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Title"></h2> </th> --- 36,40 ---- <table width="100%" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> ! <th colspan="7" align="left"> <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Title"></h2> </th> *************** *** 44,81 **** <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> ! <th width="1%"> ! ! </th> <th class="bucketsLabel" scope="col" align="right"> <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> </th> ! <th width="1%"> ! ! </th> <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_SubjectModification"> </th> ! <th width="1%"> ! ! </th> <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XTCInsertion"> </th> ! <th width="1%"> ! ! </th> <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XPLInsertion"> </th> ! <th width="1%"> ! ! </th> <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_Quarantine"> </th> ! <th width="1%"> ! ! </th> ! <th class="bucketsLabel" scope="col" align="left"> <TMPL_VAR NAME="Localize_Bucket_ChangeColor"> </th> --- 44,69 ---- <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> ! <th class="bucketsLabel" scope="col" align="right"> <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_SubjectModification"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XTCInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XPLInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_Quarantine"> </th> ! ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_ChangeColor"> </th> *************** *** 113,119 **** </td> ! <td width="1%"> ! ! </td> <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> --- 101,105 ---- </td> ! <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> *************** *** 122,128 **** <TMPL_VAR NAME="Corpus_Bucket_Unique"> </td> ! <td width="1%"> ! ! </td> <TMPL_ELSE> --- 108,112 ---- <TMPL_VAR NAME="Corpus_Bucket_Unique"> </td> ! <TMPL_ELSE> *************** *** 131,137 **** </td> ! <td width="1%"> ! ! </td> </TMPL_IF> --- 115,119 ---- </td> ! </TMPL_IF> *************** *** 140,168 **** <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_subject" <TMPL_IF NAME="Corpus_If_Subject">checked="checked"</TMPL_IF> /> </td> ! <td width="1%"> ! ! </td> <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xtc" <TMPL_IF NAME="Corpus_If_XTC">checked="checked"</TMPL_IF> /> </td> ! <td width="1%"> ! ! </td> <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xpl" <TMPL_IF NAME="Corpus_If_XPL">checked="checked"</TMPL_IF> /> </td> ! <td width="1%"> ! ! </td> <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_quarantine" <TMPL_IF NAME="Corpus_If_Quarantine">checked="checked"</TMPL_IF> /> </td> ! <td width="1%"> ! ! </td> <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <td align="left"> <select name="<TMPL_VAR NAME="Corpus_Bucket">_color"> --- 122,142 ---- <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_subject" <TMPL_IF NAME="Corpus_If_Subject">checked="checked"</TMPL_IF> /> </td> ! <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xtc" <TMPL_IF NAME="Corpus_If_XTC">checked="checked"</TMPL_IF> /> </td> ! <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xpl" <TMPL_IF NAME="Corpus_If_XPL">checked="checked"</TMPL_IF> /> </td> ! <td align="center"> <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_quarantine" <TMPL_IF NAME="Corpus_If_Quarantine">checked="checked"</TMPL_IF> /> </td> ! <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <td align="center"> <select name="<TMPL_VAR NAME="Corpus_Bucket">_color"> *************** *** 189,193 **** <tr> ! <td colspan="3"> <hr /> </td> --- 163,167 ---- <tr> ! <td colspan="2"> <hr /> </td> *************** *** 197,206 **** <TMPL_VAR NAME="Localize_Total"> </th> - <td width="1%"> - </td> <td align="right"> <TMPL_VAR NAME="Corpus_Total_Unique"> </td> ! <td colspan="9"> </td> <td> --- 171,178 ---- <TMPL_VAR NAME="Localize_Total"> </th> <td align="right"> <TMPL_VAR NAME="Corpus_Total_Unique"> </td> ! <td colspan="4"> </td> <td> |
|
From: Joseph C. <tex...@us...> - 2005-02-06 02:07:14
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28740/skins/default Modified Files: magnet-page.thtml Log Message: Remove bold open tag from HTML. Add centering to some columns. Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** magnet-page.thtml 14 Jan 2005 20:43:19 -0000 1.7 --- magnet-page.thtml 6 Feb 2005 02:07:05 -0000 1.8 *************** *** 46,50 **** <input type="text" name="text<TMPL_VAR NAME="Magnet_Row_ID">" value="<TMPL_VAR NAME="Magnet_Validating">" size="<TMPL_VAR NAME="Magnet_Size">" /> </td> ! <td> <select name="bucket<TMPL_VAR NAME="Magnet_Row_ID">" id="magnetsAddBucket"> --- 46,50 ---- <input type="text" name="text<TMPL_VAR NAME="Magnet_Row_ID">" value="<TMPL_VAR NAME="Magnet_Validating">" size="<TMPL_VAR NAME="Magnet_Size">" /> </td> ! <td align="center"> <select name="bucket<TMPL_VAR NAME="Magnet_Row_ID">" id="magnetsAddBucket"> *************** *** 59,63 **** </select> </td> ! <td> <input type="checkbox" class="checkbox" name="remove<TMPL_VAR NAME="Magnet_Row_ID">" /> <TMPL_VAR NAME="Localize_Remove"> --- 59,63 ---- </select> </td> ! <td align="center"> <input type="checkbox" class="checkbox" name="remove<TMPL_VAR NAME="Magnet_Row_ID">" /> <TMPL_VAR NAME="Localize_Remove"> *************** *** 73,80 **** <td> </td> ! <td> <input type="submit" class="deleteButton" name="update" value="<TMPL_VAR NAME="Localize_Update">" /> </td> ! <td> <input type="submit" class="deleteButton" name="delete" value="<TMPL_VAR NAME="Localize_Remove">" /> </td> --- 73,80 ---- <td> </td> ! <td align="center"> <input type="submit" class="deleteButton" name="update" value="<TMPL_VAR NAME="Localize_Update">" /> </td> ! <td align="center"> <input type="submit" class="deleteButton" name="delete" value="<TMPL_VAR NAME="Localize_Remove">" /> </td> *************** *** 95,100 **** <tr> <td> ! <b> ! <TMPL_VAR NAME="Localize_Magnet_Explanation"> </td> </tr> --- 95,99 ---- <tr> <td> ! <TMPL_VAR NAME="Localize_Magnet_Explanation"> </td> </tr> |
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28407/languages Modified Files: Arabic.msg Bulgarian.msg Chinese-Simplified-GB2312.msg Chinese-Simplified.msg Chinese-Traditional-BIG5.msg Chinese-Traditional.msg Czech.msg Dansk.msg Deutsch.msg Espanol.msg Francais.msg Hebrew.msg Hellenic.msg Hungarian.msg Italiano.msg Klingon.msg Korean.msg Nederlands.msg Nihongo.msg Norsk.msg Polish.msg Portugues do Brasil.msg Portugues.msg Russian.msg Slovak.msg Suomi.msg Svenska.msg Turkce.msg Ukrainian.msg Log Message: Move bold open tag from HTML into language string where the close tag is. Index: Polish.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Polish.msg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Polish.msg 6 Oct 2003 13:08:55 -0000 1.3 --- Polish.msg 6 Feb 2005 02:05:35 -0000 1.4 *************** *** 210,214 **** Magnet_Message1 Nastêpuj±ce musiki spowoduj± klasyfikacjê listów zawsze w okre¶lonych folderach. Magnet_CreateNew Utwórz nowy musik ! Magnet_Explanation Nastêpuj±ce rodzaje musików s± dostêpne:</b> <ul><li><b>Adres lub nazwa nadawcy:</b> na przyk³ad: jo...@co... dotyczy konkretnego adresu, <br />company.com dotyczy wszystkich nadawców z company.com, <br />John Doe dotyczy konkretnej osoby, John dotyczy wszystkich Johnów</li><li><b>Adres lub nazwa Do/Cc:</b> Jak w przypadku pola Od, ale dotyczy pól Do:/Cc: </li> <li><b>S³owa w temacie:</b> na przyk³ad: hello dotyczy wszystkich wiadomo¶ci z hello w temacie</li></ul> Magnet_MagnetType Rodzaj musika Magnet_Value Warto¶æ --- 210,214 ---- Magnet_Message1 Nastêpuj±ce musiki spowoduj± klasyfikacjê listów zawsze w okre¶lonych folderach. Magnet_CreateNew Utwórz nowy musik ! Magnet_Explanation <b>Nastêpuj±ce rodzaje musików s± dostêpne:</b> <ul><li><b>Adres lub nazwa nadawcy:</b> na przyk³ad: jo...@co... dotyczy konkretnego adresu, <br />company.com dotyczy wszystkich nadawców z company.com, <br />John Doe dotyczy konkretnej osoby, John dotyczy wszystkich Johnów</li><li><b>Adres lub nazwa Do/Cc:</b> Jak w przypadku pola Od, ale dotyczy pól Do:/Cc: </li> <li><b>S³owa w temacie:</b> na przyk³ad: hello dotyczy wszystkich wiadomo¶ci z hello w temacie</li></ul> Magnet_MagnetType Rodzaj musika Magnet_Value Warto¶æ Index: Russian.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Russian.msg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Russian.msg 6 Oct 2003 13:08:55 -0000 1.8 --- Russian.msg 6 Feb 2005 02:05:35 -0000 1.9 *************** *** 188,192 **** Magnet_Message1 íÁÇÎÉÔÙ ÐÏÚ×ÏÌÑÀÔ ÓËÌÁÄÙ×ÁÔØ ×ÓÅ ÐÏÄÈÏÄÑÝÉÅ Ë ÎÉÍ ÓÏÏÂÝÅÎÉÑ × ÕËÁÚÁÎÎÙÅ ×ÅÄÒÁ. Magnet_CreateNew óÏÚÄÁÔØ ÎÏ×ÙÊ ÍÁÇÎÉÔ ! Magnet_Explanation óÕÝÅÓÔ×ÕÅÔ ÔÒÉ ÔÉÐÁ ÍÁÇÎÉÔÏ×:</b><ul><li><b>áÄÒÅÓ ÉÌÉ ÉÍÑ ÏÔÐÒÁ×ÉÔÅÌÑ:</b> ÎÁÐÒÉÍÅÒ, "jo...@co..." ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÐÉÓÅÍ, ÐÒÉÛÅÄÛÉÈ Ó ÕËÁÚÁÎÎÏÇÏ ÁÄÒÅÓÁ, <br />"company.com" ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÌÀÂÙÈ ÐÉÓÅÍ, ÐÒÉÛÅÄÛÉÈ ÉÚ company.com, <br />"John Doe" ÓÒÁÂÏÔÁÅÔ ÅÓÌÉ × ÐÏÌÅ "ïÔÐÒÁ×ÉÔÅÌØ" ÐÒÉÓÕÔÓÔ×ÕÅÔ ÕËÁÚÁÎÎÏÅ ÉÍÑ, × ÔÏ ×ÒÅÍÑ ËÁË, "John" ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÌÀÂÙÈ äÖÏÎÏ×, ÎÁÐÉÓÁ×ÛÉÈ ×ÁÍ ÐÉÓØÍÏ</li><li> <b>áÄÒÅÓ ÉÌÉ ÉÍÑ ÐÏÌÕÞÁÔÅÌÑ:</b> ÒÁÂÏÔÁÅÔ ËÁË ÐÒÅÄÙÄÕÝÉÊ, ÔÏÌØËÏ ÏÐÅÒÉÒÕÅÔ ÐÏÌÅÍ "ðÏÌÕÞÁÔÅÌØ"</li><li> <b>óÌÏ×Á × ÔÅÍÅ ÐÉÓØÍÁ:</b> ÎÁÐÒÉÍÅÒ, "hello" ÓÒÁÂÏÔÁÅÔ ÎÁ ×ÓÅÈ ÐÉÓØÍÁÈ Ó ÜÔÉÍ ÐÒÉ×ÅÔÓÔ×ÉÅÍ × ÔÅÍÅ</li></ul> Magnet_MagnetType ôÉÐ ÍÁÇÎÉÔÁ Magnet_Value úÎÁÞÅÎÉÅ --- 188,192 ---- Magnet_Message1 íÁÇÎÉÔÙ ÐÏÚ×ÏÌÑÀÔ ÓËÌÁÄÙ×ÁÔØ ×ÓÅ ÐÏÄÈÏÄÑÝÉÅ Ë ÎÉÍ ÓÏÏÂÝÅÎÉÑ × ÕËÁÚÁÎÎÙÅ ×ÅÄÒÁ. Magnet_CreateNew óÏÚÄÁÔØ ÎÏ×ÙÊ ÍÁÇÎÉÔ ! Magnet_Explanation <b>óÕÝÅÓÔ×ÕÅÔ ÔÒÉ ÔÉÐÁ ÍÁÇÎÉÔÏ×:</b><ul><li><b>áÄÒÅÓ ÉÌÉ ÉÍÑ ÏÔÐÒÁ×ÉÔÅÌÑ:</b> ÎÁÐÒÉÍÅÒ, "jo...@co..." ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÐÉÓÅÍ, ÐÒÉÛÅÄÛÉÈ Ó ÕËÁÚÁÎÎÏÇÏ ÁÄÒÅÓÁ, <br />"company.com" ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÌÀÂÙÈ ÐÉÓÅÍ, ÐÒÉÛÅÄÛÉÈ ÉÚ company.com, <br />"John Doe" ÓÒÁÂÏÔÁÅÔ ÅÓÌÉ × ÐÏÌÅ "ïÔÐÒÁ×ÉÔÅÌØ" ÐÒÉÓÕÔÓÔ×ÕÅÔ ÕËÁÚÁÎÎÏÅ ÉÍÑ, × ÔÏ ×ÒÅÍÑ ËÁË, "John" ÓÒÁÂÏÔÁÅÔ ÄÌÑ ÌÀÂÙÈ äÖÏÎÏ×, ÎÁÐÉÓÁ×ÛÉÈ ×ÁÍ ÐÉÓØÍÏ</li><li> <b>áÄÒÅÓ ÉÌÉ ÉÍÑ ÐÏÌÕÞÁÔÅÌÑ:</b> ÒÁÂÏÔÁÅÔ ËÁË ÐÒÅÄÙÄÕÝÉÊ, ÔÏÌØËÏ ÏÐÅÒÉÒÕÅÔ ÐÏÌÅÍ "ðÏÌÕÞÁÔÅÌØ"</li><li> <b>óÌÏ×Á × ÔÅÍÅ ÐÉÓØÍÁ:</b> ÎÁÐÒÉÍÅÒ, "hello" ÓÒÁÂÏÔÁÅÔ ÎÁ ×ÓÅÈ ÐÉÓØÍÁÈ Ó ÜÔÉÍ ÐÒÉ×ÅÔÓÔ×ÉÅÍ × ÔÅÍÅ</li></ul> Magnet_MagnetType ôÉÐ ÍÁÇÎÉÔÁ Magnet_Value úÎÁÞÅÎÉÅ Index: Korean.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Korean.msg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Korean.msg 13 Oct 2003 00:41:58 -0000 1.5 --- Korean.msg 6 Feb 2005 02:05:34 -0000 1.6 *************** *** 215,219 **** Magnet_Message1 ´ÙÀ½ ÀÚ¼®Àº ÁöÁ¤µÈ ¹öŶÀ¸·Î ¸ÞÀÏÀÌ Ç×»ó ºÐ·ùµÇµµ·Ï ÇÕ´Ï´Ù. Magnet_CreateNew »õ ÀÚ¼® »ý¼º ! Magnet_Explanation ¼¼ Á¾·ùÀÇ ÀÚ¼®ÀÌ °¡´ÉÇÕ´Ï´Ù:</b> <ul><li><b>¹ß½ÅÁÖ¼Ò ¶Ç´Â À̸§:</b> ¿¹: jo...@co... (ƯÁ¤ À̸ÞÀÏ ÁÖ¼Ò·Î), <br />company.com (company.com¿¡¼ º¸³»´Â ¸ðµç ¸ÞÀÏ), <br />John Doe:Jonh Doe¸¸ ÀÏÄ¡, John:ù´Ü¾î°¡ JohnÀÌ¸é ¸ðµÎ ÀÏÄ¡</li><li><b>¼ö½ÅÀÚ ¸ÞÀÏÁÖ¼Ò ¶Ç´Â À̸§:</b> ¹ß½ÅÁÖ¼Ò¿ë ÀÚ¼®°ú µ¿ÀÏÇϳª ¼ö½ÅÀÚ¿¡ ÀÛ¿ëÇÔ</li> <li><b>Á¦¸ñÀÇ ´Ü¾î:</b> ¿¹)¾È³çÇϼ¼¿ä ´Â Á¦¸ñ¶õÀÇ ¸ðµç ¾È³çÇϼ¼¿ä ¿Í ÀÏÄ¡</li></ul> Magnet_MagnetType ÀÚ¼® Á¾·ù Magnet_Value °ª --- 215,219 ---- Magnet_Message1 ´ÙÀ½ ÀÚ¼®Àº ÁöÁ¤µÈ ¹öŶÀ¸·Î ¸ÞÀÏÀÌ Ç×»ó ºÐ·ùµÇµµ·Ï ÇÕ´Ï´Ù. Magnet_CreateNew »õ ÀÚ¼® »ý¼º ! Magnet_Explanation <b>¼¼ Á¾·ùÀÇ ÀÚ¼®ÀÌ °¡´ÉÇÕ´Ï´Ù:</b> <ul><li><b>¹ß½ÅÁÖ¼Ò ¶Ç´Â À̸§:</b> ¿¹: jo...@co... (ƯÁ¤ À̸ÞÀÏ ÁÖ¼Ò·Î), <br />company.com (company.com¿¡¼ º¸³»´Â ¸ðµç ¸ÞÀÏ), <br />John Doe:Jonh Doe¸¸ ÀÏÄ¡, John:ù´Ü¾î°¡ JohnÀÌ¸é ¸ðµÎ ÀÏÄ¡</li><li><b>¼ö½ÅÀÚ ¸ÞÀÏÁÖ¼Ò ¶Ç´Â À̸§:</b> ¹ß½ÅÁÖ¼Ò¿ë ÀÚ¼®°ú µ¿ÀÏÇϳª ¼ö½ÅÀÚ¿¡ ÀÛ¿ëÇÔ</li> <li><b>Á¦¸ñÀÇ ´Ü¾î:</b> ¿¹)¾È³çÇϼ¼¿ä ´Â Á¦¸ñ¶õÀÇ ¸ðµç ¾È³çÇϼ¼¿ä ¿Í ÀÏÄ¡</li></ul> Magnet_MagnetType ÀÚ¼® Á¾·ù Magnet_Value °ª Index: Chinese-Traditional.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Chinese-Traditional.msg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Chinese-Traditional.msg 2 Nov 2004 14:53:50 -0000 1.6 --- Chinese-Traditional.msg 6 Feb 2005 02:05:32 -0000 1.7 *************** *** 263,267 **** Magnet_Message1 ä¸åçå¸éµæè®ä¿¡ä»¶ç¸½æ¯è¢«åé¡å°ç¹å®çéµçè£. Magnet_CreateNew 建ç«æ°çå¸éµ ! Magnet_Explanation æéäºé¡å¥çå¸éµå¯ä»¥ç¨:</b> <ul><li><b>å¯ä»¶è å°åæåå:</b> èä¾ä¾èªª: jo...@co... å°±ç¥æå»åç¹å®çå°å, <br />company.com æå»åå°ä»»ä½å¾ company.com å¯åºä¾ç人, <br />John Doe æå»åç¹å®ç人, John æå»åææç Johns</li><li><b>æ¶ä»¶è /å¯æ¬å°åæå稱:</b> å°±è·å¯ä»¶è ä¸æ¨£: ä½æ¯å¸éµç¥æéå°éµä»¶è¨æ¯è£ç To:/Cc: å°åçæ</li> <li><b>主æ¨åè©:</b> ä¾å¦: hello æå»åææ主æ¨è£æ hello çéµä»¶è¨æ¯</li></ul> Magnet_MagnetType å¸éµé¡å¥ Magnet_Value å¼ --- 263,267 ---- Magnet_Message1 ä¸åçå¸éµæè®ä¿¡ä»¶ç¸½æ¯è¢«åé¡å°ç¹å®çéµçè£. Magnet_CreateNew 建ç«æ°çå¸éµ ! Magnet_Explanation <b>æéäºé¡å¥çå¸éµå¯ä»¥ç¨:</b> <ul><li><b>å¯ä»¶è å°åæåå:</b> èä¾ä¾èªª: jo...@co... å°±ç¥æå»åç¹å®çå°å, <br />company.com æå»åå°ä»»ä½å¾ company.com å¯åºä¾ç人, <br />John Doe æå»åç¹å®ç人, John æå»åææç Johns</li><li><b>æ¶ä»¶è /å¯æ¬å°åæå稱:</b> å°±è·å¯ä»¶è ä¸æ¨£: ä½æ¯å¸éµç¥æéå°éµä»¶è¨æ¯è£ç To:/Cc: å°åçæ</li> <li><b>主æ¨åè©:</b> ä¾å¦: hello æå»åææ主æ¨è£æ hello çéµä»¶è¨æ¯</li></ul> Magnet_MagnetType å¸éµé¡å¥ Magnet_Value å¼ Index: Chinese-Simplified.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Chinese-Simplified.msg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Chinese-Simplified.msg 2 Nov 2004 14:53:50 -0000 1.6 --- Chinese-Simplified.msg 6 Feb 2005 02:05:32 -0000 1.7 *************** *** 264,268 **** Magnet_Message1 ä¸åçå¸éä¼è®©ä¿¡ä»¶æ»æ¯è¢«åç±»å°ç¹å®çé®çé. Magnet_CreateNew 建ç«æ°çå¸é ! Magnet_Explanation æè¿äºç±»å«çå¸éå¯ä»¥ç¨:</b> <ul><li><b>å¯ä»¶è å°åæåå:</b> 举ä¾æ¥è¯´: jo...@co... å°±ç¥ä¼å»åç¹å®çå°å, <br />company.com ä¼å»åå°ä»»ä½ä» company.com å¯åºæ¥ç人, <br />John Doe ä¼å»åç¹å®ç人, John ä¼å»åææç Johns</li><li><b>æ¶ä»¶è /å¯æ¬å°åæå称:</b> å°±è·å¯ä»¶è ä¸æ ·: ä½æ¯å¸éç¥ä¼é对é®ä»¶è®¯æ¯éç To:/Cc: å°åçæ</li> <li><b>主æ¨åè¯:</b> ä¾å¦: hello ä¼å»åææ主æ¨éæ hello çé®ä»¶è®¯æ¯</li></ul> Magnet_MagnetType å¸éç±»å« Magnet_Value å¼ --- 264,268 ---- Magnet_Message1 ä¸åçå¸éä¼è®©ä¿¡ä»¶æ»æ¯è¢«åç±»å°ç¹å®çé®çé. Magnet_CreateNew 建ç«æ°çå¸é ! Magnet_Explanation <b>æè¿äºç±»å«çå¸éå¯ä»¥ç¨:</b> <ul><li><b>å¯ä»¶è å°åæåå:</b> 举ä¾æ¥è¯´: jo...@co... å°±ç¥ä¼å»åç¹å®çå°å, <br />company.com ä¼å»åå°ä»»ä½ä» company.com å¯åºæ¥ç人, <br />John Doe ä¼å»åç¹å®ç人, John ä¼å»åææç Johns</li><li><b>æ¶ä»¶è /å¯æ¬å°åæå称:</b> å°±è·å¯ä»¶è ä¸æ ·: ä½æ¯å¸éç¥ä¼é对é®ä»¶è®¯æ¯éç To:/Cc: å°åçæ</li> <li><b>主æ¨åè¯:</b> ä¾å¦: hello ä¼å»åææ主æ¨éæ hello çé®ä»¶è®¯æ¯</li></ul> Magnet_MagnetType å¸éç±»å« Magnet_Value å¼ Index: Turkce.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Turkce.msg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Turkce.msg 29 Sep 2004 19:24:08 -0000 1.3 --- Turkce.msg 6 Feb 2005 02:05:35 -0000 1.4 *************** *** 263,267 **** Magnet_Message1 Bu mýknatýslar, postanýn her zaman belirtilen kategori olarak sýnýflandýrýlmasýný saðlayacaktýr. Magnet_CreateNew Yeni Mýknatýs Oluþtur ! Magnet_Explanation Þu tür mýknatýslar mevcuttur:</b> <ul><li><b>Kimden adresi veya isim:</b> Örneðin: Belirli bir adresle eþleþtirmek için ze...@si..., <br />sirket.com'dan gönderen herkes ile eþleþtirmek için sirket.com, <br />belirli bir kiþiyle eþleþtirmek için Zeynel Abidin Öztürk, tüm Zeynel'ler ile eþleþtirmek için Zeynel yazýn</li><li><b>Kime/Bilgi adres veya adý:</b> Kimden: mýknatýsý gibidir fakat mesajdaki Kime:/Bilgi: adresi içindir</li> <li><b>Konu sözcükleri:</b> Örneðin: Konusunda merhaba bulunan tüm mesajlarla eþleþtirmek için merhaba yazýn</li></ul> Magnet_MagnetType Mýknatýs türü Magnet_Value Deðer --- 263,267 ---- Magnet_Message1 Bu mýknatýslar, postanýn her zaman belirtilen kategori olarak sýnýflandýrýlmasýný saðlayacaktýr. Magnet_CreateNew Yeni Mýknatýs Oluþtur ! Magnet_Explanation <b>Þu tür mýknatýslar mevcuttur:</b> <ul><li><b>Kimden adresi veya isim:</b> Örneðin: Belirli bir adresle eþleþtirmek için ze...@si..., <br />sirket.com'dan gönderen herkes ile eþleþtirmek için sirket.com, <br />belirli bir kiþiyle eþleþtirmek için Zeynel Abidin Öztürk, tüm Zeynel'ler ile eþleþtirmek için Zeynel yazýn</li><li><b>Kime/Bilgi adres veya adý:</b> Kimden: mýknatýsý gibidir fakat mesajdaki Kime:/Bilgi: adresi içindir</li> <li><b>Konu sözcükleri:</b> Örneðin: Konusunda merhaba bulunan tüm mesajlarla eþleþtirmek için merhaba yazýn</li></ul> Magnet_MagnetType Mýknatýs türü Magnet_Value Deðer Index: Portugues.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Portugues.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Portugues.msg 6 Oct 2003 13:14:56 -0000 1.1 --- Portugues.msg 6 Feb 2005 02:05:35 -0000 1.2 *************** *** 210,214 **** Magnet_Message1 Os seguintes ímans atraem as mensagens para receptáculo especificado. Magnet_CreateNew Criar Novo Íman ! Magnet_Explanation Três tipos de íman estão disponíveis: <ul><li>De um endereço ou nome:</b> Por exemplo: ad...@co... para apanhar um endereço específico, <br />companhia.com para apanhar todo mundo que manda mensagens de companhia.com, <br />Adriano Gomes para apanhar uma pessoa específica, Adriano para apanhar todos os Adrianos</li><li><b>Para um endereço ou nome:</b> Como um íman Originador: mas para o endereço Para: de uma mensagem </li><li><b>Palavras no assunto:</b> Por exemplo: olá para apanhar todas as mensagens com olá no assunto</li></ul> Magnet_MagnetType Tipo do íman Magnet_Value Valor --- 210,214 ---- Magnet_Message1 Os seguintes ímans atraem as mensagens para receptáculo especificado. Magnet_CreateNew Criar Novo Íman ! Magnet_Explanation <b>Três tipos de íman estão disponíveis: <ul><li>De um endereço ou nome:</b> Por exemplo: ad...@co... para apanhar um endereço específico, <br />companhia.com para apanhar todo mundo que manda mensagens de companhia.com, <br />Adriano Gomes para apanhar uma pessoa específica, Adriano para apanhar todos os Adrianos</li><li><b>Para um endereço ou nome:</b> Como um íman Originador: mas para o endereço Para: de uma mensagem </li><li><b>Palavras no assunto:</b> Por exemplo: olá para apanhar todas as mensagens com olá no assunto</li></ul> Magnet_MagnetType Tipo do íman Magnet_Value Valor Index: Hungarian.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Hungarian.msg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Hungarian.msg 6 Oct 2003 13:08:55 -0000 1.3 --- Hungarian.msg 6 Feb 2005 02:05:34 -0000 1.4 *************** *** 176,180 **** Magnet_Message1 A következõ mágnes minden egyes levelet a megadott konténerbe fog irányitani. Magnet_CreateNew Hozz létre új mágnest ! Magnet_Explanation Három fajta mágnes létezik:</b> <ul><li><b>Feladó cime vagy neve:</b> Például: jo...@co..., ha egy bizonyos email cimet keresünk<br>company.com ha mindenkit meg akarunk találni aki a company.com cimrõl jön, <br>"John Doe" ha egy bizonyos embert akarunk kiszûrni, John meg fog találni minden John-t<li><b>Cimyett cime vagy neve:</b> Ugyanaz mint a Feladó, de ez a Cimzett nevében és cimében keres.<li><b>Téma:</b> Például: hello meg fog találni minden email-t aminek a szó "hello" a témájában szerepel</ul> Magnet_MagnetType Mágnes tipus Magnet_Value Érték --- 176,180 ---- Magnet_Message1 A következõ mágnes minden egyes levelet a megadott konténerbe fog irányitani. Magnet_CreateNew Hozz létre új mágnest ! Magnet_Explanation <b>Három fajta mágnes létezik:</b> <ul><li><b>Feladó cime vagy neve:</b> Például: jo...@co..., ha egy bizonyos email cimet keresünk<br>company.com ha mindenkit meg akarunk találni aki a company.com cimrõl jön, <br>"John Doe" ha egy bizonyos embert akarunk kiszûrni, John meg fog találni minden John-t<li><b>Cimyett cime vagy neve:</b> Ugyanaz mint a Feladó, de ez a Cimzett nevében és cimében keres.<li><b>Téma:</b> Például: hello meg fog találni minden email-t aminek a szó "hello" a témájában szerepel</ul> Magnet_MagnetType Mágnes tipus Magnet_Value Érték Index: Arabic.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Arabic.msg,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Arabic.msg 22 Sep 2004 11:58:14 -0000 1.4 --- Arabic.msg 6 Feb 2005 02:05:32 -0000 1.5 *************** *** 1,3 **** ! # Copyright (c) 2001-2004 John Graham-Cumming # # This file is part of POPFile --- 1,3 ---- ! # Copyright (c) 2001-2004 John Graham-Cumming # # This file is part of POPFile *************** *** 30,78 **** # Common words that are used on their own all over the interface ! Apply تطبÙÙ ! On Ùشط ! Off Ù ÙÙÙ ! TurnOn ÙØ´ÙØ· ! TurnOff Ø¥ÙÙÙ ! Add أض٠! Remove Ø¥ØØ°Ù ! Previous اÙساب٠! Next اÙتاÙÙ ! From Ù Ùرس٠! Subject Ù ÙضÙع ! Cc Ùسخة Ø®ÙÙØ© (Cc) ! Classification تصÙÙÙ ! Reclassify أعد اÙتصÙÙÙ ! Probability Ø¥Øت٠اÙÙØ© ! Scores Ùتائج ! QuickMagnets ٠غÙاطÙس سرÙع ! Undo تراجع ! Close أغÙÙ ! Find إبØØ« ! Filter صÙÙÙ ! Yes Ùع٠! No Ùا ! ChangeToYes غÙÙر اÙÙ Ùع٠! ChangeToNo غÙÙر اÙÙ Ùا ! Bucket دÙÙ ! Magnet ٠غÙاطÙس ! Delete Ø¥ØØ°Ù ! Create إصÙع ! To ٠ستÙب٠! Total إج٠اÙÙ ! Rename أعادة تس٠ÙØ© ! Frequency تÙرار ! Probability Ø¥Øت٠اÙÙØ© ! Score ÙتÙجة ! Lookup إبØØ« ! Word ÙÙÙ Ø© ! Count ٠ج٠Ùع ! Update تØدÙØ« ! Refresh تØدÙØ« ! FAQ أسئÙØ© شائعة ID ID ! Date تارÙØ® ! Arrived ÙصÙÙ ! Size Øج٠# This is a regular expression pattern that is used to convert --- 30,78 ---- # Common words that are used on their own all over the interface ! Apply ????? ! On ??? ! Off ???? ! TurnOn ???? ! TurnOff ???? ! Add ??? ! Remove ???? ! Previous ?????? ! Next ?????? ! From ????? ! Subject ????? ! Cc ???? ???? (Cc) ! Classification ????? ! Reclassify ??? ??????? ! Probability ???????? ! Scores ????? ! QuickMagnets ??????? ???? ! Undo ????? ! Close ???? ! Find ???? ! Filter ???? ! Yes ??? ! No ?? ! ChangeToYes ???? ??? ??? ! ChangeToNo ???? ??? ?? ! Bucket ??? ! Magnet ??????? ! Delete ???? ! Create ???? ! To ?????? ! Total ?????? ! Rename ????? ????? ! Frequency ????? ! Probability ???????? ! Score ????? ! Lookup ???? ! Word ???? ! Count ????? ! Update ????? ! Refresh ????? ! FAQ ????? ????? ID ID ! Date ????? ! Arrived ???? ! Size ??? # This is a regular expression pattern that is used to convert *************** *** 94,333 **** # The header and footer that appear on every UI page ! Header_Title ٠رÙز تØÙÙ POPFile ! Header_Shutdown Ø¥ÙÙاء اÙبرÙا٠ج ! Header_History Ù ØÙÙظات ! Header_Buckets دÙاء ! Header_Configuration إعدادات ! Header_Advanced Ø®Ùارات ٠تÙد٠ة ! Header_Security اÙأ٠ا٠! Header_Magnets ٠غÙاطÙس ! Footer_HomePage صÙØØ© اÙبداÙØ© ! Footer_Manual تعÙÙ٠ات ! Footer_Forums Ù Ùتد٠! Footer_FeedMe تبرÙع ! Footer_RequestFeature أطÙب Ù Ùزة ! Footer_MailingList ٠ج٠Ùعة برÙدÙØ© ! Footer_Wiki Ùثائ٠! Configuration_Error1 Øر٠اÙÙص٠ÙØب Ø£Ù ÙÙÙÙ Ù Ùردا٠! Configuration_Error2 بÙابة اÙإتصا٠ÙÙاجÙØ© اÙ٠ستخد٠Ùجب أ٠تÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 65535 ! Configuration_Error3 بÙابة اÙإتصا٠ÙÙÙ POP3 Ùجب أ٠تÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 65535 ! Configuration_Error4 Øج٠اÙصÙØØ© ÙØب Ø£Ù ÙÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 1000 ! Configuration_Error5 عدد Ø£Ùا٠اÙÙ ØÙÙظات ÙØب Ø£Ù ÙÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 366 ! Configuration_Error6 ز٠٠إÙÙاء إتصا٠TCP Ùجب Ø£Ù ÙÙÙ٠رÙ٠ا٠بÙÙ 10 Ù 300 ! Configuration_Error7 بÙابة إتصا٠XML RPC Ùجب أ٠تÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 65535 ! Configuration_Error8 بÙابة إتصا٠Socks V Ùجب أ٠تÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 65535 ! Configuration_POP3Port بÙابة إتصا٠POP3 ! Configuration_POP3Update ÙÙد ت٠تعدÙ٠بÙابة إتصا٠POP3 Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Configuration_XMLRPCUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠XML-RPC Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Configuration_XMLRPCPort بÙابة إتصا٠XML-RPC ! Configuration_SMTPPort بÙابة إتصا٠SMTP ! Configuration_SMTPUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠SMTP Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Configuration_NNTPPort بÙابة اÙاتصا٠إÙÙ NNTP ! Configuration_NNTPUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠NNTP Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Configuration_POPFork Ø¥Ø³Ù Ø Ùعدة اتصاÙات POP3 بشÙ٠٠تزا٠٠! Configuration_SMTPFork Ø¥Ø³Ù Ø Ùعدة اتصاÙات SMTP بشÙ٠٠تزا٠٠! Configuration_NNTPFork Ø¥Ø³Ù Ø Ùعدة اتصاÙات NNTP بشÙ٠٠تزا٠٠! Configuration_POP3Separator Øر٠Ùص٠POP3 بÙÙ host:port:user ! Configuration_NNTPSeparator Øر٠Ùص٠NNTP بÙÙ host:port:user ! Configuration_POP3SepUpdate ت٠تعدÙÙ Øر٠Ùص٠POP3 Ø¥ÙÙ %s ! Configuration_NNTPSepUpdate ت٠تعدÙÙ Øر٠Ùص٠NNTP Ø¥ÙÙ %s ! Configuration_UI بÙابة اÙإتصا٠ÙÙاجÙØ© اÙ٠ستخد٠! Configuration_UIUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠ÙاجÙØ© اÙ٠ستخد٠إÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Configuration_History عدد اÙرسائ٠ÙÙ Ù٠صÙØØ© ! Configuration_HistoryUpdate ÙÙد ت٠تعدÙ٠عدد اÙرسائ٠ÙÙ Ù٠صÙØØ© Ø¥ÙÙ %s ! Configuration_Days عدد Ø£Ùا٠اÙÙ ØÙÙظات ÙÙإبÙاء ! Configuration_DaysUpdate ÙÙد ت٠تعدÙ٠عدد Ø£Ùا٠اÙÙ ØÙÙظات ÙÙإبÙاء Ø¥ÙÙ %s ! Configuration_UserInterface ÙاجÙØ© اÙ٠ستخد٠! Configuration_Skins س٠ة اÙÙاجÙØ© ! Configuration_SkinsChoose إختر س٠ة اÙÙاجÙØ© ! Configuration_Language Ùغة ! Configuration_LanguageChoose إختر اÙÙغة ! Configuration_ListenPorts اختÙارات اÙبÙرÙ٠ج ! Configuration_HistoryView عرض اÙÙ ØÙÙظات ! Configuration_TCPTimeout ز٠٠إÙÙاء اÙإتصا٠! Configuration_TCPTimeoutSecs ز٠٠إÙÙاء اÙإتصا٠(Ø«ÙاÙ) ! Configuration_TCPTimeoutUpdate ت٠تعدÙ٠ز٠٠إÙÙاء اÙإتصا٠إÙÙ %s ! Configuration_ClassificationInsertion إضاÙØ© Ø¥ÙÙ Ùص رساÙØ© ! Configuration_SubjectLine تعدÙÙ<br>سطر اÙÙ ÙضÙع ! Configuration_XTCInsertion رأسÙØ©<br>X-Text-Classification ! Configuration_XPLInsertion رأسÙØ©<br>X-POPFile-Link ! Configuration_Logging سجÙات ! Configuration_None بÙا ! Configuration_ToScreen Ø¥Ù٠اÙشاشة ! Configuration_ToFile Ø¥ÙÙ Ù ÙÙ ! Configuration_ToScreenFile Ø¥Ù٠اÙشاشة ÙÙ ÙÙ ! Configuration_LoggerOutput Ùاتج اÙسج٠! Configuration_GeneralSkins س٠ة اÙÙاجÙØ© ! Configuration_SmallSkins س٠ات صغÙرة ! Configuration_TinySkins س٠ات صغÙرة جدا٠! Configuration_CurrentLogFile <Ù Ù٠اÙسج٠اÙØاÙÙ> ! Configuration_SOCKSServer Ù ÙÙÙ ÙÙÙ٠خاد٠SOCKS V ! Configuration_SOCKSPort بÙابة إتصا٠٠ÙÙÙ ÙÙÙÙ SOCKS V ! Configuration_SOCKSPortUpdate ت٠تعدÙ٠بÙابة إتصا٠٠ÙÙÙ ÙÙÙÙ SOCKS V Ø¥ÙÙ %s ! Configuration_SOCKSServerUpdate ت٠تعدÙ٠خاد٠٠ÙÙÙ ÙÙÙÙ SOCKS V Ø¥ÙÙ %s ! Configuration_Fields أع٠دة اÙÙ ØÙÙظات ! Advanced_Error1 '%s' Ù ÙجÙدة ٠سبÙا٠ÙÙ ÙائØØ© اÙÙÙ٠ات اÙÙ ÙÙ ÙØ© ! Advanced_Error2 اÙÙÙ٠ات اÙÙ ÙÙ ÙØ© ÙÙ Ù٠أ٠تØتÙÙ ÙÙØ· اØر٠أ٠ارÙا٠أ٠. Ø£Ù _ Ø£Ù - Ø£Ù @ ! Advanced_Error3 ÙÙد ت٠إضاÙØ© '%s' Ø¥ÙÙ ÙائØØ© اÙÙÙ٠ات اÙÙ ÙÙ ÙØ© ! Advanced_Error4 '%s' ÙÙست ÙÙ ÙائØØ© اÙÙÙ٠ات اÙÙ ÙÙ ÙØ© ! Advanced_Error5 ÙÙد ت٠إزاÙØ© '%s' Ù Ù ÙائØØ© اÙÙÙ٠ات اÙÙ ÙÙ ÙØ© ! Advanced_StopWords ÙÙ٠ات Ù ÙÙ ÙØ© ! Advanced_Message1 POPFile ÙÙ٠٠اÙÙÙ٠ات اÙشائعة اÙإستع٠ا٠اÙتاÙÙØ©: ! Advanced_AddWord أض٠ÙÙÙ Ø© ! Advanced_RemoveWord Ø¥ØØ°Ù ÙÙÙ Ø© ! Advanced_AllParameters ÙاÙØ© ٠عاÙÙر POPFile ! Advanced_Parameter ٠عÙار ! Advanced_Value ÙÙÙ Ø© ! Advanced_Warning ÙØ°Ù Ùائ٠ة Ùا٠ÙØ© بÙاÙØ© ٠عاÙÙر POPFile. ÙÙ٠ستخد٠Ù٠اÙÙ ØترÙÙÙ ÙÙØ·: ÙÙ ÙÙÙ٠تغÙÙر Ø£Ù ÙÙÙ Ø© Ù٠٠ث٠اÙضغط عÙÙ "تØدÙØ«"Ø Ùا ÙÙجد تدÙÙ٠عÙ٠صØØ© اÙ٠عÙÙ٠ات. ! Advanced_ConfigFile Ù Ù٠اÙإعدادات: ! History_Filter (عرض اÙدÙÙ <font color="%s">%s</font>) ! History_FilterBy صÙÙ٠عÙÙ ! History_Search (جر٠اÙبØØ« ع٠٠ÙرسÙ/Ù ÙضÙع %s) ! History_Title رسائ٠ØدÙثة ! History_Jump إذÙب اÙ٠صÙØØ© ! History_ShowAll إعرض اÙÙÙ ! History_ShouldBe ÙÙضÙ٠أ٠ÙÙÙÙ ! History_NoFrom Ùا ÙÙجد سطر "from" ! History_NoSubject Ùا ÙÙجد سطر "subject" ! History_ClassifyAs صÙÙÙ Ù Ø«Ù ! History_MagnetUsed ٠غÙاطÙس ٠ستع٠٠! History_MagnetBecause <b>٠غÙاطÙس ٠ستع٠Ù</b><p>صÙ٠إÙÙ <font color="%s">%s</font> بسبب اÙ٠غÙاطÙس %s </p> ! History_ChangedTo ت٠تغÙر٠إÙÙ <font color="%s">%s</font> ! History_Already أعÙد تصÙÙÙ٠إÙÙ <font color="%s">%s</font> ! History_RemoveAll Øذ٠اÙÙÙ ! History_RemovePage Øذ٠اÙصÙØØ© ! History_RemoveChecked Øذ٠اÙ٠ختار ! History_Remove ÙØذ٠٠دخÙات ٠٠اÙÙ ØÙÙظات إضغط ! History_SearchMessage إبØØ« ٠رسÙ/Ù ÙضÙع ! History_NoMessages Ùا تÙجد رسائ٠! History_ShowMagnet ٠٠غÙØ· ! History_Negate_Search أعÙس اÙبØØ«/اÙتصÙÙÙ ! History_Magnet (عرض اÙرسائ٠اÙ٠صÙÙØ© ٠غÙاطÙسÙا٠ÙÙØ·) ! History_NoMagnet (عرض اÙرسائ٠غÙر اÙ٠صÙÙØ© ٠غÙاطÙسÙا٠ÙÙØ·) ! History_ResetSearch تصÙÙر اÙبØØ« ! History_ChangedClass سÙت٠تصÙÙÙ٠اÙØ¢Ù Ù٠ا ! History_Purge Ø¥Øذ٠اÙØ¢Ù ! History_Increase زÙد ! History_Decrease Ø®ÙÙض ! History_Column_Characters Ù٠بتغÙÙر عرض أع٠دة ٠رسÙØ Ù Ø³ØªÙبÙØ CcØ Ù ÙضÙع ! History_Automatic تÙÙائ٠! History_Reclassified أعÙد تصÙÙÙÙ History_Size_Bytes %d B History_Size_KiloBytes %.1f KB History_Size_MegaBytes %.1f MB ! Password_Title ÙÙÙ Ø© اÙ٠رÙر ! Password_Enter أدخ٠ÙÙÙ Ø© اÙ٠رÙر ! Password_Go أدخ٠! Password_Error1 ÙÙÙ Ø© اÙ٠رÙر خاطئة ! Security_Error1 اÙبÙابة Ùجب أ٠تÙÙ٠رÙ٠ا٠بÙÙ 1 Ù 65535 ! Security_Stealth Ùظا٠اÙإخÙاء/ع٠ÙÙات اÙخاد٠! Security_NoStealthMode Ùا (Ùظا٠اÙإخÙاء) Security_StealthMode (Stealth Mode) ! Security_ExplainStats (عÙد٠ا ÙÙÙÙ ÙعاÙا٠ÙÙÙÙ POPFile بإرسا٠اÙÙÙ٠اÙØ«Ùاث اÙتاÙÙØ© Ø¥ÙÙ www.usethesource.com ٠رة ÙاØدة Ù٠اÙÙÙÙ : bc (إج٠اÙ٠عدد اÙدÙاء اÙت٠عÙدÙ)Ø mc (إج٠اÙ٠عدد اÙرسائ٠اÙت٠صÙÙÙا POPFile) Ù ec (إج٠اÙ٠عدد أخطاء اÙتصÙÙÙ). Ùذ٠اÙÙÙ٠تخز٠ÙÙ Ù ÙÙ ÙÙ Ù Ø«Ù Ùت٠إستع٠اÙÙا ÙÙشر Ø¥Øصاءات ع٠ÙÙÙÙØ© استع٠ا٠اÙÙاس ÙÙ POPFile Ù٠د٠ÙجاÙØ©. اÙخاد٠اÙأساس٠ÙÙÙ٠بØÙظ اÙسجÙات Ù٠دة 5 Ø£Ùا٠ÙÙ Ù Ø«Ù Ùت٠ØØ°ÙÙØ§Ø ÙÙس ÙÙا٠سجÙات تربط بÙ٠اÙØ¥Øصاءات ÙعÙاÙÙÙ IP اÙÙردÙØ©). ! Security_ExplainUpdate (عÙد٠ا ÙÙÙÙ ÙعاÙا٠ÙÙÙÙ POPFile بإرسا٠اÙÙÙ٠اÙØ«Ùاث اÙتاÙÙØ© Ø¥ÙÙ www.usethesource.com ٠رة ÙاØدة Ù٠اÙÙÙÙ : ma (رÙ٠اÙإصدار اÙأعÙÙ ÙÙسخة POPFile اÙ٠رÙبة)Ø mi (رÙ٠اÙإصدار اÙأدÙÙ ÙÙسخة POPFile اÙ٠رÙبة) Ù bn (رÙ٠اÙبÙÙØ© ÙÙسخة POPFile اÙ٠رÙبة). POPFile ÙØص٠عÙ٠جÙاب عÙÙ Ø´Ù٠صÙرة تظÙر Ù٠أعÙ٠اÙصÙØØ© إذا ٠ا Ùا٠ÙÙا٠تØدÙØ«. اÙخاد٠اÙأساس٠ÙÙÙ٠بØÙظ اÙسجÙات Ù٠دة 5 Ø£Ùا٠ÙÙ Ù Ø«Ù Ùت٠ØØ°ÙÙØ§Ø ÙÙس ÙÙا٠سجÙات تربط بÙ٠تÙØص اÙتØدÙثات ÙعÙاÙÙÙ IP اÙÙردÙØ©). ! Security_PasswordTitle ÙÙÙ Ø© اÙ٠رÙر ÙÙاجÙØ© اÙ٠ستخد٠! Security_Password ÙÙÙ Ø© اÙ٠رÙر ! Security_PasswordUpdate ت٠تعدÙÙ ÙÙÙ Ø© اÙ٠رÙر ! Security_AUTHTitle خاد٠ع٠بعد ! Security_SecureServer خاد٠POP3 SPA/AUTH ! Security_SecureServerUpdate ÙÙد ت٠تعدÙ٠اÙخاد٠اÙآ٠٠إÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Security_SecurePort بÙابة إتصا٠POP3 SPA/AUTH ! Security_SecurePortUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠POP3 SPA/AUTH Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Security_SMTPServer خاد٠SMTP اÙ٠تسÙس٠! Security_SMTPServerUpdate ÙÙد ت٠تعدÙ٠خاد٠SMTP اÙ٠تسÙس٠إÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Security_SMTPPort بÙابة إتصا٠SMTP اÙ٠تسÙسÙØ© ! Security_SMTPPortUpdate ÙÙد ت٠تعدÙ٠بÙابة إتصا٠SMTP اÙ٠تسÙسÙØ© Ø¥ÙÙ %sØ Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙعاÙا Ø¥Ù٠أ٠Ùت٠إعادة تشغÙÙ POPFile ! Security_POP3 تÙبÙ٠إتصاÙات POP3 ٠٠أجÙزة ع٠بعد (ÙتطÙب إعادة تشغÙÙ POPFile) ! Security_SMTP تÙبÙ٠إتصاÙات SMTP ٠٠أجÙزة ع٠بعد (ÙتطÙب إعادة تشغÙÙ POPFile) ! Security_NNTP تÙبÙ٠إتصاÙات NNTP ٠٠أجÙزة ع٠بعد (ÙتطÙب إعادة تشغÙÙ POPFile) ! Security_UI تÙبÙ٠إتصاÙات HTTP (ÙاجÙØ© اÙ٠ستخد٠) ٠٠أجÙزة ع٠بعد (ÙتطÙب إعادة تشغÙÙ POPFile) ! Security_XMLRPC تÙبÙ٠إتصاÙات XML-RPC ٠٠أجÙزة ع٠بعد (ÙتطÙب إعادة تشغÙÙ POPFile) ! Security_UpdateTitle اÙتØدÙØ« اÙتÙÙائ٠! Security_Update تÙØص اÙتØدÙثات ÙÙÙ Ùا٠! Security_StatsTitle اÙتÙارÙر اÙØ¥ØصائÙØ© ! Security_Stats ارس٠اÙØ¥Øصاءات ÙÙÙ Ùا٠! Magnet_Error1 اÙ٠غÙاطÙس '%s' Ù ÙجÙد ٠سبÙا٠Ù٠اÙدÙÙ '%s' ! Magnet_Error2 اÙ٠غÙاطÙس اÙجدÙد '%s' Ùتضارب ٠ع اÙ٠غÙاطÙس '%s' Ù٠اÙدÙÙ '%s' ÙÙÙ Ù٠أ٠Ùتسبب ÙÙ Ùتائج غرÙبة. ÙÙ Ùت٠إضاÙØ© اÙ٠غÙاطÙس. ! Magnet_Error3 إصÙع ٠غÙاطÙس جدÙد '%s' Ù٠اÙدÙÙ '%s' ! Magnet_CurrentMagnets ٠غÙاطÙسات ØاÙÙØ© ! Magnet_Message1 اÙ٠غÙاطÙسات اÙتاÙÙØ© تجع٠اÙبرÙد Ø£Ù ÙتصÙÙ Ù٠اÙدÙ٠اÙÙ Ø°ÙÙر. ! Magnet_CreateNew صÙع ٠غÙاطÙس جدÙد ! Magnet_Explanation تÙجد Ùذ٠اÙØ£ÙÙاع ٠٠اÙ٠غÙاطسÙات:</b> <ul><li><b>إس٠أ٠عÙÙا٠اÙ٠رسÙ</b> ٠ثاÙ: jo...@co... Ù٠طابÙØ© ÙÙ٠عÙÙا٠٠ØØ¯Ø¯Ø <br />company.com Ù٠طابÙØ© Ù٠اÙ٠رسÙÙÙ Ù Ù company.comØ <br />John Doe Ù٠طابÙØ© ÙÙ٠اس٠شخص Ù ØØ¯Ø¯Ø <br />John Ù٠طابÙØ© Ù٠اÙأشخاص بذÙ٠اÙأس٠</li><li><b>إس٠أ٠عÙÙا٠اÙ٠ستÙبÙ:</b> ÙÙس ٠ثا٠اÙ٠رسÙ: ÙÙÙ Ùت٠اÙتصÙÙ٠عÙ٠عÙ٠عÙÙا٠To/Cc Ù٠اÙرساÙØ©</li> <li><b>ÙÙ٠ات اÙÙ ÙضÙع:</b> ٠ثاÙ: hello Ù٠طابÙØ© Ù٠اÙرسائ٠اÙت٠بÙا hello Ù٠سطر اÙÙ ÙضÙع</li></ul> ! Magnet_MagnetType ÙÙع اÙ٠غÙاطÙس ! Magnet_Value ÙÙÙ Ø© ! Magnet_Always ÙØ°Ùب ÙÙرا٠إÙ٠اÙدÙÙ ! Magnet_Jump إذÙب Ø¥Ù٠صÙØØ© ! Bucket_Error1 أسا٠٠اÙدÙاء ÙÙ Ù٠أ٠تØتÙÙ ÙÙØ· Ø£Øر٠٠٠a Ø¥ÙÙ z بأØر٠صغÙØ±Ø©Ø Ø£Ø±Ùا٠٠٠0 Ø¥ÙÙ 9Ø - Ù _ ! Bucket_Error2 دÙ٠بإس٠%s Ù ÙجÙد ٠سبÙا٠! Bucket_Error3 ت٠صÙع دÙ٠بإس٠%s ! Bucket_Error4 اÙرجاء إدخا٠ÙÙÙ Ø© غÙر Ùارغة ! Bucket_Error5 أعد تس٠ÙØ© اÙدÙÙ %s Ø¥ÙÙ %s ! Bucket_Error6 ت٠Øذ٠اÙدÙÙ %s ! Bucket_Title إعدادات اÙدÙاء ! Bucket_BucketName إس٠<br>اÙدÙÙ ! Bucket_WordCount عدد اÙÙÙ٠ات ! Bucket_WordCounts أعداد اÙÙÙ٠ات ! Bucket_UniqueWords ÙÙ٠ات<br>٠ختÙÙØ© ! Bucket_SubjectModification تعدÙÙ<br>اÙÙ ÙضÙع ! Bucket_ChangeColor ÙÙÙ<br>اÙدÙÙ ! Bucket_NotEnoughData اÙ٠عÙÙ٠ات غÙر ÙاÙÙØ© ! Bucket_ClassificationAccuracy دÙÙØ© اÙتصÙÙÙ ! Bucket_EmailsClassified رسائ٠٠صÙÙØ© ! Bucket_EmailsClassifiedUpper رسائ٠٠صÙÙØ© ! Bucket_ClassificationErrors أخطاء تصÙÙÙ ! Bucket_Accuracy دÙÙØ© ! Bucket_ClassificationCount عدد اÙتصÙÙÙات ! Bucket_ClassificationFP خطأ Ø¥Ùجاب٠! Bucket_ClassificationFN خطأ سÙب٠! Bucket_ResetStatistics تصÙÙر اÙØ¥Øصاءات ! Bucket_LastReset آخر تصÙÙر ! Bucket_CurrentColor %s ØاÙÙا٠ÙÙ ÙÙÙ %s ! Bucket_SetColorTo غÙÙر ÙÙÙ %s Ø¥ÙÙ %s ! Bucket_Maintenance صÙاÙØ© ! Bucket_CreateBucket إصÙع دÙ٠بإس٠! Bucket_DeleteBucket Ø¥Øذ٠اÙدÙ٠اÙ٠س٠٠! Bucket_RenameBucket إعادة تس٠ÙØ© اÙدÙ٠اÙ٠س٠٠! Bucket_Lookup إبØØ« ! Bucket_LookupMessage جد ÙÙÙ Ø© Ù٠دÙاء ! Bucket_LookupMessage2 Ùتائج اÙبØØ« ع٠! Bucket_LookupMostLikely <b>%s</b> عÙ٠اÙØ£Ø±Ø¬Ø Ø£Ù ØªÙÙÙ ÙÙ <font color="%s">%s</font> ! Bucket_DoesNotAppear <p><b>%s</b> غÙر Ù ÙجÙدة Ù٠اÙ٠٠٠اÙدÙاء ! Bucket_DisabledGlobally عط٠بشÙ٠عا٠! Bucket_To Ø¥ÙÙ ! Bucket_Quarantine عزÙ<br>اÙرساÙØ© ! SingleBucket_Title تÙاصÙÙ %s ! SingleBucket_WordCount عدد ÙÙ٠ات اÙدÙÙ ! SingleBucket_TotalWordCount إج٠اÙ٠عدد اÙÙÙ٠ات ! SingleBucket_Percentage اÙÙسبة ٠٠اÙإج٠اÙÙ ! SingleBucket_WordTable جدÙÙ ÙÙ٠ات %s ! SingleBucket_Message1 إضغط عÙÙ Øر٠Ù٠اÙÙÙرس Ùعرض اÙÙÙ٠ات اÙت٠تبدأ بذÙ٠اÙØرÙ. إضغط عÙ٠أÙØ© ÙÙÙ Ø© Ùعرض Ø¥Øت٠اÙÙتÙا ÙÙ ÙاÙØ© اÙدÙاء. ! SingleBucket_Unique %s ٠ختÙÙØ© ! SingleBucket_ClearBucket Ø¥ØØ°Ù ÙاÙØ© اÙÙÙ٠ات ! Session_Title Ø¥ÙتÙت صÙاØÙØ© جÙسة POPFile ! Session_Error Ø¥ÙتÙت صÙاØÙØ© جÙسة POPFile. Ùذا ÙÙ Ù٠أ٠ÙØص٠إذا ا٠إÙÙا٠Ùإعادة تشغÙÙ POPFile Ùتر٠اÙ٠تصÙØ Ù ÙتÙØ. اÙرجاء اÙضغظ عÙ٠إØد٠اÙرÙابط Ù٠اÙأعÙÙ ÙÙ٠تابعة Ù٠إستع٠ا٠POPFile. ! View_Title عرض رساÙØ© Ù Ùردة ! View_ShowFrequencies عرض تردد اÙÙÙ٠ات ! View_ShowProbabilities عرض Ø¥Øت٠اÙÙØ© اÙÙÙ٠ات ! View_ShowScores عرض Ùتائج اÙÙÙ٠ات ! View_WordMatrix ٠صÙÙÙØ© اÙÙÙ٠ات ! View_WordProbabilities عرض Ø¥Øت٠اÙÙØ© اÙÙÙ٠ات ! View_WordFrequencies عرض تردد اÙÙÙ٠ات ! View_WordScores عرض Ùتائج اÙÙÙ٠ات ! View_Chart رسÙ٠اÙÙرار ! Windows_TrayIcon عرض اÙÙÙÙØ© POPFile Ù٠شرÙØ· اÙÙ ÙØ§Ù Ø ! Windows_Console تشغÙÙ POPFile ÙÙ ÙاÙذة ÙصÙØ©Ø ! Windows_NextTime <p><font color="red">Ùذا اÙتعدÙÙ ÙÙ ÙÙÙÙ ÙÙاÙا٠إÙ٠أ٠Ùت٠إعادة تشغÙÙ POPFile</font> Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. --- 94,333 ---- # The header and footer that appear on every UI page ! Header_Title ???? ???? POPFile ! Header_Shutdown ????? ???????? ! Header_History ??????? ! Header_Buckets ???? ! Header_Configuration ??????? ! Header_Advanced ?????? ?????? ! Header_Security ?????? ! Header_Magnets ??????? ! Footer_HomePage ???? ??????? ! Footer_Manual ??????? ! Footer_Forums ????? ! Footer_FeedMe ????? ! Footer_RequestFeature ???? ???? ! Footer_MailingList ?????? ?????? ! Footer_Wiki ????? ! Configuration_Error1 ??? ????? ??? ?? ???? ?????? ! Configuration_Error2 ????? ??????? ?????? ???????? ??? ?? ???? ????? ??? 1 ? 65535 ! Configuration_Error3 ????? ??????? ??? POP3 ??? ?? ???? ????? ??? 1 ? 65535 ! Configuration_Error4 ??? ?????? ??? ?? ???? ????? ??? 1 ? 1000 ! Configuration_Error5 ??? ???? ????????? ??? ?? ???? ????? ??? 1 ? 366 ! Configuration_Error6 ??? ????? ????? TCP ??? ?? ???? ????? ??? 10 ? 300 ! Configuration_Error7 ????? ????? XML RPC ??? ?? ???? ????? ??? 1 ? 65535 ! Configuration_Error8 ????? ????? Socks V ??? ?? ???? ????? ??? 1 ? 65535 ! Configuration_POP3Port ????? ????? POP3 ! Configuration_POP3Update ??? ?? ????? ????? ????? POP3 ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Configuration_XMLRPCUpdate ??? ?? ????? ????? ????? XML-RPC ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Configuration_XMLRPCPort ????? ????? XML-RPC ! Configuration_SMTPPort ????? ????? SMTP ! Configuration_SMTPUpdate ??? ?? ????? ????? ????? SMTP ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Configuration_NNTPPort ????? ??????? ??? NNTP ! Configuration_NNTPUpdate ??? ?? ????? ????? ????? NNTP ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Configuration_POPFork ???? ???? ??????? POP3 ???? ?????? ! Configuration_SMTPFork ???? ???? ??????? SMTP ???? ?????? ! Configuration_NNTPFork ???? ???? ??????? NNTP ???? ?????? ! Configuration_POP3Separator ??? ??? POP3 ??? host:port:user ! Configuration_NNTPSeparator ??? ??? NNTP ??? host:port:user ! Configuration_POP3SepUpdate ?? ????? ??? ??? POP3 ??? %s ! Configuration_NNTPSepUpdate ?? ????? ??? ??? NNTP ??? %s ! Configuration_UI ????? ??????? ?????? ???????? ! Configuration_UIUpdate ??? ?? ????? ????? ????? ????? ???????? ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Configuration_History ??? ??????? ?? ?? ???? ! Configuration_HistoryUpdate ??? ?? ????? ??? ??????? ?? ?? ???? ??? %s ! Configuration_Days ??? ???? ????????? ??????? ! Configuration_DaysUpdate ??? ?? ????? ??? ???? ????????? ??????? ??? %s ! Configuration_UserInterface ????? ???????? ! Configuration_Skins ??? ??????? ! Configuration_SkinsChoose ???? ??? ??????? ! Configuration_Language ??? ! Configuration_LanguageChoose ???? ????? ! Configuration_ListenPorts ???????? ???????? ! Configuration_HistoryView ??? ????????? ! Configuration_TCPTimeout ??? ????? ??????? ! Configuration_TCPTimeoutSecs ??? ????? ??????? (????) ! Configuration_TCPTimeoutUpdate ?? ????? ??? ????? ??????? ??? %s ! Configuration_ClassificationInsertion ????? ??? ?? ????? ! Configuration_SubjectLine ?????<br>??? ??????? ! Configuration_XTCInsertion ?????<br>X-Text-Classification ! Configuration_XPLInsertion ?????<br>X-POPFile-Link ! Configuration_Logging ????? ! Configuration_None ??? ! Configuration_ToScreen ??? ?????? ! Configuration_ToFile ??? ??? ! Configuration_ToScreenFile ??? ?????? ???? ! Configuration_LoggerOutput ???? ????? ! Configuration_GeneralSkins ??? ??????? ! Configuration_SmallSkins ???? ????? ! Configuration_TinySkins ???? ????? ???? ! Configuration_CurrentLogFile <??? ????? ??????> ! Configuration_SOCKSServer ???? ???? ???? SOCKS V ! Configuration_SOCKSPort ????? ????? ???? ???? SOCKS V ! Configuration_SOCKSPortUpdate ?? ????? ????? ????? ???? ???? SOCKS V ??? %s ! Configuration_SOCKSServerUpdate ?? ????? ???? ???? ???? SOCKS V ??? %s ! Configuration_Fields ????? ????????? ! Advanced_Error1 '%s' ?????? ?????? ?? ????? ??????? ??????? ! Advanced_Error2 ??????? ??????? ???? ?? ????? ??? ???? ?? ????? ?? . ?? _ ?? - ?? @ ! Advanced_Error3 ??? ?? ????? '%s' ??? ????? ??????? ??????? ! Advanced_Error4 '%s' ???? ?? ????? ??????? ??????? ! Advanced_Error5 ??? ?? ????? '%s' ?? ????? ??????? ??????? ! Advanced_StopWords ????? ????? ! Advanced_Message1 POPFile ???? ??????? ??????? ????????? ???????: ! Advanced_AddWord ??? ???? ! Advanced_RemoveWord ???? ???? ! Advanced_AllParameters ???? ?????? POPFile ! Advanced_Parameter ????? ! Advanced_Value ???? ! Advanced_Warning ??? ????? ????? ????? ?????? POPFile. ?????????? ????????? ???: ?????? ????? ?? ???? ??? ?? ????? ??? "?????"? ?? ???? ????? ??? ??? ?????????. ! Advanced_ConfigFile ??? ?????????: ! History_Filter (??? ????? <font color="%s">%s</font>) ! History_FilterBy ???? ??? ! History_Search (??? ????? ?? ?????/????? %s) ! History_Title ????? ????? ! History_Jump ???? ??? ???? ! History_ShowAll ???? ???? ! History_ShouldBe ????? ?? ???? ! History_NoFrom ?? ???? ??? "from" ! History_NoSubject ?? ???? ??? "subject" ! History_ClassifyAs ???? ??? ! History_MagnetUsed ??????? ?????? ! History_MagnetBecause <b>??????? ??????</b><p>??? ??? <font color="%s">%s</font> ???? ????????? %s </p> ! History_ChangedTo ?? ????? ??? <font color="%s">%s</font> ! History_Already ???? ?????? ??? <font color="%s">%s</font> ! History_RemoveAll ??? ???? ! History_RemovePage ??? ?????? ! History_RemoveChecked ??? ??????? ! History_Remove ???? ?????? ?? ????????? ???? ! History_SearchMessage ???? ????/????? ! History_NoMessages ?? ???? ????? ! History_ShowMagnet ????? ! History_Negate_Search ???? ?????/??????? ! History_Magnet (??? ??????? ??????? ?????????? ???) ! History_NoMagnet (??? ??????? ??? ??????? ?????????? ???) ! History_ResetSearch ????? ????? ! History_ChangedClass ???? ?????? ???? ??? ! History_Purge ???? ???? ! History_Increase ??? ! History_Decrease ???? ! History_Column_Characters ?? ?????? ??? ????? ????? ??????? Cc? ????? ! History_Automatic ?????? ! History_Reclassified ???? ?????? History_Size_Bytes %d B History_Size_KiloBytes %.1f KB History_Size_MegaBytes %.1f MB ! Password_Title ???? ?????? ! Password_Enter ???? ???? ?????? ! Password_Go ???? ! Password_Error1 ???? ?????? ????? ! Security_Error1 ??????? ??? ?? ???? ????? ??? 1 ? 65535 ! Security_Stealth ???? ???????/?????? ?????? ! Security_NoStealthMode ?? (???? ???????) Security_StealthMode (Stealth Mode) ! Security_ExplainStats (????? ???? ?????? ???? POPFile ?????? ????? ?????? ??????? ??? www.usethesource.com ??? ????? ?? ?????: bc (?????? ??? ?????? ???? ????)? mc (?????? ??? ??????? ???? ????? POPFile) ? ec (?????? ??? ????? ???????). ??? ????? ???? ?? ??? ??? ?? ??? ????????? ???? ??????? ?? ????? ??????? ????? ?? POPFile ???? ?????. ?????? ??????? ???? ???? ??????? ???? 5 ???? ??? ?? ??? ?????? ??? ???? ????? ???? ??? ????????? ??????? IP ???????). ! Security_ExplainUpdate (????? ???? ?????? ???? POPFile ?????? ????? ?????? ??????? ??? www.usethesource.com ??? ????? ?? ?????: ma (??? ??????? ?????? ????? POPFile ???????)? mi (??? ??????? ?????? ????? POPFile ???????) ? bn (??? ?????? ????? POPFile ???????). POPFile ???? ??? ???? ??? ??? ???? ???? ?? ???? ?????? ??? ?? ??? ???? ?????. ?????? ??????? ???? ???? ??????? ???? 5 ???? ??? ?? ??? ?????? ??? ???? ????? ???? ??? ???? ????????? ??????? IP ???????). ! Security_PasswordTitle ???? ?????? ?????? ???????? ! Security_Password ???? ?????? ! Security_PasswordUpdate ?? ????? ???? ?????? ! Security_AUTHTitle ???? ?? ??? ! Security_SecureServer ???? POP3 SPA/AUTH ! Security_SecureServerUpdate ??? ?? ????? ?????? ????? ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Security_SecurePort ????? ????? POP3 SPA/AUTH ! Security_SecurePortUpdate ??? ?? ????? ????? ????? POP3 SPA/AUTH ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Security_SMTPServer ???? SMTP ???????? ! Security_SMTPServerUpdate ??? ?? ????? ???? SMTP ???????? ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Security_SMTPPort ????? ????? SMTP ????????? ! Security_SMTPPortUpdate ??? ?? ????? ????? ????? SMTP ????????? ??? %s? ??? ??????? ?? ???? ????? ??? ?? ??? ????? ????? POPFile ! Security_POP3 ????? ??????? POP3 ?? ????? ?? ??? (????? ????? ????? POPFile) ! Security_SMTP ????? ??????? SMTP ?? ????? ?? ??? (????? ????? ????? POPFile) ! Security_NNTP ????? ??????? NNTP ?? ????? ?? ??? (????? ????? ????? POPFile) ! Security_UI ????? ??????? HTTP (????? ????????) ?? ????? ?? ??? (????? ????? ????? POPFile) ! Security_XMLRPC ????? ??????? XML-RPC ?? ????? ?? ??? (????? ????? ????? POPFile) ! Security_UpdateTitle ??????? ???????? ! Security_Update ???? ????????? ?????? ! Security_StatsTitle ???????? ????????? ! Security_Stats ???? ????????? ?????? ! Magnet_Error1 ????????? '%s' ????? ?????? ?? ????? '%s' ! Magnet_Error2 ????????? ?????? '%s' ?????? ?? ????????? '%s' ?? ????? '%s' ????? ?? ????? ?? ????? ?????. ?? ??? ????? ?????????. ! Magnet_Error3 ???? ??????? ???? '%s' ?? ????? '%s' ! Magnet_CurrentMagnets ????????? ????? ! Magnet_Message1 ??????????? ??????? ???? ?????? ?? ????? ?? ????? ???????. ! Magnet_CreateNew ??? ??????? ???? ! Magnet_Explanation <b>???? ??? ??????? ?? ???????????:</b> <ul><li><b>??? ?? ????? ??????</b> ????: jo...@co... ??????? ??? ????? ????? <br />company.com ??????? ?? ???????? ?? company.com? <br />John Doe ??????? ??? ??? ??? ????? <br />John ??????? ?? ??????? ???? ?????</li><li><b>??? ?? ????? ????????:</b> ??? ???? ??????: ??? ??? ??????? ??? ??? ????? To/Cc ?? ???????</li> <li><b>????? ???????:</b> ????: hello ??????? ?? ??????? ???? ??? hello ?? ??? ???????</li></ul> ! Magnet_MagnetType ??? ????????? ! Magnet_Value ???? ! Magnet_Always ???? ????? ??? ????? ! Magnet_Jump ???? ??? ???? ! Bucket_Error1 ????? ?????? ???? ?? ????? ??? ???? ?? a ??? z ????? ?????? ????? ?? 0 ??? 9? - ? _ ! Bucket_Error2 ??? ???? %s ????? ?????? ! Bucket_Error3 ?? ??? ??? ???? %s ! Bucket_Error4 ?????? ????? ???? ??? ????? ! Bucket_Error5 ??? ????? ????? %s ??? %s ! Bucket_Error6 ?? ??? ????? %s ! Bucket_Title ??????? ?????? ! Bucket_BucketName ???<br>????? ! Bucket_WordCount ??? ??????? ! Bucket_WordCounts ????? ??????? ! Bucket_UniqueWords ?????<br>?????? ! Bucket_SubjectModification ?????<br>??????? ! Bucket_ChangeColor ???<br>????? ! Bucket_NotEnoughData ????????? ??? ????? ! Bucket_ClassificationAccuracy ???? ??????? ! Bucket_EmailsClassified ????? ????? ! Bucket_EmailsClassifiedUpper ????? ????? ! Bucket_ClassificationErrors ????? ????? ! Bucket_Accuracy ???? ! Bucket_ClassificationCount ??? ????????? ! Bucket_ClassificationFP ??? ?????? ! Bucket_ClassificationFN ??? ???? ! Bucket_ResetStatistics ????? ????????? ! Bucket_LastReset ??? ????? ! Bucket_CurrentColor %s ?????? ?? ??? %s ! Bucket_SetColorTo ???? ??? %s ??? %s ! Bucket_Maintenance ????? ! Bucket_CreateBucket ???? ??? ???? ! Bucket_DeleteBucket ???? ????? ?????? ! Bucket_RenameBucket ????? ????? ????? ?????? ! Bucket_Lookup ???? ! Bucket_LookupMessage ?? ???? ?? ???? ! Bucket_LookupMessage2 ????? ????? ?? ! Bucket_LookupMostLikely <b>%s</b> ??? ?????? ?? ???? ?? <font color="%s">%s</font> ! Bucket_DoesNotAppear <p><b>%s</b> ??? ?????? ?? ??? ?? ?????? ! Bucket_DisabledGlobally ??? ???? ??? ! Bucket_To ??? ! Bucket_Quarantine ???<br>??????? ! SingleBucket_Title ?????? %s ! SingleBucket_WordCount ??? ????? ????? ! SingleBucket_TotalWordCount ?????? ??? ??????? ! SingleBucket_Percentage ?????? ?? ???????? ! SingleBucket_WordTable ???? ????? %s ! SingleBucket_Message1 ???? ??? ??? ?? ?????? ???? ??????? ???? ???? ???? ?????. ???? ??? ??? ???? ???? ?????????? ?? ???? ??????. ! SingleBucket_Unique %s ?????? ! SingleBucket_ClearBucket ... [truncated message content] |
|
From: Joseph C. <tex...@us...> - 2005-02-06 02:04:08
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28149/languages Modified Files: English-UK.msg English.msg Log Message: Shorten text for config bar options. Merge some differences between English and English-UK. Index: English-UK.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** English-UK.msg 3 Sep 2004 13:00:47 -0000 1.7 --- English-UK.msg 6 Feb 2005 02:03:58 -0000 1.8 *************** *** 1,3 **** ! # Copyright (c) 2001-2004 John Graham-Cumming # # This file is part of POPFile --- 1,3 ---- ! # Copyright (c) 2001-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 31,34 **** --- 31,35 ---- # Common words that are used on their own all over the interface Apply Apply + ApplyChanges Apply Changes On On Off Off *************** *** 75,78 **** --- 76,82 ---- Arrived Arrived Size Size + Up Up + Down Down + Go Go # This is a regular expression pattern that is used to convert *************** *** 101,104 **** --- 105,109 ---- Header_Advanced Advanced Header_Security Security + Header_Administration Administration Header_Magnets Magnets *************** *** 136,148 **** Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile ! Configuration_History Number of messages per page Configuration_HistoryUpdate Updated number of messages per page to %s ! Configuration_Days Number of days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins ! Configuration_SkinsChoose Choose skin Configuration_Language Language ! Configuration_LanguageChoose Choose language Configuration_ListenPorts Module Options Configuration_HistoryView History View --- 141,153 ---- Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile ! Configuration_History Messages per page Configuration_HistoryUpdate Updated number of messages per page to %s ! Configuration_Days Days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins ! Configuration_SkinsChoose Skin Configuration_Language Language ! Configuration_LanguageChoose Language Configuration_ListenPorts Module Options Configuration_HistoryView History View *************** *** 168,172 **** Configuration_SOCKSPortUpdate Updated SOCKS V proxy port to %s Configuration_SOCKSServerUpdate Updated SOCKS V proxy host to %s ! Configuration_Fields History Columns Advanced_Error1 '%s' already in the Ignored Words list --- 173,179 ---- Configuration_SOCKSPortUpdate Updated SOCKS V proxy port to %s Configuration_SOCKSServerUpdate Updated SOCKS V proxy host to %s ! Configuration_Fields Add history columns ! Configuration_Hide_Bar Hide configuration bar ! Configuration_Show_Bar Show configuration bar Advanced_Error1 '%s' already in the Ignored Words list *************** *** 211,218 **** History_ResetSearch Reset History_ChangedClass Would now classify as ! History_Purge Purge Now History_Increase Increase History_Decrease Decrease ! History_Column_Characters Change width of From, To, Cc and Subject columns History_Automatic Automatic History_Reclassified Reclassified --- 218,225 ---- History_ResetSearch Reset History_ChangedClass Would now classify as ! History_Purge Expire Now History_Increase Increase History_Decrease Decrease ! History_Column_Characters History column width History_Automatic Automatic History_Reclassified Reclassified *************** *** 220,223 **** --- 227,231 ---- History_Size_KiloBytes %.1f KB History_Size_MegaBytes %.1f MB + History_Click_To_Sort Click to sort on this column Password_Title Password *************** *** 260,264 **** Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet ! Magnet_Explanation These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Values --- 268,272 ---- Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet ! Magnet_Explanation <b>These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Values *************** *** 290,293 **** --- 298,302 ---- Bucket_ResetStatistics Reset Statistics Bucket_LastReset Last Reset + Bucket_MessagesPerDay Average Messages Per Day Bucket_CurrentColor %s current colour is %s Bucket_SetColorTo Set %s colour to %s Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** English.msg 26 Jan 2005 11:51:13 -0000 1.81 --- English.msg 6 Feb 2005 02:03:58 -0000 1.82 *************** *** 1,3 **** ! # Copyright (c) 2001-2003 John Graham-Cumming # # This file is part of POPFile --- 1,3 ---- ! # Copyright (c) 2001-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 29,34 **** FAQLink FrequentlyAskedQuestions - - # Common words that are used on their own all over the interface Apply Apply --- 29,32 ---- *************** *** 143,155 **** Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile ! Configuration_History Number of messages per page Configuration_HistoryUpdate Updated number of messages per page to %s ! Configuration_Days Number of days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins ! Configuration_SkinsChoose Choose skin Configuration_Language Language ! Configuration_LanguageChoose Choose language Configuration_ListenPorts Module Options Configuration_HistoryView History View --- 141,153 ---- Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile ! Configuration_History Messages per page Configuration_HistoryUpdate Updated number of messages per page to %s ! Configuration_Days Days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins ! Configuration_SkinsChoose Skin Configuration_Language Language ! Configuration_LanguageChoose Language Configuration_ListenPorts Module Options Configuration_HistoryView History View *************** *** 170,174 **** Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <Download current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port --- 168,172 ---- Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port *************** *** 223,230 **** History_ResetSearch Reset History_ChangedClass Would now classify as ! History_Purge Delete Now History_Increase Increase History_Decrease Decrease ! History_Column_Characters Change width of From, To, Cc and Subject columns History_Automatic Automatic History_Reclassified Reclassified --- 221,228 ---- History_ResetSearch Reset History_ChangedClass Would now classify as ! History_Purge Expire Now History_Increase Increase History_Decrease Decrease ! History_Column_Characters History column width History_Automatic Automatic History_Reclassified Reclassified *************** *** 273,277 **** Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet ! Magnet_Explanation These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Values --- 271,275 ---- Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet ! Magnet_Explanation <b>These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Values *************** *** 347,351 **** Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. ! History_OpenMessageSummary This table contains the full text of a message message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the message's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the color used in displaying anything related to that bucket in the control center. Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many messages have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. --- 345,349 ---- Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. ! History_OpenMessageSummary This table contains the full text of a message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the message's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the color used in displaying anything related to that bucket in the control center. Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many messages have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. *************** *** 353,357 **** Bucket_AccuracyChartSummary This table graphically represents the accuracy of the message classification. Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of messages classified, and total word counts. ! Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency that that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in a message. Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify message according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. --- 351,355 ---- Bucket_AccuracyChartSummary This table graphically represents the accuracy of the message classification. Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of messages classified, and total word counts. ! Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency with which that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in a message. Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify message according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. *************** *** 388,391 **** Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile missclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the <a href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?FrequentlyAskedQuestions/EmailSorting">POPFile Documentation Project</a>. ! Help_Bucket_Setup POPFile requires at least two buckets in addition to the unclassified pseudo-bucket. What makes POPFile unique is that it can classify email more than that, you can have any number of buckets. A simple setup would be a "spam", "personal", and a "work" bucket. Help_No_More Don't show me this again --- 386,389 ---- Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile missclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the <a href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?FrequentlyAskedQuestions/EmailSorting">POPFile Documentation Project</a>. ! Help_Bucket_Setup POPFile requires at least two buckets in addition to the "unclassified" pseudo-bucket. What makes POPFile unique is that it can classify email more than that, you can have any number of buckets. A simple setup would be a "spam", "personal", and a "work" bucket. Help_No_More Don't show me this again |
|
From: John Graham-C. <jgr...@us...> - 2005-01-31 15:13:00
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26426/POPFile Modified Files: Database.pm Log Message: Add line breaks when outputting upgrade messages Index: Database.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Database.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Database.pm 11 Jan 2005 07:53:06 -0000 1.3 --- Database.pm 31 Jan 2005 15:12:38 -0000 1.4 *************** *** 390,393 **** --- 390,397 ---- flush STDOUT; } + if ( ( $i % 1000 ) == 0 ) { + print "\n"; + flush STDOUT; + } my @rows = $t->fetchrow_array; *************** *** 448,451 **** --- 452,459 ---- flush STDOUT; } + if ( ( $i % 1000 ) == 0 ) { + print "\n"; + flush STDOUT; + } s/[\r\n]//g; $db->do( $_ ); |
|
From: Joseph C. <tex...@us...> - 2005-01-31 09:42:20
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17704/skins/default Modified Files: history-page.thtml Added Files: history-javascript.thtml Log Message: Move "Remove All" button next to other Remove buttons. Add javascript "Check All" code on trial basis. Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** history-page.thtml 31 Jan 2005 08:38:27 -0000 1.49 --- history-page.thtml 31 Jan 2005 09:42:10 -0000 1.50 *************** *** 30,46 **** <TMPL_IF NAME="History_If_Some_Messages"> - <form class="HistoryMainForm" action="/history" method="post"> - <input type="hidden" name="search" value="<TMPL_VAR ESCAPE=HTML NAME="History_Field_Search">" /> - <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> - <input type="hidden" name="negate" value="<TMPL_VAR NAME="History_Field_Not">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> - <input type="hidden" name="filter" value="<TMPL_VAR NAME="History_Field_Filter">" /> - <table width="100%" summary=""> <tr> <td align="left"> <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> - <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll">" /> </td> <td class="historyNavigatorTop" align="right"> --- 30,37 ---- *************** *** 56,71 **** </td> </tr> ! </table> ! ! </form> ! ! <table> ! <tr> ! <td colspan="<TMPL_VAR NAME="History_Colspan">"> <!-- the following html was history-search-filter-widget.thtml --> <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> <!-- end of history-search-filter-widget.thtml content --> </td> ! </tr> </table> --- 47,57 ---- </td> </tr> ! <tr> ! <td colspan="2"> <!-- the following html was history-search-filter-widget.thtml --> <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> <!-- end of history-search-filter-widget.thtml content --> </td> ! </tr> </table> *************** *** 80,85 **** <table class="historyTable" width="100%" summary="<TMPL_VAR NAME="Localize_History_MainTableSummary">"> - - <tr class="rowHeader"> --- 66,69 ---- *************** *** 256,259 **** --- 240,244 ---- <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> + <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll">" /> </td> <td align="center"> *************** *** 269,273 **** <td class="historyNavigatorBottom"> <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> ! <input type="text" name="jumptopage" value="" size="4"> <input type="submit" class="submit" name="gopage" value="<TMPL_VAR NAME="Localize_Go">" /> </td> --- 254,258 ---- <td class="historyNavigatorBottom"> <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> ! <input type="text" name="jumptopage" value="" size="3"> <input type="submit" class="submit" name="gopage" value="<TMPL_VAR NAME="Localize_Go">" /> </td> *************** *** 281,299 **** <TMPL_ELSE> <!-- if some messages --> - <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> - <br /> - <br /> - <span class="bucketsLabel"> - <TMPL_VAR NAME="Localize_History_NoMessages">. - </span> - <br /> - <br /> ! <!-- the following html was history-search-filter-widget.thtml --> ! <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> ! <!-- end of history-search-filter-widget.thtml content --> </TMPL_IF> <!-- if some messages --> <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_IF NAME="If_Show_Config_Bars"> --- 266,310 ---- <TMPL_ELSE> <!-- if some messages --> ! <table width="100%" summary=""> ! <tr> ! <td align="left"> ! <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> ! </td> ! <td class="historyNavigatorTop" align="right"> ! ! <TMPL_IF "History_If_MultiPage"> ! <!-- the following html was generated by history-navigator-widget.thtml --> ! <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> ! <!-- end of history-navigator-widget.thtml content --> ! </TMPL_IF> ! ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) ! ! </td> ! </tr> ! <tr> ! <td colspan="2"> ! <!-- the following html was history-search-filter-widget.thtml --> ! <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> ! <!-- end of history-search-filter-widget.thtml content --> ! </td> ! </tr> ! ! <tr> ! <td> ! <span class="bucketsLabel"> ! <TMPL_VAR NAME="Localize_History_NoMessages">. ! </span> ! <p> ! </td> ! </tr> ! </table> ! </TMPL_IF> <!-- if some messages --> + <TMPL_INCLUDE NAME="history-javascript.thtml"> + <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_IF NAME="If_Show_Config_Bars"> --- NEW FILE: history-javascript.thtml --- <script language="JavaScript1.2"> if (document.getElementById("removeChecks")) document.getElementById("removeChecks").innerHTML = "<input type='checkbox' class='checkbox' onclick='javascript:toggleChecks(this);' title='Select All' />" function toggleChecks(x) { d = document.forms; for (var i=0; i < d.length; i++) { for (var j=0; j < d[i].elements.length; j++) if (d[i].elements[j].name.substr(0,7) == "remove_") d[i].elements[j].checked = x.checked; } return 0; } </script> |
|
From: Joseph C. <tex...@us...> - 2005-01-31 08:38:38
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3247/skins/default Modified Files: configuration-bar.thtml history-bar.thtml history-page.thtml Log Message: Trying first new version of config bar hiding. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configuration-bar.thtml 26 Jan 2005 11:51:13 -0000 1.5 --- configuration-bar.thtml 31 Jan 2005 08:38:27 -0000 1.6 *************** *** 1,4 **** - <TMPL_IF NAME="If_Show_Config_Bars"> - <tr> <td class="settingsPanel configBar" width="100%" align="center"> --- 1,2 ---- *************** *** 75,91 **** </td> </tr> - - <TMPL_ELSE> - - <tr> - <td class="settingsPanel configBar" width="100%" align="center"> - <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <div class="configBarOption"> - <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - </div> - </form> - </td> - </tr> - - </TMPL_IF> --- 73,74 ---- Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** history-page.thtml 24 Jan 2005 17:47:41 -0000 1.48 --- history-page.thtml 31 Jan 2005 08:38:27 -0000 1.49 *************** *** 122,125 **** --- 122,126 ---- </th> + <TMPL_IF NAME="History_If_MoveLeft"> <td width="10px" style="vertical-align: top;"> *************** *** 132,135 **** --- 133,137 ---- </td> </TMPL_IF> + </tr> </table> *************** *** 295,300 **** <TMPL_INCLUDE NAME="common-before-configuration.thtml"> ! <TMPL_INCLUDE NAME="history-bar.thtml"> ! <TMPL_INCLUDE NAME="configuration-bar.thtml"> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 297,309 ---- <TMPL_INCLUDE NAME="common-before-configuration.thtml"> ! <TMPL_IF NAME="If_Show_Config_Bars"> ! <TMPL_INCLUDE NAME="history-bar.thtml"> ! <TMPL_INCLUDE NAME="configuration-bar.thtml"> ! <TMPL_ELSE> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! </form> ! </TMPL_IF> <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** history-bar.thtml 26 Jan 2005 11:51:13 -0000 1.7 --- history-bar.thtml 31 Jan 2005 08:38:27 -0000 1.8 *************** *** 1,4 **** - <TMPL_IF NAME="If_Show_Config_Bars"> - <tr> --- 1,2 ---- *************** *** 81,85 **** </form> ! </tr> ! ! </TMPL_IF> --- 79,81 ---- </form> ! </tr> |
|
From: Joseph C. <tex...@us...> - 2005-01-30 09:10:58
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22869/skins/default Modified Files: corpus-page.thtml Log Message: Add checkbox class to new checkbox controls. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** corpus-page.thtml 19 Jan 2005 08:41:27 -0000 1.14 --- corpus-page.thtml 30 Jan 2005 09:10:48 -0000 1.15 *************** *** 41,45 **** </tr> <tr> ! <th class="bucketsLabel" scope="col"> <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> --- 41,45 ---- </tr> <tr> ! <th class="bucketsLabel" scope="col" align="left"> <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> *************** *** 94,98 **** </TMPL_IF> ! <td> <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> --- 94,98 ---- </TMPL_IF> ! <td align="left"> <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> *************** *** 138,142 **** <td align="center"> ! <input type="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_subject" <TMPL_IF NAME="Corpus_If_Subject">checked="checked"</TMPL_IF> /> </td> <td width="1%"> --- 138,142 ---- <td align="center"> ! <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_subject" <TMPL_IF NAME="Corpus_If_Subject">checked="checked"</TMPL_IF> /> </td> <td width="1%"> *************** *** 144,148 **** </td> <td align="center"> ! <input type="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xtc" <TMPL_IF NAME="Corpus_If_XTC">checked="checked"</TMPL_IF> /> </td> <td width="1%"> --- 144,148 ---- </td> <td align="center"> ! <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xtc" <TMPL_IF NAME="Corpus_If_XTC">checked="checked"</TMPL_IF> /> </td> <td width="1%"> *************** *** 150,154 **** </td> <td align="center"> ! <input type="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xpl" <TMPL_IF NAME="Corpus_If_XPL">checked="checked"</TMPL_IF> /> </td> <td width="1%"> --- 150,154 ---- </td> <td align="center"> ! <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_xpl" <TMPL_IF NAME="Corpus_If_XPL">checked="checked"</TMPL_IF> /> </td> <td width="1%"> *************** *** 156,160 **** </td> <td align="center"> ! <input type="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_quarantine" <TMPL_IF NAME="Corpus_If_Quarantine">checked="checked"</TMPL_IF> /> </td> <td width="1%"> --- 156,160 ---- </td> <td align="center"> ! <input type="checkbox" class="checkbox" name="<TMPL_VAR NAME="Corpus_Bucket">_quarantine" <TMPL_IF NAME="Corpus_If_Quarantine">checked="checked"</TMPL_IF> /> </td> <td width="1%"> *************** *** 164,168 **** <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <td> <select name="<TMPL_VAR NAME="Corpus_Bucket">_color"> --- 164,168 ---- <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <td align="left"> <select name="<TMPL_VAR NAME="Corpus_Bucket">_color"> |
|
From: Joseph C. <tex...@us...> - 2005-01-30 08:56:48
|
Update of /cvsroot/popfile/engine/skins/oceanblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20141/skins/oceanblue Modified Files: style.css Log Message: Add hover effect to buttons as suggested by Jim. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/oceanblue/style.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** style.css 11 Jan 2005 22:07:27 -0000 1.4 --- style.css 30 Jan 2005 08:56:20 -0000 1.5 *************** *** 75,78 **** --- 75,82 ---- } + input:hover, select:hover, textarea:hover, .submit:hover { + background-color: #1165ac; + } + input { font-size: 1em; |
|
From: Manni H. <man...@us...> - 2005-01-26 11:51:38
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840/Classifier Modified Files: popfile.sql Log Message: Added option to hide the configuration bar that was previously displayed on each of the UI pages. The look of the new hide/show buttons, as well as their text labels, is preliminary and I trust on Joe to make things prettier. Since this change required a new user configuration variable, I have changed the database schema and have upped its version number. By default, the configuration bars are shown. Index: popfile.sql =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/popfile.sql,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** popfile.sql 12 Jan 2005 11:52:22 -0000 1.23 --- popfile.sql 26 Jan 2005 11:50:56 -0000 1.24 *************** *** 1,3 **** ! -- POPFILE SCHEMA 5 -- --------------------------------------------------------------------------- -- --- 1,3 ---- ! -- POPFILE SCHEMA 6 -- --------------------------------------------------------------------------- -- *************** *** 476,480 **** insert into user_template ( name, def, form ) values ( 'history_history_days', 2, '%d' ); ! -- Checking for updates if off by default insert into user_template ( name, def, form ) values ( 'html_update_check', 0, '%d' ); --- 476,480 ---- insert into user_template ( name, def, form ) values ( 'history_history_days', 2, '%d' ); ! -- Checking for updates is off by default insert into user_template ( name, def, form ) values ( 'html_update_check', 0, '%d' ); *************** *** 546,549 **** --- 546,554 ---- insert into user_template ( name, def, form ) values ( 'imap_watched_folders', 'INBOX', '%s' ); + -- Show the config bar at the bottom of each page defaults to on + insert into user_template ( name, def, form ) values ( 'html_show_configbars', 1, '%d' ); + + + -- The adminisrator (user 1) can_admin |
|
From: Manni H. <man...@us...> - 2005-01-26 11:51:23
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840/skins/default Modified Files: configuration-bar.thtml history-bar.thtml Log Message: Added option to hide the configuration bar that was previously displayed on each of the UI pages. The look of the new hide/show buttons, as well as their text labels, is preliminary and I trust on Joe to make things prettier. Since this change required a new user configuration variable, I have changed the database schema and have upped its version number. By default, the configuration bars are shown. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configuration-bar.thtml 16 Jan 2005 23:57:53 -0000 1.4 --- configuration-bar.thtml 26 Jan 2005 11:51:13 -0000 1.5 *************** *** 1,70 **** ! <tr> ! <td class="settingsPanel configBar" width="100%" align="center"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="configBarOption"> ! <label class="configurationLabel" for="configSkin"> ! <TMPL_VAR NAME="Localize_Configuration_SkinsChoose">: ! </label> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! <select name="skin" id="configSkin"> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_GeneralSkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_General_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_General_Skin">" <TMPL_VAR NAME="Configuration_General_Selected">> ! <TMPL_VAR NAME="Configuration_General_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_SmallSkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_Small_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_Small_Skin">" <TMPL_VAR NAME="Configuration_Small_Selected">> ! <TMPL_VAR NAME="Configuration_Small_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_TinySkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_Tiny_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_Tiny_Skin">" <TMPL_VAR NAME="Configuration_Tiny_Selected">> ! <TMPL_VAR NAME="Configuration_Tiny_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! </select> ! <input type="submit" class="submit" name="change_skin" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </div> ! <div class="configBarOption"> ! <label class="configurationLabel" for="configLanguage"> ! <TMPL_VAR NAME="Localize_Configuration_LanguageChoose">: ! </label> ! <select name="language" id="configLanguage"> ! <TMPL_LOOP NAME="Configuration_Loop_Languages"> ! <option value="<TMPL_VAR NAME="Configuration_Language">" <TMPL_VAR NAME="Configuration_Selected_Language">> ! <TMPL_VAR NAME="Configuration_Language"> ! </option> ! </TMPL_LOOP> ! </select> ! <input type="submit" class="submit" name="change_language" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </div> ! </form> </td> ! </tr> --- 1,91 ---- ! <TMPL_IF NAME="If_Show_Config_Bars"> ! <tr> ! <td class="settingsPanel configBar" width="100%" align="center"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="configBarOption"> ! <label class="configurationLabel" for="configSkin"> ! <TMPL_VAR NAME="Localize_Configuration_SkinsChoose">: ! </label> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! <select name="skin" id="configSkin"> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_GeneralSkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_General_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_General_Skin">" <TMPL_VAR NAME="Configuration_General_Selected">> ! <TMPL_VAR NAME="Configuration_General_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_SmallSkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_Small_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_Small_Skin">" <TMPL_VAR NAME="Configuration_Small_Selected">> ! <TMPL_VAR NAME="Configuration_Small_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! <optgroup label="<TMPL_VAR NAME="Localize_Configuration_TinySkins">"> ! <TMPL_LOOP NAME="Configuration_Loop_Tiny_Skins"> ! <option value="<TMPL_VAR NAME="Configuration_Tiny_Skin">" <TMPL_VAR NAME="Configuration_Tiny_Selected">> ! <TMPL_VAR NAME="Configuration_Tiny_Skin"> ! </option> ! </TMPL_LOOP> ! </optgroup> ! </select> ! <input type="submit" class="submit" name="change_skin" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </div> ! <div class="configBarOption"> ! <label class="configurationLabel" for="configLanguage"> ! <TMPL_VAR NAME="Localize_Configuration_LanguageChoose">: ! </label> ! <select name="language" id="configLanguage"> ! <TMPL_LOOP NAME="Configuration_Loop_Languages"> ! <option value="<TMPL_VAR NAME="Configuration_Language">" <TMPL_VAR NAME="Configuration_Selected_Language">> ! <TMPL_VAR NAME="Configuration_Language"> ! </option> ! </TMPL_LOOP> ! ! </select> ! <input type="submit" class="submit" name="change_language" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </div> ! ! <div class="configBarOption"> ! <input type="submit" class="submit" name="hide_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" /> ! </div> ! </form> </td> ! </tr> ! ! <TMPL_ELSE> ! ! <tr> ! <td class="settingsPanel configBar" width="100%" align="center"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="configBarOption"> ! <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! </div> ! </form> ! </td> ! </tr> ! ! </TMPL_IF> Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** history-bar.thtml 16 Jan 2005 23:57:53 -0000 1.6 --- history-bar.thtml 26 Jan 2005 11:51:13 -0000 1.7 *************** *** 1,2 **** --- 1,4 ---- + <TMPL_IF NAME="If_Show_Config_Bars"> + <tr> *************** *** 81,82 **** --- 83,85 ---- </tr> + </TMPL_IF> |
|
From: Manni H. <man...@us...> - 2005-01-26 11:51:22
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840/UI Modified Files: HTML.pm Log Message: Added option to hide the configuration bar that was previously displayed on each of the UI pages. The look of the new hide/show buttons, as well as their text labels, is preliminary and I trust on Joe to make things prettier. Since this change required a new user configuration variable, I have changed the database schema and have upped its version number. By default, the configuration bars are shown. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.333 retrieving revision 1.334 diff -C2 -d -r1.333 -r1.334 *** HTML.pm 22 Jan 2005 03:01:33 -0000 1.333 --- HTML.pm 26 Jan 2005 11:50:57 -0000 1.334 *************** *** 852,855 **** --- 852,865 ---- $templ->param( 'Configuration_Loop_Languages' => \@language_loop ); + if ( defined($self->{form_}{hide_configbar}) ) { + $self->user_config_( 1, 'show_configbars', 0 ); + $templ->param( 'If_Show_Config_Bars' => 0 ); + } + + if ( defined ($self->{form_}{show_configbar}) ) { + $self->user_config_( 1, 'show_configbars', 1 ); + $templ->param( 'If_Show_Config_Bars' => 1 ); + } + return $templ; } *************** *** 2871,2874 **** --- 2881,2885 ---- 'If_Show_Bucket_Help' => $self->user_config_( 1, 'show_bucket_help' ), 'If_Show_Training_Help' => $self->user_config_( 1, 'show_training_help' ), + 'If_Show_Config_Bars' => $self->user_config_( 1, 'show_configbars' ), 'Common_Middle_If_CanAdmin' => $self->user_global_config_( 1, 'can_admin' ), 'Configuration_Action' => $page ); |
11 messages has been excluded from this view by a project administrator.
