linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 419
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-04-15 01:24:54 -0500
message:
  Synchronized the man page and the command line options
modified:
  data/linuxdcpp.1
  linux/WulforUtil.cc
  linux/downloadqueue.cc
  linux/wulfor.cc
  po/linuxdcpp.pot


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription

=== modified file 'data/linuxdcpp.1'
--- data/linuxdcpp.1	2011-04-04 16:31:38 +0000
+++ data/linuxdcpp.1	2011-04-15 06:24:54 +0000
@@ -1,7 +1,7 @@
 .TH LINUXDCPP 1 "October 21, 2009"
 
 .SH NAME
-linuxdcpp \- File-sharing client for the Direct Connect network
+LinuxDC++ \- File-sharing client for the Direct Connect network
 
 .SH SYNOPSIS
 .B linuxdcpp
@@ -15,11 +15,31 @@
 
 .SH OPTIONS
 .TP
+.I URI
+A list of URIs to load on startup. LinuxDC++ supports the following types of URIs:
+.RS
+.TP
+.B "magnet:?xt=urn:tree:tiger:[TTH]&xl=[filesize]&dn=[filename]"
+Magnet URI for a shared file. Handled the same as -a, --add-magnet
+.TP
+.B "adc://[hostname]:[port]"
+ADC hub URI. Handled the same as -c, --connect
+.TP
+.B "adcs://[hostname]:[port]"
+Secure ADC hub URI. Handled the same as -c, --connect
+.TP
+.B "dchub://[hostname]:[port]"
+NMDC hub URI. Handled the same as -c, --connect
+.RE
+.TP
+.BI "-a, --add-magnet=" URI
+Attempt to add the magnet link directly to the download queue
+.TP
 .BI "-c, --connect=" URI
 Connect to the given hub
 .TP
 .B "-e, --existing"
-Direct commands to an already running instance. If a running instance is not found, do nothing.
+Send commands to the existing instance (if applicable)
 .TP
 .B "-h, --help" 
 Show help options
@@ -27,14 +47,11 @@
 .BI "-m, --search-magnet=" URI
 Search for the given magnet link
 .TP
-.BI "-a, --add--magnet=" URI
-If possible enqueue magnet directly. Magnet must contain a TTH, filename and a file size.
-.TP
 .B "-r, --refresh" 
 Initiate filelist refresh
 .TP
 .B "-s, --show"
-Show the running instance. This is the default action if no other arguments are supplied.
+Show the running instance (default action)
 .TP
 .B "-v, --version"
 Show version information and exit

=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc	2010-12-10 05:50:31 +0000
+++ linux/WulforUtil.cc	2011-04-15 06:24:54 +0000
@@ -248,9 +248,9 @@
 
 bool WulforUtil::splitMagnet(const string &magnet, string &name, int64_t &size, string &tth)
 {
-	name = C_("Magnet", "Unknown");
+	name = _("Unknown");
 	size = 0;
-	tth = C_("Magnet", "Unknown");
+	tth = _("Unknown");
 
 	if (!isMagnet(magnet.c_str()) || magnet.size() <= magnetSignature.length())
 		return FALSE;

=== modified file 'linux/downloadqueue.cc'
--- linux/downloadqueue.cc	2010-11-10 07:07:40 +0000
+++ linux/downloadqueue.cc	2011-04-15 06:24:54 +0000
@@ -1270,8 +1270,8 @@
 	params["Size Sort"] = Util::toString(item->getSize());
 	if (item->getSize() < 0)
 	{
-		params["Size"] = C_("Size", "Unknown");
-		params["Exact Size"] = C_("Size", "Unknown");
+		params["Size"] = _("Unknown");
+		params["Exact Size"] = _("Unknown");
 	}
 	else
 	{

=== modified file 'linux/wulfor.cc'
--- linux/wulfor.cc	2011-04-04 16:31:38 +0000
+++ linux/wulfor.cc	2011-04-15 06:24:54 +0000
@@ -78,10 +78,10 @@
 	gboolean show = FALSE, refresh = FALSE, version = FALSE, existing = FALSE;
 
 	GOptionEntry entries[] = {
+		{ "add-magnet", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &addmagnet, N_("Attempt to add the magnet link directly to the download queue"), N_("URI") },
 		{ "connect", 'c', 0, G_OPTION_ARG_STRING_ARRAY, &address, N_("Connect to the given hub"), N_("URI") },
 		{ "existing", 'e', 0, G_OPTION_ARG_NONE, &existing, N_("Send commands to the existing instance (if applicable)"), NULL },
 		{ "search-magnet", 'm', 0, G_OPTION_ARG_STRING_ARRAY, &searchmagnet, N_("Search for the given magnet link"), N_("URI") },
-		{ "add-magnet", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &addmagnet, N_("Try to add given magnet directly to download queue"), N_("URI") },
 		{ "refresh", 'r', 0, G_OPTION_ARG_NONE, &refresh, N_("Initiate filelist refresh"), NULL },
 		{ "show", 's', 0, G_OPTION_ARG_NONE, &show, N_("Show the running instance (default action)"), NULL },
 		{ "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Show version information and exit"), NULL },

=== modified file 'po/linuxdcpp.pot'
--- po/linuxdcpp.pot	2011-04-04 16:31:38 +0000
+++ po/linuxdcpp.pot	2011-04-15 06:24:54 +0000
@@ -8,7 +8,7 @@
 "#-#-#-#-#  glade.pot  #-#-#-#-#\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n";
-"POT-Creation-Date: 2011-04-04 19:30+0300\n"
+"POT-Creation-Date: 2011-04-12 23:34-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -19,7 +19,7 @@
 "#-#-#-#-#  linux.pot  #-#-#-#-#\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n";
-"POT-Creation-Date: 2011-04-04 19:30+0300\n"
+"POT-Creation-Date: 2011-04-12 23:34-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1360,6 +1360,10 @@
 msgid "Are you sure you want to delete the selected favorite users?"
 msgstr ""
 
+#: linux/wulfor.cc:81
+msgid "Attempt to add the magnet link directly to the download queue"
+msgstr ""
+
 #: linux/favoritehubs.cc:46
 msgid "Auto Connect"
 msgstr ""
@@ -1496,7 +1500,7 @@
 msgid "Connect failed: %1%"
 msgstr ""
 
-#: linux/wulfor.cc:81
+#: linux/wulfor.cc:82
 msgid "Connect to the given hub"
 msgstr ""
 
@@ -1979,7 +1983,7 @@
 msgid "SJIS (Japanese)"
 msgstr ""
 
-#: linux/wulfor.cc:83
+#: linux/wulfor.cc:84
 msgid "Search for the given magnet link"
 msgstr ""
 
@@ -2004,7 +2008,7 @@
 "or any application using the port is closed."
 msgstr ""
 
-#: linux/wulfor.cc:82
+#: linux/wulfor.cc:83
 msgid "Send commands to the existing instance (if applicable)"
 msgstr ""
 
@@ -2140,15 +2144,11 @@
 msgid "Total share size: %1%"
 msgstr ""
 
-#: linux/wulfor.cc:84
-msgid "Try to add given magnet directly to download queue"
-msgstr ""
-
 #: linux/search.cc:87 linux/sharebrowser.cc:72
 msgid "Type"
 msgstr ""
 
-#: linux/wulfor.cc:81 linux/wulfor.cc:83 linux/wulfor.cc:84
+#: linux/wulfor.cc:81 linux/wulfor.cc:82 linux/wulfor.cc:84
 msgid "URI"
 msgstr ""
 
@@ -2184,17 +2184,8 @@
 msgid "Unable to open UDP port"
 msgstr ""
 
-#: linux/mainwindow.cc:1412
-msgid "Unknown"
-msgstr ""
-
-#: linux/WulforUtil.cc:251 linux/WulforUtil.cc:253
-msgctxt "Magnet"
-msgid "Unknown"
-msgstr ""
-
-#: linux/downloadqueue.cc:1273 linux/downloadqueue.cc:1274
-msgctxt "Size"
+#: linux/WulforUtil.cc:251 linux/WulforUtil.cc:253 linux/downloadqueue.cc:1273
+#: linux/downloadqueue.cc:1274 linux/mainwindow.cc:1412
 msgid "Unknown"
 msgstr ""