linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #03687
[Branch ~linuxdcpp-team/linuxdcpp/trunk] Rev 416: Drop chat command translations
------------------------------------------------------------
revno: 416
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Fri 2011-03-18 13:15:56 +0200
message:
Drop chat command translations
modified:
Changelog.txt
linux/hub.cc
linux/privatemessage.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 'Changelog.txt'
--- Changelog.txt 2011-03-08 03:55:32 +0000
+++ Changelog.txt 2011-03-18 11:15:56 +0000
@@ -65,6 +65,7 @@
[2010-10-29] lp#667491: Unexpected results deleting multiple selected search results. (Razzloss)
[2011-02-02] lp#311482: Internationalization support. (Steven)
[2011-03-07] lp#329805: Use Desktop Environment's default download folder. (Steven)
+[2011-03-15] lp#735124: Fix crash with previous if the default download folder isn't set. (Razzloss)
*** 1.0.3 2009-02-01 ***
[2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.
=== modified file 'linux/hub.cc'
--- linux/hub.cc 2010-12-23 04:10:02 +0000
+++ linux/hub.cc 2011-03-18 11:15:56 +0000
@@ -885,7 +885,7 @@
}
std::transform(command.begin(), command.end(), command.begin(), (int(*)(int))tolower);
- if (command == _("away"))
+ if (command == "away")
{
if (Util::getAway() && param.empty())
{
@@ -901,28 +901,28 @@
hub->addStatusMessage_gui(F_("Away mode on: %1%", % Util::getAwayMessage()));
}
}
- else if (command == _("back"))
+ else if (command == "back")
{
Util::setAway(FALSE);
hub->addStatusMessage_gui(_("Away mode off"));
}
- else if (command == _("clear"))
+ else if (command == "clear")
{
GtkTextIter startIter, endIter;
gtk_text_buffer_get_start_iter(hub->chatBuffer, &startIter);
gtk_text_buffer_get_end_iter(hub->chatBuffer, &endIter);
gtk_text_buffer_delete(hub->chatBuffer, &startIter, &endIter);
}
- else if (command == _("close"))
+ else if (command == "close")
{
/// @todo: figure out why this sometimes closes and reopens the tab
WulforManager::get()->getMainWindow()->removeBookEntry_gui(hub);
}
- else if (command == _("favorite") || command == _("fav"))
+ else if (command == "favorite" || command == "fav")
{
WulforManager::get()->dispatchClientFunc(new Func0<Hub>(hub, &Hub::addAsFavorite_client));
}
- else if (command == _("getlist"))
+ else if (command == "getlist")
{
if (hub->userMap.find(param) != hub->userMap.end())
{
@@ -932,7 +932,7 @@
else
hub->addStatusMessage_gui(_("User not found"));
}
- else if (command == _("grant"))
+ else if (command == "grant")
{
if (hub->userMap.find(param) != hub->userMap.end())
{
@@ -942,12 +942,13 @@
else
hub->addStatusMessage_gui(_("User not found"));
}
- else if (command == _("help"))
+ else if (command == "help")
{
+ // TRANSLATORS: /commands aren't translatable. So leave them as they are in the help string
hub->addStatusMessage_gui(_("Available commands: /away <message>, /back, /clear, /close, /favorite, "\
"/getlist <user>, /grant <user>, /help, /join <address>, /me <message>, /pm <user>, /rebuild, /refresh, /userlist"));
}
- else if (command == _("join") && !param.empty())
+ else if (command == "join" && !param.empty())
{
if (BOOLSETTING(JOIN_OPEN_NEW_WINDOW))
{
@@ -961,27 +962,27 @@
WulforManager::get()->dispatchClientFunc(func);
}
}
- else if (command == _("me"))
+ else if (command == "me")
{
func2 = new F2(hub, &Hub::sendMessage_client, param, true);
WulforManager::get()->dispatchClientFunc(func2);
}
- else if (command == _("pm"))
+ else if (command == "pm")
{
if (hub->userMap.find(param) != hub->userMap.end())
WulforManager::get()->getMainWindow()->addPrivateMessage_gui(hub->userMap[param], hub->client->getHubUrl());
else
hub->addStatusMessage_gui(_("User not found"));
}
- else if (command == _("rebuild"))
+ else if (command == "rebuild")
{
WulforManager::get()->dispatchClientFunc(new Func0<Hub>(hub, &Hub::rebuildHashData_client));
}
- else if (command == _("refresh"))
+ else if (command == "refresh")
{
WulforManager::get()->dispatchClientFunc(new Func0<Hub>(hub, &Hub::refreshFileList_client));
}
- else if (command == _("userlist"))
+ else if (command == "userlist")
{
if (GTK_WIDGET_VISIBLE(hub->getWidget("scrolledwindow2")))
gtk_widget_hide(hub->getWidget("scrolledwindow2"));
=== modified file 'linux/privatemessage.cc'
--- linux/privatemessage.cc 2010-11-12 08:07:06 +0000
+++ linux/privatemessage.cc 2011-03-18 11:15:56 +0000
@@ -317,7 +317,7 @@
}
std::transform(command.begin(), command.end(), command.begin(), (int(*)(int))tolower);
- if (command == _("away"))
+ if (command == "away")
{
if (Util::getAway() && param.empty())
{
@@ -334,44 +334,45 @@
pm->addStatusMessage_gui(F_("Away mode on: %1%", % Util::getAwayMessage()));
}
}
- else if (command == _("back"))
+ else if (command == "back")
{
Util::setAway(FALSE);
pm->addStatusMessage_gui(_("Away mode off"));
}
- else if (command == _("clear"))
+ else if (command == "clear")
{
GtkTextIter startIter, endIter;
gtk_text_buffer_get_start_iter(pm->buffer, &startIter);
gtk_text_buffer_get_end_iter(pm->buffer, &endIter);
gtk_text_buffer_delete(pm->buffer, &startIter, &endIter);
}
- else if (command == _("close"))
+ else if (command == "close")
{
WulforManager::get()->getMainWindow()->removeBookEntry_gui(pm);
}
- else if (command == _("favorite") || text == _("fav"))
+ else if (command == "favorite" || text == "fav")
{
typedef Func0<PrivateMessage> F0;
F0 *func = new F0(pm, &PrivateMessage::addFavoriteUser_client);
WulforManager::get()->dispatchClientFunc(func);
pm->addStatusMessage_gui(_("Added user to favorites list"));
}
- else if (command == _("getlist"))
+ else if (command == "getlist")
{
typedef Func0<PrivateMessage> F0;
F0 *func = new F0(pm, &PrivateMessage::getFileList_client);
WulforManager::get()->dispatchClientFunc(func);
}
- else if (command == _("grant"))
+ else if (command == "grant")
{
typedef Func0<PrivateMessage> F0;
F0 *func = new F0(pm, &PrivateMessage::grantSlot_client);
WulforManager::get()->dispatchClientFunc(func);
pm->addStatusMessage_gui(_("Slot granted"));
}
- else if (command == _("help"))
+ else if (command == "help")
{
+ // TRANSLATORS: /commands aren't translatable. So leave them as they are in the help string
pm->addStatusMessage_gui(_("Available commands: /away <message>, /back, /clear, /close, /favorite, /getlist, /grant, /help"));
}
else
=== modified file 'po/linuxdcpp.pot'
--- po/linuxdcpp.pot 2011-03-15 04:56:58 +0000
+++ po/linuxdcpp.pot 2011-03-18 11:15:56 +0000
@@ -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-03-15 06:54+0200\n"
+"POT-Creation-Date: 2011-03-18 13:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1239,7 +1239,7 @@
msgid "translator-credits"
msgstr ""
-#: linux/privatemessage.cc:627
+#: linux/privatemessage.cc:628
msgid " has joined"
msgstr ""
@@ -1286,7 +1286,7 @@
msgid "%1% has joined"
msgstr ""
-#: linux/hub.cc:1548 linux/privatemessage.cc:647
+#: linux/hub.cc:1549 linux/privatemessage.cc:648
#, boost-format
msgid "%1% has quit"
msgstr ""
@@ -1392,14 +1392,16 @@
msgid "Automatically search for alternative download locations"
msgstr ""
-#: linux/hub.cc:947
+#. TRANSLATORS: /commands aren't translatable. So leave them as they are in the help string
+#: linux/hub.cc:948
msgid ""
"Available commands: /away <message>, /back, /clear, /close, /favorite, /"
"getlist <user>, /grant <user>, /help, /join <address>, /me <message>, /pm "
"<user>, /rebuild, /refresh, /userlist"
msgstr ""
-#: linux/privatemessage.cc:375
+#. TRANSLATORS: /commands aren't translatable. So leave them as they are in the help string
+#: linux/privatemessage.cc:376
msgid ""
"Available commands: /away <message>, /back, /clear, /close, /favorite, /"
"getlist, /grant, /help"
@@ -1489,7 +1491,7 @@
msgid "Confirm favorite hub removal"
msgstr ""
-#: linux/hub.cc:1570
+#: linux/hub.cc:1571
#, boost-format
msgid "Connect failed: %1%"
msgstr ""
@@ -1498,7 +1500,7 @@
msgid "Connect to the given hub"
msgstr ""
-#: linux/hub.cc:1500 linux/transfers.cc:981
+#: linux/hub.cc:1501 linux/transfers.cc:981
msgid "Connected"
msgstr ""
@@ -1510,7 +1512,7 @@
msgid "Connecting (forced)..."
msgstr ""
-#: linux/hub.cc:1493
+#: linux/hub.cc:1494
#, boost-format
msgid "Connecting to %1%"
msgstr ""
@@ -1639,11 +1641,11 @@
msgid "Failed to communicate with existing instance: %1%"
msgstr ""
-#: linux/hub.cc:1435
+#: linux/hub.cc:1436
msgid "Favorite hub added"
msgstr ""
-#: linux/hub.cc:1440
+#: linux/hub.cc:1441
msgid "Favorite hub already exists"
msgstr ""
@@ -1775,12 +1777,12 @@
msgid "Ignore private messages from the hub"
msgstr ""
-#: linux/hub.cc:1705
+#: linux/hub.cc:1706
#, boost-format
msgid "Ignored private message from bot %1%"
msgstr ""
-#: linux/hub.cc:1698
+#: linux/hub.cc:1699
msgid "Ignored private message from hub"
msgstr ""
@@ -1861,7 +1863,7 @@
msgid "New public hub list"
msgstr ""
-#: linux/hub.cc:1722
+#: linux/hub.cc:1723
msgid "Nick already taken"
msgstr ""
@@ -1981,7 +1983,7 @@
msgid "Search for the given magnet link"
msgstr ""
-#: linux/hub.cc:1729
+#: linux/hub.cc:1730
#, boost-format
msgid "Search spam detected from %1%"
msgstr ""
@@ -2062,7 +2064,7 @@
msgid "Slot granted to "
msgstr ""
-#: linux/hub.cc:1356
+#: linux/hub.cc:1357
#, boost-format
msgid "Slot granted to %1%"
msgstr ""
@@ -2157,7 +2159,7 @@
"allowed per profile."
msgstr ""
-#: linux/hub.cc:1381
+#: linux/hub.cc:1382
msgid "Unable to connect: already connected to the requested hub"
msgstr ""
@@ -2188,7 +2190,7 @@
msgid "Unknown"
msgstr ""
-#: linux/hub.cc:998 linux/privatemessage.cc:379
+#: linux/hub.cc:999 linux/privatemessage.cc:380
#, boost-format
msgid "Unknown command '%1%': Type /help for a list of available commands"
msgstr ""
@@ -2232,12 +2234,12 @@
msgid "User Description"
msgstr ""
-#: linux/hub.cc:933 linux/hub.cc:943 linux/hub.cc:974 linux/hub.cc:1328
-#: linux/hub.cc:1348
+#: linux/hub.cc:933 linux/hub.cc:943 linux/hub.cc:975 linux/hub.cc:1329
+#: linux/hub.cc:1349
msgid "User not found"
msgstr ""
-#: linux/privatemessage.cc:587
+#: linux/privatemessage.cc:588
msgid "User went offline"
msgstr ""
@@ -2300,63 +2302,3 @@
#: linux/sharebrowser.cc:529
msgid "_Browse..."
msgstr ""
-
-#: linux/hub.cc:888 linux/privatemessage.cc:320
-msgid "away"
-msgstr ""
-
-#: linux/hub.cc:904 linux/privatemessage.cc:337
-msgid "back"
-msgstr ""
-
-#: linux/hub.cc:909 linux/privatemessage.cc:342
-msgid "clear"
-msgstr ""
-
-#: linux/hub.cc:916 linux/privatemessage.cc:349
-msgid "close"
-msgstr ""
-
-#: linux/hub.cc:921 linux/privatemessage.cc:353
-msgid "fav"
-msgstr ""
-
-#: linux/hub.cc:921 linux/privatemessage.cc:353
-msgid "favorite"
-msgstr ""
-
-#: linux/hub.cc:925 linux/privatemessage.cc:360
-msgid "getlist"
-msgstr ""
-
-#: linux/hub.cc:935 linux/privatemessage.cc:366
-msgid "grant"
-msgstr ""
-
-#: linux/hub.cc:945 linux/privatemessage.cc:373
-msgid "help"
-msgstr ""
-
-#: linux/hub.cc:950
-msgid "join"
-msgstr ""
-
-#: linux/hub.cc:964
-msgid "me"
-msgstr ""
-
-#: linux/hub.cc:969
-msgid "pm"
-msgstr ""
-
-#: linux/hub.cc:976
-msgid "rebuild"
-msgstr ""
-
-#: linux/hub.cc:980
-msgid "refresh"
-msgstr ""
-
-#: linux/hub.cc:984
-msgid "userlist"
-msgstr ""
