Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some spaces in the sourcecode.

Browse Source 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-07-11 08:14:38 +00:00
parent f02cc51409
commit 207d86543c
3 changed files with 165 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -46,14 +46,14 @@
/**************************************************************** /****************************************************************
*/ */
#define RSID_COL_NICKNAME 0 #define RSID_COL_NICKNAME 0
#define RSID_COL_KEYID 1 #define RSID_COL_KEYID 1
#define RSID_COL_IDTYPE 2 #define RSID_COL_IDTYPE 2
#define RSIDREP_COL_NAME 0 #define RSIDREP_COL_NAME 0
#define RSIDREP_COL_OPINION 1 #define RSIDREP_COL_OPINION 1
#define RSIDREP_COL_COMMENT 2 #define RSIDREP_COL_COMMENT 2
#define RSIDREP_COL_REPUTATION 3 #define RSIDREP_COL_REPUTATION 3
#define RSID_FILTER_YOURSELF 0x0001 #define RSID_FILTER_YOURSELF 0x0001
#define RSID_FILTER_FRIENDS 0x0002 #define RSID_FILTER_FRIENDS 0x0002
@ -161,9 +161,9 @@ void IdDialog::todo()
} }
void IdDialog::filterComboBoxChanged() void IdDialog::filterComboBoxChanged()
{ {
requestIdList(); requestIdList();
} }
void IdDialog::filterChanged(const QString& /*text*/) void IdDialog::filterChanged(const QString& /*text*/)
{ {
@ -371,13 +371,13 @@ void IdDialog::requestIdDetails(std::string &id)
mStateHelper->setLoading(IDDIALOG_REPLIST, true); mStateHelper->setLoading(IDDIALOG_REPLIST, true);
RsTokReqOptions opts; RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
uint32_t token; uint32_t token;
std::list<std::string> groupIds; std::list<std::string> groupIds;
groupIds.push_back(id); groupIds.push_back(id);
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS); mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS);
} }
void IdDialog::insertIdDetails(uint32_t token) void IdDialog::insertIdDetails(uint32_t token)
@ -421,7 +421,7 @@ void IdDialog::insertIdDetails(uint32_t token)
/* get GPG Details from rsPeers */ /* get GPG Details from rsPeers */
std::string ownPgpId = rsPeers->getGPGOwnId(); std::string ownPgpId = rsPeers->getGPGOwnId();
ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName)); ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId)); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
@ -464,7 +464,7 @@ void IdDialog::insertIdDetails(uint32_t token)
ui.radioButton_IdFOF->setChecked(true); ui.radioButton_IdFOF->setChecked(true);
} }
} }
else else
{ {
ui.radioButton_IdOther->setChecked(true); ui.radioButton_IdOther->setChecked(true);
} }
@ -502,7 +502,7 @@ void IdDialog::insertIdDetails(uint32_t token)
{ {
ui.line_RatingImplicit->setText("+10 UnKnown PGP"); ui.line_RatingImplicit->setText("+10 UnKnown PGP");
} }
else else
{ {
ui.line_RatingImplicit->setText("+5 Anon Id"); ui.line_RatingImplicit->setText("+5 Anon Id");
} }
@ -561,14 +561,14 @@ void IdDialog::requestRepList(const RsGxsGroupId &aboutId)
mIdQueue->cancelActiveRequestTokens(IDDIALOG_REPLIST); mIdQueue->cancelActiveRequestTokens(IDDIALOG_REPLIST);
std::list<RsGxsGroupId> groupIds; std::list<RsGxsGroupId> groupIds;
groupIds.push_back(aboutId); groupIds.push_back(aboutId);
RsTokReqOptions opts; RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
uint32_t token; uint32_t token;
mIdQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_REPLIST); mIdQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_REPLIST);
} }
void IdDialog::insertRepList(uint32_t token) void IdDialog::insertRepList(uint32_t token)
@ -615,26 +615,26 @@ void IdDialog::insertRepList(uint32_t token)
void IdDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest &req) void IdDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest &req)
{ {
std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType; std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType;
std::cerr << std::endl; std::cerr << std::endl;
switch(req.mUserType) switch(req.mUserType)
{ {
case IDDIALOG_IDLIST: case IDDIALOG_IDLIST:
insertIdList(req.mToken); insertIdList(req.mToken);
break; break;
case IDDIALOG_IDDETAILS: case IDDIALOG_IDDETAILS:
insertIdDetails(req.mToken); insertIdDetails(req.mToken);
break; break;
case IDDIALOG_REPLIST: case IDDIALOG_REPLIST:
insertRepList(req.mToken); insertRepList(req.mToken);
break; break;
default: default:
std::cerr << "IdDialog::loadRequest() ERROR"; std::cerr << "IdDialog::loadRequest() ERROR";
std::cerr << std::endl; std::cerr << std::endl;
break; break;
} }
} }

6
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -151,7 +151,7 @@ void IdEditDialog::loadExistingId(uint32_t token)
ui.lineEdit_KeyId->setText(tr("Error getting key!")); ui.lineEdit_KeyId->setText(tr("Error getting key!"));
return; return;
} }
if (datavector.size() != 1) if (datavector.size() != 1)
{ {
std::cerr << "IdDialog::insertIdDetails() Invalid datavector size"; std::cerr << "IdDialog::insertIdDetails() Invalid datavector size";
@ -253,7 +253,7 @@ void IdEditDialog::updateId()
//rid.mGpgName = ""; //rid.mGpgName = "";
//rid.mGpgEmail = ""; //rid.mGpgEmail = "";
} }
// Can only create Identities for the moment! // Can only create Identities for the moment!
RsIdentityParameters params; RsIdentityParameters params;
params.nickname = rid.mMeta.mGroupName; params.nickname = rid.mMeta.mGroupName;
@ -269,7 +269,7 @@ void IdEditDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest &
{ {
std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType; std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType;
std::cerr << std::endl; std::cerr << std::endl;
// only one here! // only one here!
loadExistingId(req.mToken); loadExistingId(req.mToken);
} }

159
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -7299,10 +7299,6 @@ p, li { white-space: pre-wrap; }
<source>New ID</source> <source>New ID</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Showing:</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Yourself</source> <source>Yourself</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7323,10 +7319,6 @@ p, li { white-space: pre-wrap; }
<source>All</source> <source>All</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>filter</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Nickname</source> <source>Nickname</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7379,10 +7371,6 @@ p, li { white-space: pre-wrap; }
<source>PGP Name</source> <source>PGP Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>PGP Email</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>PGP Id</source> <source>PGP Id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7419,6 +7407,34 @@ p, li { white-space: pre-wrap; }
<source>Local Reputation</source> <source>Local Reputation</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Todo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Linked Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anon Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown real name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anonymous Id</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>IdEditDialog</name> <name>IdEditDialog</name>
@ -7434,10 +7450,6 @@ p, li { white-space: pre-wrap; }
<source>PGP Name</source> <source>PGP Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>PGP Email</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>PGP Hash</source> <source>PGP Hash</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7446,10 +7458,6 @@ p, li { white-space: pre-wrap; }
<source>PGP Id</source> <source>PGP Id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>New Identity</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>PGP Associated ID</source> <source>PGP Associated ID</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -7459,11 +7467,35 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Cancel</source> <source>New identity</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Create/Update ID</source> <source>To be generated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>N/A</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error getting key!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error KeyID invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown GpgId</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown real name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -12513,10 +12545,6 @@ p, li { white-space: pre-wrap; }
<comment>i.e: Estimated Time of Arrival / Time left</comment> <comment>i.e: Estimated Time of Arrival / Time left</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Core-ID</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Peer</source> <source>Peer</source>
<comment>i.e: user name</comment> <comment>i.e: user name</comment>
@ -12802,6 +12830,78 @@ Try to be patient!</source>
<source>Collapse all</source> <source>Collapse all</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Size Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Completed Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Speed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Speed Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Progress / Availability</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Progress / Availability Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Sources Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Status Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Speed / Queue position Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Remaining Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download time</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Download time Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hash Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Last Time Seen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Last Time Seen Column</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Columns</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>TreeStyle_RDM</name> <name>TreeStyle_RDM</name>
@ -13025,6 +13125,13 @@ Try to be patient!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UIStateHelper</name>
<message>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>ULListDelegate</name> <name>ULListDelegate</name>
<message> <message>