soc.2009.transport: dae1242f: Fixed hardcoded czech strings and update...
hanzz at soc.pidgin.im
hanzz at soc.pidgin.im
Fri Jul 24 06:51:21 EDT 2009
-----------------------------------------------------------------
Revision: dae1242fadac3c70ca2b743631ce531f3029a822
Ancestor: 915d1fbc42d35d9bca02244d2e9402c0410fa93d
Author: hanzz at soc.pidgin.im
Date: 2009-07-23T12:21:58
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/dae1242fadac3c70ca2b743631ce531f3029a822
Modified files:
locales/cs.po main.cpp main.h
ChangeLog:
Fixed hardcoded czech strings and updated czech locale file.
-------------- next part --------------
============================================================
--- locales/cs.po bd4cbd039670799aeffa79c4616cf69930074c0e
+++ locales/cs.po 6e181759dd708edfd63195ce00382da214bd5eed
@@ -5,6 +5,7 @@
#
# This file is distributed under the same license as the Pidgin package.
#
+
msgid ""
msgstr ""
"Project-Id-Version: pidgin VERSION\n"
@@ -19,6 +20,34 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+#: main.cpp:929 main.cpp:934
+msgid "User is sending you file '"
+msgstr "U?ivatel V?m pos?l? soubor '"
+
+#: main.cpp:929
+msgid "'. It will be resend to you right after we receive it."
+msgstr "'. Bude V?m p?eposl?n jakmile jej obdr??me."
+
+#: main.cpp:934
+msgid "'. We will send you link to the file right when we receive it."
+msgstr "'. Po?leme V?m na n?j odkaz jakmile jej obdr??me."
+
+#: main.cpp:963 main.cpp:974
+msgid "File '"
+msgstr "Soubor '"
+
+#: main.cpp:963 main.cpp:974
+msgid "' was received. You can download it here: "
+msgstr "' byl p?ijat. M??ete jej st?hnout zde: "
+
+#: main.cpp:1406
+msgid ""
+"This message couldn't be sent, because you are not connected to legacy "
+"network. You will be automatically reconnected soon."
+msgstr ""
+"Tato zpr?va nemohla b?t posl?na, proto?e nejsme p?ipojeni k s?ti. "
+"Budete automaticky p?ipojeni. Pros?m po?lete pak zpr?vu znovu."
+
#. Translators may want to transliterate the name.
#. It is not to be translated.
msgid "Finch"
============================================================
--- main.cpp b418c9fd6b955581bf4ca788b6b85b3ced675079
+++ main.cpp e142c7bdc477dc60d6853cb33fd71ebb58f58fd6
@@ -680,7 +680,7 @@ void GlooxMessageHandler::purpleConnecti
// fatal error => account will be disconnected, so we have to remove it
if (reason!=0){
if (text){
- Message s(Message::Chat, user->jid(), (std::string)text);
+ Message s(Message::Chat, user->jid(), tr(user->getLang(), text));
std::string from;
s.setFrom(jid());
j->send(s);
@@ -693,7 +693,7 @@ void GlooxMessageHandler::purpleConnecti
else{
if (user->reconnectCount() > 0){
if (text){
- Message s(Message::Chat, user->jid(), (std::string)text);
+ Message s(Message::Chat, user->jid(), tr(user->getLang(),text));
std::string from;
s.setFrom(jid());
j->send(s);
@@ -858,6 +858,8 @@ void GlooxMessageHandler::loadConfigFile
m_configuration.transportFeatures = m_configuration.transportFeatures | TRANSPORT_FEATURE_AVATARS;
else if (feature == "chatstate")
m_configuration.transportFeatures = m_configuration.transportFeatures | TRANSPORT_FEATURE_TYPING_NOTIFY;
+ else if (feature == "filetransfer")
+ m_configuration.transportFeatures = m_configuration.transportFeatures | TRANSPORT_FEATURE_FILETRANSFER;
}
g_strfreev (bind);
}
@@ -872,6 +874,8 @@ void GlooxMessageHandler::loadConfigFile
m_configuration.VIPFeatures = m_configuration.VIPFeatures | TRANSPORT_FEATURE_AVATARS;
else if (feature == "chatstate")
m_configuration.VIPFeatures = m_configuration.VIPFeatures | TRANSPORT_FEATURE_TYPING_NOTIFY;
+ else if (feature == "filetransfer")
+ m_configuration.transportFeatures = m_configuration.transportFeatures | TRANSPORT_FEATURE_FILETRANSFER;
}
g_strfreev (bind);
}
@@ -922,12 +926,12 @@ void GlooxMessageHandler::purpleFileRece
User *user = userManager()->getUserByAccount(purple_xfer_get_account(xfer));
if (user!=NULL){
if(user->hasFeature(GLOOX_FEATURE_FILETRANSFER)){
- Message s(Message::Chat, user->jid(), "Uzivatel vam posila soubor '"+filename+"'. Ihned po doruceni na nas server vam bude preposlan.");
+ Message s(Message::Chat, user->jid(), tr(user->getLang(),_("User is sending you file '"))+filename+tr(user->getLang(),_("'. It will be resend to you right after we receive it.")));
s.setFrom(remote_user+"@"+jid()+"/bot");
j->send(s);
}
else{
- Message s(Message::Chat, user->jid(), "Uzivatel vam posila soubor '"+filename+"'. Ihned po doruceni na nas server vam bude preposlan odkaz umoznujici stazeni souboru.");
+ Message s(Message::Chat, user->jid(), tr(user->getLang(),_("User is sending you file '"))+filename+tr(user->getLang(),_("'. We will send you link to the file right when we receive it.")));
s.setFrom(remote_user+"@"+jid()+"/bot");
j->send(s);
}
@@ -944,7 +948,7 @@ void GlooxMessageHandler::purpleFileRece
if (user->isConnected()){
Log().Get(user->jid()) << "Trying to send file " << filename;
if(user->hasFeature(GLOOX_FEATURE_FILETRANSFER)){
- if (user->isVIP()){
+ if (user->hasTransportFeature(TRANSPORT_FEATURE_FILETRANSFER)){
fileTransferData *data = new fileTransferData;
data->to=user->jid() + "/" + user->resource();
data->from=remote_user+"@"+jid()+"/bot";
@@ -956,7 +960,7 @@ void GlooxMessageHandler::purpleFileRece
else {
sql()->addDownload(basename,"0");
}
- Message s(Message::Chat, user->jid(), "Soubor '"+filename+"' byl prijat. Muzete jej stahnout z adresy http://soumar.jabbim.cz/icq/" + basename +" .");
+ Message s(Message::Chat, user->jid(), tr(user->getLang(),_("File '"))+filename+tr(user->getLang(),_("' was received. You can download it here: ")) + "http://soumar.jabbim.cz/icq/" + basename +" .");
s.setFrom(remote_user+"@"+jid()+"/bot");
j->send(s);
}
@@ -967,7 +971,7 @@ void GlooxMessageHandler::purpleFileRece
else {
sql()->addDownload(basename,"0");
}
- Message s(Message::Chat, user->jid(), "Soubor '"+filename+"' byl prijat. Muzete jej stahnout z adresy http://soumar.jabbim.cz/icq/" + basename +" .");
+ Message s(Message::Chat, user->jid(), tr(user->getLang(),_("File '"))+filename+tr(user->getLang(),_("' was received. You can download it here: ")) + "http://soumar.jabbim.cz/icq/" + basename +" .");
s.setFrom(remote_user+"@"+jid()+"/bot");
j->send(s);
}
@@ -1399,7 +1403,7 @@ void GlooxMessageHandler::handleMessage
}
}
else {
- Message s(Message::Chat, msg.from().full(), "This message couldn't be sent, because you are not connected to legacy network. You will be automatically reconnected soon.");
+ Message s(Message::Chat, msg.from().full(), tr(configuration().language.c_str(),_("This message couldn't be sent, because you are not connected to legacy network. You will be automatically reconnected soon.")));
s.setFrom(msg.to().full());
j->send(s);
Tag *stanza = new Tag("presence");
============================================================
--- main.h 2d88e47c116f38d22072c0489c75dc0e76a5cdf7
+++ main.h 7806f6731b8f3c126e257f51a1b98d2b9fc82717
@@ -116,6 +116,7 @@ typedef enum { TRANSPORT_FEATURE_TYPING
typedef enum { TRANSPORT_FEATURE_TYPING_NOTIFY = 2,
TRANSPORT_FEATURE_AVATARS = 4,
TRANSPORT_MANGLE_STATUS = 8,
+ TRANSPORT_FEATURE_FILETRANSFER = 16
} TransportFeatures;
struct fileTransferData{
More information about the Commits
mailing list