[mw-devel] MW3 r1288 - in trunk: po src src/server src/webclient
welshbyte at sucs.org
welshbyte at sucs.org
Sat Nov 17 19:57:05 GMT 2012
Author: welshbyte
Date: 2012-11-17 19:57:05 +0000 (Sat, 17 Nov 2012)
New Revision: 1288
Removed:
trunk/src/filter.c
trunk/src/filter.h
Modified:
trunk/po/cy_GB.po
trunk/po/el_GR.po
trunk/po/mw.pot
trunk/src/Makefile
trunk/src/add.c
trunk/src/alarm.c
trunk/src/alarm.h
trunk/src/colour.c
trunk/src/echo.c
trunk/src/edit.c
trunk/src/files.h
trunk/src/gags.c
trunk/src/getpass.c
trunk/src/hash.c
trunk/src/hash.h
trunk/src/incoming.c
trunk/src/incoming.h
trunk/src/init.c
trunk/src/ipc.c
trunk/src/js.c
trunk/src/js.h
trunk/src/main.c
trunk/src/mesg.c
trunk/src/mod.c
trunk/src/new.c
trunk/src/perms.c
trunk/src/perms.h
trunk/src/rooms.c
trunk/src/script.c
trunk/src/script.h
trunk/src/script_inst.c
trunk/src/server/Makefile
trunk/src/server/servsock.c
trunk/src/special.c
trunk/src/special.h
trunk/src/sqlite.c
trunk/src/strings.c
trunk/src/strings.h
trunk/src/talker.c
trunk/src/talker.h
trunk/src/tidyup.c
trunk/src/topten.c
trunk/src/uri.c
trunk/src/user.c
trunk/src/webclient/Makefile
trunk/src/who.c
Log:
Some much needed cleaning up. Adds -Wshadow -Wmissing-prototypes -Wno-strict-aliasing and silences all the new warnings, including renaming a bunch of redeclared variable names, making a bunch of functions static, including headers where needed and rejigging definitions and prototypes. It touches a lot of code but no functionality has changed.
Modified: trunk/po/cy_GB.po
===================================================================
--- trunk/po/cy_GB.po 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/po/cy_GB.po 2012-11-17 19:57:05 UTC (rev 1288)
@@ -7,605 +7,606 @@
msgstr ""
"Project-Id-Version: mw 2.13\n"
"Report-Msgid-Bugs-To: mw-devel at lists.sucs.org\n"
-"POT-Creation-Date: 2009-12-16 19:55+0000\n"
+"POT-Creation-Date: 2012-11-17 19:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/add.c:51
+#: ../src/add.c:127
#, c-format
msgid "Not allowed to write to this folder.\n"
msgstr ""
-#: ../src/add.c:60
+#: ../src/add.c:136
#, c-format
msgid "Writing in folder %s.\n"
msgstr ""
-#: ../src/add.c:62
+#: ../src/add.c:138
#, c-format
msgid "Replying to message %d in folder %s\n"
msgstr ""
-#: ../src/add.c:67
+#: ../src/add.c:143
#, c-format
msgid "Note: Operators have the right to read any 'private' messages.\n"
msgstr ""
-#: ../src/add.c:68
+#: ../src/add.c:144
#, c-format
msgid " : If you don't like this, don't write private messages.\n"
msgstr ""
-#: ../src/add.c:86
+#: ../src/add.c:162
#, c-format
msgid "There is no message %d\n"
msgstr ""
-#: ../src/add.c:96
+#: ../src/add.c:172
#, c-format
msgid "reply: Error, could not find old message !\n"
msgstr ""
-#: ../src/add.c:112
+#: ../src/add.c:188
#, c-format
msgid "Message from %s\n"
msgstr ""
-#: ../src/add.c:117 ../src/add.c:139
+#: ../src/add.c:193 ../src/add.c:215
#, c-format
msgid "Send to: "
msgstr ""
-#: ../src/add.c:123 ../src/add.c:143
+#: ../src/add.c:199 ../src/add.c:219
#, c-format
msgid "Message must be addressed to an existing user.\n"
msgstr ""
-#: ../src/add.c:128 ../src/add.c:135 ../src/edit.c:855
+#: ../src/add.c:204 ../src/add.c:211 ../src/edit.c:916
#, c-format
msgid "Subject: "
msgstr ""
-#: ../src/add.c:133
+#: ../src/add.c:209
#, c-format
msgid ""
"\n"
"Enter subject or press <ENTER> to accept old.\n"
msgstr ""
-#: ../src/add.c:134
+#: ../src/add.c:210
#, c-format
msgid "Subject: %s\n"
msgstr ""
-#: ../src/add.c:163
+#: ../src/add.c:239
#, c-format
msgid "Enter message ending with a . on a new line\n"
msgstr ""
-#: ../src/add.c:195
+#: ../src/add.c:271
#, c-format
msgid "Post message, edit, reformat, or Abandon ?"
msgstr ""
-#: ../src/add.c:198
+#: ../src/add.c:274
msgid "abandon"
msgstr ""
-#: ../src/add.c:205
+#: ../src/add.c:281
msgid "reformat"
msgstr ""
-#: ../src/add.c:207
+#: ../src/add.c:283
#, c-format
msgid "Reformatting..."
msgstr ""
-#: ../src/add.c:210
+#: ../src/add.c:286
#, c-format
msgid "Done.\r\n"
msgstr ""
-#: ../src/add.c:212
+#: ../src/add.c:288
msgid "edit"
msgstr ""
-#: ../src/add.c:231 ../src/edit.c:771
+#: ../src/add.c:307 ../src/edit.c:832
#, c-format
msgid "Failed to set user id, aborting.\n"
msgstr ""
-#: ../src/add.c:251
+#: ../src/add.c:327
#, c-format
msgid "Cannot create temporary file: %s\n"
msgstr ""
-#: ../src/add.c:274 ../src/edit.c:804
+#: ../src/add.c:350 ../src/edit.c:865
#, c-format
msgid "ERROR: Could not spawn editor: %s\n"
msgstr ""
-#: ../src/add.c:282
+#: ../src/add.c:358
#, c-format
msgid "ERROR: child wait (%d) %s\n"
msgstr ""
-#: ../src/add.c:304
+#: ../src/add.c:380
msgid "post"
msgstr ""
-#: ../src/add.c:346
+#: ../src/add.c:422
#, c-format
msgid "Warning: Index error, skipping back %ld bytes.\r\n"
msgstr ""
-#: ../src/add.c:369
+#: ../src/add.c:445
#, c-format
msgid "Warning: incomplete folder record written; folder file may be corrupt.\n"
msgstr ""
-#: ../src/alias.c:124 ../src/alias.c:134 ../src/alias.c:148 ../src/main.c:1003
-#: ../src/user.c:384 ../src/user.c:422 ../src/user.c:488
+#: ../src/alias.c:127 ../src/alias.c:137 ../src/alias.c:151 ../src/main.c:1021
+#: ../src/user.c:415 ../src/user.c:452 ../src/user.c:518
#, c-format
msgid "---more---\r"
msgstr ""
-#: ../src/edit.c:41
+#: ../src/edit.c:148
#, c-format
msgid "Username %s not found.\n"
msgstr ""
-#: ../src/edit.c:55
+#: ../src/edit.c:162
#, c-format
msgid "Current status set to [%s]\n"
msgstr ""
-#: ../src/edit.c:58
+#: ../src/edit.c:165
#, c-format
msgid "New status [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:67
+#: ../src/edit.c:174
#, c-format
msgid "Do you really want to delete this user ? "
msgstr ""
-#: ../src/edit.c:76
+#: ../src/edit.c:183
#, c-format
msgid "Status set to [%s].\n"
msgstr ""
-#: ../src/edit.c:90
+#: ../src/edit.c:197
#, c-format
msgid "Current specials set to [%s]\n"
msgstr ""
-#: ../src/edit.c:93
+#: ../src/edit.c:200
#, c-format
msgid "New specials [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:99
+#: ../src/edit.c:206
#, c-format
msgid "Specials set to [%s].\n"
msgstr ""
-#: ../src/edit.c:112
+#: ../src/edit.c:219
#, c-format
msgid "Current chatprivs set to [%s]\n"
msgstr ""
-#: ../src/edit.c:113
+#: ../src/edit.c:220
#, c-format
msgid "New chatprivs [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:118
+#: ../src/edit.c:225
#, c-format
msgid "Chatprivs set to [%s].\n"
msgstr ""
-#: ../src/edit.c:136
+#: ../src/edit.c:243
#, c-format
msgid "Current protection set to %s\n"
msgstr ""
-#: ../src/edit.c:137
+#: ../src/edit.c:244
#, c-format
msgid "New levels [0-4]/[0-4]: "
msgstr ""
-#: ../src/edit.c:148
+#: ../src/edit.c:255
#, c-format
msgid "Protection set to %d/%d.\n"
msgstr ""
-#: ../src/edit.c:158
+#: ../src/edit.c:265
#, c-format
msgid "Invalid protection level.\n"
msgstr ""
-#: ../src/edit.c:168
+#: ../src/edit.c:275
#, c-format
msgid "Current chatmode set to [%s]\n"
msgstr ""
-#: ../src/edit.c:169
+#: ../src/edit.c:276
#, c-format
msgid "New chatmode [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:174
+#: ../src/edit.c:281
#, c-format
msgid "Chatmode set to [%s].\n"
msgstr ""
-#: ../src/edit.c:191
+#: ../src/edit.c:298
#, c-format
msgid "User currently in groups [%s]\n"
msgstr ""
-#: ../src/edit.c:192
+#: ../src/edit.c:299
#, c-format
msgid "New Groups [+-=][12345678]: "
msgstr ""
-#: ../src/edit.c:202 ../src/edit.c:596
+#: ../src/edit.c:309 ../src/edit.c:675
#, c-format
msgid "Groups changed to [%s]\n"
msgstr ""
-#: ../src/edit.c:211
+#: ../src/edit.c:318
msgid "New Passwd: "
msgstr ""
-#: ../src/edit.c:212 ../src/newmain.c:581
+#: ../src/edit.c:319 ../src/newmain.c:677
msgid "Again: "
msgstr ""
-#: ../src/edit.c:215
+#: ../src/edit.c:322
#, c-format
msgid ""
"Passwords did not match.\n"
"Not done.\n"
msgstr ""
-#: ../src/edit.c:220
+#: ../src/edit.c:327
#, c-format
msgid "Password changed.\n"
msgstr ""
-#: ../src/edit.c:232
+#: ../src/edit.c:339
#, c-format
msgid "Real Name: %s\n"
msgstr ""
-#: ../src/edit.c:233
+#: ../src/edit.c:340
#, c-format
msgid "Enter new name (%d chars): "
msgstr ""
-#: ../src/edit.c:239 ../src/edit.c:314
+#: ../src/edit.c:346 ../src/edit.c:421
#, c-format
msgid "New name set.\n"
msgstr ""
-#: ../src/edit.c:253
+#: ../src/edit.c:360
#, c-format
msgid "User currently in room [%d]\n"
msgstr ""
-#: ../src/edit.c:254
+#: ../src/edit.c:361
#, c-format
msgid "New Room: [0-65535]: "
msgstr ""
-#: ../src/edit.c:260 ../src/edit.c:266
+#: ../src/edit.c:367 ../src/edit.c:373
#, c-format
msgid "Invalid Room ID (0-65535 only)\n"
msgstr ""
-#: ../src/edit.c:272
+#: ../src/edit.c:379
#, c-format
msgid "Room changed to %d.\n"
msgstr ""
-#: ../src/edit.c:282
+#: ../src/edit.c:389
#, c-format
msgid "WARNING: This command can be very dangerous !\n"
msgstr ""
-#: ../src/edit.c:283
+#: ../src/edit.c:390
#, c-format
msgid "User Name: %s\n"
msgstr ""
-#: ../src/edit.c:284
+#: ../src/edit.c:391
#, c-format
msgid "Enter new username (%d chars): "
msgstr ""
-#: ../src/edit.c:301
+#: ../src/edit.c:408
#, c-format
msgid "You cannot change a username to one that already exists.\n"
msgstr ""
-#: ../src/edit.c:304
+#: ../src/edit.c:411
#, c-format
msgid "Attempting to update existing user.\n"
msgstr ""
-#: ../src/edit.c:307
+#: ../src/edit.c:414
#, c-format
msgid "Are you sure you want to change user '%s' into user '%s' ? "
msgstr ""
-#: ../src/edit.c:318 ../src/edit.c:320
+#: ../src/edit.c:425 ../src/edit.c:427
#, c-format
msgid "Change Cancelled.\n"
msgstr ""
-#: ../src/edit.c:325 ../src/edit.c:977
+#: ../src/edit.c:432 ../src/edit.c:986
#, c-format
msgid "Contact address: %s\n"
msgstr ""
-#: ../src/edit.c:326 ../src/edit.c:978
+#: ../src/edit.c:433 ../src/edit.c:987
#, c-format
msgid "New address (%d chars): "
msgstr ""
-#: ../src/edit.c:332 ../src/edit.c:983
+#: ../src/edit.c:439 ../src/edit.c:992
#, c-format
msgid "New address set.\n"
msgstr ""
-#: ../src/edit.c:340
+#: ../src/edit.c:447
#, c-format
msgid "Current Status: %s\n"
msgstr ""
-#: ../src/edit.c:341
+#: ../src/edit.c:448
#, c-format
msgid "New Status (%d chars): "
msgstr ""
-#: ../src/edit.c:348 ../src/edit.c:355
+#: ../src/edit.c:455 ../src/edit.c:462
#, c-format
msgid "New status set.\n"
msgstr ""
-#: ../src/edit.c:365
+#: ../src/edit.c:472
#, c-format
msgid "Timeout: %ld sec.\n"
msgstr ""
-#: ../src/edit.c:366
+#: ../src/edit.c:473
#, c-format
msgid "New timeout value: "
msgstr ""
-#: ../src/edit.c:387
+#: ../src/edit.c:494
#, c-format
msgid "TIMEOUT now disabled.\n"
msgstr ""
-#: ../src/edit.c:393
+#: ../src/edit.c:500
#, c-format
msgid "TIMEOUT was already disabled.\n"
msgstr ""
-#: ../src/edit.c:398
+#: ../src/edit.c:505
#, c-format
msgid "TIMEOUT must be be at least 10 minutes (600), or 0 to disable.\n"
msgstr ""
-#: ../src/edit.c:406
+#: ../src/edit.c:513
#, c-format
msgid "New timeout set to %ld seconds.\n"
msgstr ""
-#: ../src/edit.c:416
+#: ../src/edit.c:522
#, c-format
msgid "Lastread in folder? "
msgstr ""
-#: ../src/edit.c:421
+#: ../src/edit.c:527
#, c-format
msgid "Folder not found.\n"
msgstr ""
-#: ../src/edit.c:424
+#: ../src/edit.c:530
#, c-format
msgid "Last read message number %d\n"
msgstr ""
-#: ../src/edit.c:425
+#: ../src/edit.c:531
#, c-format
msgid "New lastread: "
msgstr ""
-#: ../src/edit.c:431
+#: ../src/edit.c:537
#, c-format
msgid "Lastread changed to %d\n"
msgstr ""
-#: ../src/edit.c:435
+#: ../src/edit.c:541
#, c-format
msgid "Not changed.\n"
msgstr ""
-#: ../src/edit.c:445
+#: ../src/edit.c:551
#, c-format
msgid ""
"Username: %s\n"
"Real Name: %s\n"
msgstr ""
-#: ../src/edit.c:446
+#: ../src/edit.c:552
#, c-format
msgid ""
"Contact: %s\n"
"Status [%s]\tSpecials [%s]\n"
msgstr ""
-#: ../src/edit.c:449 ../src/edit.c:658
+#: ../src/edit.c:555 ../src/edit.c:737
#, c-format
msgid "Groups [%s]\n"
msgstr ""
-#: ../src/edit.c:452
+#: ../src/edit.c:558
#, c-format
msgid "Talker: Modes=[%s] Privs=[%s] Protection=[%s]\n"
msgstr ""
-#: ../src/edit.c:458
+#: ../src/edit.c:564
#, c-format
msgid "Timeout disabled.\n"
msgstr ""
-#: ../src/edit.c:460
+#: ../src/edit.c:566
#, c-format
msgid "Timeout set to %s.\n"
msgstr ""
-#: ../src/edit.c:462
+#: ../src/edit.c:568
#, c-format
msgid "Last Login: %s"
msgstr ""
-#: ../src/edit.c:465
+#: ../src/edit.c:571
#, c-format
msgid "Status: %s (%s ago)\n"
msgstr ""
-#: ../src/edit.c:471
+#: ../src/edit.c:577
#, c-format
msgid "Are you sure you want to clear %s's ignore list? "
msgstr ""
-#: ../src/edit.c:477
+#: ../src/edit.c:583
#, c-format
msgid "Ignorelist Cleared.\n"
msgstr ""
-#: ../src/edit.c:481
+#: ../src/edit.c:587
#, c-format
msgid "Clear Cancelled.\n"
msgstr ""
-#: ../src/edit.c:484
+#: ../src/edit.c:590
#, c-format
msgid "Unknown Command\n"
msgstr ""
-#: ../src/edit.c:549
+#: ../src/edit.c:628
#, c-format
msgid "Unknown folder name.\n"
msgstr ""
-#: ../src/edit.c:556
+#: ../src/edit.c:635
#, c-format
msgid ""
"Folder %s\n"
"Current status:-\n"
msgstr ""
-#: ../src/edit.c:557
+#: ../src/edit.c:636
#, c-format
msgid "User not in group [%s]\n"
msgstr ""
-#: ../src/edit.c:559
+#: ../src/edit.c:638
#, c-format
msgid "User in group [%s]\n"
msgstr ""
-#: ../src/edit.c:560
+#: ../src/edit.c:639
#, c-format
msgid "Change to :-\n"
msgstr ""
-#: ../src/edit.c:561
+#: ../src/edit.c:640
#, c-format
msgid "User not in group [+-=][arwRWpm]: "
msgstr ""
-#: ../src/edit.c:568 ../src/edit.c:579
+#: ../src/edit.c:647 ../src/edit.c:658
#, c-format
msgid "Status changed to [%s]\n"
msgstr ""
-#: ../src/edit.c:570 ../src/edit.c:581
+#: ../src/edit.c:649 ../src/edit.c:660
#, c-format
msgid "WARNING: folder may get written over by the next folder created.\n"
msgstr ""
-#: ../src/edit.c:572
+#: ../src/edit.c:651
#, c-format
msgid "User in group [+-=][arwRWpm]: "
msgstr ""
-#: ../src/edit.c:588
+#: ../src/edit.c:667
#, c-format
msgid "Folder %s is currently in groups [%s]\n"
msgstr ""
-#: ../src/edit.c:589
+#: ../src/edit.c:668
#, c-format
msgid "Folder groups [+-=][12345678]: "
msgstr ""
-#: ../src/edit.c:601
+#: ../src/edit.c:680
#, c-format
msgid "Current folder name = %s\n"
msgstr ""
-#: ../src/edit.c:602
+#: ../src/edit.c:681
#, c-format
msgid "Change to ? (%d chars): "
msgstr ""
-#: ../src/edit.c:626
+#: ../src/edit.c:705
#, c-format
msgid "Name changed to %s\n"
msgstr ""
-#: ../src/edit.c:631
+#: ../src/edit.c:710
#, c-format
msgid "First Message in folder is %d\n"
msgstr ""
-#: ../src/edit.c:632
+#: ../src/edit.c:711
#, c-format
msgid "New first message: "
msgstr ""
-#: ../src/edit.c:637
+#: ../src/edit.c:716
#, c-format
msgid "First message set to %d\n"
msgstr ""
-#: ../src/edit.c:639
+#: ../src/edit.c:718
#, c-format
msgid "Last Message in folder is %d\n"
msgstr ""
-#: ../src/edit.c:640
+#: ../src/edit.c:719
#, c-format
msgid "New Last message: "
msgstr ""
-#: ../src/edit.c:645
+#: ../src/edit.c:724
#, c-format
msgid "Last message set to %d\n"
msgstr ""
-#: ../src/edit.c:652
+#: ../src/edit.c:731
#, c-format
msgid ""
"\n"
@@ -614,188 +615,188 @@
"Message range %d to %d\n"
msgstr ""
-#: ../src/edit.c:654
+#: ../src/edit.c:733
#, c-format
msgid "Status (out of group) [%s]"
msgstr ""
-#: ../src/edit.c:656
+#: ../src/edit.c:735
#, c-format
msgid " (in group) [%s]\n"
msgstr ""
-#: ../src/edit.c:663
+#: ../src/edit.c:742
#, c-format
msgid "Current folder topic = '%s'\n"
msgstr ""
-#: ../src/edit.c:664
+#: ../src/edit.c:743
#, c-format
msgid "New topic (%d chars): "
msgstr ""
-#: ../src/edit.c:669
+#: ../src/edit.c:748
#, c-format
msgid "Topic changed to '%s'\n"
msgstr ""
-#: ../src/edit.c:675
+#: ../src/edit.c:754
#, c-format
msgid "Do you really want to delete folder %s ?(yes/no) "
msgstr ""
-#: ../src/edit.c:694
+#: ../src/edit.c:773
#, c-format
msgid "Folder Deleted.\n"
msgstr ""
-#: ../src/edit.c:698 ../src/edit.c:849 ../src/edit.c:862
+#: ../src/edit.c:777 ../src/edit.c:910 ../src/edit.c:923
#, c-format
msgid "Not Done.\n"
msgstr ""
-#: ../src/edit.c:748
+#: ../src/edit.c:809
#, c-format
msgid "Message %d not found.\n"
msgstr ""
-#: ../src/edit.c:757
+#: ../src/edit.c:818
#, c-format
msgid "You cannot edit other peoples messages.\n"
msgstr ""
-#: ../src/edit.c:841
+#: ../src/edit.c:902
#, c-format
msgid "Currently to '%s'.\n"
msgstr ""
-#: ../src/edit.c:842
+#: ../src/edit.c:903
#, c-format
msgid "to: "
msgstr ""
-#: ../src/edit.c:846
+#: ../src/edit.c:907
#, c-format
msgid "Message now to '%s'\n"
msgstr ""
-#: ../src/edit.c:854
+#: ../src/edit.c:915
#, c-format
msgid "Current subject is '%s'.\n"
msgstr ""
-#: ../src/edit.c:859
+#: ../src/edit.c:920
#, c-format
msgid "Subject '%s'\n"
msgstr ""
-#: ../src/edit.c:867
+#: ../src/edit.c:928
#, c-format
msgid "Message Marked for deletion.\n"
msgstr ""
-#: ../src/edit.c:872
+#: ../src/edit.c:933
#, c-format
msgid "Message has been undeleted.\n"
msgstr ""
-#: ../src/edit.c:878
+#: ../src/edit.c:939
#, c-format
msgid "Status mode is currently %s\n"
msgstr ""
-#: ../src/edit.c:880
+#: ../src/edit.c:941
#, c-format
msgid "New status [%s]: "
msgstr ""
-#: ../src/edit.c:886 ../src/user.c:342
+#: ../src/edit.c:947 ../src/user.c:270
#, c-format
msgid "Status set to [%s]\n"
msgstr ""
-#: ../src/edit.c:890
+#: ../src/edit.c:951
#, c-format
msgid "What do you want to do ?\n"
msgstr ""
-#: ../src/edit.c:911
+#: ../src/edit.c:972
#, c-format
msgid "Total Login Time of "
msgstr ""
-#: ../src/edit.c:913
+#: ../src/edit.c:974
#, c-format
msgid "%d day%s, "
msgstr ""
-#: ../src/edit.c:915
+#: ../src/edit.c:976
#, c-format
msgid "%d hour%s, "
msgstr ""
-#: ../src/edit.c:917
+#: ../src/edit.c:978
#, c-format
msgid "%d minute%s, "
msgstr ""
-#: ../src/edit.c:918
+#: ../src/edit.c:979
#, c-format
msgid "%d second%s.\n"
msgstr ""
-#: ../src/folders.c:32
+#: ../src/folders.c:40
#, c-format
msgid "Sorry, no space for a new folder.\n"
msgstr ""
-#: ../src/folders.c:40
+#: ../src/folders.c:48
#, c-format
msgid "Create new folder :\n"
msgstr ""
-#: ../src/folders.c:41
+#: ../src/folders.c:49
#, c-format
msgid "Folder name (%d chars): "
msgstr ""
-#: ../src/folders.c:44
+#: ../src/folders.c:52
#, c-format
msgid "Folder topic (%d chars): "
msgstr ""
-#: ../src/folders.c:46
+#: ../src/folders.c:54
#, c-format
msgid "Folder status (not in group) (arwRWpm): "
msgstr ""
-#: ../src/folders.c:49
+#: ../src/folders.c:57
#, c-format
msgid "Folder status (in group) (arwRWpm): "
msgstr ""
-#: ../src/folders.c:52
+#: ../src/folders.c:60
#, c-format
msgid "Folder groups (12345678): "
msgstr ""
-#: ../src/folders.c:57
+#: ../src/folders.c:65
#, c-format
msgid "Creating folder %s - %s\n"
msgstr ""
-#: ../src/incoming.c:552
+#: ../src/incoming.c:522
#, c-format
msgid ""
"\n"
"Your name has been changed to '%s'\n"
msgstr ""
-#: ../src/incoming.c:697
+#: ../src/incoming.c:667
msgid "*** Your ignore list has just been cleared ***"
msgstr ""
-#: ../src/incoming.c:706
+#: ../src/incoming.c:676
#, c-format
msgid ""
"\n"
@@ -803,7 +804,7 @@
"--> You appear to have been banned. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:712
+#: ../src/incoming.c:682
#, c-format
msgid ""
"\n"
@@ -811,280 +812,294 @@
"--> You appear to have been DELETED. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
#, c-format
msgid ""
"\n"
"Boing, Zebedee arrived. \"%s--\", said Zebedee\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
msgid "Time for bed"
msgstr ""
-#: ../src/incoming.c:930
+#: ../src/incoming.c:900
#, c-format
msgid "%s just sent the Zebedee of Death to you.\n"
msgstr ""
-#: ../src/incoming.c:960
+#: ../src/incoming.c:930
#, c-format
msgid "Boing, Zebedee's arrived. \"Look up!\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:961
+#: ../src/incoming.c:931
#, c-format
msgid "You look up; a large object is falling towards you very fast,\n"
msgstr ""
-#: ../src/incoming.c:962
+#: ../src/incoming.c:932
#, c-format
msgid "very very fast. It looks like a Magic Roundabout!\n"
msgstr ""
-#: ../src/incoming.c:963
+#: ../src/incoming.c:933
#, c-format
msgid "\"I wouldn't stand there if I was you\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:964
+#: ../src/incoming.c:934
#, c-format
msgid "Boing, Zebedee's left you standing all alone\n"
msgstr ""
-#: ../src/incoming.c:965
+#: ../src/incoming.c:935
#, c-format
msgid "WWWHHHEEEEEEEKKKKEEEERRRRRUUUUUNNNNNCCCCCHHHHHH\a\a\a\a\a\n"
msgstr ""
-#: ../src/incoming.c:966
+#: ../src/incoming.c:936
#, c-format
msgid "%s has just dropped the Magic Roundabout of Death on you.\n"
msgstr ""
-#: ../src/incoming.c:969
+#: ../src/incoming.c:939
#, c-format
msgid "\"%s--\" says Zebedee\n"
msgstr ""
-#: ../src/init.c:111
+#: ../src/init.c:130
#, c-format
msgid "Cannot load \"%s\": Illegal path\n"
msgstr ""
-#: ../src/init.c:124
+#: ../src/init.c:143
#, c-format
msgid "Error reading %s: Not a regular file\n"
msgstr ""
-#: ../src/init.c:131
+#: ../src/init.c:150
#, c-format
msgid "Error reading %s: %s\n"
msgstr ""
-#: ../src/init.c:162 ../src/init.c:169
+#: ../src/init.c:181 ../src/init.c:188
#, c-format
msgid "Malformed alias in %s at line %d\n"
msgstr ""
-#: ../src/init.c:177
+#: ../src/init.c:196
#, c-format
msgid "Alias %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:185 ../src/init.c:192
+#: ../src/init.c:204 ../src/init.c:211
#, c-format
msgid "Malformed bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:200
+#: ../src/init.c:219
#, c-format
msgid "Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:208 ../src/init.c:215
+#: ../src/init.c:227 ../src/init.c:234
#, c-format
msgid "Malformed rpc bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:223
+#: ../src/init.c:242
#, c-format
msgid "RPC Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:231 ../src/init.c:250
+#: ../src/init.c:250 ../src/init.c:269
#, c-format
msgid "Malformed include in %s at line %d\n"
msgstr ""
-#: ../src/init.c:262
+#: ../src/init.c:281
#, c-format
msgid "Malformed event bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:270
+#: ../src/init.c:289
#, c-format
msgid "Event bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:278
+#: ../src/init.c:297
#, c-format
msgid "Malformed ipc in %s at line %d\n"
msgstr ""
-#: ../src/init.c:286
+#: ../src/init.c:305
#, c-format
msgid "IPC bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:294
+#: ../src/init.c:313
#, c-format
msgid "Malformed checkonoff bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:302
+#: ../src/init.c:321
#, c-format
msgid "Checkonoff bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:310
+#: ../src/init.c:329
#, c-format
msgid "Malformed shutdown bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:318
+#: ../src/init.c:337
#, c-format
msgid "Shutdown bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:326
+#: ../src/init.c:345
#, c-format
msgid "Malformed force bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:334
+#: ../src/init.c:353
#, c-format
msgid "Force bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:342 ../src/init.c:355
+#: ../src/init.c:361 ../src/init.c:374
#, c-format
msgid "Malformed Script Function declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:368 ../src/init.c:381
+#: ../src/init.c:387 ../src/init.c:400
#, c-format
msgid "Malformed Script Init declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:394 ../src/init.c:407
+#: ../src/init.c:413 ../src/init.c:426
#, c-format
msgid "Malformed Script BoardInit declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:415
+#: ../src/init.c:434
#, c-format
msgid "Loading file %s unrecognised command '%s' on line %d\n"
msgstr ""
-#: ../src/main.c:371
+#: ../src/main.c:253
+msgid "05*** You have new mail.\n"
+msgstr ""
+
+#: ../src/main.c:259
#, c-format
+msgid "05*** You have %d new mail messages.\n"
+msgstr ""
+
+#: ../src/main.c:485
+#, c-format
msgid ""
"\n"
"Milliways accepts the optional arguments of:\n"
"\n"
msgstr ""
-#: ../src/main.c:372
+#: ../src/main.c:486
#, c-format
msgid " -ae_arg <a> Pass the string 'a' in to all 'initfunc' functions as $*\n"
msgstr ""
-#: ../src/main.c:373
+#: ../src/main.c:487
#, c-format
msgid " -autochat Automatically use SUCS username to log onto talker\n"
msgstr ""
-#: ../src/main.c:374
+#: ../src/main.c:488
#, c-format
msgid " -autowho Show a 'who' list automatically on log on to talker\n"
msgstr ""
-#: ../src/main.c:375
+#: ../src/main.c:489
#, c-format
msgid " -i Internet mode (no readline)\n"
msgstr ""
-#: ../src/main.c:376
+#: ../src/main.c:490
#, c-format
msgid " -new Summary of new messages and quit\n"
msgstr ""
-#: ../src/main.c:377
+#: ../src/main.c:491
#, c-format
+msgid " -server <a> Connect to server <a>\n"
+msgstr ""
+
+#: ../src/main.c:492
+#, c-format
msgid " -since Lists people logged on between now and when you last logged on\n"
msgstr ""
-#: ../src/main.c:378
+#: ../src/main.c:493
#, c-format
msgid " -who Show a list of users logged on and quit\n"
msgstr ""
-#: ../src/main.c:379
+#: ../src/main.c:494
#, c-format
msgid " -what Show a list of what users are doing\n"
msgstr ""
-#: ../src/main.c:386
+#: ../src/main.c:501
#, c-format
msgid ""
"\n"
"To view this help message, use the arguments: -h, -help, or -?\n"
msgstr ""
-#: ../src/main.c:387
+#: ../src/main.c:502
#, c-format
msgid ""
"To specify arguments, you may use '--', or '/' instead of '-'.\n"
"\n"
msgstr ""
-#: ../src/main.c:403 ../src/main.c:415 ../src/main.c:427 ../src/main.c:442
+#: ../src/main.c:518 ../src/main.c:530 ../src/main.c:542 ../src/main.c:557
#, c-format
msgid "Username not permitted.\n"
msgstr ""
-#: ../src/main.c:498 ../src/main.c:524
+#: ../src/main.c:612 ../src/main.c:638
#, c-format
msgid "%s: User %s not found.\n"
msgstr ""
-#: ../src/main.c:517
+#: ../src/main.c:631
#, c-format
msgid "%s: Folder %s not found.\n"
msgstr ""
-#: ../src/main.c:559
+#: ../src/main.c:673
#, c-format
msgid "The board is currently locked to normal users.\n"
msgstr ""
-#: ../src/main.c:562
+#: ../src/main.c:676
#, c-format
msgid "The Board has been temporarily closed.\n"
msgstr ""
-#: ../src/main.c:563
+#: ../src/main.c:677
#, c-format
msgid "Please call again soon.\n"
msgstr ""
-#: ../src/main.c:577
+#: ../src/main.c:694
#, c-format
msgid "01%s has just entered the board."
msgstr ""
-#: ../src/main.c:601
+#: ../src/main.c:718
#, c-format
msgid ""
"\n"
@@ -1092,1021 +1107,1017 @@
"\n"
msgstr ""
-#: ../src/main.c:603
+#: ../src/main.c:720
#, c-format
msgid "Type 'talker' to enter chat mode.\n"
msgstr ""
-#: ../src/main.c:608
+#: ../src/main.c:725
#, c-format
msgid "You must register before being able to use this system fully.\n"
msgstr ""
-#: ../src/main.c:609
+#: ../src/main.c:726
#, c-format
msgid "Until then you will not be able to write in most folders or use chat mode.\n"
msgstr ""
-#: ../src/main.c:610
+#: ../src/main.c:727
#, c-format
msgid "Wait here for a few minutes and an administrator might register you.\n"
msgstr ""
-#: ../src/main.c:612
+#: ../src/main.c:729
#, c-format
msgid "Type 'help' for help.\n"
msgstr ""
-#: ../src/main.c:788
-msgid "05*** You have new mail.\n"
-msgstr ""
-
-#: ../src/main.c:794
+#: ../src/main.c:1075
#, c-format
-msgid "05*** You have %d new mail messages.\n"
-msgstr ""
-
-#: ../src/main.c:1028 ../src/main.c:1067 ../src/main.c:1091
-#, c-format
-msgid "Sorry, no help available on that subject.\n"
-msgstr ""
-
-#: ../src/main.c:1053
-#, c-format
-msgid "No general help available for talker commands.\n"
-msgstr ""
-
-#: ../src/main.c:1148
-#, c-format
msgid ""
"\n"
"Error reading incoming message pipe. panic.\n"
msgstr ""
-#: ../src/main.c:1152
+#: ../src/main.c:1079
#, c-format
msgid ""
"\n"
"Error on input terminal, argh.\n"
msgstr ""
-#: ../src/main.c:1210
+#: ../src/main.c:1152
#, c-format
msgid "Error: Urk, no message to print.\n"
msgstr ""
-#: ../src/main.c:1428
+#: ../src/main.c:1368
#, c-format
msgid "*** Timed Out, Good Bye\r\n"
msgstr ""
-#: ../src/main.c:1432
+#: ../src/main.c:1372
#, c-format
msgid "04%s has been timed out."
msgstr ""
-#: ../src/main.c:1439
+#: ../src/main.c:1379
#, c-format
msgid "%c*** Wakey ! Wakey !\r\n"
msgstr ""
-#: ../src/main.c:2108
+#: ../src/main.c:2030
#, c-format
msgid "Release version %s.%s.%s\n"
msgstr ""
-#: ../src/main.c:2110
+#: ../src/main.c:2032
#, c-format
msgid "Release version %s.%s\n"
msgstr ""
-#: ../src/main.c:2112
+#: ../src/main.c:2034
#, c-format
msgid "Development version %s.%s.%s\n"
msgstr ""
-#: ../src/main.c:2114
+#: ../src/main.c:2036
#, c-format
msgid "Built by %s on %s\n"
msgstr ""
-#: ../src/mesg.c:37
+#: ../src/mesg.c:26
#, c-format
msgid "User does not exist.\n"
msgstr ""
-#: ../src/mesg.c:41
+#: ../src/mesg.c:30
#, c-format
msgid "%s is not registered.\n"
msgstr ""
-#: ../src/mesg.c:47
+#: ../src/mesg.c:36
#, c-format
msgid "%s has msg off, writing anyway.\n"
msgstr ""
-#: ../src/mesg.c:49
+#: ../src/mesg.c:38
#, c-format
msgid "%s has turned messages off.\n"
msgstr ""
-#: ../src/mesg.c:58
+#: ../src/mesg.c:47
#, c-format
msgid "User not logged on.\n"
msgstr ""
-#: ../src/mesg.c:67
+#: ../src/mesg.c:56
#, c-format
msgid "Cannot inform %s of new mail.\n"
msgstr ""
-#: ../src/mod.c:31
+#: ../src/mod.c:80
#, c-format
+msgid ""
+"\n"
+"Message in folder %s\n"
+"From: %s\n"
+"To: %s\n"
+"Subject: %s\n"
+"Date: %s"
+msgstr ""
+
+#: ../src/mod.c:106
+#, c-format
msgid "Changing to folder %s\n"
msgstr ""
-#: ../src/mod.c:53
+#: ../src/mod.c:128
#, c-format
msgid "only %d of %d bytes read.\n"
msgstr ""
-#: ../src/mod.c:57
+#: ../src/mod.c:132
#, c-format
msgid "[%s] (A)pprove, (L)eave, (S)ave&delete ? (<CR> to delete)"
msgstr ""
-#: ../src/mod.c:59
+#: ../src/mod.c:134
msgid "approve"
msgstr ""
-#: ../src/mod.c:68
+#: ../src/mod.c:143
#, c-format
msgid "Message approved as mesg %d folder %s\n"
msgstr ""
-#: ../src/mod.c:70
+#: ../src/mod.c:145
msgid "leave"
msgstr ""
-#: ../src/mod.c:73
+#: ../src/mod.c:148
#, c-format
msgid "Skipping message for now.\n"
msgstr ""
-#: ../src/mod.c:75
+#: ../src/mod.c:150
msgid "save"
msgstr ""
-#: ../src/mod.c:78
+#: ../src/mod.c:153
#, c-format
msgid "Saved and Deleted\n"
msgstr ""
-#: ../src/mod.c:80
+#: ../src/mod.c:155
#, c-format
msgid "Deleted.\n"
msgstr ""
-#: ../src/mod.c:83
+#: ../src/mod.c:158
#, c-format
msgid "End of folder %s\n"
msgstr ""
-#: ../src/mod.c:157
+#: ../src/new.c:37 ../src/new.c:186 ../src/new.c:220
#, c-format
-msgid ""
-"\n"
-"Message in folder %s\n"
-"From: %s\n"
-"To: %s\n"
-"Subject: %s\n"
-"Date: %s"
-msgstr ""
-
-#: ../src/new.c:29 ../src/new.c:82 ../src/new.c:213
-#, c-format
msgid "There are no folders to read !\n"
msgstr ""
-#: ../src/new.c:49
+#: ../src/new.c:57
#, c-format
msgid ") Last read message %4d of %-4d %4d new\n"
msgstr ""
-#: ../src/new.c:54
+#: ../src/new.c:62
#, c-format
msgid ") %4d Msgs Topic: %s\n"
msgstr ""
-#: ../src/new.c:63
+#: ../src/new.c:71
#, c-format
msgid "---more--- Press <return> to continue.\r"
msgstr ""
-#: ../src/new.c:97
+#: ../src/new.c:88
#, c-format
-msgid "Scanning folder %-*s\r"
-msgstr ""
-
-#: ../src/new.c:116
-#, c-format
msgid "Error: cannot find index file for folder %s\n"
msgstr ""
-#: ../src/new.c:118
+#: ../src/new.c:90
#, c-format
msgid "Error: cannot find text file for folder %s\n"
msgstr ""
-#: ../src/new.c:142
+#: ../src/new.c:114
#, c-format
msgid "Skipping deleted message.\n"
msgstr ""
-#: ../src/new.c:158
+#: ../src/new.c:130
#, c-format
msgid "Hit return for next message (%s - %d of %d)>"
msgstr ""
-#: ../src/new.c:164
+#: ../src/new.c:136
#, c-format
msgid "Catching up on folder %s\n"
msgstr ""
-#: ../src/new.c:169
+#: ../src/new.c:141
#, c-format
msgid "Skipping this folder. %d messages left unread.\n"
msgstr ""
-#: ../src/new.c:183 ../src/newmain.c:612
+#: ../src/new.c:155 ../src/newmain.c:708
#, c-format
msgid "Unsubscribing from %s.\n"
msgstr ""
-#: ../src/new.c:218
+#: ../src/new.c:201
#, c-format
+msgid "Scanning folder %-*s\r"
+msgstr ""
+
+#: ../src/new.c:225
+#, c-format
msgid " Folder Mesg Date From Subject\n"
msgstr ""
-#: ../src/new.c:219
+#: ../src/new.c:226
#, c-format
msgid " ====== ==== ==== ==== =======\n"
msgstr ""
-#: ../src/new.c:231
+#: ../src/new.c:238
#, c-format
msgid " <empty>\n"
msgstr ""
-#: ../src/newmain.c:59 ../src/newmain.c:65
+#: ../src/newmain.c:77 ../src/newmain.c:116 ../src/newmain.c:140
#, c-format
+msgid "Sorry, no help available on that subject.\n"
+msgstr ""
+
+#: ../src/newmain.c:102
+#, c-format
+msgid "No general help available for talker commands.\n"
+msgstr ""
+
+#: ../src/newmain.c:156 ../src/newmain.c:162
+#, c-format
msgid "Unknown foldername.\n"
msgstr ""
-#: ../src/newmain.c:70
+#: ../src/newmain.c:167
#, c-format
msgid "Changing to folder %s.\n"
msgstr ""
-#: ../src/newmain.c:104 ../src/newmain.c:479
+#: ../src/newmain.c:201 ../src/newmain.c:575
#, c-format
msgid "No current folder.\n"
msgstr ""
-#: ../src/newmain.c:108
+#: ../src/newmain.c:205
#, c-format
msgid "Moved to end of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:116
+#: ../src/newmain.c:213
#, c-format
msgid "Moved to start of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:146
+#: ../src/newmain.c:243
#, c-format
msgid "Messages are now off.\n"
msgstr ""
-#: ../src/newmain.c:148
+#: ../src/newmain.c:245
#, c-format
msgid "Messages are already off.\n"
msgstr ""
-#: ../src/newmain.c:155
+#: ../src/newmain.c:252
#, c-format
msgid "Messages are now on.\n"
msgstr ""
-#: ../src/newmain.c:157
+#: ../src/newmain.c:254
#, c-format
msgid "Messages already on.\n"
msgstr ""
-#: ../src/newmain.c:171
+#: ../src/newmain.c:268
#, c-format
msgid "You will NOT be informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:173
+#: ../src/newmain.c:270
#, c-format
msgid "You are already not informed of logins.\n"
msgstr ""
-#: ../src/newmain.c:180
+#: ../src/newmain.c:277
#, c-format
msgid "You now WILL be informed of logins/outs\n"
msgstr ""
-#: ../src/newmain.c:182
+#: ../src/newmain.c:279
#, c-format
msgid "You are already informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:195
+#: ../src/newmain.c:292
#, c-format
msgid "Colours disabled.\n"
msgstr ""
-#: ../src/newmain.c:197
+#: ../src/newmain.c:294
#, c-format
msgid "Colour enabled.\n"
msgstr ""
-#: ../src/newmain.c:199
+#: ../src/newmain.c:296
#, c-format
msgid "No colour scheme loaded.\n"
msgstr ""
-#: ../src/newmain.c:200
+#: ../src/newmain.c:297
#, c-format
msgid "Current colour scheme: %d: %s\n"
msgstr ""
-#: ../src/newmain.c:215
+#: ../src/newmain.c:310
#, c-format
msgid "Error opening colour scheme list - %s\n"
msgstr ""
-#: ../src/newmain.c:219
+#: ../src/newmain.c:314
#, c-format
msgid "Listing available colour schemes:-\n"
msgstr ""
-#: ../src/newmain.c:246
+#: ../src/newmain.c:342
#, c-format
msgid "No colour schemes found.\n"
msgstr ""
-#: ../src/newmain.c:260
+#: ../src/newmain.c:356
#, c-format
msgid "ERROR: Cannot open colour scheme '%d'\n"
msgstr ""
-#: ../src/newmain.c:275
+#: ../src/newmain.c:371
#, c-format
msgid "Colour mode now disabled.\n"
msgstr ""
-#: ../src/newmain.c:277
+#: ../src/newmain.c:373
#, c-format
msgid "Colour mode already disabled.\n"
msgstr ""
-#: ../src/newmain.c:284
+#: ../src/newmain.c:380
#, c-format
msgid "Colour mode now enabled.\n"
msgstr ""
-#: ../src/newmain.c:286
+#: ../src/newmain.c:382
#, c-format
msgid "Colour mode already enabled.\n"
msgstr ""
-#: ../src/newmain.c:300
+#: ../src/newmain.c:396
#, c-format
msgid "You will NOT hear any beeps.\n"
msgstr ""
-#: ../src/newmain.c:302
+#: ../src/newmain.c:398
#, c-format
msgid "You have already turned beeps off.\n"
msgstr ""
-#: ../src/newmain.c:309
+#: ../src/newmain.c:405
#, c-format
msgid "You now WILL get beeps.\n"
msgstr ""
-#: ../src/newmain.c:311
+#: ../src/newmain.c:407
#, c-format
msgid "You are already getting beeps.\n"
msgstr ""
-#: ../src/newmain.c:325
+#: ../src/newmain.c:421
#, c-format
msgid "You will no longer receive wizchat.\n"
msgstr ""
-#: ../src/newmain.c:327
+#: ../src/newmain.c:423
#, c-format
msgid "You have already turned wizchat off.\n"
msgstr ""
-#: ../src/newmain.c:334
+#: ../src/newmain.c:430
#, c-format
msgid "You will now receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:336
+#: ../src/newmain.c:432
#, c-format
msgid "You already receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
#, c-format
msgid "Forcing Subscription to folder %s "
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "Off"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "On"
msgstr ""
-#: ../src/newmain.c:355
+#: ../src/newmain.c:451
#, c-format
msgid ""
"Failed\n"
"Unknown folder name %s\n"
msgstr ""
-#: ../src/newmain.c:359
+#: ../src/newmain.c:455
#, c-format
msgid ", Done.\n"
msgstr ""
-#: ../src/newmain.c:373
+#: ../src/newmain.c:469
#, c-format
msgid "Wiz! Bang! - You're a wizard again.\n"
msgstr ""
-#: ../src/newmain.c:375
+#: ../src/newmain.c:471
#, c-format
msgid "You are already a wizard.\n"
msgstr ""
-#: ../src/newmain.c:383
+#: ../src/newmain.c:479
#, c-format
msgid "!gnaB !ziW - You feel rather normal.\n"
msgstr ""
-#: ../src/newmain.c:385
+#: ../src/newmain.c:481
#, c-format
msgid "You are already rather normal.\n"
msgstr ""
-#: ../src/newmain.c:414
+#: ../src/newmain.c:510
#, c-format
msgid "You have been sent to 'coventry' you are not allowed to talk to anyone..\n"
msgstr ""
-#: ../src/newmain.c:460
+#: ../src/newmain.c:556
#, c-format
msgid "Sorry, message is %d character%s too long (would be truncated to: '%s'). Try again.\n"
msgstr ""
-#: ../src/newmain.c:472
+#: ../src/newmain.c:568
#, c-format
msgid "You are marked as doing nothing.\n"
msgstr ""
-#: ../src/newmain.c:482
+#: ../src/newmain.c:578
#, c-format
msgid "Current folder = %s\n"
msgstr ""
-#: ../src/newmain.c:484
+#: ../src/newmain.c:580
#, c-format
msgid "You haven't read any messages in this folder yet.\n"
msgstr ""
-#: ../src/newmain.c:486
+#: ../src/newmain.c:582
#, c-format
msgid "You last read message %d.\n"
msgstr ""
-#: ../src/newmain.c:498
+#: ../src/newmain.c:594
#, c-format
msgid "You are not permitted to read this folder.\n"
msgstr ""
-#: ../src/newmain.c:508
+#: ../src/newmain.c:604
#, c-format
msgid "WARNING: This command should not be run whilst people are using\n"
msgstr ""
-#: ../src/newmain.c:509
+#: ../src/newmain.c:605
#, c-format
msgid " the bulletin board, please exercise caution.\n"
msgstr ""
-#: ../src/newmain.c:525
+#: ../src/newmain.c:621
#, c-format
msgid "Could not lockboard.\n"
msgstr ""
-#: ../src/newmain.c:529
+#: ../src/newmain.c:625
#, c-format
msgid "Board now locked.\n"
msgstr ""
-#: ../src/newmain.c:534
+#: ../src/newmain.c:630
#, c-format
msgid "Already Locked.\n"
msgstr ""
-#: ../src/newmain.c:541
+#: ../src/newmain.c:637
#, c-format
msgid "Board now unlocked.\n"
msgstr ""
-#: ../src/newmain.c:544
+#: ../src/newmain.c:640
#, c-format
msgid "Board not locked.\n"
msgstr ""
-#: ../src/newmain.c:546
+#: ../src/newmain.c:642
#, c-format
msgid "Do you want to lock or unlock it.\n"
msgstr ""
-#: ../src/newmain.c:575
+#: ../src/newmain.c:671
msgid "Enter old password: "
msgstr ""
-#: ../src/newmain.c:576
+#: ../src/newmain.c:672
#, c-format
msgid "Incorrect.\n"
msgstr ""
-#: ../src/newmain.c:580
+#: ../src/newmain.c:676
msgid "New password: "
msgstr ""
-#: ../src/newmain.c:583
+#: ../src/newmain.c:679
#, c-format
msgid "Did not match.\n"
msgstr ""
-#: ../src/newmain.c:588
+#: ../src/newmain.c:684
#, c-format
msgid "Password set.\n"
msgstr ""
-#: ../src/newmain.c:597
+#: ../src/newmain.c:693
#, c-format
msgid "You are already subscribed to %s.\n"
msgstr ""
-#: ../src/newmain.c:601
+#: ../src/newmain.c:697
#, c-format
msgid "Resubscribing to %s.\n"
msgstr ""
-#: ../src/newmain.c:608
+#: ../src/newmain.c:704
#, c-format
msgid "Already Unsubscribed from %s.\n"
msgstr ""
-#: ../src/newmain.c:625
+#: ../src/newmain.c:721
#, c-format
msgid "You are already at the beginning of the folder.\n"
msgstr ""
-#: ../src/newmain.c:631
+#: ../src/newmain.c:727
#, c-format
msgid "You are already at the end of this folder.\n"
msgstr ""
-#: ../src/newmain.c:643
+#: ../src/newmain.c:739
#, c-format
msgid "Current Status of %s\n"
msgstr ""
-#: ../src/newmain.c:644
+#: ../src/newmain.c:740
#, c-format
msgid "Your real name is %s\n"
msgstr ""
-#: ../src/newmain.c:645
+#: ../src/newmain.c:741
#, c-format
msgid "Your contact address is %s\n"
msgstr ""
-#: ../src/newmain.c:646
+#: ../src/newmain.c:742
#, c-format
msgid "Your current status is [%s]\n"
msgstr ""
-#: ../src/newmain.c:647
+#: ../src/newmain.c:743
#, c-format
msgid "Special settings are [%s]\n"
msgstr ""
-#: ../src/newmain.c:658
+#: ../src/newmain.c:754
#, c-format
msgid "Talker modes=[%s] privs=[%s] protection=[%s]\n"
msgstr ""
-#: ../src/newmain.c:664
+#: ../src/newmain.c:760
#, c-format
msgid "Talker modes=[%s] privs=[%s]\n"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
#, c-format
msgid "You have set messages %s.\n"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "off"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "on"
msgstr ""
-#: ../src/newmain.c:667
+#: ../src/newmain.c:763
#, c-format
msgid "You %s be informed of logins and logouts\n"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will not"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will"
msgstr ""
-#: ../src/newmain.c:668
+#: ../src/newmain.c:764
#, c-format
msgid "You %s hear beeps.\n"
msgstr ""
-#: ../src/newmain.c:671
+#: ../src/newmain.c:767
#, c-format
msgid "You can use wizchat"
msgstr ""
-#: ../src/newmain.c:673
+#: ../src/newmain.c:769
#, c-format
msgid ", but you will not hear any replies"
msgstr ""
-#: ../src/newmain.c:677
+#: ../src/newmain.c:773
#, c-format
msgid "You %s informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:679
+#: ../src/newmain.c:775
#, c-format
msgid "You belong to the following group(s) [%s]\n"
msgstr ""
-#: ../src/newmain.c:680
+#: ../src/newmain.c:776
#, c-format
msgid "You are currently in folder %s, which you "
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are"
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are not"
msgstr ""
-#: ../src/newmain.c:682
+#: ../src/newmain.c:778
#, c-format
msgid " subscribed to.\n"
msgstr ""
-#: ../src/newmain.c:684
+#: ../src/newmain.c:780
#, c-format
msgid "You will not be timed out for being idle.\n"
msgstr ""
-#: ../src/newmain.c:686
+#: ../src/newmain.c:782
#, c-format
msgid "You will be timed out after being idle for %s.\n"
msgstr ""
-#: ../src/newmain.c:705
+#: ../src/newmain.c:819
#, c-format
msgid "You have to read a message before you can reply to it.\n"
msgstr ""
-#: ../src/newmain.c:708
+#: ../src/newmain.c:822
#, c-format
msgid "Replying to message %d.\n"
msgstr ""
-#: ../src/newmain.c:722
+#: ../src/newmain.c:836
#, c-format
msgid "No folders found.\n"
msgstr ""
-#: ../src/newmain.c:727
+#: ../src/newmain.c:841
#, c-format
msgid "Marking ALL folders as read.\n"
msgstr ""
-#: ../src/newmain.c:747
+#: ../src/newmain.c:861
#, c-format
msgid "There is no folder '%s'\n"
msgstr ""
-#: ../src/newmain.c:753
+#: ../src/newmain.c:867
#, c-format
msgid "There is no folder %s\n"
msgstr ""
-#: ../src/newmain.c:764
+#: ../src/newmain.c:878
#, c-format
msgid "Marking folder %s as read.\n"
msgstr ""
-#: ../src/newmain.c:772
+#: ../src/newmain.c:886
#, c-format
msgid "Current time and date is %s"
msgstr ""
-#: ../src/newmain.c:840 ../src/newmain.c:864
+#: ../src/newmain.c:954 ../src/newmain.c:978
#, c-format
msgid "TIMEOUT must be at least 10 minutes.\n"
msgstr ""
-#: ../src/newmain.c:856
+#: ../src/newmain.c:970
#, c-format
msgid "Invalid time unit '%c' must be one of: dhms.\n"
msgstr ""
-#: ../src/newmain.c:870
+#: ../src/newmain.c:984
#, c-format
msgid "TIMEOUT now set to %s\n"
msgstr ""
-#: ../src/newmain.c:872
+#: ../src/newmain.c:986
#, c-format
msgid "TIMEOUT was already set to %s.\n"
msgstr ""
-#: ../src/newmain.c:887
+#: ../src/newmain.c:1001
#, c-format
msgid "Timestamps now disabled.\n"
msgstr ""
-#: ../src/newmain.c:889
+#: ../src/newmain.c:1003
#, c-format
msgid "Timestamping was already off.\n"
msgstr ""
-#: ../src/newmain.c:896
+#: ../src/newmain.c:1010
#, c-format
msgid "Timestamps now enabled.\n"
msgstr ""
-#: ../src/newmain.c:898
+#: ../src/newmain.c:1012
#, c-format
msgid "Timestamping already enabled.\n"
msgstr ""
-#: ../src/newmain.c:912
+#: ../src/newmain.c:1026
#, c-format
msgid "Posting information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:914
+#: ../src/newmain.c:1028
#, c-format
msgid "Posting info was already off.\n"
msgstr ""
-#: ../src/newmain.c:921
+#: ../src/newmain.c:1035
#, c-format
msgid "You will now be informed of new postings.\n"
msgstr ""
-#: ../src/newmain.c:923
+#: ../src/newmain.c:1037
#, c-format
msgid "Posting info was already on.\n"
msgstr ""
-#: ../src/newmain.c:937
+#: ../src/newmain.c:1051
#, c-format
msgid "User change information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:939
+#: ../src/newmain.c:1053
#, c-format
msgid "Change info was already off.\n"
msgstr ""
-#: ../src/newmain.c:946
+#: ../src/newmain.c:1060
#, c-format
msgid "You will now be informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:948
+#: ../src/newmain.c:1062
#, c-format
msgid "Change info was already on.\n"
msgstr ""
-#: ../src/newmain.c:959
+#: ../src/newmain.c:1073
#, c-format
msgid "Already in chat mode, silly.\n"
msgstr ""
-#: ../src/newmain.c:975
+#: ../src/newmain.c:1089
#, c-format
msgid "You are not allowed to change your contact address. Please notify a SuperUser to change this for you.\n"
msgstr ""
-#: ../src/newmain.c:982
+#: ../src/newmain.c:1096
#, c-format
msgid "Alias '%s' already exists. Has now been redefined!\n"
msgstr ""
-#: ../src/newmain.c:984
+#: ../src/newmain.c:1098
#, c-format
msgid "Alias '%s' added!\n"
msgstr ""
-#: ../src/newmain.c:992
+#: ../src/newmain.c:1106
#, c-format
msgid "All Aliases Destroyed!\n"
msgstr ""
-#: ../src/newmain.c:997
+#: ../src/newmain.c:1111
#, c-format
msgid "Alias '%s' was not found!\n"
msgstr ""
-#: ../src/newmain.c:999
+#: ../src/newmain.c:1113
#, c-format
msgid "Alias '%s' was destroyed...\n"
msgstr ""
-#: ../src/talker.c:446 ../src/talker.c:448
+#: ../src/talker.c:449 ../src/talker.c:451
#, c-format
msgid "Current mwrc path: %s\n"
msgstr ""
-#: ../src/talker.c:446
+#: ../src/talker.c:449
msgid "<unset>"
msgstr ""
-#: ../src/talker.c:454
+#: ../src/talker.c:457
#, c-format
msgid "Setting mwrc path to: %s\n"
msgstr ""
-#: ../src/talker.c:533
+#: ../src/talker.c:536
#, c-format
-msgid "User %s not logged on.\n"
+msgid "User '%s' is not logged on.\n"
msgstr ""
-#: ../src/user.c:90
+#: ../src/user.c:82
+msgid "Enter Password: "
+msgstr ""
+
+#: ../src/user.c:85
#, c-format
-msgid "Please enter username: "
+msgid ""
+"Login Incorrect.\n"
+"\n"
msgstr ""
-#: ../src/user.c:92
+#: ../src/user.c:93
#, c-format
-msgid "Please enter username [%s]: "
+msgid "Sorry, this username has been banned.\n"
msgstr ""
-#: ../src/user.c:106
+#: ../src/user.c:94
#, c-format
-msgid "Don't be shy.\n"
+msgid "Have a nice day. *:-)\n"
msgstr ""
-#: ../src/user.c:143
+#: ../src/user.c:102
#, c-format
-msgid "Problem in get_person: my uid=%d my euid=%d"
+msgid "Sorry, you do not have permission to run development versions of milliways.\n"
msgstr ""
-#: ../src/user.c:163
-msgid "Enter Password: "
+#: ../src/user.c:108
+#, c-format
+msgid "Hello %s.\n"
msgstr ""
-#: ../src/user.c:166
+#: ../src/user.c:138
#, c-format
-msgid ""
-"Login Incorrect.\n"
-"\n"
+msgid "Please enter username: "
msgstr ""
-#: ../src/user.c:174
+#: ../src/user.c:140
#, c-format
-msgid "Sorry, this username has been banned.\n"
+msgid "Please enter username [%s]: "
msgstr ""
-#: ../src/user.c:175
+#: ../src/user.c:154
#, c-format
-msgid "Have a nice day. *:-)\n"
+msgid "Don't be shy.\n"
msgstr ""
-#: ../src/user.c:183
+#: ../src/user.c:173
#, c-format
-msgid "Sorry, you do not have permission to run development versions of milliways.\n"
+msgid "Problem in get_person: my uid=%d my euid=%d"
msgstr ""
-#: ../src/user.c:189
+#: ../src/user.c:262
#, c-format
-msgid "Hello %s.\n"
+msgid "What status do you want to be ? [rms] "
msgstr ""
-#: ../src/user.c:198
+#: ../src/user.c:287
#, c-format
-msgid "Did I get your name right %s ? y/n: "
+msgid "Did I get your name right %s ? [Y]/n: "
msgstr ""
-#: ../src/user.c:207
+#: ../src/user.c:300
#, c-format
msgid ""
"Sorry, you do not have permission to run development versions of milliways.\n"
"Please log in again using the public version.\n"
msgstr ""
-#: ../src/user.c:214
+#: ../src/user.c:307
#, c-format
msgid "We use a password on this BB.\n"
msgstr ""
-#: ../src/user.c:217
+#: ../src/user.c:310
#, c-format
msgid "Passwords did not match.\n"
msgstr ""
-#: ../src/user.c:218
+#: ../src/user.c:311
msgid "Enter password: "
msgstr ""
-#: ../src/user.c:219
+#: ../src/user.c:312
msgid "Re-enter password: "
msgstr ""
-#: ../src/user.c:224
+#: ../src/user.c:317
#, c-format
msgid ""
"\n"
"Please enter the following details so that we can register you as a\n"
msgstr ""
-#: ../src/user.c:225
+#: ../src/user.c:318
#, c-format
msgid "normal user of this bulletin board. without correct information you\n"
msgstr ""
-#: ../src/user.c:226
+#: ../src/user.c:319
#, c-format
msgid "will not be allowed to use the full facilities of this board.\n"
msgstr ""
-#: ../src/user.c:227
+#: ../src/user.c:320
#, c-format
msgid ""
"\n"
"DATA PROTECTION ACT:\n"
msgstr ""
-#: ../src/user.c:228
+#: ../src/user.c:321
#, c-format
msgid "Any data entered will be recorded in a computer database for the purpose\n"
msgstr ""
-#: ../src/user.c:229
+#: ../src/user.c:322
#, c-format
msgid "of the administration, operation and security of the computer society. By \n"
msgstr ""
-#: ../src/user.c:230
+#: ../src/user.c:323
#, c-format
msgid "entering this data you consent to the storage of this data, and become an\n"
msgstr ""
-#: ../src/user.c:231
+#: ../src/user.c:324
#, c-format
msgid "associate member of the society.\n"
msgstr ""
-#: ../src/user.c:232
+#: ../src/user.c:325
#, c-format
msgid ""
"\n"
@@ -2114,32 +2125,27 @@
"\n"
msgstr ""
-#: ../src/user.c:235
+#: ../src/user.c:328
#, c-format
msgid "Real Name: "
msgstr ""
-#: ../src/user.c:240
+#: ../src/user.c:333
#, c-format
msgid "User record '%s' cancelled.\n"
msgstr ""
-#: ../src/user.c:241
+#: ../src/user.c:334
#, c-format
msgid "Goodbye.\n"
msgstr ""
-#: ../src/user.c:247
+#: ../src/user.c:340
#, c-format
msgid "Email address: "
msgstr ""
-#: ../src/user.c:256
+#: ../src/user.c:349
#, c-format
msgid "Creating new user %s\n"
msgstr ""
-
-#: ../src/user.c:338
-#, c-format
-msgid "What status do you want to be ? [rms] "
-msgstr ""
Modified: trunk/po/el_GR.po
===================================================================
--- trunk/po/el_GR.po 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/po/el_GR.po 2012-11-17 19:57:05 UTC (rev 1288)
@@ -8,71 +8,72 @@
msgstr ""
"Project-Id-Version: gr\n"
"Report-Msgid-Bugs-To: mw-devel at lists.sucs.org\n"
-"POT-Creation-Date: 2009-12-16 19:55+0000\n"
+"POT-Creation-Date: 2012-11-17 19:52+0000\n"
"PO-Revision-Date: 2004-01-29 21:18+0200\n"
"Last-Translator: Bill Giannakopoulos <hstg at billg.gr>\n"
"Language-Team: el_GR <el at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
-#: ../src/add.c:51
+#: ../src/add.c:127
#, c-format
msgid "Not allowed to write to this folder.\n"
msgstr "Δεν επιτρέπεται η εγγραφή στο φάκελο αυτό.\n"
-#: ../src/add.c:60
+#: ../src/add.c:136
#, c-format
msgid "Writing in folder %s.\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/add.c:62
+#: ../src/add.c:138
#, c-format
msgid "Replying to message %d in folder %s\n"
msgstr "Απάντηση στο μήνυμα %d στο φάκελο %s\n"
-#: ../src/add.c:67
+#: ../src/add.c:143
#, c-format
msgid "Note: Operators have the right to read any 'private' messages.\n"
msgstr "Σημείωση: Οι Χειριστές έχουν το δικαίωμα να διαβάσουν τα προσωπικά μηνύματα.\n"
-#: ../src/add.c:68
+#: ../src/add.c:144
#, c-format
msgid " : If you don't like this, don't write private messages.\n"
msgstr " : Αν δεν σας αρέσει αυτό, μην γράφετε προσωπικά μηνύματα.\n"
-#: ../src/add.c:86
+#: ../src/add.c:162
#, c-format
msgid "There is no message %d\n"
msgstr "Δεν υπάρχει μήνυμα %d\n"
-#: ../src/add.c:96
+#: ../src/add.c:172
#, c-format
msgid "reply: Error, could not find old message !\n"
msgstr "απάντηση: Σφάλμα, αδυναμία εύρεσης παλαιού μηνύματος !\n"
-#: ../src/add.c:112
+#: ../src/add.c:188
#, c-format
msgid "Message from %s\n"
msgstr "Μήνυμα από %s\n"
-#: ../src/add.c:117 ../src/add.c:139
+#: ../src/add.c:193 ../src/add.c:215
#, c-format
msgid "Send to: "
msgstr "Αποστολή σε: "
-#: ../src/add.c:123 ../src/add.c:143
+#: ../src/add.c:199 ../src/add.c:219
#, c-format
msgid "Message must be addressed to an existing user.\n"
msgstr "Το μήνυμα πρέπει να έχει τη διεύθυνση ενός υπάρχοντος χρήστη.\n"
-#: ../src/add.c:128 ../src/add.c:135 ../src/edit.c:855
+#: ../src/add.c:204 ../src/add.c:211 ../src/edit.c:916
#, c-format
msgid "Subject: "
msgstr "Θέμα: "
-#: ../src/add.c:133
+#: ../src/add.c:209
#, c-format
msgid ""
"\n"
@@ -81,197 +82,197 @@
"\n"
"Εισάγετε το θέμα ή πατήστε <ENTER> για να δεχτείτε το παλιό.\n"
-#: ../src/add.c:134
+#: ../src/add.c:210
#, c-format
msgid "Subject: %s\n"
msgstr "Θέμα: %s\n"
-#: ../src/add.c:163
+#: ../src/add.c:239
#, c-format
msgid "Enter message ending with a . on a new line\n"
msgstr "Εισάγετε το τέλος του μηνύματος με ένα . σε νέα γραμμή\n"
-#: ../src/add.c:195
+#: ../src/add.c:271
#, c-format
msgid "Post message, edit, reformat, or Abandon ?"
msgstr "Αποστολή μηνύματος, επεξεργασία, αναδιαμόρφωση, ή Ματαίωση;"
-#: ../src/add.c:198
+#: ../src/add.c:274
msgid "abandon"
msgstr "ματαίωση"
-#: ../src/add.c:205
+#: ../src/add.c:281
msgid "reformat"
msgstr "αναδιαμόρφωση"
-#: ../src/add.c:207
+#: ../src/add.c:283
#, c-format
msgid "Reformatting..."
msgstr "Αναδιαμόρφωση..."
-#: ../src/add.c:210
+#: ../src/add.c:286
#, c-format
msgid "Done.\r\n"
msgstr "Έγινε.\r\n"
-#: ../src/add.c:212
+#: ../src/add.c:288
msgid "edit"
msgstr "επεξεργασία"
-#: ../src/add.c:231 ../src/edit.c:771
+#: ../src/add.c:307 ../src/edit.c:832
#, c-format
msgid "Failed to set user id, aborting.\n"
msgstr "Αποτυχία ορισμού νέας ταυτότητας χρήστη, ματαίωση.\n"
-#: ../src/add.c:251
+#: ../src/add.c:327
#, c-format
msgid "Cannot create temporary file: %s\n"
msgstr "Αδυναμία δημιουργίας προσωρινού αρχείου: %s\n"
-#: ../src/add.c:274 ../src/edit.c:804
+#: ../src/add.c:350 ../src/edit.c:865
#, c-format
msgid "ERROR: Could not spawn editor: %s\n"
msgstr "ΣΦΑΛΜΑ: Δεν μπορώ να ξεκινήσω τον επεξεργαστή: %s\n"
-#: ../src/add.c:282
+#: ../src/add.c:358
#, c-format
msgid "ERROR: child wait (%d) %s\n"
msgstr "ΣΦΑΛΜΑ: αναμονή αποτελέσματος (%d) %s\n"
-#: ../src/add.c:304
+#: ../src/add.c:380
msgid "post"
msgstr "αποστολή"
-#: ../src/add.c:346
+#: ../src/add.c:422
#, c-format
msgid "Warning: Index error, skipping back %ld bytes.\r\n"
msgstr "Ειδοποίηση: Σφάλμα ευρετηρίου, παράβλεψη προς τα πίσω %ld δεδομένων.\r\n"
-#: ../src/add.c:369
+#: ../src/add.c:445
#, c-format
msgid "Warning: incomplete folder record written; folder file may be corrupt.\n"
msgstr "Προειδοποίηση: ανολοκλήρωτη εγγραφή φακέλου εγγραφής, το αρχείο στο φάκελο μπορεί να είναι κατεστραμμένο.\n"
-#: ../src/alias.c:124 ../src/alias.c:134 ../src/alias.c:148 ../src/main.c:1003
-#: ../src/user.c:384 ../src/user.c:422 ../src/user.c:488
+#: ../src/alias.c:127 ../src/alias.c:137 ../src/alias.c:151 ../src/main.c:1021
+#: ../src/user.c:415 ../src/user.c:452 ../src/user.c:518
#, c-format
msgid "---more---\r"
msgstr "---περισσότερα---\r"
-#: ../src/edit.c:41
+#: ../src/edit.c:148
#, c-format
msgid "Username %s not found.\n"
msgstr "Το όνομα χρήστη %s δε βρέθηκε.\n"
-#: ../src/edit.c:55
+#: ../src/edit.c:162
#, c-format
msgid "Current status set to [%s]\n"
msgstr "Η τρέχουσα κατάσταση ορίζεται σε [%s]\n"
-#: ../src/edit.c:58
+#: ../src/edit.c:165
#, c-format
msgid "New status [+-=][%s]: "
msgstr "Νέα κατάσταση [+-=][%s]: "
-#: ../src/edit.c:67
+#: ../src/edit.c:174
#, c-format
msgid "Do you really want to delete this user ? "
msgstr "Θέλετε σίγουρα να διαγράψετε αυτό το χρήστη; "
-#: ../src/edit.c:76
+#: ../src/edit.c:183
#, c-format
msgid "Status set to [%s].\n"
msgstr "Η κατάσταση ορίστηκε σε [%s].\n"
-#: ../src/edit.c:90
+#: ../src/edit.c:197
#, c-format
msgid "Current specials set to [%s]\n"
msgstr "Τα τρέχουσα ειδικά ορίστηκαν σε [%s]\n"
-#: ../src/edit.c:93
+#: ../src/edit.c:200
#, c-format
msgid "New specials [+-=][%s]: "
msgstr "Νέα ειδικά [+-=][%s]: "
-#: ../src/edit.c:99
+#: ../src/edit.c:206
#, c-format
msgid "Specials set to [%s].\n"
msgstr "Τα ειδικά ορίστηκαν σε [%s].\n"
-#: ../src/edit.c:112
+#: ../src/edit.c:219
#, c-format
msgid "Current chatprivs set to [%s]\n"
msgstr "Τα τρέχοντα προσωπικά μηνύματα ορίστικαν σε [%s]\n"
-#: ../src/edit.c:113
+#: ../src/edit.c:220
#, c-format
msgid "New chatprivs [+-=][%s]: "
msgstr "Νέα προσωπικά μηνύματα [+-=][%s]: "
-#: ../src/edit.c:118
+#: ../src/edit.c:225
#, c-format
msgid "Chatprivs set to [%s].\n"
msgstr "Τα προσωπικά μηνύματα ορίστικαν σε [%s].\n"
-#: ../src/edit.c:136
+#: ../src/edit.c:243
#, c-format
msgid "Current protection set to %s\n"
msgstr "Η τρέχουσα προστασία ορίστηκε σε %s\n"
-#: ../src/edit.c:137
+#: ../src/edit.c:244
#, c-format
msgid "New levels [0-4]/[0-4]: "
msgstr "Νέα επίπεδα [0-4]/[0-4]: "
-#: ../src/edit.c:148
+#: ../src/edit.c:255
#, c-format
msgid "Protection set to %d/%d.\n"
msgstr "Η προστασία ορίστικε σε %d/%d.\n"
-#: ../src/edit.c:158
+#: ../src/edit.c:265
#, c-format
msgid "Invalid protection level.\n"
msgstr "Εσφαλμένο επίπεδο προστασίας.\n"
-#: ../src/edit.c:168
+#: ../src/edit.c:275
#, c-format
msgid "Current chatmode set to [%s]\n"
msgstr "Η τρέχουσα κατάσταση ομιλίας ορίστηκε σε [%s]\n"
-#: ../src/edit.c:169
+#: ../src/edit.c:276
#, c-format
msgid "New chatmode [+-=][%s]: "
msgstr "Νέα κατάσταση ομιλίας [+-=][%s]: "
-#: ../src/edit.c:174
+#: ../src/edit.c:281
#, c-format
msgid "Chatmode set to [%s].\n"
msgstr "Η κατάσταση ομιλίς ορίστηκε σε [%s].\n"
-#: ../src/edit.c:191
+#: ../src/edit.c:298
#, c-format
msgid "User currently in groups [%s]\n"
msgstr "Ο χρήστης τώρα σε ομάδες [%s]\n"
-#: ../src/edit.c:192
+#: ../src/edit.c:299
#, c-format
msgid "New Groups [+-=][12345678]: "
msgstr "Νέες Ομάδες [+-=][12345678]: "
-#: ../src/edit.c:202 ../src/edit.c:596
+#: ../src/edit.c:309 ../src/edit.c:675
#, c-format
msgid "Groups changed to [%s]\n"
msgstr "Οι ομάδες άλλαξαν σε [%s]\n"
-#: ../src/edit.c:211
+#: ../src/edit.c:318
msgid "New Passwd: "
msgstr "Νέο συνθηματικό: "
-#: ../src/edit.c:212 ../src/newmain.c:581
+#: ../src/edit.c:319 ../src/newmain.c:677
msgid "Again: "
msgstr "Ξανά: "
-#: ../src/edit.c:215
+#: ../src/edit.c:322
#, c-format
msgid ""
"Passwords did not match.\n"
@@ -280,172 +281,172 @@
"Τα συνθηματικά δεν ταιριάζουν.\n"
"Δεν έγινε.\n"
-#: ../src/edit.c:220
+#: ../src/edit.c:327
#, c-format
msgid "Password changed.\n"
msgstr "Το συνθηματικό άλλαξε.\n"
-#: ../src/edit.c:232
+#: ../src/edit.c:339
#, c-format
msgid "Real Name: %s\n"
msgstr "Αληθινό Όνομα: %s\n"
-#: ../src/edit.c:233
+#: ../src/edit.c:340
#, c-format
msgid "Enter new name (%d chars): "
msgstr "Εισαγωγη νέου ονόματος (%d χαρακτήρες): "
-#: ../src/edit.c:239 ../src/edit.c:314
+#: ../src/edit.c:346 ../src/edit.c:421
#, c-format
msgid "New name set.\n"
msgstr "Το νέο όνομα ορίστηκε.\n"
-#: ../src/edit.c:253
+#: ../src/edit.c:360
#, c-format
msgid "User currently in room [%d]\n"
msgstr "Ο χρήστης βρίσκεται στο κανάλι [%d]\n"
-#: ../src/edit.c:254
+#: ../src/edit.c:361
#, c-format
msgid "New Room: [0-65535]: "
msgstr "Νέο Κανάλι: [0-65535]: "
-#: ../src/edit.c:260 ../src/edit.c:266
+#: ../src/edit.c:367 ../src/edit.c:373
#, c-format
msgid "Invalid Room ID (0-65535 only)\n"
msgstr "Εσφαλμένη Ταυτότητα Καναλιού (μόνο 0-65535)\n"
-#: ../src/edit.c:272
+#: ../src/edit.c:379
#, c-format
msgid "Room changed to %d.\n"
msgstr "Το κανάλι άλλαξε σε %d.\n"
-#: ../src/edit.c:282
+#: ../src/edit.c:389
#, c-format
msgid "WARNING: This command can be very dangerous !\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτή η εντολή μπορεί να είναι πολύ επικίνδυνη !\n"
-#: ../src/edit.c:283
+#: ../src/edit.c:390
#, c-format
msgid "User Name: %s\n"
msgstr "Όνομα Χρήστη: %s\n"
-#: ../src/edit.c:284
+#: ../src/edit.c:391
#, c-format
msgid "Enter new username (%d chars): "
msgstr "Εισαγωγή νέου ονόματος χρήστη (%d χαρακτήρες): "
-#: ../src/edit.c:301
+#: ../src/edit.c:408
#, c-format
msgid "You cannot change a username to one that already exists.\n"
msgstr "Δεν μπορείτε να αλλάξετε ένα όνομα χρήστη σε κάποιο που υπάρχει ήδη.\n"
-#: ../src/edit.c:304
+#: ../src/edit.c:411
#, c-format
msgid "Attempting to update existing user.\n"
msgstr "Προσπάθεια ενημέρωσης νέου χρήστη.\n"
-#: ../src/edit.c:307
+#: ../src/edit.c:414
#, c-format
msgid "Are you sure you want to change user '%s' into user '%s' ? "
msgstr "Είστε σιγουρος ότι θέλετε να αλλάξετε το χρήστη '%s' σε χρήστη '%s' ; "
-#: ../src/edit.c:318 ../src/edit.c:320
+#: ../src/edit.c:425 ../src/edit.c:427
#, c-format
msgid "Change Cancelled.\n"
msgstr "Η αλλαγή ακυρώθηκε.\n"
-#: ../src/edit.c:325 ../src/edit.c:977
+#: ../src/edit.c:432 ../src/edit.c:986
#, c-format
msgid "Contact address: %s\n"
msgstr "Διεύθυνση επικοινωνίας: %s\n"
-#: ../src/edit.c:326 ../src/edit.c:978
+#: ../src/edit.c:433 ../src/edit.c:987
#, c-format
msgid "New address (%d chars): "
msgstr "Νέα διεύθυνση (%d χαρακτήρες): "
-#: ../src/edit.c:332 ../src/edit.c:983
+#: ../src/edit.c:439 ../src/edit.c:992
#, c-format
msgid "New address set.\n"
msgstr "Η νέα διεύθυνση ορίστηκε.\n"
-#: ../src/edit.c:340
+#: ../src/edit.c:447
#, fuzzy, c-format
msgid "Current Status: %s\n"
msgstr "Η τρέχουσα κατάσταση ορίζεται σε [%s]\n"
-#: ../src/edit.c:341
+#: ../src/edit.c:448
#, fuzzy, c-format
msgid "New Status (%d chars): "
msgstr "Νέα διεύθυνση (%d χαρακτήρες): "
-#: ../src/edit.c:348 ../src/edit.c:355
+#: ../src/edit.c:455 ../src/edit.c:462
#, fuzzy, c-format
msgid "New status set.\n"
msgstr "Το νέο όνομα ορίστηκε.\n"
-#: ../src/edit.c:365
+#: ../src/edit.c:472
#, c-format
msgid "Timeout: %ld sec.\n"
msgstr "Τέλος χρόνου: %ld δεύτερα.\n"
-#: ../src/edit.c:366
+#: ../src/edit.c:473
#, fuzzy, c-format
msgid "New timeout value: "
msgstr "Νέα τιμή για τέλος χρόνου (δευτερόλεπτα): "
-#: ../src/edit.c:387
+#: ../src/edit.c:494
#, c-format
msgid "TIMEOUT now disabled.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ απενεργοποιήθηκε.\n"
-#: ../src/edit.c:393
+#: ../src/edit.c:500
#, c-format
msgid "TIMEOUT was already disabled.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ έχει ήδη απενεργοποιηθεί.\n"
-#: ../src/edit.c:398
+#: ../src/edit.c:505
#, fuzzy, c-format
msgid "TIMEOUT must be be at least 10 minutes (600), or 0 to disable.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ πρέπει να είνα ιμεταξύ 10 λεπτά (600), και 3 'ώρες (10800), or 0 to disable.\n"
-#: ../src/edit.c:406
+#: ../src/edit.c:513
#, c-format
msgid "New timeout set to %ld seconds.\n"
msgstr "Νέο τέλος χρόνου ορισμένο στα %ld seconds.\n"
-#: ../src/edit.c:416
+#: ../src/edit.c:522
#, c-format
msgid "Lastread in folder? "
msgstr "Τελευταία ανάγνωση στο φάκελο; "
-#: ../src/edit.c:421
+#: ../src/edit.c:527
#, c-format
msgid "Folder not found.\n"
msgstr "Ο φάκελος δεν βρέθηκε.\n"
-#: ../src/edit.c:424
+#: ../src/edit.c:530
#, c-format
msgid "Last read message number %d\n"
msgstr "Τελευταίο ανεγνωσμένο μήνυμα αριθμό %d\n"
-#: ../src/edit.c:425
+#: ../src/edit.c:531
#, c-format
msgid "New lastread: "
msgstr "Νέο τελευταίο αναγνωσμένο: "
-#: ../src/edit.c:431
+#: ../src/edit.c:537
#, c-format
msgid "Lastread changed to %d\n"
msgstr "Το τελευταίο αναγνωσμένο άλλαξε σε %d\n"
-#: ../src/edit.c:435
+#: ../src/edit.c:541
#, c-format
msgid "Not changed.\n"
msgstr "Χωρίς αλλαγές.\n"
-#: ../src/edit.c:445
+#: ../src/edit.c:551
#, c-format
msgid ""
"Username: %s\n"
@@ -454,7 +455,7 @@
"Όνομα χρήστη: %s\n"
"Αληθινό Όνομα: %s\n"
-#: ../src/edit.c:446
+#: ../src/edit.c:552
#, c-format
msgid ""
"Contact: %s\n"
@@ -463,62 +464,62 @@
"Επικοινωνία: %s\n"
"Κατάσταση [%s]\tΕιδικά [%s]\n"
-#: ../src/edit.c:449 ../src/edit.c:658
+#: ../src/edit.c:555 ../src/edit.c:737
#, c-format
msgid "Groups [%s]\n"
msgstr "Ομάδες [%s]\n"
-#: ../src/edit.c:452
+#: ../src/edit.c:558
#, c-format
msgid "Talker: Modes=[%s] Privs=[%s] Protection=[%s]\n"
msgstr "Ομιλητής: Καταστάσεις=[%s] Ιδιαίτερα=[%s] Προστασία=[%s]\n"
-#: ../src/edit.c:458
+#: ../src/edit.c:564
#, c-format
msgid "Timeout disabled.\n"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/edit.c:460
+#: ../src/edit.c:566
#, c-format
msgid "Timeout set to %s.\n"
msgstr "Το τέλος χρόνου ορίστηκε σε %s.\n"
-#: ../src/edit.c:462
+#: ../src/edit.c:568
#, c-format
msgid "Last Login: %s"
msgstr "Τελευταία Σύνδεση: %s"
-#: ../src/edit.c:465
+#: ../src/edit.c:571
#, fuzzy, c-format
msgid "Status: %s (%s ago)\n"
msgstr "Η θέση είναι ορισμένη σε [%s]\n"
-#: ../src/edit.c:471
+#: ../src/edit.c:577
#, c-format
msgid "Are you sure you want to clear %s's ignore list? "
msgstr "Είστε σίγουρος ότι θέλετε να καθαρίσετε την λίστα αγνόησης του %s; "
-#: ../src/edit.c:477
+#: ../src/edit.c:583
#, c-format
msgid "Ignorelist Cleared.\n"
msgstr "Η λίστα Αγνόησης Καθάρισε.\n"
-#: ../src/edit.c:481
+#: ../src/edit.c:587
#, c-format
msgid "Clear Cancelled.\n"
msgstr "Η Εκαθάριση Ακυρώθηκε.\n"
-#: ../src/edit.c:484
+#: ../src/edit.c:590
#, c-format
msgid "Unknown Command\n"
msgstr "Άγνωστη Εντολή\n"
-#: ../src/edit.c:549
+#: ../src/edit.c:628
#, c-format
msgid "Unknown folder name.\n"
msgstr "Άγνωστο όνομα φακέλου.\n"
-#: ../src/edit.c:556
+#: ../src/edit.c:635
#, c-format
msgid ""
"Folder %s\n"
@@ -527,97 +528,97 @@
"Φάκελος %s\n"
"Τρέχουσα κατάσταση:-\n"
-#: ../src/edit.c:557
+#: ../src/edit.c:636
#, c-format
msgid "User not in group [%s]\n"
msgstr "Ο χρήστης δεν είναι στην ομάδα [%s]\n"
-#: ../src/edit.c:559
+#: ../src/edit.c:638
#, c-format
msgid "User in group [%s]\n"
msgstr "Ο χρήστης στην ομάδα [%s]\n"
-#: ../src/edit.c:560
+#: ../src/edit.c:639
#, c-format
msgid "Change to :-\n"
msgstr "Αλλαγή σε :-\n"
-#: ../src/edit.c:561
+#: ../src/edit.c:640
#, c-format
msgid "User not in group [+-=][arwRWpm]: "
msgstr "Ο χρήστης δεν είναι σε ομάδα [+-=][arwRWpm]: "
-#: ../src/edit.c:568 ../src/edit.c:579
+#: ../src/edit.c:647 ../src/edit.c:658
#, c-format
msgid "Status changed to [%s]\n"
msgstr "Η κατάσταση άλλαξε σε [%s]\n"
-#: ../src/edit.c:570 ../src/edit.c:581
+#: ../src/edit.c:649 ../src/edit.c:660
#, c-format
msgid "WARNING: folder may get written over by the next folder created.\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ο φάκελος μπορεί να γραφτείαπό πάνω από τον επόμενο φάκελο που δημιουργείται.\n"
-#: ../src/edit.c:572
+#: ../src/edit.c:651
#, c-format
msgid "User in group [+-=][arwRWpm]: "
msgstr "Ο χρήστης στην ομάδα [+-=][arwRWpm]: "
-#: ../src/edit.c:588
+#: ../src/edit.c:667
#, c-format
msgid "Folder %s is currently in groups [%s]\n"
msgstr "Ο φάκελος %s είναι τώρα στις ομάδες [%s]\n"
-#: ../src/edit.c:589
+#: ../src/edit.c:668
#, c-format
msgid "Folder groups [+-=][12345678]: "
msgstr "Φάκελος ομάδων [+-=][12345678]: "
-#: ../src/edit.c:601
+#: ../src/edit.c:680
#, c-format
msgid "Current folder name = %s\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/edit.c:602
+#: ../src/edit.c:681
#, c-format
msgid "Change to ? (%d chars): "
msgstr "Αλλαγή σε ? (%d χαρακτήρες): "
-#: ../src/edit.c:626
+#: ../src/edit.c:705
#, c-format
msgid "Name changed to %s\n"
msgstr "Το όνομα άλλαξε σε %s\n"
-#: ../src/edit.c:631
+#: ../src/edit.c:710
#, c-format
msgid "First Message in folder is %d\n"
msgstr "Το πρώτο μήνυμα στο φάκελο είναι %d\n"
-#: ../src/edit.c:632
+#: ../src/edit.c:711
#, c-format
msgid "New first message: "
msgstr "Νέο πρώτο μήνυμα: "
-#: ../src/edit.c:637
+#: ../src/edit.c:716
#, c-format
msgid "First message set to %d\n"
msgstr "Το πρώτο μήνυμα ορίστηκε σε %d\n"
-#: ../src/edit.c:639
+#: ../src/edit.c:718
#, c-format
msgid "Last Message in folder is %d\n"
msgstr "Το τελευταίο μήνυμα στο φάκελο είναι %d\n"
-#: ../src/edit.c:640
+#: ../src/edit.c:719
#, c-format
msgid "New Last message: "
msgstr "Νέο Τελευταίο Μήνυμα: "
-#: ../src/edit.c:645
+#: ../src/edit.c:724
#, c-format
msgid "Last message set to %d\n"
msgstr "Το τελευταίο μήνυμα ορίστηκε σε %d\n"
-#: ../src/edit.c:652
+#: ../src/edit.c:731
#, c-format
msgid ""
"\n"
@@ -630,188 +631,188 @@
"Θέμα: %s\n"
"Μήκος μηνύματος %d σε %d\n"
-#: ../src/edit.c:654
+#: ../src/edit.c:733
#, c-format
msgid "Status (out of group) [%s]"
msgstr "Κατάστση (εκτός ομάδας) [%s]"
-#: ../src/edit.c:656
+#: ../src/edit.c:735
#, c-format
msgid " (in group) [%s]\n"
msgstr " (στην ομάδα) [%s]\n"
-#: ../src/edit.c:663
+#: ../src/edit.c:742
#, c-format
msgid "Current folder topic = '%s'\n"
msgstr "Τρέχων θέμα φακέλου = '%s'\n"
-#: ../src/edit.c:664
+#: ../src/edit.c:743
#, c-format
msgid "New topic (%d chars): "
msgstr "Νέο θέμα (%d χαρακτήρες): "
-#: ../src/edit.c:669
+#: ../src/edit.c:748
#, c-format
msgid "Topic changed to '%s'\n"
msgstr "Το θέμα άλλαξε σε '%s'\n"
-#: ../src/edit.c:675
+#: ../src/edit.c:754
#, c-format
msgid "Do you really want to delete folder %s ?(yes/no) "
msgstr "Είστε σίγουρος ότι θέλετε να διαγράψετε το φάκελο %s ?(yes/no) "
-#: ../src/edit.c:694
+#: ../src/edit.c:773
#, c-format
msgid "Folder Deleted.\n"
msgstr "Ο φάκελος διεγράφη.\n"
-#: ../src/edit.c:698 ../src/edit.c:849 ../src/edit.c:862
+#: ../src/edit.c:777 ../src/edit.c:910 ../src/edit.c:923
#, c-format
msgid "Not Done.\n"
msgstr "Δεν έγινε.\n"
-#: ../src/edit.c:748
+#: ../src/edit.c:809
#, c-format
msgid "Message %d not found.\n"
msgstr "Το μήνυμα %d δεν βρέθηκε.\n"
-#: ../src/edit.c:757
+#: ../src/edit.c:818
#, c-format
msgid "You cannot edit other peoples messages.\n"
msgstr "Δεν μπορείτε να επεξεργαστείτε τα μηνύματα άλλων.\n"
-#: ../src/edit.c:841
+#: ../src/edit.c:902
#, c-format
msgid "Currently to '%s'.\n"
msgstr "Τρέχοντα σε '%s'.\n"
-#: ../src/edit.c:842
+#: ../src/edit.c:903
#, c-format
msgid "to: "
msgstr "σε: "
-#: ../src/edit.c:846
+#: ../src/edit.c:907
#, c-format
msgid "Message now to '%s'\n"
msgstr "Μήνυμα τώρα στον '%s'\n"
-#: ../src/edit.c:854
+#: ../src/edit.c:915
#, c-format
msgid "Current subject is '%s'.\n"
msgstr "Το τρέχων θέμα είναι '%s'.\n"
-#: ../src/edit.c:859
+#: ../src/edit.c:920
#, c-format
msgid "Subject '%s'\n"
msgstr "Θέμα '%s'\n"
-#: ../src/edit.c:867
+#: ../src/edit.c:928
#, c-format
msgid "Message Marked for deletion.\n"
msgstr "Το μήνυμα σημειώθηκε για διαγραφή.\n"
-#: ../src/edit.c:872
+#: ../src/edit.c:933
#, c-format
msgid "Message has been undeleted.\n"
msgstr "Το μήνυμα επαναφέρθηκε.\n"
-#: ../src/edit.c:878
+#: ../src/edit.c:939
#, c-format
msgid "Status mode is currently %s\n"
msgstr "Κατάσταση θέσης είναι τώρα %s\n"
-#: ../src/edit.c:880
+#: ../src/edit.c:941
#, c-format
msgid "New status [%s]: "
msgstr "Νέα θέση [%s]: "
-#: ../src/edit.c:886 ../src/user.c:342
+#: ../src/edit.c:947 ../src/user.c:270
#, c-format
msgid "Status set to [%s]\n"
msgstr "Η θέση είναι ορισμένη σε [%s]\n"
-#: ../src/edit.c:890
+#: ../src/edit.c:951
#, c-format
msgid "What do you want to do ?\n"
msgstr "Τι θέλετε να κάνω; \n"
-#: ../src/edit.c:911
+#: ../src/edit.c:972
#, c-format
msgid "Total Login Time of "
msgstr "Συνολικός Χρόνος Σύνδεσης του "
-#: ../src/edit.c:913
+#: ../src/edit.c:974
#, c-format
msgid "%d day%s, "
msgstr "%d μέρα%s, "
-#: ../src/edit.c:915
+#: ../src/edit.c:976
#, c-format
msgid "%d hour%s, "
msgstr "%d ώρα%s, "
-#: ../src/edit.c:917
+#: ../src/edit.c:978
#, c-format
msgid "%d minute%s, "
msgstr "%d λεπτό%s, "
-#: ../src/edit.c:918
+#: ../src/edit.c:979
#, c-format
msgid "%d second%s.\n"
msgstr "%d δευτερόλεπτο%s.\n"
-#: ../src/folders.c:32
+#: ../src/folders.c:40
#, c-format
msgid "Sorry, no space for a new folder.\n"
msgstr ""
-#: ../src/folders.c:40
+#: ../src/folders.c:48
#, fuzzy, c-format
msgid "Create new folder :\n"
msgstr "Τελευταία ανάγνωση στο φάκελο; "
-#: ../src/folders.c:41
+#: ../src/folders.c:49
#, fuzzy, c-format
msgid "Folder name (%d chars): "
msgstr "Εισαγωγη νέου ονόματος (%d χαρακτήρες): "
-#: ../src/folders.c:44
+#: ../src/folders.c:52
#, fuzzy, c-format
msgid "Folder topic (%d chars): "
msgstr "Νέο θέμα (%d χαρακτήρες): "
-#: ../src/folders.c:46
+#: ../src/folders.c:54
#, fuzzy, c-format
msgid "Folder status (not in group) (arwRWpm): "
msgstr "Ο χρήστης δεν είναι σε ομάδα [+-=][arwRWpm]: "
-#: ../src/folders.c:49
+#: ../src/folders.c:57
#, fuzzy, c-format
msgid "Folder status (in group) (arwRWpm): "
msgstr "Ο χρήστης δεν είναι σε ομάδα [+-=][arwRWpm]: "
-#: ../src/folders.c:52
+#: ../src/folders.c:60
#, fuzzy, c-format
msgid "Folder groups (12345678): "
msgstr "Φάκελος ομάδων [+-=][12345678]: "
-#: ../src/folders.c:57
+#: ../src/folders.c:65
#, fuzzy, c-format
msgid "Creating folder %s - %s\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/incoming.c:552
+#: ../src/incoming.c:522
#, fuzzy, c-format
msgid ""
"\n"
"Your name has been changed to '%s'\n"
msgstr "Το όνομα άλλαξε σε %s\n"
-#: ../src/incoming.c:697
+#: ../src/incoming.c:667
msgid "*** Your ignore list has just been cleared ***"
msgstr ""
-#: ../src/incoming.c:706
+#: ../src/incoming.c:676
#, c-format
msgid ""
"\n"
@@ -819,7 +820,7 @@
"--> You appear to have been banned. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:712
+#: ../src/incoming.c:682
#, c-format
msgid ""
"\n"
@@ -827,185 +828,194 @@
"--> You appear to have been DELETED. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
#, c-format
msgid ""
"\n"
"Boing, Zebedee arrived. \"%s--\", said Zebedee\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
#, fuzzy
msgid "Time for bed"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/incoming.c:930
+#: ../src/incoming.c:900
#, c-format
msgid "%s just sent the Zebedee of Death to you.\n"
msgstr ""
-#: ../src/incoming.c:960
+#: ../src/incoming.c:930
#, c-format
msgid "Boing, Zebedee's arrived. \"Look up!\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:961
+#: ../src/incoming.c:931
#, c-format
msgid "You look up; a large object is falling towards you very fast,\n"
msgstr ""
-#: ../src/incoming.c:962
+#: ../src/incoming.c:932
#, c-format
msgid "very very fast. It looks like a Magic Roundabout!\n"
msgstr ""
-#: ../src/incoming.c:963
+#: ../src/incoming.c:933
#, c-format
msgid "\"I wouldn't stand there if I was you\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:964
+#: ../src/incoming.c:934
#, c-format
msgid "Boing, Zebedee's left you standing all alone\n"
msgstr ""
-#: ../src/incoming.c:965
+#: ../src/incoming.c:935
#, c-format
msgid "WWWHHHEEEEEEEKKKKEEEERRRRRUUUUUNNNNNCCCCCHHHHHH\a\a\a\a\a\n"
msgstr ""
-#: ../src/incoming.c:966
+#: ../src/incoming.c:936
#, c-format
msgid "%s has just dropped the Magic Roundabout of Death on you.\n"
msgstr ""
-#: ../src/incoming.c:969
+#: ../src/incoming.c:939
#, c-format
msgid "\"%s--\" says Zebedee\n"
msgstr ""
-#: ../src/init.c:111
+#: ../src/init.c:130
#, c-format
msgid "Cannot load \"%s\": Illegal path\n"
msgstr ""
-#: ../src/init.c:124
+#: ../src/init.c:143
#, c-format
msgid "Error reading %s: Not a regular file\n"
msgstr ""
-#: ../src/init.c:131
+#: ../src/init.c:150
#, c-format
msgid "Error reading %s: %s\n"
msgstr ""
-#: ../src/init.c:162 ../src/init.c:169
+#: ../src/init.c:181 ../src/init.c:188
#, c-format
msgid "Malformed alias in %s at line %d\n"
msgstr ""
-#: ../src/init.c:177
+#: ../src/init.c:196
#, c-format
msgid "Alias %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:185 ../src/init.c:192
+#: ../src/init.c:204 ../src/init.c:211
#, c-format
msgid "Malformed bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:200
+#: ../src/init.c:219
#, c-format
msgid "Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:208 ../src/init.c:215
+#: ../src/init.c:227 ../src/init.c:234
#, c-format
msgid "Malformed rpc bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:223
+#: ../src/init.c:242
#, c-format
msgid "RPC Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:231 ../src/init.c:250
+#: ../src/init.c:250 ../src/init.c:269
#, c-format
msgid "Malformed include in %s at line %d\n"
msgstr ""
-#: ../src/init.c:262
+#: ../src/init.c:281
#, c-format
msgid "Malformed event bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:270
+#: ../src/init.c:289
#, c-format
msgid "Event bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:278
+#: ../src/init.c:297
#, c-format
msgid "Malformed ipc in %s at line %d\n"
msgstr ""
-#: ../src/init.c:286
+#: ../src/init.c:305
#, c-format
msgid "IPC bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:294
+#: ../src/init.c:313
#, c-format
msgid "Malformed checkonoff bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:302
+#: ../src/init.c:321
#, c-format
msgid "Checkonoff bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:310
+#: ../src/init.c:329
#, c-format
msgid "Malformed shutdown bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:318
+#: ../src/init.c:337
#, c-format
msgid "Shutdown bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:326
+#: ../src/init.c:345
#, c-format
msgid "Malformed force bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:334
+#: ../src/init.c:353
#, c-format
msgid "Force bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:342 ../src/init.c:355
+#: ../src/init.c:361 ../src/init.c:374
#, c-format
msgid "Malformed Script Function declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:368 ../src/init.c:381
+#: ../src/init.c:387 ../src/init.c:400
#, c-format
msgid "Malformed Script Init declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:394 ../src/init.c:407
+#: ../src/init.c:413 ../src/init.c:426
#, c-format
msgid "Malformed Script BoardInit declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:415
+#: ../src/init.c:434
#, c-format
msgid "Loading file %s unrecognised command '%s' on line %d\n"
msgstr ""
-#: ../src/main.c:371
+#: ../src/main.c:253
+msgid "05*** You have new mail.\n"
+msgstr "05*** Έχετε νέο μήνυμα.\n"
+
+#: ../src/main.c:259
#, c-format
+msgid "05*** You have %d new mail messages.\n"
+msgstr "05*** Έχετε %d νέα μηνύματα.\n"
+
+#: ../src/main.c:485
+#, c-format
msgid ""
"\n"
"Milliways accepts the optional arguments of:\n"
@@ -1015,47 +1025,52 @@
"Το Milliways δέχεται μόνο προαιρετικά ορίσματα του:\n"
"\n"
-#: ../src/main.c:372
+#: ../src/main.c:486
#, c-format
msgid " -ae_arg <a> Pass the string 'a' in to all 'initfunc' functions as $*\n"
msgstr " -ae_arg <a> Πέρασμα της συμβολοσειράς 'a' σε όλες τις λειτουργίες 'initfunc' ως $*\n"
-#: ../src/main.c:373
+#: ../src/main.c:487
#, c-format
msgid " -autochat Automatically use SUCS username to log onto talker\n"
msgstr " -autochat Αυτόματη χρήση του ονόματος πρόσβασης SUCS για σύνδεση στον ομιλητή\n"
-#: ../src/main.c:374
+#: ../src/main.c:488
#, c-format
msgid " -autowho Show a 'who' list automatically on log on to talker\n"
msgstr " -autowho Εμφανίζει μια λίστα 'who' αυτόματα κατά τη σύνδεση στον ομιλητή\n"
-#: ../src/main.c:375
+#: ../src/main.c:489
#, c-format
msgid " -i Internet mode (no readline)\n"
msgstr " -i Κατάσταση Διαδικτύου (όχι readline)\n"
-#: ../src/main.c:376
+#: ../src/main.c:490
#, c-format
msgid " -new Summary of new messages and quit\n"
msgstr " -new Σύνοψη των νέων μηνυμάτων και έξοδος\n"
-#: ../src/main.c:377
+#: ../src/main.c:491
#, c-format
+msgid " -server <a> Connect to server <a>\n"
+msgstr ""
+
+#: ../src/main.c:492
+#, c-format
msgid " -since Lists people logged on between now and when you last logged on\n"
msgstr " -since Λίστες ανθρώπων που συνδέθηκαν μεταξύ τώρα και την τελευταία φορά που συνδεθήκατε\n"
-#: ../src/main.c:378
+#: ../src/main.c:493
#, c-format
msgid " -who Show a list of users logged on and quit\n"
msgstr " -who Εμφάνιση μιας λίστας όλων των συνδεδεμένων χρηστών και μετά έξοδος\n"
-#: ../src/main.c:379
+#: ../src/main.c:494
#, fuzzy, c-format
msgid " -what Show a list of what users are doing\n"
msgstr " -who Εμφάνιση μιας λίστας όλων των συνδεδεμένων χρηστών και μετά έξοδος\n"
-#: ../src/main.c:386
+#: ../src/main.c:501
#, c-format
msgid ""
"\n"
@@ -1064,7 +1079,7 @@
"\n"
"Για να εμφανιστεί αυτό το βοηθιτικό μήνυμα, χρησιμοποιήστε τα ορίσματα: -h, -help, ή -?\n"
-#: ../src/main.c:387
+#: ../src/main.c:502
#, c-format
msgid ""
"To specify arguments, you may use '--', or '/' instead of '-'.\n"
@@ -1073,42 +1088,42 @@
"Για να προσδιορίσετε τα ορίσματα, μπορείτε να χρησιμοποιήσετε '--', ή '/' αντί του '-'.\n"
"\n"
-#: ../src/main.c:403 ../src/main.c:415 ../src/main.c:427 ../src/main.c:442
+#: ../src/main.c:518 ../src/main.c:530 ../src/main.c:542 ../src/main.c:557
#, c-format
msgid "Username not permitted.\n"
msgstr "Δεν επιτρέπεται το όνομα χρήστη.\n"
-#: ../src/main.c:498 ../src/main.c:524
+#: ../src/main.c:612 ../src/main.c:638
#, c-format
msgid "%s: User %s not found.\n"
msgstr "Ο%s: Χρήστης %s δεν βρέθηκε.\n"
-#: ../src/main.c:517
+#: ../src/main.c:631
#, c-format
msgid "%s: Folder %s not found.\n"
msgstr "Ο%s: Φάκελος %s δεν βρέθηκε.\n"
-#: ../src/main.c:559
+#: ../src/main.c:673
#, c-format
msgid "The board is currently locked to normal users.\n"
msgstr "Το επίπεδο είναι κλειδωμένο για κανονικούς χρήστες.\n"
-#: ../src/main.c:562
+#: ../src/main.c:676
#, c-format
msgid "The Board has been temporarily closed.\n"
msgstr "Το επίπεδο είναι προσωρινά κλειστό.\n"
-#: ../src/main.c:563
+#: ../src/main.c:677
#, c-format
msgid "Please call again soon.\n"
msgstr "Παρακαλώ καλέστε ξανά σύντομα.\n"
-#: ../src/main.c:577
+#: ../src/main.c:694
#, c-format
msgid "01%s has just entered the board."
msgstr "01%s μόλις εισήχθη στο επίπεδο."
-#: ../src/main.c:601
+#: ../src/main.c:718
#, fuzzy, c-format
msgid ""
"\n"
@@ -1118,52 +1133,33 @@
"\n"
"Τελευταία αποσύνδεση %s\n"
-#: ../src/main.c:603
+#: ../src/main.c:720
#, c-format
msgid "Type 'talker' to enter chat mode.\n"
msgstr ""
-#: ../src/main.c:608
+#: ../src/main.c:725
#, c-format
msgid "You must register before being able to use this system fully.\n"
msgstr ""
-#: ../src/main.c:609
+#: ../src/main.c:726
#, c-format
msgid "Until then you will not be able to write in most folders or use chat mode.\n"
msgstr ""
-#: ../src/main.c:610
+#: ../src/main.c:727
#, c-format
msgid "Wait here for a few minutes and an administrator might register you.\n"
msgstr ""
-#: ../src/main.c:612
+#: ../src/main.c:729
#, c-format
msgid "Type 'help' for help.\n"
msgstr ""
-#: ../src/main.c:788
-msgid "05*** You have new mail.\n"
-msgstr "05*** Έχετε νέο μήνυμα.\n"
-
-#: ../src/main.c:794
+#: ../src/main.c:1075
#, c-format
-msgid "05*** You have %d new mail messages.\n"
-msgstr "05*** Έχετε %d νέα μηνύματα.\n"
-
-#: ../src/main.c:1028 ../src/main.c:1067 ../src/main.c:1091
-#, c-format
-msgid "Sorry, no help available on that subject.\n"
-msgstr "Συγνώμη, δεν υπάρχει διαθέσημη βοήθεια σε αυτό το θέμα.\n"
-
-#: ../src/main.c:1053
-#, c-format
-msgid "No general help available for talker commands.\n"
-msgstr "Δεν υπάρχει διαθέσιμη γενική βοήθεια για εντολές ομιλητή.\n"
-
-#: ../src/main.c:1148
-#, c-format
msgid ""
"\n"
"Error reading incoming message pipe. panic.\n"
@@ -1171,7 +1167,7 @@
"\n"
"Σφάλμα ανάγνωσης εισερχόμενου μηνύματος pipe. πανικός.\n"
-#: ../src/main.c:1152
+#: ../src/main.c:1079
#, c-format
msgid ""
"\n"
@@ -1180,969 +1176,984 @@
"\n"
"Σφάλμα στην είσοδο του τερματικού.\n"
-#: ../src/main.c:1210
+#: ../src/main.c:1152
#, c-format
msgid "Error: Urk, no message to print.\n"
msgstr "Σφάλμα: κανένα μήνυμα για εκτύπωση.\n"
-#: ../src/main.c:1428
+#: ../src/main.c:1368
#, c-format
msgid "*** Timed Out, Good Bye\r\n"
msgstr "*** Τέλος Χρόνου, Στο καλό\r\n"
-#: ../src/main.c:1432
+#: ../src/main.c:1372
#, c-format
msgid "04%s has been timed out."
msgstr "04%s του τελείωσε ο χρόνος."
-#: ../src/main.c:1439
+#: ../src/main.c:1379
#, c-format
msgid "%c*** Wakey ! Wakey !\r\n"
msgstr "%c*** Ξύπνα ! Ξύπνα !\r\n"
-#: ../src/main.c:2108
+#: ../src/main.c:2030
#, c-format
msgid "Release version %s.%s.%s\n"
msgstr "Τελευταία έκδοση %s.%s.%s\n"
-#: ../src/main.c:2110
+#: ../src/main.c:2032
#, c-format
msgid "Release version %s.%s\n"
msgstr "Τελευταία έκδοση %s.%s\n"
-#: ../src/main.c:2112
+#: ../src/main.c:2034
#, c-format
msgid "Development version %s.%s.%s\n"
msgstr "Έκδοση υπό ανάπτυξη %s.%s.%s\n"
-#: ../src/main.c:2114
+#: ../src/main.c:2036
#, c-format
msgid "Built by %s on %s\n"
msgstr "Θεμελίωση από %s στο %s\n"
-#: ../src/mesg.c:37
+#: ../src/mesg.c:26
#, fuzzy, c-format
msgid "User does not exist.\n"
msgstr "Δεν επιτρέπεται το όνομα χρήστη.\n"
-#: ../src/mesg.c:41
+#: ../src/mesg.c:30
#, fuzzy, c-format
msgid "%s is not registered.\n"
msgstr "Η λίστα Αγνόησης Καθάρισε.\n"
-#: ../src/mesg.c:47
+#: ../src/mesg.c:36
#, c-format
msgid "%s has msg off, writing anyway.\n"
msgstr ""
-#: ../src/mesg.c:49
+#: ../src/mesg.c:38
#, c-format
msgid "%s has turned messages off.\n"
msgstr ""
-#: ../src/mesg.c:58
+#: ../src/mesg.c:47
#, fuzzy, c-format
msgid "User not logged on.\n"
msgstr "Το όνομα χρήστη %s δε βρέθηκε.\n"
-#: ../src/mesg.c:67
+#: ../src/mesg.c:56
#, c-format
msgid "Cannot inform %s of new mail.\n"
msgstr ""
-#: ../src/mod.c:31
+#: ../src/mod.c:80
+#, c-format
+msgid ""
+"\n"
+"Message in folder %s\n"
+"From: %s\n"
+"To: %s\n"
+"Subject: %s\n"
+"Date: %s"
+msgstr ""
+
+#: ../src/mod.c:106
#, fuzzy, c-format
msgid "Changing to folder %s\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/mod.c:53
+#: ../src/mod.c:128
#, c-format
msgid "only %d of %d bytes read.\n"
msgstr ""
-#: ../src/mod.c:57
+#: ../src/mod.c:132
#, c-format
msgid "[%s] (A)pprove, (L)eave, (S)ave&delete ? (<CR> to delete)"
msgstr ""
-#: ../src/mod.c:59
+#: ../src/mod.c:134
msgid "approve"
msgstr ""
-#: ../src/mod.c:68
+#: ../src/mod.c:143
#, fuzzy, c-format
msgid "Message approved as mesg %d folder %s\n"
msgstr "Απάντηση στο μήνυμα %d στο φάκελο %s\n"
-#: ../src/mod.c:70
+#: ../src/mod.c:145
msgid "leave"
msgstr ""
-#: ../src/mod.c:73
+#: ../src/mod.c:148
#, c-format
msgid "Skipping message for now.\n"
msgstr ""
-#: ../src/mod.c:75
+#: ../src/mod.c:150
msgid "save"
msgstr ""
-#: ../src/mod.c:78
+#: ../src/mod.c:153
#, c-format
msgid "Saved and Deleted\n"
msgstr ""
-#: ../src/mod.c:80
+#: ../src/mod.c:155
#, fuzzy, c-format
msgid "Deleted.\n"
msgstr "Ο φάκελος διεγράφη.\n"
-#: ../src/mod.c:83
+#: ../src/mod.c:158
#, fuzzy, c-format
msgid "End of folder %s\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/mod.c:157
+#: ../src/new.c:37 ../src/new.c:186 ../src/new.c:220
#, c-format
-msgid ""
-"\n"
-"Message in folder %s\n"
-"From: %s\n"
-"To: %s\n"
-"Subject: %s\n"
-"Date: %s"
-msgstr ""
-
-#: ../src/new.c:29 ../src/new.c:82 ../src/new.c:213
-#, c-format
msgid "There are no folders to read !\n"
msgstr ""
-#: ../src/new.c:49
+#: ../src/new.c:57
#, fuzzy, c-format
msgid ") Last read message %4d of %-4d %4d new\n"
msgstr "Τελευταίο ανεγνωσμένο μήνυμα αριθμό %d\n"
-#: ../src/new.c:54
+#: ../src/new.c:62
#, c-format
msgid ") %4d Msgs Topic: %s\n"
msgstr ""
-#: ../src/new.c:63
+#: ../src/new.c:71
#, c-format
msgid "---more--- Press <return> to continue.\r"
msgstr ""
-#: ../src/new.c:97
-#, fuzzy, c-format
-msgid "Scanning folder %-*s\r"
-msgstr "Εγγραφή στο φάκελο %s.\n"
-
-#: ../src/new.c:116
+#: ../src/new.c:88
#, c-format
msgid "Error: cannot find index file for folder %s\n"
msgstr ""
-#: ../src/new.c:118
+#: ../src/new.c:90
#, c-format
msgid "Error: cannot find text file for folder %s\n"
msgstr ""
-#: ../src/new.c:142
+#: ../src/new.c:114
#, c-format
msgid "Skipping deleted message.\n"
msgstr ""
-#: ../src/new.c:158
+#: ../src/new.c:130
#, c-format
msgid "Hit return for next message (%s - %d of %d)>"
msgstr ""
-#: ../src/new.c:164
+#: ../src/new.c:136
#, fuzzy, c-format
msgid "Catching up on folder %s\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/new.c:169
+#: ../src/new.c:141
#, c-format
msgid "Skipping this folder. %d messages left unread.\n"
msgstr ""
-#: ../src/new.c:183 ../src/newmain.c:612
+#: ../src/new.c:155 ../src/newmain.c:708
#, fuzzy, c-format
msgid "Unsubscribing from %s.\n"
msgstr "Μήνυμα από %s\n"
-#: ../src/new.c:218
+#: ../src/new.c:201
+#, fuzzy, c-format
+msgid "Scanning folder %-*s\r"
+msgstr "Εγγραφή στο φάκελο %s.\n"
+
+#: ../src/new.c:225
#, c-format
msgid " Folder Mesg Date From Subject\n"
msgstr ""
-#: ../src/new.c:219
+#: ../src/new.c:226
#, c-format
msgid " ====== ==== ==== ==== =======\n"
msgstr ""
-#: ../src/new.c:231
+#: ../src/new.c:238
#, c-format
msgid " <empty>\n"
msgstr ""
-#: ../src/newmain.c:59 ../src/newmain.c:65
+#: ../src/newmain.c:77 ../src/newmain.c:116 ../src/newmain.c:140
+#, c-format
+msgid "Sorry, no help available on that subject.\n"
+msgstr "Συγνώμη, δεν υπάρχει διαθέσημη βοήθεια σε αυτό το θέμα.\n"
+
+#: ../src/newmain.c:102
+#, c-format
+msgid "No general help available for talker commands.\n"
+msgstr "Δεν υπάρχει διαθέσιμη γενική βοήθεια για εντολές ομιλητή.\n"
+
+#: ../src/newmain.c:156 ../src/newmain.c:162
#, fuzzy, c-format
msgid "Unknown foldername.\n"
msgstr "Άγνωστο όνομα φακέλου.\n"
-#: ../src/newmain.c:70
+#: ../src/newmain.c:167
#, fuzzy, c-format
msgid "Changing to folder %s.\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/newmain.c:104 ../src/newmain.c:479
+#: ../src/newmain.c:201 ../src/newmain.c:575
#, fuzzy, c-format
msgid "No current folder.\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/newmain.c:108
+#: ../src/newmain.c:205
#, c-format
msgid "Moved to end of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:116
+#: ../src/newmain.c:213
#, c-format
msgid "Moved to start of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:146
+#: ../src/newmain.c:243
#, fuzzy, c-format
msgid "Messages are now off.\n"
msgstr "Το μήνυμα %d δεν βρέθηκε.\n"
-#: ../src/newmain.c:148
+#: ../src/newmain.c:245
#, fuzzy, c-format
msgid "Messages are already off.\n"
msgstr "Το μήνυμα σημειώθηκε για διαγραφή.\n"
-#: ../src/newmain.c:155
+#: ../src/newmain.c:252
#, fuzzy, c-format
msgid "Messages are now on.\n"
msgstr "Το μήνυμα %d δεν βρέθηκε.\n"
-#: ../src/newmain.c:157
+#: ../src/newmain.c:254
#, fuzzy, c-format
msgid "Messages already on.\n"
msgstr "Το μήνυμα σημειώθηκε για διαγραφή.\n"
-#: ../src/newmain.c:171
+#: ../src/newmain.c:268
#, c-format
msgid "You will NOT be informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:173
+#: ../src/newmain.c:270
#, c-format
msgid "You are already not informed of logins.\n"
msgstr ""
-#: ../src/newmain.c:180
+#: ../src/newmain.c:277
#, c-format
msgid "You now WILL be informed of logins/outs\n"
msgstr ""
-#: ../src/newmain.c:182
+#: ../src/newmain.c:279
#, c-format
msgid "You are already informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:195
+#: ../src/newmain.c:292
#, fuzzy, c-format
msgid "Colours disabled.\n"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/newmain.c:197
+#: ../src/newmain.c:294
#, fuzzy, c-format
msgid "Colour enabled.\n"
msgstr "Ο φάκελος διεγράφη.\n"
-#: ../src/newmain.c:199
+#: ../src/newmain.c:296
#, c-format
msgid "No colour scheme loaded.\n"
msgstr ""
-#: ../src/newmain.c:200
+#: ../src/newmain.c:297
#, fuzzy, c-format
msgid "Current colour scheme: %d: %s\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/newmain.c:215
+#: ../src/newmain.c:310
#, c-format
msgid "Error opening colour scheme list - %s\n"
msgstr ""
-#: ../src/newmain.c:219
+#: ../src/newmain.c:314
#, c-format
msgid "Listing available colour schemes:-\n"
msgstr ""
-#: ../src/newmain.c:246
+#: ../src/newmain.c:342
#, c-format
msgid "No colour schemes found.\n"
msgstr ""
-#: ../src/newmain.c:260
+#: ../src/newmain.c:356
#, c-format
msgid "ERROR: Cannot open colour scheme '%d'\n"
msgstr ""
-#: ../src/newmain.c:275
+#: ../src/newmain.c:371
#, fuzzy, c-format
msgid "Colour mode now disabled.\n"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/newmain.c:277
+#: ../src/newmain.c:373
#, fuzzy, c-format
msgid "Colour mode already disabled.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ έχει ήδη απενεργοποιηθεί.\n"
-#: ../src/newmain.c:284
+#: ../src/newmain.c:380
#, c-format
msgid "Colour mode now enabled.\n"
msgstr ""
-#: ../src/newmain.c:286
+#: ../src/newmain.c:382
#, c-format
msgid "Colour mode already enabled.\n"
msgstr ""
-#: ../src/newmain.c:300
+#: ../src/newmain.c:396
#, c-format
msgid "You will NOT hear any beeps.\n"
msgstr ""
-#: ../src/newmain.c:302
+#: ../src/newmain.c:398
#, c-format
msgid "You have already turned beeps off.\n"
msgstr ""
-#: ../src/newmain.c:309
+#: ../src/newmain.c:405
#, c-format
msgid "You now WILL get beeps.\n"
msgstr ""
-#: ../src/newmain.c:311
+#: ../src/newmain.c:407
#, c-format
msgid "You are already getting beeps.\n"
msgstr ""
-#: ../src/newmain.c:325
+#: ../src/newmain.c:421
#, c-format
msgid "You will no longer receive wizchat.\n"
msgstr ""
-#: ../src/newmain.c:327
+#: ../src/newmain.c:423
#, c-format
msgid "You have already turned wizchat off.\n"
msgstr ""
-#: ../src/newmain.c:334
+#: ../src/newmain.c:430
#, c-format
msgid "You will now receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:336
+#: ../src/newmain.c:432
#, c-format
msgid "You already receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
#, fuzzy, c-format
msgid "Forcing Subscription to folder %s "
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "Off"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "On"
msgstr ""
-#: ../src/newmain.c:355
+#: ../src/newmain.c:451
#, fuzzy, c-format
msgid ""
"Failed\n"
"Unknown folder name %s\n"
msgstr "Άγνωστο όνομα φακέλου.\n"
-#: ../src/newmain.c:359
+#: ../src/newmain.c:455
#, fuzzy, c-format
msgid ", Done.\n"
msgstr "Έγινε.\r\n"
-#: ../src/newmain.c:373
+#: ../src/newmain.c:469
#, c-format
msgid "Wiz! Bang! - You're a wizard again.\n"
msgstr ""
-#: ../src/newmain.c:375
+#: ../src/newmain.c:471
#, c-format
msgid "You are already a wizard.\n"
msgstr ""
-#: ../src/newmain.c:383
+#: ../src/newmain.c:479
#, c-format
msgid "!gnaB !ziW - You feel rather normal.\n"
msgstr ""
-#: ../src/newmain.c:385
+#: ../src/newmain.c:481
#, c-format
msgid "You are already rather normal.\n"
msgstr ""
-#: ../src/newmain.c:414
+#: ../src/newmain.c:510
#, c-format
msgid "You have been sent to 'coventry' you are not allowed to talk to anyone..\n"
msgstr ""
-#: ../src/newmain.c:460
+#: ../src/newmain.c:556
#, c-format
msgid "Sorry, message is %d character%s too long (would be truncated to: '%s'). Try again.\n"
msgstr ""
-#: ../src/newmain.c:472
+#: ../src/newmain.c:568
#, fuzzy, c-format
msgid "You are marked as doing nothing.\n"
msgstr "Δεν επιτρέπεται η εγγραφή στο φάκελο αυτό.\n"
-#: ../src/newmain.c:482
+#: ../src/newmain.c:578
#, fuzzy, c-format
msgid "Current folder = %s\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/newmain.c:484
+#: ../src/newmain.c:580
#, fuzzy, c-format
msgid "You haven't read any messages in this folder yet.\n"
msgstr "Δεν επιτρέπεται η εγγραφή στο φάκελο αυτό.\n"
-#: ../src/newmain.c:486
+#: ../src/newmain.c:582
#, fuzzy, c-format
msgid "You last read message %d.\n"
msgstr "Τελευταίο ανεγνωσμένο μήνυμα αριθμό %d\n"
-#: ../src/newmain.c:498
+#: ../src/newmain.c:594
#, fuzzy, c-format
msgid "You are not permitted to read this folder.\n"
msgstr "Δεν επιτρέπεται η εγγραφή στο φάκελο αυτό.\n"
-#: ../src/newmain.c:508
+#: ../src/newmain.c:604
#, fuzzy, c-format
msgid "WARNING: This command should not be run whilst people are using\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτή η εντολή μπορεί να είναι πολύ επικίνδυνη !\n"
-#: ../src/newmain.c:509
+#: ../src/newmain.c:605
#, c-format
msgid " the bulletin board, please exercise caution.\n"
msgstr ""
-#: ../src/newmain.c:525
+#: ../src/newmain.c:621
#, fuzzy, c-format
msgid "Could not lockboard.\n"
msgstr "Ο φάκελος δεν βρέθηκε.\n"
-#: ../src/newmain.c:529
+#: ../src/newmain.c:625
#, c-format
msgid "Board now locked.\n"
msgstr ""
-#: ../src/newmain.c:534
+#: ../src/newmain.c:630
#, c-format
msgid "Already Locked.\n"
msgstr ""
-#: ../src/newmain.c:541
+#: ../src/newmain.c:637
#, c-format
msgid "Board now unlocked.\n"
msgstr ""
-#: ../src/newmain.c:544
+#: ../src/newmain.c:640
#, fuzzy, c-format
msgid "Board not locked.\n"
msgstr "Ο φάκελος δεν βρέθηκε.\n"
-#: ../src/newmain.c:546
+#: ../src/newmain.c:642
#, c-format
msgid "Do you want to lock or unlock it.\n"
msgstr ""
-#: ../src/newmain.c:575
+#: ../src/newmain.c:671
msgid "Enter old password: "
msgstr ""
-#: ../src/newmain.c:576
+#: ../src/newmain.c:672
#, c-format
msgid "Incorrect.\n"
msgstr ""
-#: ../src/newmain.c:580
+#: ../src/newmain.c:676
#, fuzzy
msgid "New password: "
msgstr "Νέο συνθηματικό: "
-#: ../src/newmain.c:583
+#: ../src/newmain.c:679
#, c-format
msgid "Did not match.\n"
msgstr ""
-#: ../src/newmain.c:588
+#: ../src/newmain.c:684
#, fuzzy, c-format
msgid "Password set.\n"
msgstr "Το συνθηματικό άλλαξε.\n"
-#: ../src/newmain.c:597
+#: ../src/newmain.c:693
#, c-format
msgid "You are already subscribed to %s.\n"
msgstr ""
-#: ../src/newmain.c:601
+#: ../src/newmain.c:697
#, c-format
msgid "Resubscribing to %s.\n"
msgstr ""
-#: ../src/newmain.c:608
+#: ../src/newmain.c:704
#, c-format
msgid "Already Unsubscribed from %s.\n"
msgstr ""
-#: ../src/newmain.c:625
+#: ../src/newmain.c:721
#, c-format
msgid "You are already at the beginning of the folder.\n"
msgstr ""
-#: ../src/newmain.c:631
+#: ../src/newmain.c:727
#, fuzzy, c-format
msgid "You are already at the end of this folder.\n"
msgstr "Δεν επιτρέπεται η εγγραφή στο φάκελο αυτό.\n"
-#: ../src/newmain.c:643
+#: ../src/newmain.c:739
#, fuzzy, c-format
msgid "Current Status of %s\n"
msgstr "Η τρέχουσα κατάσταση ορίζεται σε [%s]\n"
-#: ../src/newmain.c:644
+#: ../src/newmain.c:740
#, fuzzy, c-format
msgid "Your real name is %s\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/newmain.c:645
+#: ../src/newmain.c:741
#, fuzzy, c-format
msgid "Your contact address is %s\n"
msgstr "Διεύθυνση επικοινωνίας: %s\n"
-#: ../src/newmain.c:646
+#: ../src/newmain.c:742
#, fuzzy, c-format
msgid "Your current status is [%s]\n"
msgstr "Η τρέχουσα κατάσταση ορίζεται σε [%s]\n"
-#: ../src/newmain.c:647
+#: ../src/newmain.c:743
#, fuzzy, c-format
msgid "Special settings are [%s]\n"
msgstr "Τα ειδικά ορίστηκαν σε [%s].\n"
-#: ../src/newmain.c:658
+#: ../src/newmain.c:754
#, fuzzy, c-format
msgid "Talker modes=[%s] privs=[%s] protection=[%s]\n"
msgstr "Ομιλητής: Καταστάσεις=[%s] Ιδιαίτερα=[%s] Προστασία=[%s]\n"
-#: ../src/newmain.c:664
+#: ../src/newmain.c:760
#, fuzzy, c-format
msgid "Talker modes=[%s] privs=[%s]\n"
msgstr "Ομιλητής: Καταστάσεις=[%s] Ιδιαίτερα=[%s] Προστασία=[%s]\n"
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
#, fuzzy, c-format
msgid "You have set messages %s.\n"
msgstr "05*** Έχετε %d νέα μηνύματα.\n"
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "off"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "on"
msgstr ""
-#: ../src/newmain.c:667
+#: ../src/newmain.c:763
#, c-format
msgid "You %s be informed of logins and logouts\n"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will not"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will"
msgstr ""
-#: ../src/newmain.c:668
+#: ../src/newmain.c:764
#, c-format
msgid "You %s hear beeps.\n"
msgstr ""
-#: ../src/newmain.c:671
+#: ../src/newmain.c:767
#, c-format
msgid "You can use wizchat"
msgstr ""
-#: ../src/newmain.c:673
+#: ../src/newmain.c:769
#, c-format
msgid ", but you will not hear any replies"
msgstr ""
-#: ../src/newmain.c:677
+#: ../src/newmain.c:773
#, c-format
msgid "You %s informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:679
+#: ../src/newmain.c:775
#, fuzzy, c-format
msgid "You belong to the following group(s) [%s]\n"
msgstr " (στην ομάδα) [%s]\n"
-#: ../src/newmain.c:680
+#: ../src/newmain.c:776
#, c-format
msgid "You are currently in folder %s, which you "
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are"
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are not"
msgstr ""
-#: ../src/newmain.c:682
+#: ../src/newmain.c:778
#, c-format
msgid " subscribed to.\n"
msgstr ""
-#: ../src/newmain.c:684
+#: ../src/newmain.c:780
#, c-format
msgid "You will not be timed out for being idle.\n"
msgstr ""
-#: ../src/newmain.c:686
+#: ../src/newmain.c:782
#, c-format
msgid "You will be timed out after being idle for %s.\n"
msgstr ""
-#: ../src/newmain.c:705
+#: ../src/newmain.c:819
#, c-format
msgid "You have to read a message before you can reply to it.\n"
msgstr ""
-#: ../src/newmain.c:708
+#: ../src/newmain.c:822
#, fuzzy, c-format
msgid "Replying to message %d.\n"
msgstr "Απάντηση στο μήνυμα %d στο φάκελο %s\n"
-#: ../src/newmain.c:722
+#: ../src/newmain.c:836
#, fuzzy, c-format
msgid "No folders found.\n"
msgstr "Ο φάκελος δεν βρέθηκε.\n"
-#: ../src/newmain.c:727
+#: ../src/newmain.c:841
#, fuzzy, c-format
msgid "Marking ALL folders as read.\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/newmain.c:747
+#: ../src/newmain.c:861
#, fuzzy, c-format
msgid "There is no folder '%s'\n"
msgstr "Δεν υπάρχει μήνυμα %d\n"
-#: ../src/newmain.c:753
+#: ../src/newmain.c:867
#, fuzzy, c-format
msgid "There is no folder %s\n"
msgstr "Δεν υπάρχει μήνυμα %d\n"
-#: ../src/newmain.c:764
+#: ../src/newmain.c:878
#, fuzzy, c-format
msgid "Marking folder %s as read.\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/newmain.c:772
+#: ../src/newmain.c:886
#, fuzzy, c-format
msgid "Current time and date is %s"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/newmain.c:840 ../src/newmain.c:864
+#: ../src/newmain.c:954 ../src/newmain.c:978
#, fuzzy, c-format
msgid "TIMEOUT must be at least 10 minutes.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ πρέπει να είνα ιμεταξύ 10 λεπτά (600), και 3 'ώρες (10800), or 0 to disable.\n"
-#: ../src/newmain.c:856
+#: ../src/newmain.c:970
#, c-format
msgid "Invalid time unit '%c' must be one of: dhms.\n"
msgstr ""
-#: ../src/newmain.c:870
+#: ../src/newmain.c:984
#, fuzzy, c-format
msgid "TIMEOUT now set to %s\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ απενεργοποιήθηκε.\n"
-#: ../src/newmain.c:872
+#: ../src/newmain.c:986
#, fuzzy, c-format
msgid "TIMEOUT was already set to %s.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ έχει ήδη απενεργοποιηθεί.\n"
-#: ../src/newmain.c:887
+#: ../src/newmain.c:1001
#, fuzzy, c-format
msgid "Timestamps now disabled.\n"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/newmain.c:889
+#: ../src/newmain.c:1003
#, c-format
msgid "Timestamping was already off.\n"
msgstr ""
-#: ../src/newmain.c:896
+#: ../src/newmain.c:1010
#, fuzzy, c-format
msgid "Timestamps now enabled.\n"
msgstr "Το τέλος χρόνου είναι απενεργοποιημένο.\n"
-#: ../src/newmain.c:898
+#: ../src/newmain.c:1012
#, fuzzy, c-format
msgid "Timestamping already enabled.\n"
msgstr "Το ΤΕΛΟΣ ΧΡΟΝΟΥ έχει ήδη απενεργοποιηθεί.\n"
-#: ../src/newmain.c:912
+#: ../src/newmain.c:1026
#, c-format
msgid "Posting information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:914
+#: ../src/newmain.c:1028
#, c-format
msgid "Posting info was already off.\n"
msgstr ""
-#: ../src/newmain.c:921
+#: ../src/newmain.c:1035
#, c-format
msgid "You will now be informed of new postings.\n"
msgstr ""
-#: ../src/newmain.c:923
+#: ../src/newmain.c:1037
#, c-format
msgid "Posting info was already on.\n"
msgstr ""
-#: ../src/newmain.c:937
+#: ../src/newmain.c:1051
#, c-format
msgid "User change information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:939
+#: ../src/newmain.c:1053
#, c-format
msgid "Change info was already off.\n"
msgstr ""
-#: ../src/newmain.c:946
+#: ../src/newmain.c:1060
#, c-format
msgid "You will now be informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:948
+#: ../src/newmain.c:1062
#, c-format
msgid "Change info was already on.\n"
msgstr ""
-#: ../src/newmain.c:959
+#: ../src/newmain.c:1073
#, c-format
msgid "Already in chat mode, silly.\n"
msgstr ""
-#: ../src/newmain.c:975
+#: ../src/newmain.c:1089
#, c-format
msgid "You are not allowed to change your contact address. Please notify a SuperUser to change this for you.\n"
msgstr ""
-#: ../src/newmain.c:982
+#: ../src/newmain.c:1096
#, c-format
msgid "Alias '%s' already exists. Has now been redefined!\n"
msgstr ""
-#: ../src/newmain.c:984
+#: ../src/newmain.c:1098
#, c-format
msgid "Alias '%s' added!\n"
msgstr ""
-#: ../src/newmain.c:992
+#: ../src/newmain.c:1106
#, c-format
msgid "All Aliases Destroyed!\n"
msgstr ""
-#: ../src/newmain.c:997
+#: ../src/newmain.c:1111
#, fuzzy, c-format
msgid "Alias '%s' was not found!\n"
msgstr "Ο%s: Χρήστης %s δεν βρέθηκε.\n"
-#: ../src/newmain.c:999
+#: ../src/newmain.c:1113
#, c-format
msgid "Alias '%s' was destroyed...\n"
msgstr ""
-#: ../src/talker.c:446 ../src/talker.c:448
+#: ../src/talker.c:449 ../src/talker.c:451
#, fuzzy, c-format
msgid "Current mwrc path: %s\n"
msgstr "Τρέχων όνομα φακέλου = %s\n"
-#: ../src/talker.c:446
+#: ../src/talker.c:449
msgid "<unset>"
msgstr ""
-#: ../src/talker.c:454
+#: ../src/talker.c:457
#, c-format
msgid "Setting mwrc path to: %s\n"
msgstr ""
-#: ../src/talker.c:533
+#: ../src/talker.c:536
#, fuzzy, c-format
-msgid "User %s not logged on.\n"
+msgid "User '%s' is not logged on.\n"
msgstr "Το όνομα χρήστη %s δε βρέθηκε.\n"
-#: ../src/user.c:90
-#, c-format
-msgid "Please enter username: "
-msgstr ""
-
-#: ../src/user.c:92
-#, fuzzy, c-format
-msgid "Please enter username [%s]: "
-msgstr "Εισαγωγή νέου ονόματος χρήστη (%d χαρακτήρες): "
-
-#: ../src/user.c:106
-#, c-format
-msgid "Don't be shy.\n"
-msgstr ""
-
-#: ../src/user.c:143
-#, c-format
-msgid "Problem in get_person: my uid=%d my euid=%d"
-msgstr ""
-
-#: ../src/user.c:163
+#: ../src/user.c:82
#, fuzzy
msgid "Enter Password: "
msgstr "Νέο συνθηματικό: "
-#: ../src/user.c:166
+#: ../src/user.c:85
#, c-format
msgid ""
"Login Incorrect.\n"
"\n"
msgstr ""
-#: ../src/user.c:174
+#: ../src/user.c:93
#, c-format
msgid "Sorry, this username has been banned.\n"
msgstr ""
-#: ../src/user.c:175
+#: ../src/user.c:94
#, c-format
msgid "Have a nice day. *:-)\n"
msgstr ""
-#: ../src/user.c:183
+#: ../src/user.c:102
#, c-format
msgid "Sorry, you do not have permission to run development versions of milliways.\n"
msgstr ""
-#: ../src/user.c:189
+#: ../src/user.c:108
#, c-format
msgid "Hello %s.\n"
msgstr ""
-#: ../src/user.c:198
+#: ../src/user.c:138
#, c-format
-msgid "Did I get your name right %s ? y/n: "
+msgid "Please enter username: "
msgstr ""
-#: ../src/user.c:207
+#: ../src/user.c:140
+#, fuzzy, c-format
+msgid "Please enter username [%s]: "
+msgstr "Εισαγωγή νέου ονόματος χρήστη (%d χαρακτήρες): "
+
+#: ../src/user.c:154
#, c-format
+msgid "Don't be shy.\n"
+msgstr ""
+
+#: ../src/user.c:173
+#, c-format
+msgid "Problem in get_person: my uid=%d my euid=%d"
+msgstr ""
+
+#: ../src/user.c:262
+#, fuzzy, c-format
+msgid "What status do you want to be ? [rms] "
+msgstr "Τι θέλετε να κάνω; \n"
+
+#: ../src/user.c:287
+#, c-format
+msgid "Did I get your name right %s ? [Y]/n: "
+msgstr ""
+
+#: ../src/user.c:300
+#, c-format
msgid ""
"Sorry, you do not have permission to run development versions of milliways.\n"
"Please log in again using the public version.\n"
msgstr ""
-#: ../src/user.c:214
+#: ../src/user.c:307
#, c-format
msgid "We use a password on this BB.\n"
msgstr ""
-#: ../src/user.c:217
+#: ../src/user.c:310
#, fuzzy, c-format
msgid "Passwords did not match.\n"
msgstr ""
"Τα συνθηματικά δεν ταιριάζουν.\n"
"Δεν έγινε.\n"
-#: ../src/user.c:218
+#: ../src/user.c:311
#, fuzzy
msgid "Enter password: "
msgstr "Νέο συνθηματικό: "
-#: ../src/user.c:219
+#: ../src/user.c:312
#, fuzzy
msgid "Re-enter password: "
msgstr "Νέο συνθηματικό: "
-#: ../src/user.c:224
+#: ../src/user.c:317
#, c-format
msgid ""
"\n"
"Please enter the following details so that we can register you as a\n"
msgstr ""
-#: ../src/user.c:225
+#: ../src/user.c:318
#, c-format
msgid "normal user of this bulletin board. without correct information you\n"
msgstr ""
-#: ../src/user.c:226
+#: ../src/user.c:319
#, c-format
msgid "will not be allowed to use the full facilities of this board.\n"
msgstr ""
-#: ../src/user.c:227
+#: ../src/user.c:320
#, c-format
msgid ""
"\n"
"DATA PROTECTION ACT:\n"
msgstr ""
-#: ../src/user.c:228
+#: ../src/user.c:321
#, c-format
msgid "Any data entered will be recorded in a computer database for the purpose\n"
msgstr ""
-#: ../src/user.c:229
+#: ../src/user.c:322
#, c-format
msgid "of the administration, operation and security of the computer society. By \n"
msgstr ""
-#: ../src/user.c:230
+#: ../src/user.c:323
#, c-format
msgid "entering this data you consent to the storage of this data, and become an\n"
msgstr ""
-#: ../src/user.c:231
+#: ../src/user.c:324
#, c-format
msgid "associate member of the society.\n"
msgstr ""
-#: ../src/user.c:232
+#: ../src/user.c:325
#, c-format
msgid ""
"\n"
@@ -2150,36 +2161,31 @@
"\n"
msgstr ""
-#: ../src/user.c:235
+#: ../src/user.c:328
#, fuzzy, c-format
msgid "Real Name: "
msgstr "Αληθινό Όνομα: %s\n"
-#: ../src/user.c:240
+#: ../src/user.c:333
#, c-format
msgid "User record '%s' cancelled.\n"
msgstr ""
-#: ../src/user.c:241
+#: ../src/user.c:334
#, c-format
msgid "Goodbye.\n"
msgstr ""
-#: ../src/user.c:247
+#: ../src/user.c:340
#, fuzzy, c-format
msgid "Email address: "
msgstr "Διεύθυνση επικοινωνίας: %s\n"
-#: ../src/user.c:256
+#: ../src/user.c:349
#, fuzzy, c-format
msgid "Creating new user %s\n"
msgstr "Εγγραφή στο φάκελο %s.\n"
-#: ../src/user.c:338
-#, fuzzy, c-format
-msgid "What status do you want to be ? [rms] "
-msgstr "Τι θέλετε να κάνω; \n"
-
#~ msgid " *** Wakey ! Wakey !\r\n"
#~ msgstr " *** Ξύπνα ! Ξύπνα !\r\n"
Modified: trunk/po/mw.pot
===================================================================
--- trunk/po/mw.pot 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/po/mw.pot 2012-11-17 19:57:05 UTC (rev 1288)
@@ -8,605 +8,606 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: mw-devel at lists.sucs.org\n"
-"POT-Creation-Date: 2009-12-16 19:58+0000\n"
+"POT-Creation-Date: 2012-11-17 19:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/add.c:51
+#: ../src/add.c:127
#, c-format
msgid "Not allowed to write to this folder.\n"
msgstr ""
-#: ../src/add.c:60
+#: ../src/add.c:136
#, c-format
msgid "Writing in folder %s.\n"
msgstr ""
-#: ../src/add.c:62
+#: ../src/add.c:138
#, c-format
msgid "Replying to message %d in folder %s\n"
msgstr ""
-#: ../src/add.c:67
+#: ../src/add.c:143
#, c-format
msgid "Note: Operators have the right to read any 'private' messages.\n"
msgstr ""
-#: ../src/add.c:68
+#: ../src/add.c:144
#, c-format
msgid " : If you don't like this, don't write private messages.\n"
msgstr ""
-#: ../src/add.c:86
+#: ../src/add.c:162
#, c-format
msgid "There is no message %d\n"
msgstr ""
-#: ../src/add.c:96
+#: ../src/add.c:172
#, c-format
msgid "reply: Error, could not find old message !\n"
msgstr ""
-#: ../src/add.c:112
+#: ../src/add.c:188
#, c-format
msgid "Message from %s\n"
msgstr ""
-#: ../src/add.c:117 ../src/add.c:139
+#: ../src/add.c:193 ../src/add.c:215
#, c-format
msgid "Send to: "
msgstr ""
-#: ../src/add.c:123 ../src/add.c:143
+#: ../src/add.c:199 ../src/add.c:219
#, c-format
msgid "Message must be addressed to an existing user.\n"
msgstr ""
-#: ../src/add.c:128 ../src/add.c:135 ../src/edit.c:855
+#: ../src/add.c:204 ../src/add.c:211 ../src/edit.c:916
#, c-format
msgid "Subject: "
msgstr ""
-#: ../src/add.c:133
+#: ../src/add.c:209
#, c-format
msgid ""
"\n"
"Enter subject or press <ENTER> to accept old.\n"
msgstr ""
-#: ../src/add.c:134
+#: ../src/add.c:210
#, c-format
msgid "Subject: %s\n"
msgstr ""
-#: ../src/add.c:163
+#: ../src/add.c:239
#, c-format
msgid "Enter message ending with a . on a new line\n"
msgstr ""
-#: ../src/add.c:195
+#: ../src/add.c:271
#, c-format
msgid "Post message, edit, reformat, or Abandon ?"
msgstr ""
-#: ../src/add.c:198
+#: ../src/add.c:274
msgid "abandon"
msgstr ""
-#: ../src/add.c:205
+#: ../src/add.c:281
msgid "reformat"
msgstr ""
-#: ../src/add.c:207
+#: ../src/add.c:283
#, c-format
msgid "Reformatting..."
msgstr ""
-#: ../src/add.c:210
+#: ../src/add.c:286
#, c-format
msgid "Done.\r\n"
msgstr ""
-#: ../src/add.c:212
+#: ../src/add.c:288
msgid "edit"
msgstr ""
-#: ../src/add.c:231 ../src/edit.c:771
+#: ../src/add.c:307 ../src/edit.c:832
#, c-format
msgid "Failed to set user id, aborting.\n"
msgstr ""
-#: ../src/add.c:251
+#: ../src/add.c:327
#, c-format
msgid "Cannot create temporary file: %s\n"
msgstr ""
-#: ../src/add.c:274 ../src/edit.c:804
+#: ../src/add.c:350 ../src/edit.c:865
#, c-format
msgid "ERROR: Could not spawn editor: %s\n"
msgstr ""
-#: ../src/add.c:282
+#: ../src/add.c:358
#, c-format
msgid "ERROR: child wait (%d) %s\n"
msgstr ""
-#: ../src/add.c:304
+#: ../src/add.c:380
msgid "post"
msgstr ""
-#: ../src/add.c:346
+#: ../src/add.c:422
#, c-format
msgid "Warning: Index error, skipping back %ld bytes.\r\n"
msgstr ""
-#: ../src/add.c:369
+#: ../src/add.c:445
#, c-format
msgid "Warning: incomplete folder record written; folder file may be corrupt.\n"
msgstr ""
-#: ../src/alias.c:124 ../src/alias.c:134 ../src/alias.c:148 ../src/main.c:1003
-#: ../src/user.c:384 ../src/user.c:422 ../src/user.c:488
+#: ../src/alias.c:127 ../src/alias.c:137 ../src/alias.c:151 ../src/main.c:1021
+#: ../src/user.c:415 ../src/user.c:452 ../src/user.c:518
#, c-format
msgid "---more---\r"
msgstr ""
-#: ../src/edit.c:41
+#: ../src/edit.c:148
#, c-format
msgid "Username %s not found.\n"
msgstr ""
-#: ../src/edit.c:55
+#: ../src/edit.c:162
#, c-format
msgid "Current status set to [%s]\n"
msgstr ""
-#: ../src/edit.c:58
+#: ../src/edit.c:165
#, c-format
msgid "New status [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:67
+#: ../src/edit.c:174
#, c-format
msgid "Do you really want to delete this user ? "
msgstr ""
-#: ../src/edit.c:76
+#: ../src/edit.c:183
#, c-format
msgid "Status set to [%s].\n"
msgstr ""
-#: ../src/edit.c:90
+#: ../src/edit.c:197
#, c-format
msgid "Current specials set to [%s]\n"
msgstr ""
-#: ../src/edit.c:93
+#: ../src/edit.c:200
#, c-format
msgid "New specials [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:99
+#: ../src/edit.c:206
#, c-format
msgid "Specials set to [%s].\n"
msgstr ""
-#: ../src/edit.c:112
+#: ../src/edit.c:219
#, c-format
msgid "Current chatprivs set to [%s]\n"
msgstr ""
-#: ../src/edit.c:113
+#: ../src/edit.c:220
#, c-format
msgid "New chatprivs [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:118
+#: ../src/edit.c:225
#, c-format
msgid "Chatprivs set to [%s].\n"
msgstr ""
-#: ../src/edit.c:136
+#: ../src/edit.c:243
#, c-format
msgid "Current protection set to %s\n"
msgstr ""
-#: ../src/edit.c:137
+#: ../src/edit.c:244
#, c-format
msgid "New levels [0-4]/[0-4]: "
msgstr ""
-#: ../src/edit.c:148
+#: ../src/edit.c:255
#, c-format
msgid "Protection set to %d/%d.\n"
msgstr ""
-#: ../src/edit.c:158
+#: ../src/edit.c:265
#, c-format
msgid "Invalid protection level.\n"
msgstr ""
-#: ../src/edit.c:168
+#: ../src/edit.c:275
#, c-format
msgid "Current chatmode set to [%s]\n"
msgstr ""
-#: ../src/edit.c:169
+#: ../src/edit.c:276
#, c-format
msgid "New chatmode [+-=][%s]: "
msgstr ""
-#: ../src/edit.c:174
+#: ../src/edit.c:281
#, c-format
msgid "Chatmode set to [%s].\n"
msgstr ""
-#: ../src/edit.c:191
+#: ../src/edit.c:298
#, c-format
msgid "User currently in groups [%s]\n"
msgstr ""
-#: ../src/edit.c:192
+#: ../src/edit.c:299
#, c-format
msgid "New Groups [+-=][12345678]: "
msgstr ""
-#: ../src/edit.c:202 ../src/edit.c:596
+#: ../src/edit.c:309 ../src/edit.c:675
#, c-format
msgid "Groups changed to [%s]\n"
msgstr ""
-#: ../src/edit.c:211
+#: ../src/edit.c:318
msgid "New Passwd: "
msgstr ""
-#: ../src/edit.c:212 ../src/newmain.c:581
+#: ../src/edit.c:319 ../src/newmain.c:677
msgid "Again: "
msgstr ""
-#: ../src/edit.c:215
+#: ../src/edit.c:322
#, c-format
msgid ""
"Passwords did not match.\n"
"Not done.\n"
msgstr ""
-#: ../src/edit.c:220
+#: ../src/edit.c:327
#, c-format
msgid "Password changed.\n"
msgstr ""
-#: ../src/edit.c:232
+#: ../src/edit.c:339
#, c-format
msgid "Real Name: %s\n"
msgstr ""
-#: ../src/edit.c:233
+#: ../src/edit.c:340
#, c-format
msgid "Enter new name (%d chars): "
msgstr ""
-#: ../src/edit.c:239 ../src/edit.c:314
+#: ../src/edit.c:346 ../src/edit.c:421
#, c-format
msgid "New name set.\n"
msgstr ""
-#: ../src/edit.c:253
+#: ../src/edit.c:360
#, c-format
msgid "User currently in room [%d]\n"
msgstr ""
-#: ../src/edit.c:254
+#: ../src/edit.c:361
#, c-format
msgid "New Room: [0-65535]: "
msgstr ""
-#: ../src/edit.c:260 ../src/edit.c:266
+#: ../src/edit.c:367 ../src/edit.c:373
#, c-format
msgid "Invalid Room ID (0-65535 only)\n"
msgstr ""
-#: ../src/edit.c:272
+#: ../src/edit.c:379
#, c-format
msgid "Room changed to %d.\n"
msgstr ""
-#: ../src/edit.c:282
+#: ../src/edit.c:389
#, c-format
msgid "WARNING: This command can be very dangerous !\n"
msgstr ""
-#: ../src/edit.c:283
+#: ../src/edit.c:390
#, c-format
msgid "User Name: %s\n"
msgstr ""
-#: ../src/edit.c:284
+#: ../src/edit.c:391
#, c-format
msgid "Enter new username (%d chars): "
msgstr ""
-#: ../src/edit.c:301
+#: ../src/edit.c:408
#, c-format
msgid "You cannot change a username to one that already exists.\n"
msgstr ""
-#: ../src/edit.c:304
+#: ../src/edit.c:411
#, c-format
msgid "Attempting to update existing user.\n"
msgstr ""
-#: ../src/edit.c:307
+#: ../src/edit.c:414
#, c-format
msgid "Are you sure you want to change user '%s' into user '%s' ? "
msgstr ""
-#: ../src/edit.c:318 ../src/edit.c:320
+#: ../src/edit.c:425 ../src/edit.c:427
#, c-format
msgid "Change Cancelled.\n"
msgstr ""
-#: ../src/edit.c:325 ../src/edit.c:977
+#: ../src/edit.c:432 ../src/edit.c:986
#, c-format
msgid "Contact address: %s\n"
msgstr ""
-#: ../src/edit.c:326 ../src/edit.c:978
+#: ../src/edit.c:433 ../src/edit.c:987
#, c-format
msgid "New address (%d chars): "
msgstr ""
-#: ../src/edit.c:332 ../src/edit.c:983
+#: ../src/edit.c:439 ../src/edit.c:992
#, c-format
msgid "New address set.\n"
msgstr ""
-#: ../src/edit.c:340
+#: ../src/edit.c:447
#, c-format
msgid "Current Status: %s\n"
msgstr ""
-#: ../src/edit.c:341
+#: ../src/edit.c:448
#, c-format
msgid "New Status (%d chars): "
msgstr ""
-#: ../src/edit.c:348 ../src/edit.c:355
+#: ../src/edit.c:455 ../src/edit.c:462
#, c-format
msgid "New status set.\n"
msgstr ""
-#: ../src/edit.c:365
+#: ../src/edit.c:472
#, c-format
msgid "Timeout: %ld sec.\n"
msgstr ""
-#: ../src/edit.c:366
+#: ../src/edit.c:473
#, c-format
msgid "New timeout value: "
msgstr ""
-#: ../src/edit.c:387
+#: ../src/edit.c:494
#, c-format
msgid "TIMEOUT now disabled.\n"
msgstr ""
-#: ../src/edit.c:393
+#: ../src/edit.c:500
#, c-format
msgid "TIMEOUT was already disabled.\n"
msgstr ""
-#: ../src/edit.c:398
+#: ../src/edit.c:505
#, c-format
msgid "TIMEOUT must be be at least 10 minutes (600), or 0 to disable.\n"
msgstr ""
-#: ../src/edit.c:406
+#: ../src/edit.c:513
#, c-format
msgid "New timeout set to %ld seconds.\n"
msgstr ""
-#: ../src/edit.c:416
+#: ../src/edit.c:522
#, c-format
msgid "Lastread in folder? "
msgstr ""
-#: ../src/edit.c:421
+#: ../src/edit.c:527
#, c-format
msgid "Folder not found.\n"
msgstr ""
-#: ../src/edit.c:424
+#: ../src/edit.c:530
#, c-format
msgid "Last read message number %d\n"
msgstr ""
-#: ../src/edit.c:425
+#: ../src/edit.c:531
#, c-format
msgid "New lastread: "
msgstr ""
-#: ../src/edit.c:431
+#: ../src/edit.c:537
#, c-format
msgid "Lastread changed to %d\n"
msgstr ""
-#: ../src/edit.c:435
+#: ../src/edit.c:541
#, c-format
msgid "Not changed.\n"
msgstr ""
-#: ../src/edit.c:445
+#: ../src/edit.c:551
#, c-format
msgid ""
"Username: %s\n"
"Real Name: %s\n"
msgstr ""
-#: ../src/edit.c:446
+#: ../src/edit.c:552
#, c-format
msgid ""
"Contact: %s\n"
"Status [%s]\tSpecials [%s]\n"
msgstr ""
-#: ../src/edit.c:449 ../src/edit.c:658
+#: ../src/edit.c:555 ../src/edit.c:737
#, c-format
msgid "Groups [%s]\n"
msgstr ""
-#: ../src/edit.c:452
+#: ../src/edit.c:558
#, c-format
msgid "Talker: Modes=[%s] Privs=[%s] Protection=[%s]\n"
msgstr ""
-#: ../src/edit.c:458
+#: ../src/edit.c:564
#, c-format
msgid "Timeout disabled.\n"
msgstr ""
-#: ../src/edit.c:460
+#: ../src/edit.c:566
#, c-format
msgid "Timeout set to %s.\n"
msgstr ""
-#: ../src/edit.c:462
+#: ../src/edit.c:568
#, c-format
msgid "Last Login: %s"
msgstr ""
-#: ../src/edit.c:465
+#: ../src/edit.c:571
#, c-format
msgid "Status: %s (%s ago)\n"
msgstr ""
-#: ../src/edit.c:471
+#: ../src/edit.c:577
#, c-format
msgid "Are you sure you want to clear %s's ignore list? "
msgstr ""
-#: ../src/edit.c:477
+#: ../src/edit.c:583
#, c-format
msgid "Ignorelist Cleared.\n"
msgstr ""
-#: ../src/edit.c:481
+#: ../src/edit.c:587
#, c-format
msgid "Clear Cancelled.\n"
msgstr ""
-#: ../src/edit.c:484
+#: ../src/edit.c:590
#, c-format
msgid "Unknown Command\n"
msgstr ""
-#: ../src/edit.c:549
+#: ../src/edit.c:628
#, c-format
msgid "Unknown folder name.\n"
msgstr ""
-#: ../src/edit.c:556
+#: ../src/edit.c:635
#, c-format
msgid ""
"Folder %s\n"
"Current status:-\n"
msgstr ""
-#: ../src/edit.c:557
+#: ../src/edit.c:636
#, c-format
msgid "User not in group [%s]\n"
msgstr ""
-#: ../src/edit.c:559
+#: ../src/edit.c:638
#, c-format
msgid "User in group [%s]\n"
msgstr ""
-#: ../src/edit.c:560
+#: ../src/edit.c:639
#, c-format
msgid "Change to :-\n"
msgstr ""
-#: ../src/edit.c:561
+#: ../src/edit.c:640
#, c-format
msgid "User not in group [+-=][arwRWpm]: "
msgstr ""
-#: ../src/edit.c:568 ../src/edit.c:579
+#: ../src/edit.c:647 ../src/edit.c:658
#, c-format
msgid "Status changed to [%s]\n"
msgstr ""
-#: ../src/edit.c:570 ../src/edit.c:581
+#: ../src/edit.c:649 ../src/edit.c:660
#, c-format
msgid "WARNING: folder may get written over by the next folder created.\n"
msgstr ""
-#: ../src/edit.c:572
+#: ../src/edit.c:651
#, c-format
msgid "User in group [+-=][arwRWpm]: "
msgstr ""
-#: ../src/edit.c:588
+#: ../src/edit.c:667
#, c-format
msgid "Folder %s is currently in groups [%s]\n"
msgstr ""
-#: ../src/edit.c:589
+#: ../src/edit.c:668
#, c-format
msgid "Folder groups [+-=][12345678]: "
msgstr ""
-#: ../src/edit.c:601
+#: ../src/edit.c:680
#, c-format
msgid "Current folder name = %s\n"
msgstr ""
-#: ../src/edit.c:602
+#: ../src/edit.c:681
#, c-format
msgid "Change to ? (%d chars): "
msgstr ""
-#: ../src/edit.c:626
+#: ../src/edit.c:705
#, c-format
msgid "Name changed to %s\n"
msgstr ""
-#: ../src/edit.c:631
+#: ../src/edit.c:710
#, c-format
msgid "First Message in folder is %d\n"
msgstr ""
-#: ../src/edit.c:632
+#: ../src/edit.c:711
#, c-format
msgid "New first message: "
msgstr ""
-#: ../src/edit.c:637
+#: ../src/edit.c:716
#, c-format
msgid "First message set to %d\n"
msgstr ""
-#: ../src/edit.c:639
+#: ../src/edit.c:718
#, c-format
msgid "Last Message in folder is %d\n"
msgstr ""
-#: ../src/edit.c:640
+#: ../src/edit.c:719
#, c-format
msgid "New Last message: "
msgstr ""
-#: ../src/edit.c:645
+#: ../src/edit.c:724
#, c-format
msgid "Last message set to %d\n"
msgstr ""
-#: ../src/edit.c:652
+#: ../src/edit.c:731
#, c-format
msgid ""
"\n"
@@ -615,188 +616,188 @@
"Message range %d to %d\n"
msgstr ""
-#: ../src/edit.c:654
+#: ../src/edit.c:733
#, c-format
msgid "Status (out of group) [%s]"
msgstr ""
-#: ../src/edit.c:656
+#: ../src/edit.c:735
#, c-format
msgid " (in group) [%s]\n"
msgstr ""
-#: ../src/edit.c:663
+#: ../src/edit.c:742
#, c-format
msgid "Current folder topic = '%s'\n"
msgstr ""
-#: ../src/edit.c:664
+#: ../src/edit.c:743
#, c-format
msgid "New topic (%d chars): "
msgstr ""
-#: ../src/edit.c:669
+#: ../src/edit.c:748
#, c-format
msgid "Topic changed to '%s'\n"
msgstr ""
-#: ../src/edit.c:675
+#: ../src/edit.c:754
#, c-format
msgid "Do you really want to delete folder %s ?(yes/no) "
msgstr ""
-#: ../src/edit.c:694
+#: ../src/edit.c:773
#, c-format
msgid "Folder Deleted.\n"
msgstr ""
-#: ../src/edit.c:698 ../src/edit.c:849 ../src/edit.c:862
+#: ../src/edit.c:777 ../src/edit.c:910 ../src/edit.c:923
#, c-format
msgid "Not Done.\n"
msgstr ""
-#: ../src/edit.c:748
+#: ../src/edit.c:809
#, c-format
msgid "Message %d not found.\n"
msgstr ""
-#: ../src/edit.c:757
+#: ../src/edit.c:818
#, c-format
msgid "You cannot edit other peoples messages.\n"
msgstr ""
-#: ../src/edit.c:841
+#: ../src/edit.c:902
#, c-format
msgid "Currently to '%s'.\n"
msgstr ""
-#: ../src/edit.c:842
+#: ../src/edit.c:903
#, c-format
msgid "to: "
msgstr ""
-#: ../src/edit.c:846
+#: ../src/edit.c:907
#, c-format
msgid "Message now to '%s'\n"
msgstr ""
-#: ../src/edit.c:854
+#: ../src/edit.c:915
#, c-format
msgid "Current subject is '%s'.\n"
msgstr ""
-#: ../src/edit.c:859
+#: ../src/edit.c:920
#, c-format
msgid "Subject '%s'\n"
msgstr ""
-#: ../src/edit.c:867
+#: ../src/edit.c:928
#, c-format
msgid "Message Marked for deletion.\n"
msgstr ""
-#: ../src/edit.c:872
+#: ../src/edit.c:933
#, c-format
msgid "Message has been undeleted.\n"
msgstr ""
-#: ../src/edit.c:878
+#: ../src/edit.c:939
#, c-format
msgid "Status mode is currently %s\n"
msgstr ""
-#: ../src/edit.c:880
+#: ../src/edit.c:941
#, c-format
msgid "New status [%s]: "
msgstr ""
-#: ../src/edit.c:886 ../src/user.c:342
+#: ../src/edit.c:947 ../src/user.c:270
#, c-format
msgid "Status set to [%s]\n"
msgstr ""
-#: ../src/edit.c:890
+#: ../src/edit.c:951
#, c-format
msgid "What do you want to do ?\n"
msgstr ""
-#: ../src/edit.c:911
+#: ../src/edit.c:972
#, c-format
msgid "Total Login Time of "
msgstr ""
-#: ../src/edit.c:913
+#: ../src/edit.c:974
#, c-format
msgid "%d day%s, "
msgstr ""
-#: ../src/edit.c:915
+#: ../src/edit.c:976
#, c-format
msgid "%d hour%s, "
msgstr ""
-#: ../src/edit.c:917
+#: ../src/edit.c:978
#, c-format
msgid "%d minute%s, "
msgstr ""
-#: ../src/edit.c:918
+#: ../src/edit.c:979
#, c-format
msgid "%d second%s.\n"
msgstr ""
-#: ../src/folders.c:32
+#: ../src/folders.c:40
#, c-format
msgid "Sorry, no space for a new folder.\n"
msgstr ""
-#: ../src/folders.c:40
+#: ../src/folders.c:48
#, c-format
msgid "Create new folder :\n"
msgstr ""
-#: ../src/folders.c:41
+#: ../src/folders.c:49
#, c-format
msgid "Folder name (%d chars): "
msgstr ""
-#: ../src/folders.c:44
+#: ../src/folders.c:52
#, c-format
msgid "Folder topic (%d chars): "
msgstr ""
-#: ../src/folders.c:46
+#: ../src/folders.c:54
#, c-format
msgid "Folder status (not in group) (arwRWpm): "
msgstr ""
-#: ../src/folders.c:49
+#: ../src/folders.c:57
#, c-format
msgid "Folder status (in group) (arwRWpm): "
msgstr ""
-#: ../src/folders.c:52
+#: ../src/folders.c:60
#, c-format
msgid "Folder groups (12345678): "
msgstr ""
-#: ../src/folders.c:57
+#: ../src/folders.c:65
#, c-format
msgid "Creating folder %s - %s\n"
msgstr ""
-#: ../src/incoming.c:552
+#: ../src/incoming.c:522
#, c-format
msgid ""
"\n"
"Your name has been changed to '%s'\n"
msgstr ""
-#: ../src/incoming.c:697
+#: ../src/incoming.c:667
msgid "*** Your ignore list has just been cleared ***"
msgstr ""
-#: ../src/incoming.c:706
+#: ../src/incoming.c:676
#, c-format
msgid ""
"\n"
@@ -804,7 +805,7 @@
"--> You appear to have been banned. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:712
+#: ../src/incoming.c:682
#, c-format
msgid ""
"\n"
@@ -812,280 +813,294 @@
"--> You appear to have been DELETED. Goodbye... <--\r\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
#, c-format
msgid ""
"\n"
"Boing, Zebedee arrived. \"%s\033--\", said Zebedee\n"
msgstr ""
-#: ../src/incoming.c:928
+#: ../src/incoming.c:898
msgid "Time for bed"
msgstr ""
-#: ../src/incoming.c:930
+#: ../src/incoming.c:900
#, c-format
msgid "%s just sent the Zebedee of Death to you.\n"
msgstr ""
-#: ../src/incoming.c:960
+#: ../src/incoming.c:930
#, c-format
msgid "Boing, Zebedee's arrived. \"Look up!\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:961
+#: ../src/incoming.c:931
#, c-format
msgid "You look up; a large object is falling towards you very fast,\n"
msgstr ""
-#: ../src/incoming.c:962
+#: ../src/incoming.c:932
#, c-format
msgid "very very fast. It looks like a Magic Roundabout!\n"
msgstr ""
-#: ../src/incoming.c:963
+#: ../src/incoming.c:933
#, c-format
msgid "\"I wouldn't stand there if I was you\", says Zebedee\n"
msgstr ""
-#: ../src/incoming.c:964
+#: ../src/incoming.c:934
#, c-format
msgid "Boing, Zebedee's left you standing all alone\n"
msgstr ""
-#: ../src/incoming.c:965
+#: ../src/incoming.c:935
#, c-format
msgid "WWWHHHEEEEEEEKKKKEEEERRRRRUUUUUNNNNNCCCCCHHHHHH\a\a\a\a\a\n"
msgstr ""
-#: ../src/incoming.c:966
+#: ../src/incoming.c:936
#, c-format
msgid "%s has just dropped the Magic Roundabout of Death on you.\n"
msgstr ""
-#: ../src/incoming.c:969
+#: ../src/incoming.c:939
#, c-format
msgid "\"%s\033--\" says Zebedee\n"
msgstr ""
-#: ../src/init.c:111
+#: ../src/init.c:130
#, c-format
msgid "Cannot load \"%s\": Illegal path\n"
msgstr ""
-#: ../src/init.c:124
+#: ../src/init.c:143
#, c-format
msgid "Error reading %s: Not a regular file\n"
msgstr ""
-#: ../src/init.c:131
+#: ../src/init.c:150
#, c-format
msgid "Error reading %s: %s\n"
msgstr ""
-#: ../src/init.c:162 ../src/init.c:169
+#: ../src/init.c:181 ../src/init.c:188
#, c-format
msgid "Malformed alias in %s at line %d\n"
msgstr ""
-#: ../src/init.c:177
+#: ../src/init.c:196
#, c-format
msgid "Alias %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:185 ../src/init.c:192
+#: ../src/init.c:204 ../src/init.c:211
#, c-format
msgid "Malformed bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:200
+#: ../src/init.c:219
#, c-format
msgid "Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:208 ../src/init.c:215
+#: ../src/init.c:227 ../src/init.c:234
#, c-format
msgid "Malformed rpc bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:223
+#: ../src/init.c:242
#, c-format
msgid "RPC Bind %s already exists. Redefined at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:231 ../src/init.c:250
+#: ../src/init.c:250 ../src/init.c:269
#, c-format
msgid "Malformed include in %s at line %d\n"
msgstr ""
-#: ../src/init.c:262
+#: ../src/init.c:281
#, c-format
msgid "Malformed event bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:270
+#: ../src/init.c:289
#, c-format
msgid "Event bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:278
+#: ../src/init.c:297
#, c-format
msgid "Malformed ipc in %s at line %d\n"
msgstr ""
-#: ../src/init.c:286
+#: ../src/init.c:305
#, c-format
msgid "IPC bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:294
+#: ../src/init.c:313
#, c-format
msgid "Malformed checkonoff bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:302
+#: ../src/init.c:321
#, c-format
msgid "Checkonoff bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:310
+#: ../src/init.c:329
#, c-format
msgid "Malformed shutdown bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:318
+#: ../src/init.c:337
#, c-format
msgid "Shutdown bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:326
+#: ../src/init.c:345
#, c-format
msgid "Malformed force bind in %s at line %d\n"
msgstr ""
-#: ../src/init.c:334
+#: ../src/init.c:353
#, c-format
msgid "Force bind already exists. Useless instruction at line %d in %s.\n"
msgstr ""
-#: ../src/init.c:342 ../src/init.c:355
+#: ../src/init.c:361 ../src/init.c:374
#, c-format
msgid "Malformed Script Function declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:368 ../src/init.c:381
+#: ../src/init.c:387 ../src/init.c:400
#, c-format
msgid "Malformed Script Init declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:394 ../src/init.c:407
+#: ../src/init.c:413 ../src/init.c:426
#, c-format
msgid "Malformed Script BoardInit declaration in %s at line %d\n"
msgstr ""
-#: ../src/init.c:415
+#: ../src/init.c:434
#, c-format
msgid "Loading file %s unrecognised command '%s' on line %d\n"
msgstr ""
-#: ../src/main.c:371
+#: ../src/main.c:253
+msgid "\03305*** You have new mail.\n"
+msgstr ""
+
+#: ../src/main.c:259
#, c-format
+msgid "\03305*** You have %d new mail messages.\n"
+msgstr ""
+
+#: ../src/main.c:485
+#, c-format
msgid ""
"\n"
"Milliways accepts the optional arguments of:\n"
"\n"
msgstr ""
-#: ../src/main.c:372
+#: ../src/main.c:486
#, c-format
msgid " -ae_arg <a> Pass the string 'a' in to all 'initfunc' functions as $*\n"
msgstr ""
-#: ../src/main.c:373
+#: ../src/main.c:487
#, c-format
msgid " -autochat Automatically use SUCS username to log onto talker\n"
msgstr ""
-#: ../src/main.c:374
+#: ../src/main.c:488
#, c-format
msgid " -autowho Show a 'who' list automatically on log on to talker\n"
msgstr ""
-#: ../src/main.c:375
+#: ../src/main.c:489
#, c-format
msgid " -i Internet mode (no readline)\n"
msgstr ""
-#: ../src/main.c:376
+#: ../src/main.c:490
#, c-format
msgid " -new Summary of new messages and quit\n"
msgstr ""
-#: ../src/main.c:377
+#: ../src/main.c:491
#, c-format
+msgid " -server <a> Connect to server <a>\n"
+msgstr ""
+
+#: ../src/main.c:492
+#, c-format
msgid " -since Lists people logged on between now and when you last logged on\n"
msgstr ""
-#: ../src/main.c:378
+#: ../src/main.c:493
#, c-format
msgid " -who Show a list of users logged on and quit\n"
msgstr ""
-#: ../src/main.c:379
+#: ../src/main.c:494
#, c-format
msgid " -what Show a list of what users are doing\n"
msgstr ""
-#: ../src/main.c:386
+#: ../src/main.c:501
#, c-format
msgid ""
"\n"
"To view this help message, use the arguments: -h, -help, or -?\n"
msgstr ""
-#: ../src/main.c:387
+#: ../src/main.c:502
#, c-format
msgid ""
"To specify arguments, you may use '--', or '/' instead of '-'.\n"
"\n"
msgstr ""
-#: ../src/main.c:403 ../src/main.c:415 ../src/main.c:427 ../src/main.c:442
+#: ../src/main.c:518 ../src/main.c:530 ../src/main.c:542 ../src/main.c:557
#, c-format
msgid "Username not permitted.\n"
msgstr ""
-#: ../src/main.c:498 ../src/main.c:524
+#: ../src/main.c:612 ../src/main.c:638
#, c-format
msgid "%s: User %s not found.\n"
msgstr ""
-#: ../src/main.c:517
+#: ../src/main.c:631
#, c-format
msgid "%s: Folder %s not found.\n"
msgstr ""
-#: ../src/main.c:559
+#: ../src/main.c:673
#, c-format
msgid "The board is currently locked to normal users.\n"
msgstr ""
-#: ../src/main.c:562
+#: ../src/main.c:676
#, c-format
msgid "The Board has been temporarily closed.\n"
msgstr ""
-#: ../src/main.c:563
+#: ../src/main.c:677
#, c-format
msgid "Please call again soon.\n"
msgstr ""
-#: ../src/main.c:577
+#: ../src/main.c:694
#, c-format
msgid "\03301%s has just entered the board."
msgstr ""
-#: ../src/main.c:601
+#: ../src/main.c:718
#, c-format
msgid ""
"\n"
@@ -1093,1021 +1108,1017 @@
"\n"
msgstr ""
-#: ../src/main.c:603
+#: ../src/main.c:720
#, c-format
msgid "Type 'talker' to enter chat mode.\n"
msgstr ""
-#: ../src/main.c:608
+#: ../src/main.c:725
#, c-format
msgid "You must register before being able to use this system fully.\n"
msgstr ""
-#: ../src/main.c:609
+#: ../src/main.c:726
#, c-format
msgid "Until then you will not be able to write in most folders or use chat mode.\n"
msgstr ""
-#: ../src/main.c:610
+#: ../src/main.c:727
#, c-format
msgid "Wait here for a few minutes and an administrator might register you.\n"
msgstr ""
-#: ../src/main.c:612
+#: ../src/main.c:729
#, c-format
msgid "Type 'help' for help.\n"
msgstr ""
-#: ../src/main.c:788
-msgid "\03305*** You have new mail.\n"
-msgstr ""
-
-#: ../src/main.c:794
+#: ../src/main.c:1075
#, c-format
-msgid "\03305*** You have %d new mail messages.\n"
-msgstr ""
-
-#: ../src/main.c:1028 ../src/main.c:1067 ../src/main.c:1091
-#, c-format
-msgid "Sorry, no help available on that subject.\n"
-msgstr ""
-
-#: ../src/main.c:1053
-#, c-format
-msgid "No general help available for talker commands.\n"
-msgstr ""
-
-#: ../src/main.c:1148
-#, c-format
msgid ""
"\n"
"Error reading incoming message pipe. panic.\n"
msgstr ""
-#: ../src/main.c:1152
+#: ../src/main.c:1079
#, c-format
msgid ""
"\n"
"Error on input terminal, argh.\n"
msgstr ""
-#: ../src/main.c:1210
+#: ../src/main.c:1152
#, c-format
msgid "Error: Urk, no message to print.\n"
msgstr ""
-#: ../src/main.c:1428
+#: ../src/main.c:1368
#, c-format
msgid "*** Timed Out, Good Bye\r\n"
msgstr ""
-#: ../src/main.c:1432
+#: ../src/main.c:1372
#, c-format
msgid "\03304%s has been timed out."
msgstr ""
-#: ../src/main.c:1439
+#: ../src/main.c:1379
#, c-format
msgid "%c*** Wakey ! Wakey !\r\n"
msgstr ""
-#: ../src/main.c:2108
+#: ../src/main.c:2030
#, c-format
msgid "Release version %s.%s.%s\n"
msgstr ""
-#: ../src/main.c:2110
+#: ../src/main.c:2032
#, c-format
msgid "Release version %s.%s\n"
msgstr ""
-#: ../src/main.c:2112
+#: ../src/main.c:2034
#, c-format
msgid "Development version %s.%s.%s\n"
msgstr ""
-#: ../src/main.c:2114
+#: ../src/main.c:2036
#, c-format
msgid "Built by %s on %s\n"
msgstr ""
-#: ../src/mesg.c:37
+#: ../src/mesg.c:26
#, c-format
msgid "User does not exist.\n"
msgstr ""
-#: ../src/mesg.c:41
+#: ../src/mesg.c:30
#, c-format
msgid "%s is not registered.\n"
msgstr ""
-#: ../src/mesg.c:47
+#: ../src/mesg.c:36
#, c-format
msgid "%s has msg off, writing anyway.\n"
msgstr ""
-#: ../src/mesg.c:49
+#: ../src/mesg.c:38
#, c-format
msgid "%s has turned messages off.\n"
msgstr ""
-#: ../src/mesg.c:58
+#: ../src/mesg.c:47
#, c-format
msgid "User not logged on.\n"
msgstr ""
-#: ../src/mesg.c:67
+#: ../src/mesg.c:56
#, c-format
msgid "Cannot inform %s of new mail.\n"
msgstr ""
-#: ../src/mod.c:31
+#: ../src/mod.c:80
#, c-format
+msgid ""
+"\n"
+"Message in folder %s\n"
+"From: %s\n"
+"To: %s\n"
+"Subject: %s\n"
+"Date: %s"
+msgstr ""
+
+#: ../src/mod.c:106
+#, c-format
msgid "Changing to folder %s\n"
msgstr ""
-#: ../src/mod.c:53
+#: ../src/mod.c:128
#, c-format
msgid "only %d of %d bytes read.\n"
msgstr ""
-#: ../src/mod.c:57
+#: ../src/mod.c:132
#, c-format
msgid "[%s] (A)pprove, (L)eave, (S)ave&delete ? (<CR> to delete)"
msgstr ""
-#: ../src/mod.c:59
+#: ../src/mod.c:134
msgid "approve"
msgstr ""
-#: ../src/mod.c:68
+#: ../src/mod.c:143
#, c-format
msgid "Message approved as mesg %d folder %s\n"
msgstr ""
-#: ../src/mod.c:70
+#: ../src/mod.c:145
msgid "leave"
msgstr ""
-#: ../src/mod.c:73
+#: ../src/mod.c:148
#, c-format
msgid "Skipping message for now.\n"
msgstr ""
-#: ../src/mod.c:75
+#: ../src/mod.c:150
msgid "save"
msgstr ""
-#: ../src/mod.c:78
+#: ../src/mod.c:153
#, c-format
msgid "Saved and Deleted\n"
msgstr ""
-#: ../src/mod.c:80
+#: ../src/mod.c:155
#, c-format
msgid "Deleted.\n"
msgstr ""
-#: ../src/mod.c:83
+#: ../src/mod.c:158
#, c-format
msgid "End of folder %s\n"
msgstr ""
-#: ../src/mod.c:157
+#: ../src/new.c:37 ../src/new.c:186 ../src/new.c:220
#, c-format
-msgid ""
-"\n"
-"Message in folder %s\n"
-"From: %s\n"
-"To: %s\n"
-"Subject: %s\n"
-"Date: %s"
-msgstr ""
-
-#: ../src/new.c:29 ../src/new.c:82 ../src/new.c:213
-#, c-format
msgid "There are no folders to read !\n"
msgstr ""
-#: ../src/new.c:49
+#: ../src/new.c:57
#, c-format
msgid ") Last read message %4d of %-4d %4d new\n"
msgstr ""
-#: ../src/new.c:54
+#: ../src/new.c:62
#, c-format
msgid ") %4d Msgs Topic: %s\n"
msgstr ""
-#: ../src/new.c:63
+#: ../src/new.c:71
#, c-format
msgid "---more--- Press <return> to continue.\r"
msgstr ""
-#: ../src/new.c:97
+#: ../src/new.c:88
#, c-format
-msgid "Scanning folder %-*s\r"
-msgstr ""
-
-#: ../src/new.c:116
-#, c-format
msgid "Error: cannot find index file for folder %s\n"
msgstr ""
-#: ../src/new.c:118
+#: ../src/new.c:90
#, c-format
msgid "Error: cannot find text file for folder %s\n"
msgstr ""
-#: ../src/new.c:142
+#: ../src/new.c:114
#, c-format
msgid "Skipping deleted message.\n"
msgstr ""
-#: ../src/new.c:158
+#: ../src/new.c:130
#, c-format
msgid "Hit return for next message (%s - %d of %d)>"
msgstr ""
-#: ../src/new.c:164
+#: ../src/new.c:136
#, c-format
msgid "Catching up on folder %s\n"
msgstr ""
-#: ../src/new.c:169
+#: ../src/new.c:141
#, c-format
msgid "Skipping this folder. %d messages left unread.\n"
msgstr ""
-#: ../src/new.c:183 ../src/newmain.c:612
+#: ../src/new.c:155 ../src/newmain.c:708
#, c-format
msgid "Unsubscribing from %s.\n"
msgstr ""
-#: ../src/new.c:218
+#: ../src/new.c:201
#, c-format
+msgid "Scanning folder %-*s\r"
+msgstr ""
+
+#: ../src/new.c:225
+#, c-format
msgid " Folder Mesg Date From Subject\n"
msgstr ""
-#: ../src/new.c:219
+#: ../src/new.c:226
#, c-format
msgid " ====== ==== ==== ==== =======\n"
msgstr ""
-#: ../src/new.c:231
+#: ../src/new.c:238
#, c-format
msgid " <empty>\n"
msgstr ""
-#: ../src/newmain.c:59 ../src/newmain.c:65
+#: ../src/newmain.c:77 ../src/newmain.c:116 ../src/newmain.c:140
#, c-format
+msgid "Sorry, no help available on that subject.\n"
+msgstr ""
+
+#: ../src/newmain.c:102
+#, c-format
+msgid "No general help available for talker commands.\n"
+msgstr ""
+
+#: ../src/newmain.c:156 ../src/newmain.c:162
+#, c-format
msgid "Unknown foldername.\n"
msgstr ""
-#: ../src/newmain.c:70
+#: ../src/newmain.c:167
#, c-format
msgid "Changing to folder %s.\n"
msgstr ""
-#: ../src/newmain.c:104 ../src/newmain.c:479
+#: ../src/newmain.c:201 ../src/newmain.c:575
#, c-format
msgid "No current folder.\n"
msgstr ""
-#: ../src/newmain.c:108
+#: ../src/newmain.c:205
#, c-format
msgid "Moved to end of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:116
+#: ../src/newmain.c:213
#, c-format
msgid "Moved to start of folder. (message %d)\n"
msgstr ""
-#: ../src/newmain.c:146
+#: ../src/newmain.c:243
#, c-format
msgid "Messages are now off.\n"
msgstr ""
-#: ../src/newmain.c:148
+#: ../src/newmain.c:245
#, c-format
msgid "Messages are already off.\n"
msgstr ""
-#: ../src/newmain.c:155
+#: ../src/newmain.c:252
#, c-format
msgid "Messages are now on.\n"
msgstr ""
-#: ../src/newmain.c:157
+#: ../src/newmain.c:254
#, c-format
msgid "Messages already on.\n"
msgstr ""
-#: ../src/newmain.c:171
+#: ../src/newmain.c:268
#, c-format
msgid "You will NOT be informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:173
+#: ../src/newmain.c:270
#, c-format
msgid "You are already not informed of logins.\n"
msgstr ""
-#: ../src/newmain.c:180
+#: ../src/newmain.c:277
#, c-format
msgid "You now WILL be informed of logins/outs\n"
msgstr ""
-#: ../src/newmain.c:182
+#: ../src/newmain.c:279
#, c-format
msgid "You are already informed of logins/outs.\n"
msgstr ""
-#: ../src/newmain.c:195
+#: ../src/newmain.c:292
#, c-format
msgid "Colours disabled.\n"
msgstr ""
-#: ../src/newmain.c:197
+#: ../src/newmain.c:294
#, c-format
msgid "Colour enabled.\n"
msgstr ""
-#: ../src/newmain.c:199
+#: ../src/newmain.c:296
#, c-format
msgid "No colour scheme loaded.\n"
msgstr ""
-#: ../src/newmain.c:200
+#: ../src/newmain.c:297
#, c-format
msgid "Current colour scheme: %d: %s\n"
msgstr ""
-#: ../src/newmain.c:215
+#: ../src/newmain.c:310
#, c-format
msgid "Error opening colour scheme list - %s\n"
msgstr ""
-#: ../src/newmain.c:219
+#: ../src/newmain.c:314
#, c-format
msgid "Listing available colour schemes:-\n"
msgstr ""
-#: ../src/newmain.c:246
+#: ../src/newmain.c:342
#, c-format
msgid "No colour schemes found.\n"
msgstr ""
-#: ../src/newmain.c:260
+#: ../src/newmain.c:356
#, c-format
msgid "ERROR: Cannot open colour scheme '%d'\n"
msgstr ""
-#: ../src/newmain.c:275
+#: ../src/newmain.c:371
#, c-format
msgid "Colour mode now disabled.\n"
msgstr ""
-#: ../src/newmain.c:277
+#: ../src/newmain.c:373
#, c-format
msgid "Colour mode already disabled.\n"
msgstr ""
-#: ../src/newmain.c:284
+#: ../src/newmain.c:380
#, c-format
msgid "Colour mode now enabled.\n"
msgstr ""
-#: ../src/newmain.c:286
+#: ../src/newmain.c:382
#, c-format
msgid "Colour mode already enabled.\n"
msgstr ""
-#: ../src/newmain.c:300
+#: ../src/newmain.c:396
#, c-format
msgid "You will NOT hear any beeps.\n"
msgstr ""
-#: ../src/newmain.c:302
+#: ../src/newmain.c:398
#, c-format
msgid "You have already turned beeps off.\n"
msgstr ""
-#: ../src/newmain.c:309
+#: ../src/newmain.c:405
#, c-format
msgid "You now WILL get beeps.\n"
msgstr ""
-#: ../src/newmain.c:311
+#: ../src/newmain.c:407
#, c-format
msgid "You are already getting beeps.\n"
msgstr ""
-#: ../src/newmain.c:325
+#: ../src/newmain.c:421
#, c-format
msgid "You will no longer receive wizchat.\n"
msgstr ""
-#: ../src/newmain.c:327
+#: ../src/newmain.c:423
#, c-format
msgid "You have already turned wizchat off.\n"
msgstr ""
-#: ../src/newmain.c:334
+#: ../src/newmain.c:430
#, c-format
msgid "You will now receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:336
+#: ../src/newmain.c:432
#, c-format
msgid "You already receive wizchat messages.\n"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
#, c-format
msgid "Forcing Subscription to folder %s "
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "Off"
msgstr ""
-#: ../src/newmain.c:352
+#: ../src/newmain.c:448
msgid "On"
msgstr ""
-#: ../src/newmain.c:355
+#: ../src/newmain.c:451
#, c-format
msgid ""
"Failed\n"
"Unknown folder name %s\n"
msgstr ""
-#: ../src/newmain.c:359
+#: ../src/newmain.c:455
#, c-format
msgid ", Done.\n"
msgstr ""
-#: ../src/newmain.c:373
+#: ../src/newmain.c:469
#, c-format
msgid "Wiz! Bang! - You're a wizard again.\n"
msgstr ""
-#: ../src/newmain.c:375
+#: ../src/newmain.c:471
#, c-format
msgid "You are already a wizard.\n"
msgstr ""
-#: ../src/newmain.c:383
+#: ../src/newmain.c:479
#, c-format
msgid "!gnaB !ziW - You feel rather normal.\n"
msgstr ""
-#: ../src/newmain.c:385
+#: ../src/newmain.c:481
#, c-format
msgid "You are already rather normal.\n"
msgstr ""
-#: ../src/newmain.c:414
+#: ../src/newmain.c:510
#, c-format
msgid "You have been sent to 'coventry' you are not allowed to talk to anyone..\n"
msgstr ""
-#: ../src/newmain.c:460
+#: ../src/newmain.c:556
#, c-format
msgid "Sorry, message is %d character%s too long (would be truncated to: '%s'). Try again.\n"
msgstr ""
-#: ../src/newmain.c:472
+#: ../src/newmain.c:568
#, c-format
msgid "You are marked as doing nothing.\n"
msgstr ""
-#: ../src/newmain.c:482
+#: ../src/newmain.c:578
#, c-format
msgid "Current folder = %s\n"
msgstr ""
-#: ../src/newmain.c:484
+#: ../src/newmain.c:580
#, c-format
msgid "You haven't read any messages in this folder yet.\n"
msgstr ""
-#: ../src/newmain.c:486
+#: ../src/newmain.c:582
#, c-format
msgid "You last read message %d.\n"
msgstr ""
-#: ../src/newmain.c:498
+#: ../src/newmain.c:594
#, c-format
msgid "You are not permitted to read this folder.\n"
msgstr ""
-#: ../src/newmain.c:508
+#: ../src/newmain.c:604
#, c-format
msgid "WARNING: This command should not be run whilst people are using\n"
msgstr ""
-#: ../src/newmain.c:509
+#: ../src/newmain.c:605
#, c-format
msgid " the bulletin board, please exercise caution.\n"
msgstr ""
-#: ../src/newmain.c:525
+#: ../src/newmain.c:621
#, c-format
msgid "Could not lockboard.\n"
msgstr ""
-#: ../src/newmain.c:529
+#: ../src/newmain.c:625
#, c-format
msgid "Board now locked.\n"
msgstr ""
-#: ../src/newmain.c:534
+#: ../src/newmain.c:630
#, c-format
msgid "Already Locked.\n"
msgstr ""
-#: ../src/newmain.c:541
+#: ../src/newmain.c:637
#, c-format
msgid "Board now unlocked.\n"
msgstr ""
-#: ../src/newmain.c:544
+#: ../src/newmain.c:640
#, c-format
msgid "Board not locked.\n"
msgstr ""
-#: ../src/newmain.c:546
+#: ../src/newmain.c:642
#, c-format
msgid "Do you want to lock or unlock it.\n"
msgstr ""
-#: ../src/newmain.c:575
+#: ../src/newmain.c:671
msgid "Enter old password: "
msgstr ""
-#: ../src/newmain.c:576
+#: ../src/newmain.c:672
#, c-format
msgid "Incorrect.\n"
msgstr ""
-#: ../src/newmain.c:580
+#: ../src/newmain.c:676
msgid "New password: "
msgstr ""
-#: ../src/newmain.c:583
+#: ../src/newmain.c:679
#, c-format
msgid "Did not match.\n"
msgstr ""
-#: ../src/newmain.c:588
+#: ../src/newmain.c:684
#, c-format
msgid "Password set.\n"
msgstr ""
-#: ../src/newmain.c:597
+#: ../src/newmain.c:693
#, c-format
msgid "You are already subscribed to %s.\n"
msgstr ""
-#: ../src/newmain.c:601
+#: ../src/newmain.c:697
#, c-format
msgid "Resubscribing to %s.\n"
msgstr ""
-#: ../src/newmain.c:608
+#: ../src/newmain.c:704
#, c-format
msgid "Already Unsubscribed from %s.\n"
msgstr ""
-#: ../src/newmain.c:625
+#: ../src/newmain.c:721
#, c-format
msgid "You are already at the beginning of the folder.\n"
msgstr ""
-#: ../src/newmain.c:631
+#: ../src/newmain.c:727
#, c-format
msgid "You are already at the end of this folder.\n"
msgstr ""
-#: ../src/newmain.c:643
+#: ../src/newmain.c:739
#, c-format
msgid "Current Status of %s\n"
msgstr ""
-#: ../src/newmain.c:644
+#: ../src/newmain.c:740
#, c-format
msgid "Your real name is %s\n"
msgstr ""
-#: ../src/newmain.c:645
+#: ../src/newmain.c:741
#, c-format
msgid "Your contact address is %s\n"
msgstr ""
-#: ../src/newmain.c:646
+#: ../src/newmain.c:742
#, c-format
msgid "Your current status is [%s]\n"
msgstr ""
-#: ../src/newmain.c:647
+#: ../src/newmain.c:743
#, c-format
msgid "Special settings are [%s]\n"
msgstr ""
-#: ../src/newmain.c:658
+#: ../src/newmain.c:754
#, c-format
msgid "Talker modes=[%s] privs=[%s] protection=[%s]\n"
msgstr ""
-#: ../src/newmain.c:664
+#: ../src/newmain.c:760
#, c-format
msgid "Talker modes=[%s] privs=[%s]\n"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
#, c-format
msgid "You have set messages %s.\n"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "off"
msgstr ""
-#: ../src/newmain.c:666
+#: ../src/newmain.c:762
msgid "on"
msgstr ""
-#: ../src/newmain.c:667
+#: ../src/newmain.c:763
#, c-format
msgid "You %s be informed of logins and logouts\n"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will not"
msgstr ""
-#: ../src/newmain.c:667 ../src/newmain.c:668 ../src/newmain.c:678
+#: ../src/newmain.c:763 ../src/newmain.c:764 ../src/newmain.c:774
msgid "will"
msgstr ""
-#: ../src/newmain.c:668
+#: ../src/newmain.c:764
#, c-format
msgid "You %s hear beeps.\n"
msgstr ""
-#: ../src/newmain.c:671
+#: ../src/newmain.c:767
#, c-format
msgid "You can use wizchat"
msgstr ""
-#: ../src/newmain.c:673
+#: ../src/newmain.c:769
#, c-format
msgid ", but you will not hear any replies"
msgstr ""
-#: ../src/newmain.c:677
+#: ../src/newmain.c:773
#, c-format
msgid "You %s informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:679
+#: ../src/newmain.c:775
#, c-format
msgid "You belong to the following group(s) [%s]\n"
msgstr ""
-#: ../src/newmain.c:680
+#: ../src/newmain.c:776
#, c-format
msgid "You are currently in folder %s, which you "
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are"
msgstr ""
-#: ../src/newmain.c:681
+#: ../src/newmain.c:777
#, c-format
msgid "are not"
msgstr ""
-#: ../src/newmain.c:682
+#: ../src/newmain.c:778
#, c-format
msgid " subscribed to.\n"
msgstr ""
-#: ../src/newmain.c:684
+#: ../src/newmain.c:780
#, c-format
msgid "You will not be timed out for being idle.\n"
msgstr ""
-#: ../src/newmain.c:686
+#: ../src/newmain.c:782
#, c-format
msgid "You will be timed out after being idle for %s.\n"
msgstr ""
-#: ../src/newmain.c:705
+#: ../src/newmain.c:819
#, c-format
msgid "You have to read a message before you can reply to it.\n"
msgstr ""
-#: ../src/newmain.c:708
+#: ../src/newmain.c:822
#, c-format
msgid "Replying to message %d.\n"
msgstr ""
-#: ../src/newmain.c:722
+#: ../src/newmain.c:836
#, c-format
msgid "No folders found.\n"
msgstr ""
-#: ../src/newmain.c:727
+#: ../src/newmain.c:841
#, c-format
msgid "Marking ALL folders as read.\n"
msgstr ""
-#: ../src/newmain.c:747
+#: ../src/newmain.c:861
#, c-format
msgid "There is no folder '%s'\n"
msgstr ""
-#: ../src/newmain.c:753
+#: ../src/newmain.c:867
#, c-format
msgid "There is no folder %s\n"
msgstr ""
-#: ../src/newmain.c:764
+#: ../src/newmain.c:878
#, c-format
msgid "Marking folder %s as read.\n"
msgstr ""
-#: ../src/newmain.c:772
+#: ../src/newmain.c:886
#, c-format
msgid "Current time and date is %s"
msgstr ""
-#: ../src/newmain.c:840 ../src/newmain.c:864
+#: ../src/newmain.c:954 ../src/newmain.c:978
#, c-format
msgid "TIMEOUT must be at least 10 minutes.\n"
msgstr ""
-#: ../src/newmain.c:856
+#: ../src/newmain.c:970
#, c-format
msgid "Invalid time unit '%c' must be one of: dhms.\n"
msgstr ""
-#: ../src/newmain.c:870
+#: ../src/newmain.c:984
#, c-format
msgid "TIMEOUT now set to %s\n"
msgstr ""
-#: ../src/newmain.c:872
+#: ../src/newmain.c:986
#, c-format
msgid "TIMEOUT was already set to %s.\n"
msgstr ""
-#: ../src/newmain.c:887
+#: ../src/newmain.c:1001
#, c-format
msgid "Timestamps now disabled.\n"
msgstr ""
-#: ../src/newmain.c:889
+#: ../src/newmain.c:1003
#, c-format
msgid "Timestamping was already off.\n"
msgstr ""
-#: ../src/newmain.c:896
+#: ../src/newmain.c:1010
#, c-format
msgid "Timestamps now enabled.\n"
msgstr ""
-#: ../src/newmain.c:898
+#: ../src/newmain.c:1012
#, c-format
msgid "Timestamping already enabled.\n"
msgstr ""
-#: ../src/newmain.c:912
+#: ../src/newmain.c:1026
#, c-format
msgid "Posting information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:914
+#: ../src/newmain.c:1028
#, c-format
msgid "Posting info was already off.\n"
msgstr ""
-#: ../src/newmain.c:921
+#: ../src/newmain.c:1035
#, c-format
msgid "You will now be informed of new postings.\n"
msgstr ""
-#: ../src/newmain.c:923
+#: ../src/newmain.c:1037
#, c-format
msgid "Posting info was already on.\n"
msgstr ""
-#: ../src/newmain.c:937
+#: ../src/newmain.c:1051
#, c-format
msgid "User change information now suppressed.\n"
msgstr ""
-#: ../src/newmain.c:939
+#: ../src/newmain.c:1053
#, c-format
msgid "Change info was already off.\n"
msgstr ""
-#: ../src/newmain.c:946
+#: ../src/newmain.c:1060
#, c-format
msgid "You will now be informed of user status changes.\n"
msgstr ""
-#: ../src/newmain.c:948
+#: ../src/newmain.c:1062
#, c-format
msgid "Change info was already on.\n"
msgstr ""
-#: ../src/newmain.c:959
+#: ../src/newmain.c:1073
#, c-format
msgid "Already in chat mode, silly.\n"
msgstr ""
-#: ../src/newmain.c:975
+#: ../src/newmain.c:1089
#, c-format
msgid "You are not allowed to change your contact address. Please notify a SuperUser to change this for you.\n"
msgstr ""
-#: ../src/newmain.c:982
+#: ../src/newmain.c:1096
#, c-format
msgid "Alias '%s' already exists. Has now been redefined!\n"
msgstr ""
-#: ../src/newmain.c:984
+#: ../src/newmain.c:1098
#, c-format
msgid "Alias '%s' added!\n"
msgstr ""
-#: ../src/newmain.c:992
+#: ../src/newmain.c:1106
#, c-format
msgid "All Aliases Destroyed!\n"
msgstr ""
-#: ../src/newmain.c:997
+#: ../src/newmain.c:1111
#, c-format
msgid "Alias '%s' was not found!\n"
msgstr ""
-#: ../src/newmain.c:999
+#: ../src/newmain.c:1113
#, c-format
msgid "Alias '%s' was destroyed...\n"
msgstr ""
-#: ../src/talker.c:446 ../src/talker.c:448
+#: ../src/talker.c:449 ../src/talker.c:451
#, c-format
msgid "Current mwrc path: %s\n"
msgstr ""
-#: ../src/talker.c:446
+#: ../src/talker.c:449
msgid "<unset>"
msgstr ""
-#: ../src/talker.c:454
+#: ../src/talker.c:457
#, c-format
msgid "Setting mwrc path to: %s\n"
msgstr ""
-#: ../src/talker.c:533
+#: ../src/talker.c:536
#, c-format
-msgid "User %s not logged on.\n"
+msgid "User '%s' is not logged on.\n"
msgstr ""
-#: ../src/user.c:90
+#: ../src/user.c:82
+msgid "Enter Password: "
+msgstr ""
+
+#: ../src/user.c:85
#, c-format
-msgid "Please enter username: "
+msgid ""
+"Login Incorrect.\n"
+"\n"
msgstr ""
-#: ../src/user.c:92
+#: ../src/user.c:93
#, c-format
-msgid "Please enter username [%s]: "
+msgid "Sorry, this username has been banned.\n"
msgstr ""
-#: ../src/user.c:106
+#: ../src/user.c:94
#, c-format
-msgid "Don't be shy.\n"
+msgid "Have a nice day. *:-)\n"
msgstr ""
-#: ../src/user.c:143
+#: ../src/user.c:102
#, c-format
-msgid "Problem in get_person: my uid=%d my euid=%d"
+msgid "Sorry, you do not have permission to run development versions of milliways.\n"
msgstr ""
-#: ../src/user.c:163
-msgid "Enter Password: "
+#: ../src/user.c:108
+#, c-format
+msgid "Hello %s.\n"
msgstr ""
-#: ../src/user.c:166
+#: ../src/user.c:138
#, c-format
-msgid ""
-"Login Incorrect.\n"
-"\n"
+msgid "Please enter username: "
msgstr ""
-#: ../src/user.c:174
+#: ../src/user.c:140
#, c-format
-msgid "Sorry, this username has been banned.\n"
+msgid "Please enter username [%s]: "
msgstr ""
-#: ../src/user.c:175
+#: ../src/user.c:154
#, c-format
-msgid "Have a nice day. *:-)\n"
+msgid "Don't be shy.\n"
msgstr ""
-#: ../src/user.c:183
+#: ../src/user.c:173
#, c-format
-msgid "Sorry, you do not have permission to run development versions of milliways.\n"
+msgid "Problem in get_person: my uid=%d my euid=%d"
msgstr ""
-#: ../src/user.c:189
+#: ../src/user.c:262
#, c-format
-msgid "Hello %s.\n"
+msgid "What status do you want to be ? [rms] "
msgstr ""
-#: ../src/user.c:198
+#: ../src/user.c:287
#, c-format
-msgid "Did I get your name right %s ? y/n: "
+msgid "Did I get your name right %s ? [Y]/n: "
msgstr ""
-#: ../src/user.c:207
+#: ../src/user.c:300
#, c-format
msgid ""
"Sorry, you do not have permission to run development versions of milliways.\n"
"Please log in again using the public version.\n"
msgstr ""
-#: ../src/user.c:214
+#: ../src/user.c:307
#, c-format
msgid "We use a password on this BB.\n"
msgstr ""
-#: ../src/user.c:217
+#: ../src/user.c:310
#, c-format
msgid "Passwords did not match.\n"
msgstr ""
-#: ../src/user.c:218
+#: ../src/user.c:311
msgid "Enter password: "
msgstr ""
-#: ../src/user.c:219
+#: ../src/user.c:312
msgid "Re-enter password: "
msgstr ""
-#: ../src/user.c:224
+#: ../src/user.c:317
#, c-format
msgid ""
"\n"
"Please enter the following details so that we can register you as a\n"
msgstr ""
-#: ../src/user.c:225
+#: ../src/user.c:318
#, c-format
msgid "normal user of this bulletin board. without correct information you\n"
msgstr ""
-#: ../src/user.c:226
+#: ../src/user.c:319
#, c-format
msgid "will not be allowed to use the full facilities of this board.\n"
msgstr ""
-#: ../src/user.c:227
+#: ../src/user.c:320
#, c-format
msgid ""
"\n"
"DATA PROTECTION ACT:\n"
msgstr ""
-#: ../src/user.c:228
+#: ../src/user.c:321
#, c-format
msgid "Any data entered will be recorded in a computer database for the purpose\n"
msgstr ""
-#: ../src/user.c:229
+#: ../src/user.c:322
#, c-format
msgid "of the administration, operation and security of the computer society. By \n"
msgstr ""
-#: ../src/user.c:230
+#: ../src/user.c:323
#, c-format
msgid "entering this data you consent to the storage of this data, and become an\n"
msgstr ""
-#: ../src/user.c:231
+#: ../src/user.c:324
#, c-format
msgid "associate member of the society.\n"
msgstr ""
-#: ../src/user.c:232
+#: ../src/user.c:325
#, c-format
msgid ""
"\n"
@@ -2115,32 +2126,27 @@
"\n"
msgstr ""
-#: ../src/user.c:235
+#: ../src/user.c:328
#, c-format
msgid "Real Name: "
msgstr ""
-#: ../src/user.c:240
+#: ../src/user.c:333
#, c-format
msgid "User record '%s' cancelled.\n"
msgstr ""
-#: ../src/user.c:241
+#: ../src/user.c:334
#, c-format
msgid "Goodbye.\n"
msgstr ""
-#: ../src/user.c:247
+#: ../src/user.c:340
#, c-format
msgid "Email address: "
msgstr ""
-#: ../src/user.c:256
+#: ../src/user.c:349
#, c-format
msgid "Creating new user %s\n"
msgstr ""
-
-#: ../src/user.c:338
-#, c-format
-msgid "What status do you want to be ? [rms] "
-msgstr ""
Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/Makefile 2012-11-17 19:57:05 UTC (rev 1288)
@@ -11,7 +11,7 @@
CFLAGS+=-I/usr/include/mozjs
# cflags for standard 'cc' compiler
-CFLAGS+= -Wall -pedantic -fpie -std=gnu99 -D_GNU_SOURCE
+CFLAGS+= -Wall -Wshadow -Wmissing-prototypes -Wno-strict-aliasing -pedantic -fpie -std=gnu99 -D_GNU_SOURCE
LDFLAGS+= -pie
LDLIBS+= -lreadline -ltermcap -lcrypt -l$(JSLIB) -lsqlite3 -lcurl -lpthread -lgnutls-openssl -ljansson
@@ -54,7 +54,7 @@
.PHONY: build install clean test
mw: user.o main.o read.o add.o folders.o new.o perms.o edit.o mod.o who.o\
-echo.o getpass.o filter.o mesg.o strings.o special.o Parse.o\
+echo.o getpass.o mesg.o strings.o special.o Parse.o\
newmain.o init.o talker.o talker_privs.o colour.o bork.o rooms.o alarm.o\
topten.o sort.o tidyup.o gags.o script_inst.o script.o\
incoming.o command.o chattable.o alias.o frl.o hash.o vars.o expand.o\
Modified: trunk/src/add.c
===================================================================
--- trunk/src/add.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/add.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -20,22 +20,88 @@
#include "read.h"
#include "user.h"
#include "main.h"
-#include "filter.h"
#include "init.h"
#include "mesg.h"
#include "intl.h"
+#include "add.h"
+#include "talker.h"
extern int eof_caught;
extern int remote;
extern int busy;
+static void tidy_string(char *buff)
+{
+ int linelength=0;
+ int ptr=0;
+ int screen_width=screen_w();
+
+ while (buff[ptr]!=0)
+ {
+ if (buff[ptr]!='\n')
+ {
+ linelength++;
+ if (linelength>=screen_width)
+ if (buff[ptr]==' ')
+ {
+ buff[ptr]='\n';
+ linelength=0;
+ ptr++;
+ }
+ else
+ {
+ while (buff[ptr]!=' ' && buff[ptr]!='\n')
+ ptr--;
+ if (buff[ptr]==' ')
+ {
+ buff[ptr]='\n';
+ linelength=0;
+ ptr++;
+ }else
+ {
+ ptr+=linelength;
+ buff[ptr]='\n';
+ linelength=0;
+ ptr++;
+ }
+ }
+ else
+ ptr++;
+ }else
+ {
+ linelength=0;
+ ptr++;
+ }
+ }
+}
+
+static void filter_returns(char *buff) /* and tabs */
+{
+ int a;
+ int blank;
+ blank=0;
+ a=0;
+ while(buff[a]!=0)
+ {
+ if (buff[a]=='\t') buff[a]=' ';
+ if (buff[a]=='\n')
+ {
+ if (blank!=1 && buff[a+1]!='\n')
+ buff[a]=' ';
+ if (buff[a+1]=='\n') blank=1;
+ else blank=0;
+ }
+ a++;
+ }
+}
+
int add_msg(int folnum,struct person *user,int replyto)
{
struct Header *new;
struct Header inreplyto;
long replyposn=0l;
struct folder *fol;
- int index,data,folderfile;
+ int i,data,folderfile;
int ptr=0;
int limit;
char *buff;
@@ -318,7 +384,7 @@
/* open files ready for saveing */
- if ((index=err_open(buildpath(STATEDIR,fol->name,INDEX_END,is_moderated(fol,user)?MOD_END:""),O_CREAT|O_RDWR,0600))<0)
+ if ((i=err_open(buildpath(STATEDIR,fol->name,INDEX_END,is_moderated(fol,user)?MOD_END:""),O_CREAT|O_RDWR,0600))<0)
{
exit(-1);
}
@@ -327,7 +393,7 @@
exit(-1);
}
Lock_File(folderfile);
- Lock_File(index);
+ Lock_File(i);
Lock_File(data);
new->datafield=lseek(data,0l,2);
@@ -341,22 +407,22 @@
if (fol->first==0) fol->first=1;
if (replyto>0)
{
- lseek(index,replyposn,0);
- write(index,&inreplyto,sizeof(inreplyto));
+ lseek(i,replyposn,0);
+ write(i,&inreplyto,sizeof(inreplyto));
}
}else
{
new->Ref=0;
}
- tt=lseek(index,0,2);
+ tt=lseek(i,0,2);
td=tt%sizeof(*new);
if (td>0){
printf(_("Warning: Index error, skipping back %ld bytes.\r\n"),td);
- lseek(index,-td,1);
+ lseek(i,-td,1);
}
- if ((write(index,new,sizeof(*new)))<sizeof(*new))
+ if ((write(i,new,sizeof(*new)))<sizeof(*new))
{
perror("index");
exit(-1);
@@ -380,10 +446,10 @@
}
}
Unlock_File(data);
- Unlock_File(index);
+ Unlock_File(i);
Unlock_File(folderfile);
- close(index);
+ close(i);
close(data);
close(folderfile);
if (is_private(fol,user)) inform_of_mail(new->to);
Modified: trunk/src/alarm.c
===================================================================
--- trunk/src/alarm.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/alarm.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -18,12 +18,12 @@
sigaction(SIGALRM, &s, NULL);
}
-void alarm_enable()
+void alarm_enable(void)
{
alarm_enabled = 1;
}
-void alarm_disable()
+void alarm_disable(void)
{
alarm_enabled = 0;
}
@@ -68,7 +68,7 @@
}
}
-void alarm_check()
+void alarm_check(void)
{
struct timeval now;
struct itimerval delay;
Modified: trunk/src/alarm.h
===================================================================
--- trunk/src/alarm.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/alarm.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -18,9 +18,9 @@
extern struct alarm *volatile first_alarm, *volatile next_alarm;
-void alarm_enable();
-void alarm_disable();
-void alarm_check();
+void alarm_enable(void);
+void alarm_disable(void);
+void alarm_check(void);
void alarm_init(void);
void alarm_cleanup(void);
void alarm_handler(int sig);
Modified: trunk/src/colour.c
===================================================================
--- trunk/src/colour.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/colour.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -14,6 +14,7 @@
#include "bb.h"
#include "frl.h"
#include "user.h"
+#include "colour.h"
#define COLOUR_LIMIT 40
static char *colour_chart[COLOUR_LIMIT];
Modified: trunk/src/echo.c
===================================================================
--- trunk/src/echo.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/echo.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -8,6 +8,7 @@
#include <termios.h>
#include <arpa/telnet.h>
/* POSIX echo handler - Alan Cox 1993 */
+#include "echo.h"
extern int internet;
Modified: trunk/src/edit.c
===================================================================
--- trunk/src/edit.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/edit.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -519,7 +519,6 @@
{
char temp[FOLNAMESIZE+1];
int folnum;
- int read;
printf(_("Lastread in folder? "));
get_str(temp,FOLNAMESIZE);
folnum=foldernumber(temp);
@@ -533,10 +532,10 @@
get_str(temp,5);
if (*temp)
{
- read=atoi(temp);
- usr.lastread[folnum]=read;
- printf(_("Lastread changed to %d\n"),read);
- sprintf(temp,"%d:%d",folnum,read);
+ int lastread = atoi(temp);
+ usr.lastread[folnum] = lastread;
+ printf(_("Lastread changed to %d\n"), lastread);
+ sprintf(temp, "%d:%d", folnum, lastread);
ipc_send_to_username(usr.name, IPC_LASTREAD, temp);
}else
printf(_("Not changed.\n"));
@@ -600,17 +599,17 @@
static void users_lastread(int folnum)
{
- struct person user;
+ struct person usr;
int ufile;
ufile=openuserfile(O_RDWR);
Lock_File(ufile);
- while (read(ufile,&user,sizeof(user))>0)
+ while (read(ufile,&usr,sizeof(usr))>0)
{
- lseek(ufile,-1*sizeof(user),1);
- user.lastread[folnum]=0;
- user.folders[0]|=(1<<folnum);
- write(ufile,&user,sizeof(user));
+ lseek(ufile,-1*sizeof(usr),1);
+ usr.lastread[folnum]=0;
+ usr.folders[0]|=(1<<folnum);
+ write(ufile,&usr,sizeof(usr));
}
Unlock_File(ufile);
close(ufile);
@@ -794,17 +793,17 @@
void mesg_edit(char *args, char *foldername, int msgno, struct person *usr)
{
- int index,text;
+ int fd, text;
struct Header head;
char *buff;
- if ((index=err_open(buildpath(STATEDIR,foldername,INDEX_END,""),O_RDWR,0))<0)
+ if ((fd=err_open(buildpath(STATEDIR,foldername,INDEX_END,""),O_RDWR,0))<0)
return;
if ((text=err_open(buildpath(STATEDIR,foldername,TEXT_END,""),O_RDWR,0))<0)
return;
/* go and get message */
- while (get_data(index,&head) && head.Ref<msgno);
+ while (get_data(fd,&head) && head.Ref<msgno);
if (head.Ref!=msgno)
{
printf(_("Message %d not found.\n"),msgno);
@@ -950,11 +949,11 @@
}
else
printf(_("What do you want to do ?\n"));
- Lock_File(index);
- lseek(index,-1*sizeof(head),1);
- write(index,&head,sizeof(head));
- Unlock_File(index);
- close(index);
+ Lock_File(fd);
+ lseek(fd,-1*sizeof(head),1);
+ write(fd,&head,sizeof(head));
+ Unlock_File(fd);
+ close(fd);
close(text);
free(buff);
}
Modified: trunk/src/files.h
===================================================================
--- trunk/src/files.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/files.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -28,6 +28,4 @@
int get_folder_entry(int file, struct folder *tmp);
int get_folder_number(struct folder *fol, int num);
-extern int incoming_pipe;
-
#endif
Deleted: trunk/src/filter.c
===================================================================
--- trunk/src/filter.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/filter.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -1,73 +0,0 @@
-/*********************************************************
- * The Milliways III System is copyright 1992 *
- * J.S.Mitchell. (arthur at sugalaxy.swan.ac.uk) *
- * see licence for furthur information. *
- *********************************************************/
-
-#include <stdio.h>
-#include "talker.h"
-
-void tidy_string(char *buff)
-{
- int linelength=0;
- int ptr=0;
- int screen_width=screen_w();
-
- while (buff[ptr]!=0)
- {
- if (buff[ptr]!='\n')
- {
- linelength++;
- if (linelength>=screen_width)
- if (buff[ptr]==' ')
- {
- buff[ptr]='\n';
- linelength=0;
- ptr++;
- }
- else
- {
- while (buff[ptr]!=' ' && buff[ptr]!='\n')
- ptr--;
- if (buff[ptr]==' ')
- {
- buff[ptr]='\n';
- linelength=0;
- ptr++;
- }else
- {
- ptr+=linelength;
- buff[ptr]='\n';
- linelength=0;
- ptr++;
- }
- }
- else
- ptr++;
- }else
- {
- linelength=0;
- ptr++;
- }
- }
-}
-
-void filter_returns(char *buff) /* and tabs */
-{
- int a;
- int blank;
- blank=0;
- a=0;
- while(buff[a]!=0)
- {
- if (buff[a]=='\t') buff[a]=' ';
- if (buff[a]=='\n')
- {
- if (blank!=1 && buff[a+1]!='\n')
- buff[a]=' ';
- if (buff[a+1]=='\n') blank=1;
- else blank=0;
- }
- a++;
- }
-}
Deleted: trunk/src/filter.h
===================================================================
--- trunk/src/filter.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/filter.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -1,7 +0,0 @@
-#ifndef FILTER_H
-#define FILTER_H
-
-void tidy_string(char *buff);
-void filter_returns(char *buff);
-
-#endif /* FILTER_H */
Modified: trunk/src/gags.c
===================================================================
--- trunk/src/gags.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/gags.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -14,7 +14,7 @@
****************************************************************/
/* given two strings of the same length, will copy colour codes from one to the other */
-char *merge_colours(char *in, char *old)
+static char *merge_colours(char *in, char *old)
{
char *new=NULL;
int n, i;
@@ -33,7 +33,7 @@
}
/* replaces every word in a string with another string */
-void gag_wordrep(char *text,char *rep)
+static void gag_wordrep(char *text,char *rep)
{
int wordcount=1;
char *temp=text;
Modified: trunk/src/getpass.c
===================================================================
--- trunk/src/getpass.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/getpass.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -7,6 +7,7 @@
#include <stdio.h>
#include "bb.h"
#include "echo.h"
+#include "getpass.h"
char *get_pass(char *p)
{
Modified: trunk/src/hash.c
===================================================================
--- trunk/src/hash.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/hash.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -1,12 +1,10 @@
/* hash.c
* hashtable functions
*/
-
-#include "hash.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include "hash.h"
#define INITIALBUCKETS 256
#define INITIALFIELDS 64
Modified: trunk/src/hash.h
===================================================================
--- trunk/src/hash.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/hash.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -50,9 +50,9 @@
extern union fieldrec *fields;
extern int code;
-void hash_setup();
-void hash_shutdown();
-int hash_alloc();
+extern void hash_setup(void);
+extern void hash_shutdown(void);
+extern int hash_alloc(void);
void hash_free(int field);
void hash_iterate(struct hashrec ***iter, int field);
void hash_next(struct hashrec ***iter);
Modified: trunk/src/incoming.c
===================================================================
--- trunk/src/incoming.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/incoming.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -106,7 +106,7 @@
InsertMesg(new);
}
-void StackEvent(char *text, char *from, int flags)
+static void StackEvent(char *text, char *from, int flags)
{
struct mstack *new;
new=(struct mstack *)malloc(sizeof(struct mstack));
@@ -198,7 +198,7 @@
char *backup;
char *onoff_name, *sep, *head, *head2;
char *uname, *reason = NULL;
- int code, method, isquiet;
+ int ccode, method, isquiet;
/* go through list and find checkonoff function */
onoff_name = NULL;
@@ -217,11 +217,11 @@
if (sep == NULL)
{
/* simply convert to a number */
- code = atoi(new->text);
+ ccode = atoi(new->text);
/* due to backwards compatibility issues, we can only use 0 or 1 */
- if (code < 0) { free(backup); break; }
- if (code > 1) { free(backup); break; }
+ if (ccode < 0) { free(backup); break; }
+ if (ccode > 1) { free(backup); break; }
/* create memory for argument strings */
aargs[0] = malloc(sizeof(char) * 13);
@@ -232,7 +232,7 @@
aargs[5] = malloc(sizeof(char) * MAXTEXTLENGTH);
/* set up the argument strings */
- snprintf(aargs[0], 12, "%d", code);
+ snprintf(aargs[0], 12, "%d", ccode);
aargs[1][0] = 0;
aargs[2][0] = 0;
aargs[3][0] = 0;
@@ -258,7 +258,7 @@
*sep = 0;
/* get the checkonoff code number */
- code = atoi(new->text);
+ ccode = atoi(new->text);
/* get the next comma in the checkonoff code */
sep = strchr(head, ',');
@@ -266,8 +266,8 @@
if (sep == NULL)
{
/* due to backwards compatibility issues, we can only use 0 or 1 */
- if (code < 0) { free(backup); break; }
- if (code > 1) { free(backup); break; }
+ if (ccode < 0) { free(backup); break; }
+ if (ccode > 1) { free(backup); break; }
/* simply convert the next argument to a number */
isquiet = atoi(head);
@@ -281,7 +281,7 @@
aargs[5] = malloc(sizeof(char) * MAXTEXTLENGTH);
/* set up the argument strings */
- snprintf(aargs[0], 12, "%d", code);
+ snprintf(aargs[0], 12, "%d", ccode);
aargs[1][0] = 0;
snprintf(aargs[2], 2, "%d", isquiet);
aargs[3][0] = 0;
@@ -336,7 +336,7 @@
}
/* limit the method information */
- switch (code)
+ switch (ccode)
{
/* leave the talker */
case 0:
@@ -391,7 +391,7 @@
aargs[5] = malloc(sizeof(char) * MAXTEXTLENGTH);
/* set up the argument strings */
- snprintf(aargs[0], 12, "%d", code);
+ snprintf(aargs[0], 12, "%d", ccode);
snprintf(aargs[1], 12, "%d", method);
snprintf(aargs[2], 2, "%d", isquiet);
snprintf(aargs[3], NAMESIZE, "%s", uname);
@@ -428,7 +428,7 @@
MesgStack=NULL;
}
-int MesgIsStacked()
+int MesgIsStacked(void)
{
return (MesgStacked > 0);
}
Modified: trunk/src/incoming.h
===================================================================
--- trunk/src/incoming.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/incoming.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -33,7 +33,7 @@
void handle_mesg(void);
void InsertMesg(struct mstack *mesg);
void StackMesg(char *text, char *from, int event);
-int MesgIsStacked();
+extern int MesgIsStacked(void);
void DisplayStack(void);
void ClearStack(void);
void PopMesg(void);
Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/init.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -16,6 +16,7 @@
#include "alias.h"
#include "js.h"
#include "sqlite.h"
+#include "init.h"
#include <curl/curl.h>
extern Alias alias_list;
@@ -33,9 +34,7 @@
extern struct person *user;
-/* Prototypes */
int ReadInitFile(char *base, char *filename);
-void LoadFunction(char *, char *, FILE *, int *, const char *, int);
void DestroyFunction(char *);
/* drop and restore user level privs */
Modified: trunk/src/ipc.c
===================================================================
--- trunk/src/ipc.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/ipc.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -14,6 +14,7 @@
#include "who.h"
#include "files.h"
#include "socket.h"
+#include "strings.h"
/* client mode uses this as its connection */
ipc_connection_t * ipcsock = NULL;
Modified: trunk/src/js.c
===================================================================
--- trunk/src/js.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/js.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -30,6 +30,7 @@
#include "user.h"
#include "init.h"
#include "who.h"
+#include "js.h"
extern Alias alias_list;
extern Alias bind_list;
@@ -94,7 +95,7 @@
/* prints a warning */
-void js_warning(JSContext *cx, const char *warning)
+static void js_warning(JSContext *cx, const char *warning)
{
JSStackFrame *fp = NULL;
JSScript *script;
@@ -119,7 +120,7 @@
}
/* clears the timeout event when a js finishes (or the js uses input) */
-void js_clear_timeout(void)
+static void js_clear_timeout(void)
{
if(js_timeout_event != NULL)
{
@@ -129,7 +130,7 @@
}
/* starts a 3 second timer that will interupt js if it is exceeded */
-void js_start_timeout(void)
+static void js_start_timeout(void)
{
js_clear_timeout();
alarm_enable();
@@ -391,7 +392,7 @@
/* bind something to a javascript function */
static JSBool js_bind(JSContext *cx, JSObject __attribute__((unused)) *obj, uintN argc, jsval *argv, jsval __attribute__((unused)) *rval)
{
- char *bind=NULL;
+ char *jbind=NULL;
char *function_name=NULL;
// int conversion_result;
int bind_type=-1;
@@ -406,13 +407,13 @@
}
if (JSVAL_IS_STRING(argv[0])) {
- bind = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
+ jbind = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
bind_type=K_BIND;
} else if (JSVAL_IS_INT(argv[0])) {
bind_type=JSVAL_TO_INT(argv[0]);
if(bind_type == K_BIND || bind_type == K_BIND_ALIAS || bind_type == K_BIND_RPC) {
i++;
- bind = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
+ jbind = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
}
} else {
@@ -429,37 +430,37 @@
switch(bind_type) {
case K_BIND:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Empty bind");
return JS_FALSE;
}
- if (AddLink(&bind_list, bind, function_name))
+ if (AddLink(&bind_list, jbind, function_name))
{
- snprintf(msg, MAXTEXTLENGTH-1, "Bind %s already exists. Redefined", bind);
+ snprintf(msg, MAXTEXTLENGTH-1, "Bind %s already exists. Redefined", jbind);
js_warning(cx, msg);
}
break;
case K_BIND_ALIAS:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Empty bind");
return JS_FALSE;
}
- if (AddLink(&alias_list, bind, function_name))
+ if (AddLink(&alias_list, jbind, function_name))
{
- snprintf(msg, MAXTEXTLENGTH-1, "Alias %s->%s already exists. Redefined", bind, function_name);
+ snprintf(msg, MAXTEXTLENGTH-1, "Alias %s->%s already exists. Redefined", jbind, function_name);
js_warning(cx, msg);
}
break;
case K_BIND_RPC:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Empty bind");
return JS_TRUE;
}
- if (AddLink(&rpc_list, bind, function_name))
+ if (AddLink(&rpc_list, jbind, function_name))
{
- snprintf(msg, MAXTEXTLENGTH-1, "RPC %s Bind %s already exists. Redefined", bind, function_name);
+ snprintf(msg, MAXTEXTLENGTH-1, "RPC %s Bind %s already exists. Redefined", jbind, function_name);
js_warning(cx, msg);
}
@@ -518,7 +519,7 @@
/* bind something to a javascript function */
static JSBool js_unbind(JSContext *cx, JSObject __attribute__((unused)) *obj, uintN argc, jsval *argv, jsval __attribute__((unused)) *rval)
{
- char *bind=NULL;
+ char *jbind=NULL;
char *function_name=NULL;
int bind_type=-1;
char msg[MAXTEXTLENGTH];
@@ -531,13 +532,13 @@
}
if (JSVAL_IS_STRING(argv[0])) {
- bind = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
+ jbind = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
bind_type=K_BIND;
} else if (JSVAL_IS_INT(argv[0])) {
bind_type=JSVAL_TO_INT(argv[0]);
if(JSVAL_IS_STRING(argv[1])) {
- bind = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
- function_name = bind;
+ jbind = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
+ function_name = jbind;
} else {
JS_ReportError(cx, "Error in javascript: bind expects final argument to be a string.");
return JS_FALSE;
@@ -549,37 +550,37 @@
}
switch(bind_type) {
case K_BIND:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Error: Empty bind");
return JS_FALSE;
}
- if(!DestroyLink(&bind_list, bind))
+ if(!DestroyLink(&bind_list, jbind))
{
- snprintf(msg, MAXTEXTLENGTH-1, "Bind %s does not exist for unbinding", bind);
+ snprintf(msg, MAXTEXTLENGTH-1, "Bind %s does not exist for unbinding", jbind);
js_warning(cx, msg);
}
break;
case K_BIND_ALIAS:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Empty bind");
return JS_TRUE;
}
- if (!DestroyLink(&alias_list, bind))
+ if (!DestroyLink(&alias_list, jbind))
{
- snprintf(msg, MAXTEXTLENGTH-1, "Alias %s does not exist for unbinding", bind);
+ snprintf(msg, MAXTEXTLENGTH-1, "Alias %s does not exist for unbinding", jbind);
js_warning(cx, msg);
}
break;
case K_BIND_RPC:
- if(bind == NULL || bind[0]=='\0') {
+ if(jbind == NULL || jbind[0]=='\0') {
JS_ReportError(cx, "Empty bind");
return JS_TRUE;
}
- if (!DestroyLink(&rpc_list, bind))
+ if (!DestroyLink(&rpc_list, jbind))
{
- snprintf(msg, MAXTEXTLENGTH-1, "RPC %s does not exist for unbinding", bind);
+ snprintf(msg, MAXTEXTLENGTH-1, "RPC %s does not exist for unbinding", jbind);
js_warning(cx, msg);
}
@@ -932,7 +933,7 @@
struct js_db_result *dbres;
char *dbname;
char *query;
- jsval resobject_jsval;
+ jsval resobject_jsval = 0;
char path[1024];
struct passwd *pw;
JSBool retval;
@@ -1190,7 +1191,7 @@
return 0;
}
-JSBool js_operation_callback(JSContext *cx) {
+static JSBool js_operation_callback(JSContext *cx) {
JSObject *global = JS_GetGlobalObject(cx);
if (global) {
if (js_interrupted==1) {
Modified: trunk/src/js.h
===================================================================
--- trunk/src/js.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/js.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -3,7 +3,7 @@
#include <stdio.h>
-int js_isrunning();
+int js_isrunning(void);
int js_exec(char *name, int argc, char **argvc);
int load_jsfile(FILE *f, char *filename);
int load_js(char *filename);
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/main.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -124,14 +124,13 @@
char **complete_entry(const char *text, int start, int end);
void accept_command(char *comm);
static void interrupt(int sig);
-void DoScript(char *line);
static char prompt[41];
static char comm[MAXTEXTLENGTH];
static int eof_count = 0;
/* are we running it as a privaledged user */
-int god_mode(void)
+static int god_mode(void)
{
/* old god mode, run as owner */
if (getuid()==geteuid()) {
@@ -183,7 +182,7 @@
}
}
-void restore_tty(void)
+static void restore_tty(void)
{
struct termios termios;
@@ -221,7 +220,7 @@
return 1;
}
-void accept_line(char *line)
+static void accept_line(char *line)
{
int conversion_result;
if (line == NULL)
@@ -274,7 +273,7 @@
}
}
-void enable_rl()
+static void enable_rl()
{
if (inreadline) return;
set_prompt();
@@ -298,18 +297,18 @@
}
}
-int match_arg_str(char *search, char *sub)
+static int match_arg_str(char *srch, char *sub)
{
char *match;
int value = 0;
match = malloc(sizeof(char) * (strlen(sub) + 3));
sprintf(match, "-%s", sub);
- if (!strcasecmp(search, match)) value = 1;
+ if (!strcasecmp(srch, match)) value = 1;
sprintf(match, "--%s", sub);
- if (!strcasecmp(search, match)) value = 1;
+ if (!strcasecmp(srch, match)) value = 1;
sprintf(match, "/%s", sub);
- if (!strcasecmp(search, match)) value = 1;
+ if (!strcasecmp(srch, match)) value = 1;
free(match);
return(value);
@@ -844,14 +843,14 @@
}
}
-void accept_command(char *comm)
+void accept_command(char *cmd)
{
char history_comm[MAXTEXTLENGTH];
int conversion_result;
if (UseRL)
{
- conversion_result=convert_string_charset(comm, "UTF-8", strlen(comm), history_comm, "LOCAL", MAXTEXTLENGTH, NULL, NULL, NULL, NULL, NULL);
+ conversion_result=convert_string_charset(cmd, "UTF-8", strlen(cmd), history_comm, "LOCAL", MAXTEXTLENGTH, NULL, NULL, NULL, NULL, NULL);
if(conversion_result >= 0)
{
add_history(history_comm);
@@ -860,43 +859,43 @@
}
if (cm_flags(user->chatmode,CM_ONCHAT,CM_MODE_ANY))
{
- if (comm[0]==*CMD_BOARD_STR)
+ if (cmd[0]==*CMD_BOARD_STR)
{
set_rights();
- DoCommand(&comm[1], table);
+ DoCommand(&cmd[1], table);
set_talk_rights();
}else
- if (comm[0]==*CMD_TALK_STR)
+ if (cmd[0]==*CMD_TALK_STR)
{
set_talk_rights();
- DoCommand(&comm[1], chattable);
+ DoCommand(&cmd[1], chattable);
}else
- if (comm[0]==*CMD_SCRIPT_STR && cp_flags(user->chatprivs,CP_SCRIPT,CM_MODE_ANY))
+ if (cmd[0]==*CMD_SCRIPT_STR && cp_flags(user->chatprivs,CP_SCRIPT,CM_MODE_ANY))
{
set_talk_rights();
- DoScript(&comm[1]);
+ DoScript(&cmd[1]);
}else {
char *event_name=NULL;
script_output=1;
while ((event_name = NextLink(eventin_list, event_name)) != NULL) {
if (is_js(event_name)) {
char *argv[2];
- argv[0] = comm;
+ argv[0] = cmd;
argv[1] = NULL;
busy++;
js_exec(event_name, 1, argv);
busy--;
}
}
- if (script_output) chat_say(comm);
+ if (script_output) chat_say(cmd);
}
}else
{
set_rights();
if (comm[0]==*CMD_BOARD_STR)
- DoCommand(&comm[1], table);
+ DoCommand(&cmd[1], table);
else
- DoCommand(comm, table);
+ DoCommand(cmd, table);
}
}
@@ -1112,7 +1111,7 @@
else return 0;
}
-void printline_in_local(char *line, int *warnings, size_t *not_in_local)
+static void printline_in_local(char *line, int *warnings, size_t *not_in_local)
{
char local_line[MAXTEXTLENGTH];
int conversion_result;
@@ -1359,24 +1358,22 @@
}
}
-void time_out(void *idle_count_p)
+static void time_out(void *idle_count_p)
{
- int *idle;
-
+ int *icnt = idle_count_p;
if (idle_count_p == NULL) return;
- idle = (int *)idle_count_p;
- if (*idle==1)
+ if (*icnt==1)
{
char msg[128];
snprintf(msg, sizeof(msg), _("*** Timed Out, Good Bye\r\n"));
- ++(*idle);
+ ++(*icnt);
write(1,msg,strlen(msg));
broadcast(1, _("\03304%s has been timed out.") ,user->name);
mwlog("TIMEOUT(LOGOUT)");
close_down(1, NULL, NULL);
}
- else if (*idle==0)
+ else if (*icnt==0)
{
char msg[128];
snprintf(msg, sizeof(msg), _("%c*** Wakey ! Wakey !\r\n"), 7);
@@ -1616,7 +1613,6 @@
/* not a command name, or script, so check number of arguments.
if not an argument we wish to tab-complete, then dont :) */
int t_c = 0;
- int index = 0;
if (cmd!=NULL)
{
@@ -1638,17 +1634,16 @@
t_c = 1;
}
}
- while (tct[index].Command!=NULL)
+ for (int i = 0; tct[i].Command != NULL; i++)
{
- if (command_compare(cmd, tct[index].Command)==inlen)
+ if (command_compare(cmd, tct[i].Command)==inlen)
{
- if (tct[index].Rights!=0 && ((rights&tct[index].Rights)!=tct[index].Rights))
+ if (tct[i].Rights!=0 && ((rights&tct[i].Rights)!=tct[i].Rights))
{
t_c = 0;
break;
}
}
- index++;
}
}
cl++;
@@ -1721,13 +1716,13 @@
/* tab completion feature for board commands */
char *list_commands(const char *text, int state)
{
- static int index, len;
+ static int i, len;
char *name;
char *rtext;
if (state==0)
{
- index=0;
+ i=0;
len=strlen(text);
if (cm_flags(user->chatmode,CM_ONCHAT,CM_MODE_ANY)) len--;
}
@@ -1736,16 +1731,16 @@
if (cm_flags(user->chatmode,CM_ONCHAT,CM_MODE_ANY)) strcpy(rtext,&text[1]);
else strcpy(rtext,text);
- while ((name=table[index].Command)!=NULL)
+ while ((name=table[i].Command)!=NULL)
{
if (!strncasecmp(name, rtext, len) &&
- ( table[index].Rights==0 || ((rights&table[index].Rights)==table[index].Rights)))
+ ( table[i].Rights==0 || ((rights&table[i].Rights)==table[i].Rights)))
{
free(rtext);
- index++;
+ i++;
return (dupstr(name, cm_flags(user->chatmode,CM_ONCHAT,CM_MODE_ANY)?CMD_BOARD_STR:""));
}
- index++;
+ i++;
}
free(rtext);
return(NULL);
@@ -1754,28 +1749,28 @@
/* tab completion feature for talker commands */
char *list_chat_commands(const char *text, int state)
{
- static int index, len;
+ static int i, len;
char *name;
if (state==0)
{
- index=0;
+ i=0;
len=strlen(text);
len--;
}
text++;
- while ((name=chattable[index].Command)!=NULL)
+ while ((name=chattable[i].Command)!=NULL)
{
if (!strncasecmp(name, text, len) &&
- (chattable[index].Rights==0 || ((rights&chattable[index].Rights)==chattable[index].Rights)) &&
- (chattable[index].Show == 1))
+ (chattable[i].Rights==0 || ((rights&chattable[i].Rights)==chattable[i].Rights)) &&
+ (chattable[i].Show == 1))
{
- index++;
+ i++;
return (dupstr(name, cm_flags(user->chatmode,CM_ONCHAT,CM_MODE_ANY)?CMD_TALK_STR:""));
}
- index++;
+ i++;
}
return(NULL);
}
@@ -2054,13 +2049,13 @@
}
-void broadcast_onoffcode(int code, int method, const char *sourceuser, const char *reason)
+void broadcast_onoffcode(int ocode, int method, const char *sourceuser, const char *reason)
{
char logofftext[MAXTEXTLENGTH];
extern int talker_logontype;
/* create the broadcast string */
- snprintf(logofftext, MAXTEXTLENGTH-1, "%d,%d,%d,%s", code, method, talker_logontype & LOGONMASK_QUIET, (sourceuser)?(sourceuser):(user->name));
+ snprintf(logofftext, MAXTEXTLENGTH-1, "%d,%d,%d,%s", ocode, method, talker_logontype & LOGONMASK_QUIET, (sourceuser)?(sourceuser):(user->name));
/* add an optional reason */
if (reason != NULL)
Modified: trunk/src/mesg.c
===================================================================
--- trunk/src/mesg.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/mesg.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -14,6 +14,7 @@
#include "perms.h"
#include "files.h"
#include "intl.h"
+#include "mesg.h"
void send_mesg(char *from, char *to, char *text, int wiz)
{
Modified: trunk/src/mod.c
===================================================================
--- trunk/src/mod.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/mod.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -13,6 +13,7 @@
#include "strings.h"
#include "read.h"
#include "intl.h"
+#include "mod.h"
static void add_message(struct folder *fold, struct Header *head, char *text)
{
Modified: trunk/src/new.c
===================================================================
--- trunk/src/new.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/new.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -19,6 +19,7 @@
#include "main.h"
#include "add.h"
#include "intl.h"
+#include "new.h"
extern int remote;
extern int busy;
@@ -212,7 +213,6 @@
{
int ffile,ifile;
struct folder fold;
- struct Header index;
char datestr[30],sub[40];
if (nofolders())
@@ -238,31 +238,29 @@
printf(_(" <empty>\n"));
else
{
+ struct Header hdr;
if ((ifile=err_open(x,O_RDONLY,0))<0)
return;
- lseek(ifile,-1*sizeof(index),SEEK_END);
- read(ifile,&index,sizeof(index));
+ lseek(ifile,-1*sizeof(hdr),SEEK_END);
+ read(ifile,&hdr,sizeof(hdr));
now=time(0);
- then = index.date;
+ then = hdr.date;
t_then=localtime(&then);
if (t_then == NULL)
snprintf(datestr, 30, "Invalid Date");
else
- if (now - index.date > 7776000)
+ if (now - hdr.date > 7776000)
strftime(datestr, 30, "%a %b %d %Y ", t_then);
else
strftime(datestr, 30, "%a %b %d %H:%M", t_then);
- /*strcpy(datestr,ctime(&index.date));
- datestr[16]=0; */
-
- strncpy(sub,index.subject,30);
+ strncpy(sub,hdr.subject,30);
sub[27]=0;
- if (strlen(index.subject)>30)
+ if (strlen(hdr.subject)>30)
strcat(sub,"...");
printf("%4d %s %*s %s\n",fold.last,datestr,
- NAMESIZE,index.from,sub);
+ NAMESIZE,hdr.from,sub);
close(ifile);
}
}
Modified: trunk/src/perms.c
===================================================================
--- trunk/src/perms.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/perms.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -14,6 +14,27 @@
#include "bb.h"
#include "perms.h"
+static const char user_perm_chars[8] = {
+ [MWUSR_REGD] = 'r',
+ [MWUSR_MOD] = 'm',
+ [MWUSR_SUPER] = 's',
+ [MWUSR_BANNED] = 'b',
+ [MWUSR_MESG] = 'n',
+ [MWUSR_INFORM] = 'i',
+ [MWUSR_BEEPS] = 'p',
+ [MWUSR_DELETED] = 'D'
+};
+
+static const char folder_stat_chars[7] = {
+ [MWFOLDR_ACTIVE] = 'a',
+ [MWFOLDR_RUNREG] = 'r',
+ [MWFOLDR_WUNREG] = 'w',
+ [MWFOLDR_RREG] = 'R',
+ [MWFOLDR_WREG] = 'W',
+ [MWFOLDR_PRIVATE] = 'p',
+ [MWFOLDR_MODERATED] = 'm'
+};
+
int allowed_r(struct folder *fol, struct person *usr)
/* permission to read from folder */
{
@@ -62,127 +83,8 @@
return(false);
}
-int u_ban(int user) /* is banned */
+char user_stats(char *string, char ustat)
{
- if (user&(1<<3))
- return(true);
- else
- return(false);
-}
-
-int u_del(int user) /* marked for deletion */
-{
- if (user&(1<<7))
- return(true);
- else
- return(false);
-}
-
-int u_god(int user) /* is a superuser */
-{
- if (user&(1<<2))
- return(true);
- else
- return(false);
-}
-
-int u_inform(int user) /* gets informed of logins/logouts */
-{
- if (user&(1<<5))
- return(true);
- else
- return(false);
-}
-
-int u_mesg(int user) /* messages off */
-{
- if (user&(1<<4))
- return(true);
- else
- return(false);
-}
-
-int u_beep(int user) /* beeps off */
-{
- if (user&(1<<6))
- return(true);
- else
- return(false);
-}
-
-int u_mod(int user) /* is a moderator */
-{
- if (user&(1<<1))
- return(true);
- else
- return(false);}
-
-int u_reg(int user) /* is registered */
-{
- if (user&1)
- return(true);
- else
- return(false);
-}
-
-int f_active(int stat)
-{
- if (stat&1)
- return(true);
- else
- return(false);
-}
-
-int f_r_unreg(int stat)
-{
- if (stat&(1<<1))
- return(true);
- else
- return(false);
-}
-
-int f_w_unreg(int stat)
-{
- if (stat&(1<<2))
- return(true);
- else
- return(false);
-}
-
-int f_r_reg(int stat)
-{
- if (stat&(1<<3))
- return(true);
- else
- return(false);
-}
-
-int f_w_reg(int stat)
-{
- if (stat&(1<<4))
- return(true);
- else
- return(false);
-}
-
-int f_private(int stat)
-{
- if (stat&(1<<5))
- return(true);
- else
- return(false);
-}
-
-int f_moderated(int stat)
-{
- if (stat&(1<<6))
- return(true);
- else
- return(false);
-}
-
-char user_stats(char *string,char stat)
-{
int mode=0;
int i;
char p=0; /*pattern buffer */
@@ -202,12 +104,12 @@
case 'D': p=p|(1<<7);break;
};
if (mode==0) return(p);
- else if (mode==-1) return(stat|p);
- else if (mode==1) return(stat&(~p));
+ else if (mode==-1) return(ustat|p);
+ else if (mode==1) return(ustat&(~p));
else return(p);
}
-char mesg_stats(char *string, char stat)
+char mesg_stats(char *string, char mstat)
{
int mode=0;
int i;
@@ -224,12 +126,12 @@
case 'x': p=p|(1<<3);break;
};
if (mode==0) return(p);
- else if (mode==-1) return(stat|p);
- else if (mode==1) return(stat&(~p));
+ else if (mode==-1) return(mstat|p);
+ else if (mode==1) return(mstat&(~p));
else return(p);
}
-char folder_stats(char *string, char stat)
+char folder_stats(char *string, char st)
{
int mode=0;
int i;
@@ -249,12 +151,12 @@
case 'm': p=p|(1<<6);break;
};
if (mode==0) return(p);
- else if (mode==-1) return(stat|p);
- else if (mode==1) return(stat&~p);
+ else if (mode==-1) return(st|p);
+ else if (mode==1) return(st&~p);
return(p);
}
-char folder_groups(char *string, char stat)
+char folder_groups(char *string, char st)
{
int mode=0;
int i;
@@ -275,63 +177,51 @@
case '8': p=p|(1<<7);break;
};
if (mode==0) return(p);
- else if (mode==-1) return(stat|p);
- else if (mode==1) return(stat&~p);
+ else if (mode==-1) return(st|p);
+ else if (mode==1) return(st&~p);
return(p);
}
-void show_user_stats(unsigned char stat, char *tmp, int flag)
+static void show_stats(unsigned char st, char *tmp, size_t tmpsize, const char *map, int flag)
{
- int i=0;
-
- if (stat&(1<<0)) tmp[i++]='r'; else if (flag) tmp[i++]='-';
- if (stat&(1<<1)) tmp[i++]='m'; else if (flag) tmp[i++]='-';
- if (stat&(1<<2)) tmp[i++]='s'; else if (flag) tmp[i++]='-';
- if (stat&(1<<3)) tmp[i++]='b'; else if (flag) tmp[i++]='-';
- if (stat&(1<<4)) tmp[i++]='n'; else if (flag) tmp[i++]='-';
- if (stat&(1<<5)) tmp[i++]='i'; else if (flag) tmp[i++]='-';
- if (stat&(1<<6)) tmp[i++]='p'; else if (flag) tmp[i++]='-';
- if (stat&(1<<7)) tmp[i++]='D'; else if (flag) tmp[i++]='-';
- tmp[i]=0;
+ int i;
+ for (i = 0; i < tmpsize; i++)
+ if (st & (1<<i))
+ tmp[i] = map[i];
+ else if (flag)
+ tmp[i] = '-';
+ tmp[i] = '\0';
}
-void show_mesg_stats(unsigned char stat, char *tmp, int flag)
+void show_user_stats(unsigned char ustat, char *tmp, int flag)
{
- int i=0;
-
- if (stat&(1<<0)) tmp[i++]='m'; else if (flag) tmp[i++]='-';
- if (stat&(1<<1)) tmp[i++]='d'; else if (flag) tmp[i++]='-';
- if (stat&(1<<2)) tmp[i++]='r'; else if (flag) tmp[i++]='-';
- if (stat&(1<<3)) tmp[i++]='x'; else if (flag) tmp[i++]='-';
- tmp[i]=0;
+ show_stats(ustat, tmp, MWUSR_SIZE, user_perm_chars, flag);
}
-void show_fold_stats(char stat, char *tmp, int flag)
+void show_mesg_stats(unsigned char mstat, char *tmp, int flag)
{
int i=0;
- if (stat&1) tmp[i++]='a'; else if (flag) tmp[i++]='-';
- if (stat&(1<<1)) tmp[i++]='r'; else if (flag) tmp[i++]='-';
- if (stat&(1<<2)) tmp[i++]='w'; else if (flag) tmp[i++]='-';
- if (stat&(1<<3)) tmp[i++]='R'; else if (flag) tmp[i++]='-';
- if (stat&(1<<4)) tmp[i++]='W'; else if (flag) tmp[i++]='-';
- if (stat&(1<<5)) tmp[i++]='p'; else if (flag) tmp[i++]='-';
- if (stat&(1<<6)) tmp[i++]='m'; else if (flag) tmp[i++]='-';
+ if (mstat&(1<<0)) tmp[i++]='m'; else if (flag) tmp[i++]='-';
+ if (mstat&(1<<1)) tmp[i++]='d'; else if (flag) tmp[i++]='-';
+ if (mstat&(1<<2)) tmp[i++]='r'; else if (flag) tmp[i++]='-';
+ if (mstat&(1<<3)) tmp[i++]='x'; else if (flag) tmp[i++]='-';
tmp[i]=0;
}
-
-void show_fold_groups(char stat, char *tmp, int flag)
+
+void show_fold_stats(char st, char *tmp, int flag)
{
- int i=0;
+ show_stats(st, tmp, MWFOLDR_SIZE, folder_stat_chars, flag);
+}
- if (stat&1) tmp[i++]='1'; else if (flag) tmp[i++]='-';
- if (stat&(1<<1)) tmp[i++]='2'; else if (flag) tmp[i++]='-';
- if (stat&(1<<2)) tmp[i++]='3'; else if (flag) tmp[i++]='-';
- if (stat&(1<<3)) tmp[i++]='4'; else if (flag) tmp[i++]='-';
- if (stat&(1<<4)) tmp[i++]='5'; else if (flag) tmp[i++]='-';
- if (stat&(1<<5)) tmp[i++]='6'; else if (flag) tmp[i++]='-';
- if (stat&(1<<6)) tmp[i++]='7'; else if (flag) tmp[i++]='-';
- if (stat&(1<<7)) tmp[i++]='8'; else if (flag) tmp[i++]='-';
+void show_fold_groups(char st, char *tmp, int flag)
+{
+ int i;
+ for (i = 0; i < 8; i++)
+ if (st & (1<<i))
+ tmp[i]='2'+i;
+ else if (flag)
+ tmp[i]='-';
tmp[i]=0;
}
@@ -368,18 +258,18 @@
va_end(ap);
}
-int get_subscribe(struct person *user, int folder)
+int get_subscribe(struct person *usr, int folder)
{
if (folder<=31 && folder>=0)
{
- if (user->folders[0] & (1<<folder) )
+ if (usr->folders[0] & (1<<folder) )
return(true);
else
return(false);
}else
if (folder>=32 && folder <=63)
{
- if (user->folders[1] & (1<< (folder-32)))
+ if (usr->folders[1] & (1<< (folder-32)))
return(true);
else
return(false);
@@ -390,17 +280,17 @@
}
}
-void set_subscribe(struct person *user,int folder,int status)
+void set_subscribe(struct person *usr,int folder,int status)
{
if (folder>=0 && folder<=31)
{
if (status==true)
{
- user->folders[0]|=(1<<folder);
+ usr->folders[0]|=(1<<folder);
}else
if (status==false)
{
- user->folders[0]&=~(1<<folder);
+ usr->folders[0]&=~(1<<folder);
}else
printf("Error in set_subscribe to folder %d\n",folder);
}else
@@ -408,15 +298,13 @@
{
if (status==true)
{
- user->folders[1]|=(1<<(folder-32));
+ usr->folders[1]|=(1<<(folder-32));
}else
if (status==false)
{
- user->folders[1]&=~(1<<(folder-32));
+ usr->folders[1]&=~(1<<(folder-32));
}else
printf("Error in set_subscribe to folder %d\n",folder);
}else
printf("Error in set_subscribe to folder %d\n",folder);
}
-
-
Modified: trunk/src/perms.h
===================================================================
--- trunk/src/perms.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/perms.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -4,16 +4,6 @@
#include "folders.h"
#include "user.h"
-int u_god(int user);
-int u_mod(int user);
-int u_mod(int user);
-int u_reg(int user);
-int u_ban(int user);
-int u_del(int user);
-int u_mesg(int user);
-int u_beep(int user);
-int u_inform(int user);
-
void mwlog(char *fmt, ...);
char user_stats(char *string, char stat);
@@ -36,12 +26,40 @@
void set_subscribe(struct person *user,int folder,int status);
int get_subscribe(struct person *user, int folder);
-int f_active(int stat);
-int f_r_unreg(int stat);
-int f_w_unreg(int stat);
-int f_r_reg(int stat);
-int f_w_reg(int stat);
-int f_private(int stat);
-int f_moderated(int stat);
+#define MWUSR_REGD 0
+#define MWUSR_MOD 1
+#define MWUSR_SUPER 2
+#define MWUSR_BANNED 3
+#define MWUSR_MESG 4
+#define MWUSR_INFORM 5
+#define MWUSR_BEEPS 6
+#define MWUSR_DELETED 7
+#define MWUSR_SIZE 8 /* Dummy for limit checking */
+#define u_ban(user) (user & (1 << MWUSR_BANNED))
+#define u_del(user) (user & (1 << MWUSR_DELETED))
+#define u_god(user) (user & (1 << MWUSR_SUPER))
+#define u_inform(user) (user & (1 << MWUSR_INFORM))
+#define u_mesg(user) (user & (1 << MWUSR_MESG))
+#define u_beep(user) (user & (1 << MWUSR_BEEPS))
+#define u_mod(user) (user & (1 << MWUSR_MOD))
+#define u_reg(user) (user & (1 << MWUSR_REGD))
+
+#define MWFOLDR_ACTIVE 0
+#define MWFOLDR_RUNREG 1
+#define MWFOLDR_WUNREG 2
+#define MWFOLDR_RREG 3
+#define MWFOLDR_WREG 4
+#define MWFOLDR_PRIVATE 5
+#define MWFOLDR_MODERATED 6
+#define MWFOLDR_SIZE 7 /* Dummy for limit checking */
+
+#define f_active(stat) (stat & (1 << MWFOLDR_ACTIVE))
+#define f_r_unreg(stat) (stat & (1 << MWFOLDR_RUNREG))
+#define f_w_unreg(stat) (stat & (1 << MWFOLDR_WUNREG))
+#define f_r_reg(stat) (stat & (1 << MWFOLDR_RREG))
+#define f_w_reg(stat) (stat & (1 << MWFOLDR_WREG))
+#define f_private(stat) (stat & (1 << MWFOLDR_PRIVATE))
+#define f_moderated(stat) (stat & (1 << MWFOLDR_MODERATED))
+
#endif
Modified: trunk/src/rooms.c
===================================================================
--- trunk/src/rooms.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/rooms.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -47,7 +47,7 @@
SAFE_FREE(room->prompt);
}
-int str2num(char *in)
+static int str2num(char *in)
{
int out;
Modified: trunk/src/script.c
===================================================================
--- trunk/src/script.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/script.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -99,7 +99,7 @@
return (new);
}
-char *debug_info(const char *filename, int lineno)
+static char *debug_info(const char *filename, int lineno)
{
char buff[512];
snprintf(buff, 511, "%s:%d", filename, lineno);
@@ -380,7 +380,7 @@
void DestroyFunction(char *funcname)
{
struct function *func, *funcold;
- struct code *code;
+ struct code *fcode;
struct label *label;
func=function_list;
@@ -410,17 +410,17 @@
label=oldlabel;
}
- code=func->code;
- while (code!=NULL) {
+ fcode=func->code;
+ while (fcode!=NULL) {
int i;
struct code *oldcode;
- free(code->debug);
- for (i=0;i<code->argc;i++)
- free(code->argv[i]);
- free(code->argv);
- oldcode=code->next;
- free(code);
- code=oldcode;
+ free(fcode->debug);
+ for (i=0;i<fcode->argc;i++)
+ free(fcode->argv[i]);
+ free(fcode->argv);
+ oldcode=fcode->next;
+ free(fcode);
+ fcode=oldcode;
}
free(func->complist);
@@ -432,7 +432,7 @@
void DestroyAllFunctions(int debug)
{
struct function *func;
- struct code *code;
+ struct code *fcode;
struct label *label;
while (function_list!=NULL)
@@ -450,18 +450,18 @@
free (label);
label=oldlabel;
}
- code=function_list->code;
- while (code!=NULL)
+ fcode=function_list->code;
+ while (fcode!=NULL)
{
int i;
struct code *oldcode;
- free(code->debug);
- for (i=0;i<code->argc;i++)
- free(code->argv[i]);
- free(code->argv);
- oldcode=code->next;
- free(code);
- code=oldcode;
+ free(fcode->debug);
+ for (i=0;i<fcode->argc;i++)
+ free(fcode->argv[i]);
+ free(fcode->argv);
+ oldcode=fcode->next;
+ free(fcode);
+ fcode=oldcode;
}
free(function_list->complist);
func = function_list;
@@ -547,7 +547,7 @@
}
}
-void ListVars(char *search)
+void ListVars(char *srch)
{
var_op_t op;
int count=0;
@@ -560,7 +560,7 @@
VAR_LIST_ITERATE(&op, &var_list);
while (VAR_FOUND(&op))
{
- if (search == NULL || !strncasecmp(search, VAR_STR_KEY(&op), strlen(search)))
+ if (srch == NULL || !strncasecmp(srch, VAR_STR_KEY(&op), strlen(srch)))
{
snprintf(buff, MAXTEXTLENGTH-1, "Variable '%s'", VAR_STR_KEY(&op));
if (var_str_val(&op)==NULL)
@@ -874,15 +874,15 @@
int ExecEvent2(char *script, char *event, char *who, int pre, int numargs, char *aargs[])
{
var_list_t args;
- int retval, index;
+ int retval, i;
if (is_js(script)) {
char **argv;
argv = calloc(numargs+2,sizeof(char *));
argv[0]=event;
argv[1]=who;
- for (index=0;index<numargs;index++)
- argv[index+2]=aargs[index];
+ for (i=0;i<numargs;i++)
+ argv[i+2]=aargs[i];
retval = js_exec(script, numargs+2, argv);
free(argv);
return retval;
@@ -901,9 +901,9 @@
ARG_RANGE(&args, 0, numargs+1);
ARG_STR_FORCE(&args, 0, strdup(event));
- for (index = 0; index < numargs; index++)
+ for (i = 0; i < numargs; i++)
{
- ARG_STR_FORCE(&args, index + 1, strdup(aargs[index]));
+ ARG_STR_FORCE(&args, i + 1, strdup(aargs[i]));
}
if (who!=NULL)
@@ -932,7 +932,6 @@
void ListScript(char *name)
{
struct function *ptr;
- struct code *code;
int i;
ptr=function_list;
@@ -946,13 +945,11 @@
printf("Function %s not found.\n", name);
else
{
- code=ptr->code;
- while (code!=NULL)
+ for (struct code *c = ptr->code; c != NULL; c = c->next)
{
- printf("%s: %s %d ", code->debug, code->inst->name, code->argc);
- for (i=0; i<code->argc; i++) printf("'%s' ", code->argv[i]);
+ printf("%s: %s %d ", c->debug, c->inst->name, c->argc);
+ for (i=0; i<c->argc; i++) printf("'%s' ", c->argv[i]);
printf("\n");
- code=code->next;
}
}
}
@@ -974,7 +971,7 @@
{
char **new;
char buff[13];
- int i, index, num;
+ int i, idx, num;
char *text;
int fargc;
char **fargv = 0;
@@ -1006,7 +1003,7 @@
new=(char **)calloc((*newsize)+1, sizeof(char *));
- index=0;
+ idx=0;
for (i=0; i<num; i++)
{
text = eval_arg(argv[offset+i], fargc, fargv);
@@ -1025,19 +1022,19 @@
for (j=0; j<fargc-start; j++)
{
snprintf(buff, 12, "$%d", j+start);
- new[index]=eval_arg(buff, fargc, fargv);
- index++;
+ new[idx]=eval_arg(buff, fargc, fargv);
+ idx++;
}
}
else
{
- new[index]=eval_arg(argv[offset+i], fargc, fargv);
- index++;
+ new[idx]=eval_arg(argv[offset+i], fargc, fargv);
+ idx++;
}
free(text);
}
- new[index]=NULL;
+ new[idx]=NULL;
return (new);
}
Modified: trunk/src/script.h
===================================================================
--- trunk/src/script.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/script.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -1,6 +1,7 @@
#ifndef SCRIPT_H
#define SCRIPT_H 1
+#include <stdio.h>
#include "Parse.h"
#define FF_OK 0
@@ -240,6 +241,7 @@
int ExecInst(char *line);
void scr_devel_msg(struct code *pc, char *fmt, ...);
void RunInitFuncs(int talkinit);
+extern void LoadFunction(char *, char *, FILE *, int *, const char *, int);
int arg_count(var_list_t *list);
int var_isanum(var_op_t *op, int *result, int onlydecimal);
@@ -253,6 +255,7 @@
char *var_str_val(var_op_t *op);
void var_key_dup(var_op_t *op);
+extern void DoScript(char *line);
int ExecScript(char *name, var_list_t *args, int bound);
int ExecEvent(char *script, char *text, char *event, char *who, int pre);
int ExecEvent2(char *script, char *event, char *who, int pre, int numargs, char *aargs[]);
Modified: trunk/src/script_inst.c
===================================================================
--- trunk/src/script_inst.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/script_inst.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -2459,7 +2459,7 @@
var_op_t op;
int count=0, size=0, i;
char *text, *nextkey;
- char *search, *what;
+ char *srch, *what;
char *key;
char lastkey[63];
int prefix=0, searchlen=0;
@@ -2473,11 +2473,11 @@
if (pc->argc >= 2)
{
- search = eval_arg(pc->argv[1], fargc, fargv);
- searchlen = strlen(search);
+ srch = eval_arg(pc->argv[1], fargc, fargv);
+ searchlen = strlen(srch);
}
else
- search = 0;
+ srch = 0;
i = 0;
size+=512;
@@ -2488,7 +2488,7 @@
while (VAR_FOUND(&op))
{
key = VAR_STR_KEY(&op);
- if (search == NULL || !strncasecmp(search, key, searchlen))
+ if (srch == NULL || !strncasecmp(srch, key, searchlen))
{
/* How many initial chars match the previous key? */
prefix = 0;
@@ -2507,7 +2507,7 @@
VAR_LIST_NEXT(&op);
}
var_str_force_2(what, text);
- if (search) free(search);
+ if (srch) free(srch);
free(what);
}
Modified: trunk/src/server/Makefile
===================================================================
--- trunk/src/server/Makefile 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/server/Makefile 2012-11-17 19:57:05 UTC (rev 1288)
@@ -8,7 +8,7 @@
HOMEPATH := $(libdir)/mw
# cflags for standard 'cc' compiler
-CFLAGS= -Wall -pedantic --std=gnu99 -D_GNU_SOURCE -I.. -I/usr/include/postgresql
+CFLAGS= -Wall -Wshadow -Wmissing-prototypes -Wno-strict-aliasing -pedantic --std=gnu99 -D_GNU_SOURCE -I.. -I/usr/include/postgresql
#LDFLAGS+= -pie
# info strings, do not edit.
Modified: trunk/src/server/servsock.c
===================================================================
--- trunk/src/server/servsock.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/server/servsock.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -126,11 +126,11 @@
if (!list_empty(&conn->outq)) {
struct list_head *pos, *q;
list_for_each_safe(pos, q, &conn->outq) {
- outq_msg_t * q = list_entry(pos, outq_msg_t, list);
- list_del(&(q->list));
- q->msg->refcount--;
- if (q->msg->refcount <= 0) ipcmsg_destroy(q->msg);
- free(q);
+ outq_msg_t * oq = list_entry(pos, outq_msg_t, list);
+ list_del(&(oq->list));
+ oq->msg->refcount--;
+ if (oq->msg->refcount <= 0) ipcmsg_destroy(oq->msg);
+ free(oq);
}
}
bzero(conn, sizeof(ipc_connection_t));
@@ -267,15 +267,15 @@
/* otherwise redistribute this message to intended target */
struct list_head *pos;
list_for_each(pos, &connection_list) {
- ipc_connection_t * conn = list_entry(pos, ipc_connection_t, list);
- if (conn->state == IPCSTATE_VALID) {
+ ipc_connection_t *c = list_entry(pos, ipc_connection_t, list);
+ if (c->state == IPCSTATE_VALID) {
if (msg->head.dst == 0) {
/* broadcast */
- msg_attach(msg, conn);
+ msg_attach(msg, c);
} else
- if (msg->head.dst == conn->addr) {
+ if (msg->head.dst == c->addr) {
/* unicast */
- msg_attach(msg, conn);
+ msg_attach(msg, c);
}
}
}
Modified: trunk/src/special.c
===================================================================
--- trunk/src/special.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/special.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -4,13 +4,31 @@
* see licence for furthur information. *
*********************************************************/
-#include <fcntl.h>
#include <stdio.h>
#include <string.h>
-#include <stdbool.h>
+#include "special.h"
+static const char special_chars[MWSPCL_SIZE] = {
+ [MWSPCL_COVENTRY] = 'C',
+ [MWSPCL_SUPER] = 'S',
+ [MWSPCL_WIZCHAT] = 'W',
+ [MWSPCL_WIZCHATOFF] = 'n',
+ [MWSPCL_TIMEOUT] = 'T',
+ [MWSPCL_TIMESTAMP] = 't',
+ [MWSPCL_POSTINFO] = 'P',
+ [7] /* Unused */ = '\0',
+ [MWSPCL_COLOUROFF] = 'c',
+ [MWSPCL_CHGINFO] = 'G',
+ [10] /* unused */ = '\0',
+ [MWSPCL_QUIET] = 'Q',
+ [MWSPCL_TCUNAMES] = 'U',
+ [MWSPCL_DEVEL] = 'D',
+ [MWSPCL_FIXEDCONTACT] = 'o',
+ [MWSPCL_NOWRAP] = 'L'
+};
+
/* short = 16 bits */
-unsigned short set_special(char *string, unsigned short stat)
+unsigned short set_special(char *string, unsigned short st)
{
int mode=0;
int i;
@@ -39,145 +57,19 @@
};
}
if (mode==0) return(p);
- else if (mode==-1) return(stat|p);
- else if (mode==1) return(stat&(~p));
+ else if (mode==-1) return(st|p);
+ else if (mode==1) return(st&(~p));
else return(p);
}
-void show_special(unsigned short stat, char *tmp, int flag)
+void show_special(unsigned short st, char *tmp, int flag)
{
- int i=0;
-
- if (stat&(1<<0)) tmp[i++]='C'; else if (flag) tmp[i++]='-';
- if (stat&(1<<1)) tmp[i++]='S'; else if (flag) tmp[i++]='-';
- if (stat&(1<<2)) tmp[i++]='W'; else if (flag) tmp[i++]='-';
- if (stat&(1<<3)) tmp[i++]='n'; else if (flag) tmp[i++]='-';
- if (stat&(1<<4)) tmp[i++]='T'; else if (flag) tmp[i++]='-';
- if (stat&(1<<5)) tmp[i++]='t'; else if (flag) tmp[i++]='-';
- if (stat&(1<<6)) tmp[i++]='P'; else if (flag) tmp[i++]='-';
- if (stat&(1<<8)) tmp[i++]='c'; else if (flag) tmp[i++]='-';
- if (stat&(1<<9)) tmp[i++]='G'; else if (flag) tmp[i++]='-';
- if (stat&(1<<11)) tmp[i++]='Q'; else if (flag) tmp[i++]='-';
- if (stat&(1<<12)) tmp[i++]='U'; else if (flag) tmp[i++]='-';
- if (stat&(1<<13)) tmp[i++]='D'; else if (flag) tmp[i++]='-';
- if (stat&(1<<14)) tmp[i++]='o'; else if (flag) tmp[i++]='-';
- if (stat&(1<<15)) tmp[i++]='L'; else if (flag) tmp[i++]='-';
-
+ int i;
+ for (i = 0; i < MWSPCL_SIZE; i++)
+ if (st&(1<<i))
+ tmp[i] = special_chars[i];
+ else if (flag)
+ tmp[i]='-';
tmp[i]=0;
}
-
-/* place test code here */
-
-int s_coventry(unsigned short stat)
-{
- if (stat&(1<<0))
- return(true);
- else
- return(false);
-}
-
-int s_superuser(unsigned short stat)
-{
- if (stat&(1<<1))
- return(true);
- else
- return(false);
-}
-
-int s_wizchat(unsigned short stat)
-{
- if (stat&(1<<2))
- return(true);
- else
- return(false);
-}
-
-
-int s_chatoff(unsigned short stat)
-{
- if (stat&(1<<3))
- return(true);
- else
- return(false);
-}
-
-int s_timeout(unsigned short stat)
-{
- if (stat&(1<<4))
- return(true);
- else
- return(false);
-}
-
-int s_timestamp (unsigned short stat)
-{
- if (stat&(1<<5))
- return(true);
- else
- return(false);
-}
-
-int s_postinfo (unsigned short stat)
-{
- if (stat&(1<<6))
- return(true);
- else
- return(false);
-}
-
-int s_colouroff (unsigned short stat)
-{
- if (stat&(1<<8))
- return(true);
- else
- return(false);
-}
-
-int s_changeinfo (unsigned short stat)
-{
- if (stat&(1<<9))
- return(true);
- else
- return(false);
-}
-
-int s_quiet (unsigned short stat)
-{
- if (stat&(1<<11))
- return(true);
- else
- return(false);
-}
-
-int s_tcunames (unsigned short stat)
-{
- if (stat&(1<<12))
- return(true);
- else
- return(false);
-}
-
-int s_devel (unsigned short stat)
-{
- if (stat&(1<<13))
- return(true);
- else
- return(false);
-}
-
-int s_fixedcontact(unsigned short stat)
-{
- if (stat&(1<<14))
- return (true);
- else
- return (false);
-}
-
-int s_nolinewrap(unsigned short stat)
-{
- if (stat&(1<<15))
- return (true);
- else
- return (false);
-}
Modified: trunk/src/special.h
===================================================================
--- trunk/src/special.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/special.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -19,4 +19,40 @@
int s_fixedcontact(unsigned short stat);
int s_nolinewrap(unsigned short stat);
+enum {
+ MWSPCL_COVENTRY = 0,
+ MWSPCL_SUPER,
+ MWSPCL_WIZCHAT,
+ MWSPCL_WIZCHATOFF,
+ MWSPCL_TIMEOUT,
+ MWSPCL_TIMESTAMP,
+ MWSPCL_POSTINFO,
+ /* 7 unused */
+ MWSPCL_COLOUROFF = 8,
+ MWSPCL_CHGINFO,
+ /* 10 unused */
+ MWSPCL_QUIET = 11,
+ MWSPCL_TCUNAMES,
+ MWSPCL_DEVEL,
+ MWSPCL_FIXEDCONTACT,
+ MWSPCL_NOWRAP,
+ /* Dummy for limit checking */
+ MWSPCL_SIZE
+};
+
+#define s_coventry(stat) (stat & (1<<MWSPCL_COVENTRY))
+#define s_superuser(stat) (stat & (1<<MWSPCL_SUPER))
+#define s_wizchat(stat) (stat & (1<<MWSPCL_WIZCHAT))
+#define s_chatoff(stat) (stat & (1<<MWSPCL_WIZCHATOFF))
+#define s_timeout(stat) (stat & (1<<MWSPCL_TIMEOUT))
+#define s_timestamp(stat) (stat & (1<<MWSPCL_TIMESTAMP))
+#define s_postinfo(stat) (stat & (1<<MWSPCL_POSTINFO))
+#define s_colouroff(stat) (stat & (1<<MWSPCL_COLOUROFF))
+#define s_changeinfo(stat) (stat & (1<<MWSPCL_CHGINFO))
+#define s_quiet(stat) (stat & (1<<MWSPCL_QUIET))
+#define s_tcunames(stat) (stat & (1<<MWSPCL_TCUNAMES))
+#define s_devel(stat) (stat & (1<<MWSPCL_DEVEL))
+#define s_fixedcontact(stat) (stat & (1<<MWSPCL_FIXEDCONTACT))
+#define s_nolinewrap(stat) (stat & (1<<MWSPCL_NOWRAP))
+
#endif /* SPECIAL_H */
Modified: trunk/src/sqlite.c
===================================================================
--- trunk/src/sqlite.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/sqlite.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -7,8 +7,7 @@
#include <sqlite3.h>
#include "bb.h"
-sqlite3*
-db_open(char *dbname)
+static sqlite3* db_open(char *dbname)
{
sqlite3 *db;
int error = sqlite3_open(dbname, &db);
@@ -21,15 +20,13 @@
return db;
}
-void
-db_close(sqlite3 *db)
+static void db_close(sqlite3 *db)
{
/* printf("Closing database %p\n", (void *)db); */
sqlite3_close(db);
}
-int
-db_callback(void *ptr, int ncols, char **row, char **cols)
+static int db_callback(void *ptr, int ncols, char **row, char **cols)
{
struct db_result *query = ptr;
struct db_data *ndata;
@@ -177,7 +174,7 @@
/* how many rows in that result */
-int db_numrows(struct db_result *result)
+static int db_numrows(struct db_result *result)
{
if (result == NULL) return 0;
return result->rows;
@@ -290,17 +287,17 @@
/* set a new value */
struct db_result *res;
if (arg==NULL || *arg==0) {
- char *query = sqlite3_mprintf("DELETE FROM %q WHERE user=%Q AND opt=%Q", table, user, opt);
- db_free(db_query(USERSQL, query, 1));
- sqlite3_free(query);
+ char *q= sqlite3_mprintf("DELETE FROM %q WHERE user=%Q AND opt=%Q", table, user, opt);
+ db_free(db_query(USERSQL, q, 1));
+ sqlite3_free(q);
}else
if (old != NULL && old->rows > 0) {
- char *query = sqlite3_mprintf("UPDATE %q SET arg=%Q WHERE user=%Q AND opt=%Q", table, arg, user, opt);
- db_free(db_query(USERSQL, query, 1));
- sqlite3_free(query);
+ char *q= sqlite3_mprintf("UPDATE %q SET arg=%Q WHERE user=%Q AND opt=%Q", table, arg, user, opt);
+ db_free(db_query(USERSQL, q, 1));
+ sqlite3_free(q);
} else {
- char *query = sqlite3_mprintf("INSERT INTO %q (user, opt, arg) VALUES (%Q,%Q,%Q)", table, user, opt, arg);
- res = db_query(USERSQL, query, 1);
+ char *q= sqlite3_mprintf("INSERT INTO %q (user, opt, arg) VALUES (%Q,%Q,%Q)", table, user, opt, arg);
+ res = db_query(USERSQL, q, 1);
if (res == NULL) {
/* it failed, try to create the table */
char *create = sqlite3_mprintf("CREATE TABLE %q (user text, opt text, arg text)", table);
@@ -309,11 +306,11 @@
if (res != NULL) {
/* it worked, resubmit the insert */
db_free(res);
- res = db_query(USERSQL, query, 0);
+ res = db_query(USERSQL, q, 0);
}
}
db_free(res);
- sqlite3_free(query);
+ sqlite3_free(q);
}
db_free(old);
}
@@ -353,17 +350,17 @@
/* set a new value */
struct db_result *res;
if (arg==NULL || *arg==0) {
- char *query = sqlite3_mprintf("DELETE FROM "USERDB_ROOMS" WHERE room=%d AND opt=%Q", room, opt);
- db_free(db_query(USERSQL, query, 1));
- sqlite3_free(query);
+ char *q= sqlite3_mprintf("DELETE FROM "USERDB_ROOMS" WHERE room=%d AND opt=%Q", room, opt);
+ db_free(db_query(USERSQL, q, 1));
+ sqlite3_free(q);
}else
if (old != NULL && old->rows > 0) {
- char *query = sqlite3_mprintf("UPDATE "USERDB_ROOMS" SET arg=%Q WHERE room=%d AND opt=%Q", arg, room, opt);
- db_free(db_query(USERSQL, query, 1));
- sqlite3_free(query);
+ char *q= sqlite3_mprintf("UPDATE "USERDB_ROOMS" SET arg=%Q WHERE room=%d AND opt=%Q", arg, room, opt);
+ db_free(db_query(USERSQL, q, 1));
+ sqlite3_free(q);
} else {
- char *query = sqlite3_mprintf("INSERT INTO "USERDB_ROOMS" (room, opt, arg) VALUES (%d,%Q,%Q)", room, opt, arg);
- res = db_query(USERSQL, query, 1);
+ char *q= sqlite3_mprintf("INSERT INTO "USERDB_ROOMS" (room, opt, arg) VALUES (%d,%Q,%Q)", room, opt, arg);
+ res = db_query(USERSQL, q, 1);
if (res == NULL) {
/* it failed, try to create the table */
char *create = "CREATE TABLE "USERDB_ROOMS" (room integer, opt text, arg text)";
@@ -372,11 +369,11 @@
if (res != NULL) {
/* it worked, resubmit the insert */
db_free(res);
- res = db_query(USERSQL, query, 0);
+ res = db_query(USERSQL, q, 0);
}
}
db_free(res);
- sqlite3_free(query);
+ sqlite3_free(q);
}
db_free(old);
}
Modified: trunk/src/strings.c
===================================================================
--- trunk/src/strings.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/strings.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -15,8 +15,6 @@
#define false 0
#define true !false
-extern char *mw_fgets();
-
#define min(a,b) a<b?a:b
#define max(a,b) a>b?a:b
@@ -105,6 +103,63 @@
string[len]=0;
}
+static char *mw_fgets(char *string,int size, FILE *fp)
+{
+ int ct=0;
+ int ch;
+ int tty_ready;
+
+ if(fp!=stdin || internet==0)
+ {
+ while ((tty_ready = idle(fileno(fp), 500)) == 0 || (tty_ready < 0 && errno == EINTR));
+ if (tty_ready < 0) return NULL;
+ else return fgets(string,size,fp);
+ }
+
+ while(ct<size)
+ {
+ while ((tty_ready = idle(0, 500)) == 0 || (tty_ready < 0 && errno == EINTR));
+ if (tty_ready < 0) return NULL;
+ ch=getchar();
+ if(ch==EOF)
+ return(NULL);
+ if(ch==IAC)
+ {
+ ch=getachar();
+ switch(ch)
+ {
+ case EOF:return(NULL);
+ case WILL:;
+ case WONT:;
+ case DO:;
+ case DONT:
+ getchar();
+ continue;
+ case EC:
+ if(ct>0) ct--;
+ break;
+ case EL:
+ ct=0;
+ break;
+ }
+ }
+ else
+ {
+ if(ch==8 || ch==127)
+ {
+ if(ct>0) ct--;
+ }
+ else
+ string[ct++]=ch;
+ }
+ if(ch=='\r')
+ ct--;
+ if(ch=='\n')
+ return(string);
+ }
+ return(string);
+}
+
void get_str(char *string, int size)
{
char *ptr;
@@ -202,63 +257,6 @@
return(x);
}
-char *mw_fgets(char *string,int size, FILE *fp)
-{
- int ct=0;
- int ch;
- int tty_ready;
-
- if(fp!=stdin || internet==0)
- {
- while ((tty_ready = idle(fileno(fp), 500)) == 0 || (tty_ready < 0 && errno == EINTR));
- if (tty_ready < 0) return NULL;
- else return fgets(string,size,fp);
- }
-
- while(ct<size)
- {
- while ((tty_ready = idle(0, 500)) == 0 || (tty_ready < 0 && errno == EINTR));
- if (tty_ready < 0) return NULL;
- ch=getchar();
- if(ch==EOF)
- return(NULL);
- if(ch==IAC)
- {
- ch=getachar();
- switch(ch)
- {
- case EOF:return(NULL);
- case WILL:;
- case WONT:;
- case DO:;
- case DONT:
- getchar();
- continue;
- case EC:
- if(ct>0) ct--;
- break;
- case EL:
- ct=0;
- break;
- }
- }
- else
- {
- if(ch==8 || ch==127)
- {
- if(ct>0) ct--;
- }
- else
- string[ct++]=ch;
- }
- if(ch=='\r')
- ct--;
- if(ch=='\n')
- return(string);
- }
- return(string);
-}
-
int get_rand(int min, int max)
{
float fValue;
Modified: trunk/src/strings.h
===================================================================
--- trunk/src/strings.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/strings.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -28,6 +28,8 @@
char *strip_colours(const char *text);
void strip_str(char *string);
void get_str(char *string, int size);
+void strip_quote(char *a);
+char *quotetext(const char *a);
char *buildpath(char *a, char *b, char *c, char *d);
#define makepath(a,b,c) (buildpath(HOMEPATH,a,b,c))
Modified: trunk/src/talker.c
===================================================================
--- trunk/src/talker.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/talker.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -875,7 +875,6 @@
{
char text[MAXTEXTLENGTH];
int newroom;
- int loop, index;
if (sscanf(argv[1],"%d",&newroom)!=1)
{
@@ -889,21 +888,22 @@
return;
}
- for (loop = 2; loop < argc; loop++)
+ for (int i = 2; i < argc; i++)
{
+ int j;
/* go through all username arguments in front of this one */
- for (index = 2; index < loop; index++)
+ for (j = 2; j < i; j++)
{
/* if any usernames match, then break out of the loop */
- if (!strcasecmp(argv[loop], argv[index])) break;
+ if (!strcasecmp(argv[i], argv[j])) break;
}
/* if a username match was found, skip this argument */
- if (index != loop) continue;
+ if (j != i) continue;
- snprintf(text,MAXTEXTLENGTH-1,"\03315%s has just tried to summon %s to room %d",user->name,argv[loop],newroom);
+ snprintf(text,MAXTEXTLENGTH-1,"\03315%s has just tried to summon %s to room %d",user->name,argv[i],newroom);
talk_send_raw(text,user->room);
snprintf(text,MAXTEXTLENGTH-1,"-%05d",newroom);
- ipc_send_to_username(argv[loop], IPC_CHANNEL, text);
+ ipc_send_to_username(argv[i], IPC_CHANNEL, text);
}
}
Modified: trunk/src/talker.h
===================================================================
--- trunk/src/talker.h 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/talker.h 2012-11-17 19:57:05 UTC (rev 1288)
@@ -72,7 +72,6 @@
void talk_single(char *to, char *text);
void talk_sayto(char *text, char *to, int channel, int exclude);
void apply_gag(char *text);
-char *quotetext(const char *a);
unsigned long cp_flags(unsigned long cm, unsigned long flags, int mode);
void enter_talker(int logontype);
@@ -85,6 +84,4 @@
void sendipc(char *to, char *text, int broadcast);
void sendrpc(char *to, char *type, char *text, int broadcast);
-void strip_quote(char *a);
-
#endif /* TALKER_H */
Modified: trunk/src/tidyup.c
===================================================================
--- trunk/src/tidyup.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/tidyup.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -10,6 +10,7 @@
#include "bb.h"
#include "strings.h"
#include "files.h"
+#include "tidyup.h"
#define NEW_END ".t"
Modified: trunk/src/topten.c
===================================================================
--- trunk/src/topten.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/topten.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -12,12 +12,13 @@
#include "sort.h"
#include "talker.h"
#include "strings.h"
+#include "topten.h"
void topten(int argc, char **argv)
{
struct listing *head=NULL;
char fullpath[PATHSIZE];
- struct Header index;
+ struct Header hdr;
struct listing *new;
struct listing *ptr;
int file;
@@ -43,22 +44,22 @@
return;
}
new=(struct listing *)malloc(sizeof(*new));
- while(read(file,&index,sizeof(index))>0)
+ while(read(file,&hdr,sizeof(hdr))>0)
{
- struct listing *ptr;
- ptr=head;
- while (ptr!=NULL && strcasecmp(index.from,ptr->name))
- {ptr=ptr->next;}
- if (ptr!=NULL)
+ struct listing *listing = head;
+ while (listing != NULL && strcasecmp(hdr.from, ptr->name))
+ listing = listing->next;
+
+ if (listing != NULL)
{
- ptr->count++;
- ptr->size+=index.size;
+ listing->count++;
+ listing->size+=hdr.size;
}
else
{
- strcpy(new->name,index.from);
+ strcpy(new->name,hdr.from);
new->count=1;
- new->size=index.size;
+ new->size=hdr.size;
new->next=head;
head=new;
new=(struct listing *)malloc(sizeof(*new));
Modified: trunk/src/uri.c
===================================================================
--- trunk/src/uri.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/uri.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -179,12 +179,12 @@
while(node) {
char *id = node->field[0];
char *added = node->field[1];
- char *username = node->field[2];
+ char *usr = node->field[2];
char *url = node->field[3];
char *title = node->field[4];
uri_make_flags_description(node->field[5], flagstr, sizeof(flagstr)); // flags = node->field[5]
- snprintf(url_line, width, "#\033G-%s\033-- [%s] <%s>%s\n", id, added, username, flagstr );
+ snprintf(url_line, width, "#\033G-%s\033-- [%s] <%s>%s\n", id, added, usr, flagstr );
display_message(url_line, 0, 1);
if(title != NULL) {
@@ -331,7 +331,7 @@
// checks an id supplied to uri_delete/nsfw etc. is valid or creates an id if the user specified 'last'
// if wiz is true "last" will return the the last uri in mwuri otherwise it is the current users last uri
// returns 0 if the id is not valid.
-unsigned int uri_get_id(char *idstr, int wiz)
+static unsigned int uri_get_id(char *idstr, int wiz)
{
unsigned int id;
char c;
@@ -451,7 +451,7 @@
// toggles flag uri argv[1] if argv[1] is the id of a valid uri or "last"
// if wiz then any uri can be modified otherwise only the current user's
-void uri_set_flag(int argc, char **argv, int wiz, int flag)
+static void uri_set_flag(int argc, char **argv, int wiz, int flag)
{
unsigned int id;
char mesg[MAXTEXTLENGTH];
Modified: trunk/src/user.c
===================================================================
--- trunk/src/user.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/user.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -69,7 +69,7 @@
close(outfile);
}
-int old_usr(struct person *usr)
+static int old_usr(struct person *usr)
{
char salt[3],passwd[PASSWDSIZE];
char *name;
@@ -189,7 +189,6 @@
{
int i, n;
struct folder f;
- int index;
struct Header head;
long curtime = time(NULL);
@@ -234,18 +233,19 @@
{
if (f_active(f.status))
{
+ int idx;
/* get index of max of last 10 messages */
if (f.last - 10 > f.first)
- index = f.last - 10;
+ idx = f.last - 10;
else
- index = f.first;
+ idx = f.first;
/* now work forwards til have a message less than 2 weeks old */
/* 2 weeks = 60 secs * 60 mins * 24 hours * 14 days */
/* = 1209600 secs */
- while (get_mesg_header(&f, index, &head)
- && (curtime - head.date > 1209600)) index++;
+ while (get_mesg_header(&f, idx, &head)
+ && (curtime - head.date > 1209600)) idx++;
/* set last read message */
- user->lastread[i] = index;
+ user->lastread[i] = idx;
}
i++;
}
@@ -279,7 +279,7 @@
}
}
-int new_usr(struct person *usr, char *name, int32_t *userposn)
+static int new_usr(struct person *usr, char *name, int32_t *userposn)
{
char passwd[PASSWDSIZE],passwd2[PASSWDSIZE],salt[3];
char c[10];
@@ -393,7 +393,6 @@
{
int file;
struct person usr;
- long time;
char stats[10],gr[10];
int linecount=0;
int screen_height = screen_h();
@@ -403,14 +402,13 @@
{
if (!newonly || ( newonly && !u_reg(usr.status) ) )
{
- time=usr.lastlogout;
show_user_stats(usr.status,stats,true);
show_fold_groups(usr.groups,gr,true);
if (!u_del(usr.status))
{
linecount++;
-
- printf("%*s [%5s] [%8s] %s",NAMESIZE,usr.name,stats,gr,ctime(&time));
+ printf("%*s [%5s] [%8s] %s", NAMESIZE, usr.name,
+ stats, gr, ctime((time_t*)&usr.lastlogout));
if (linecount>=(screen_height-1))
{
char foo[6];
@@ -432,7 +430,6 @@
{
int file;
struct person usr;
- long time;
char stats[10],gr[10];
int linecount=0;
int screen_height = screen_h();
@@ -442,13 +439,13 @@
{
if (usr.lastlogout>date)
{
- time=usr.lastlogout;
show_user_stats(usr.status,stats,true);
show_fold_groups(usr.groups,gr,true);
if (!u_del(usr.status))
{
linecount++;
- printf("%*s [%5s] [%8s] %s",NAMESIZE,usr.name,stats,gr,ctime(&time));
+ printf("%*s [%5s] [%8s] %s", NAMESIZE, usr.name,
+ stats, gr, ctime((time_t*)&usr.lastlogout));
if (linecount>=(screen_height-1))
{
char foo[6];
@@ -466,13 +463,12 @@
close(file);
}
-void list_users_flags(int flags, int type, int inv)
+static void list_users_flags(int flags, int type, int inv)
/*type: 0=status 1=special 2=group 3=chatmodes 4=chatprivs */
/*inv: 0= with flags, 1=without flags */
{
int file;
struct person usr;
- long time;
char stats[10],gr[10],spec[20],cmodes[20],cprivs[20],prot[10];
int linecount=0;
int check=0;
@@ -498,7 +494,6 @@
check=check&flags;
if (inv?check==0:check!=0)
{
- time=usr.lastlogout;
show_user_stats(usr.status,stats,true);
show_special(usr.special,spec,true);
show_fold_groups(usr.groups,gr,true);
@@ -511,10 +506,12 @@
linecount++;
if (type < 3)
- printf("%*s [%s] [%s] [%s] %s",NAMESIZE,usr.name,stats,spec,gr,ctime(&time));
+ printf("%*s [%s] [%s] [%s] %s", NAMESIZE, usr.name,
+ stats, spec, gr, ctime((time_t*)&usr.lastlogout));
else
- printf("%*s [%s] [%s] [%s] %s",NAMESIZE,usr.name,cmodes,cprivs,prot,ctime(&time));
-
+ printf("%*s [%s] [%s] [%s] %s", NAMESIZE, usr.name, cmodes,
+ cprivs, prot, ctime((time_t*)&usr.lastlogout));
+
if (linecount>=(screen_height-1))
{
char foo[6];
Modified: trunk/src/webclient/Makefile
===================================================================
--- trunk/src/webclient/Makefile 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/webclient/Makefile 2012-11-17 19:57:05 UTC (rev 1288)
@@ -8,7 +8,7 @@
HOMEPATH := $(libdir)/mw
# cflags for standard 'cc' compiler
-CFLAGS= -Wall -pedantic --std=gnu99 -D_GNU_SOURCE -I.. -I/usr/include/postgresql
+CFLAGS= -Wall -Wshadow -Wmissing-prototypes -pedantic --std=gnu99 -D_GNU_SOURCE -I.. -I/usr/include/postgresql
#LDFLAGS+= -pie
# info strings, do not edit.
Modified: trunk/src/who.c
===================================================================
--- trunk/src/who.c 2012-11-15 22:31:52 UTC (rev 1287)
+++ trunk/src/who.c 2012-11-17 19:57:05 UTC (rev 1288)
@@ -58,7 +58,6 @@
int wizchat;
int wiz;
char *divider;
- int index;
if (u_god(user->status)) wiz=1; else wiz=0;
busy++;
@@ -77,7 +76,7 @@
else printf("\n %-*s Idle What...\n",NAMESIZE,"Name");
divider = NULL;
- for (index = 0; index < screen_w(); index++) string_add(÷r, "-");
+ for (int i = 0; i < screen_w(); i++) string_add(÷r, "-");
printf("%s\n", divider);
More information about the mw-devel
mailing list