Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Added new translatable strings (patch from Henry)

Browse Source 
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-10 18:37:21 +00:00
parent e7489ea2dc
commit 383a035bdb
11 changed files with 1238 additions and 2412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/tests/network_simulator/gui/NetworkViewer.cpp
View File

@ -33,10 +33,10 @@ NetworkViewer::NetworkViewer(QWidget *parent,Network&net)
connect(this,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint))); connect(this,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint)));
action_ClientForHash = new QAction(QString("Client for new random hash"),this) ; action_ClientForHash = new QAction(tr("Client for new random hash"),this) ;
QObject::connect(action_ClientForHash,SIGNAL(triggered()),this,SLOT(actionClientForHash())) ; QObject::connect(action_ClientForHash,SIGNAL(triggered()),this,SLOT(actionClientForHash())) ;
action_ProvideGRKey = new QAction(QString("Provide new GRouter key"),this) ; action_ProvideGRKey = new QAction(tr("Provide new GRouter key"),this) ;
QObject::connect(action_ProvideGRKey,SIGNAL(triggered()),this,SLOT(actionProvideGRKey())) ; QObject::connect(action_ProvideGRKey,SIGNAL(triggered()),this,SLOT(actionProvideGRKey())) ;
setMouseTracking(true) ; setMouseTracking(true) ;

14
retroshare-gui/src/gui/PluginManager.cpp
View File

@ -61,7 +61,7 @@ PluginManager::defaultLoad( )
if ( !workDir.exists() ) if ( !workDir.exists() )
{ {
QString em= QString("base folder %1 doesn't exist, default load failed") QString em= tr("base folder %1 doesn't exist, default load failed")
.arg( baseFolder ); .arg( baseFolder );
emit errorAppeared( em ); emit errorAppeared( em );
return ; return ;
@ -200,7 +200,7 @@ PluginManager::pluginWidget(QString pluginName)
} }
else else
{ {
QString em=QString("Error: instance '%1'can't create a widget") QString em=tr("Error: instance '%1'can't create a widget")
.arg( pluginName ); .arg( pluginName );
emit errorAppeared( em ); emit errorAppeared( em );
return 0; return 0;
@ -213,7 +213,7 @@ PluginManager::pluginWidget(QString pluginName)
} }
else else
{ {
QString em = QString("Error: no plugin with name '%1' found") QString em = tr("Error: no plugin with name '%1' found")
.arg(pluginName); .arg(pluginName);
emit errorAppeared( em ); emit errorAppeared( em );
} }
@ -283,7 +283,7 @@ PluginManager::removePlugin(QString pluginName)
QFile fl(fn); QFile fl(fn);
if (!fl.remove()) if (!fl.remove())
{ {
QString em = QString("Error: failed to revove file %1" QString em = tr("Error: failed to revove file %1"
"(uninstalling plugin '%2')") "(uninstalling plugin '%2')")
.arg(fn).arg(pluginName); .arg(fn).arg(pluginName);
emit errorAppeared( em); emit errorAppeared( em);
@ -296,7 +296,7 @@ PluginManager::removePlugin(QString pluginName)
} }
else else
{ {
QString em = QString("Error(uninstall): no plugin with name '%1' found") QString em = tr("Error(uninstall): no plugin with name '%1' found")
.arg(pluginName); .arg(pluginName);
emit errorAppeared( em ); emit errorAppeared( em );
} }
@ -311,7 +311,7 @@ PluginManager::installPlugin(QString fileName)
if (!QFile::exists( fileName) ) if (!QFile::exists( fileName) )
{ {
QString em = QString("Error(installation): flugin file %1 doesn't exist") QString em = tr("Error(installation): plugin file %1 doesn't exist")
.arg( fileName ); .arg( fileName );
emit errorAppeared( em ); emit errorAppeared( em );
@ -335,7 +335,7 @@ PluginManager::installPlugin(QString fileName)
} // } //
else else
{ {
QString em = QString("Error: can't copy %1 as %2") QString em = tr("Error: can't copy %1 as %2")
.arg(fileName, newFileName) ; .arg(fileName, newFileName) ;
emit errorAppeared( em ); emit errorAppeared( em );
} }

2
retroshare-gui/src/gui/PluginManagerWidget.cpp
View File

@ -190,7 +190,7 @@ PluginManagerWidget::removePluginFrame(QString pluginName)
} }
// normally unreachable place // normally unreachable place
QString em = QString("Widget for plugin %1 not found on plugins frame") QString em = tr("Widget for plugin %1 not found on plugins frame")
.arg( pluginName ) ; .arg( pluginName ) ;
acceptErrorMessage( em ); acceptErrorMessage( em );
} }

12
retroshare-gui/src/gui/QuickStartWizard.cpp
View File

@ -285,11 +285,11 @@ void QuickStartWizard::loadShare()
listWidget->setItem(row,0,new QTableWidgetItem(QString::fromStdString((*it).filename))); listWidget->setItem(row,0,new QTableWidgetItem(QString::fromStdString((*it).filename)));
#ifdef USE_COMBOBOX #ifdef USE_COMBOBOX
QComboBox *cb = new QComboBox ; QComboBox *cb = new QComboBox ;
cb->addItem(QString("Network Wide")) ; cb->addItem(tr("Network Wide")) ;
cb->addItem(QString("Browsable")) ; cb->addItem(tr("Browsable")) ;
cb->addItem(QString("Universal")) ; cb->addItem(tr("Universal")) ;
cb->setToolTip(QString("Decide here whether this directory is\n* Network Wide: \tanonymously shared over the network (including your friends)\n* Browsable: \tbrowsable by your friends\n* Universal: \t\tboth")) ; cb->setToolTip(tr("Decide here whether this directory is\n* Network Wide: \tanonymously shared over the network (including your friends)\n* Browsable: \tbrowsable by your friends\n* Universal: \t\tboth")) ;
// TODO // TODO
// - set combobox current value depending on what rsFiles reports. // - set combobox current value depending on what rsFiles reports.
@ -319,8 +319,8 @@ void QuickStartWizard::loadShare()
cb1->setChecked( (*it).shareflags & DIR_FLAGS_NETWORK_WIDE_OTHERS ) ; cb1->setChecked( (*it).shareflags & DIR_FLAGS_NETWORK_WIDE_OTHERS ) ;
cb2->setChecked( (*it).shareflags & DIR_FLAGS_BROWSABLE_OTHERS ) ; cb2->setChecked( (*it).shareflags & DIR_FLAGS_BROWSABLE_OTHERS ) ;
cb1->setToolTip(QString("If checked, the share is anonymously shared to anybody.")) ; cb1->setToolTip(tr("If checked, the share is anonymously shared to anybody.")) ;
cb2->setToolTip(QString("If checked, the share is browsable by your friends.")) ; cb2->setToolTip(tr("If checked, the share is browsable by your friends.")) ;
listWidget->setCellWidget(row,1,cb1); listWidget->setCellWidget(row,1,cb1);
listWidget->setCellWidget(row,2,cb2); listWidget->setCellWidget(row,2,cb2);

8
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -649,10 +649,10 @@ QString RetroShareLink::title() const
{ {
RsPeerDetails detail; RsPeerDetails detail;
rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ; rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ;
return QString("Click to send a private message to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ; return QObject::tr("Click to send a private message to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
} }
case TYPE_EXTRAFILE: case TYPE_EXTRAFILE:
return QString("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size())); return QObject::tr("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size()));
case TYPE_FILE: case TYPE_FILE:
return QString("%1 (%2)").arg(hash()).arg(misc::friendlyUnit(size())); return QString("%1 (%2)").arg(hash()).arg(misc::friendlyUnit(size()));
case TYPE_PERSON: case TYPE_PERSON:
@ -818,7 +818,7 @@ QString RetroShareLink::niceName() const
if(type() == TYPE_PUBLIC_MSG) { if(type() == TYPE_PUBLIC_MSG) {
RsPeerDetails detail; RsPeerDetails detail;
rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ; rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ;
return QString("Click this link to send a private message to %1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ; return QObject::tr("Click this link to send a private message to %1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
} }
if(type() == TYPE_CERTIFICATE) if(type() == TYPE_CERTIFICATE)
{ {
@ -828,7 +828,7 @@ QString RetroShareLink::niceName() const
if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code)) if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code))
return QObject::tr("This cert is malformed. Error code: ")+QString::number(error_code) ; return QObject::tr("This cert is malformed. Error code: ")+QString::number(error_code) ;
else else
return QString("RetroShare Certificate (%1, @%2)").arg(QString::fromUtf8(details.name.c_str()), QString::fromUtf8(details.location.c_str())); // should add SSL id there return QObject::tr("RetroShare Certificate (%1, @%2)").arg(QString::fromUtf8(details.name.c_str()), QString::fromUtf8(details.location.c_str())); // should add SSL id there
} }
return name(); return name();

4
retroshare-gui/src/gui/bwctrl/BwCtrlWindow.cpp
View File

@ -282,8 +282,8 @@ void BwCtrlWindow::updateBandwidth()
peerTreeWidget->addTopLevelItem(item); peerTreeWidget->addTopLevelItem(item);
/* do Totals */ /* do Totals */
item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString("TOTALS")); item -> setData(COLUMN_PEERID, Qt::DisplayRole, tr("TOTALS"));
item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString("Totals")); item -> setData(COLUMN_RSNAME, Qt::DisplayRole, tr("Totals"));
item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, totalRates.mRateIn); item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, totalRates.mRateIn);
item -> setData(COLUMN_IN_MAX, Qt::DisplayRole,totalRates.mRateMaxIn); item -> setData(COLUMN_IN_MAX, Qt::DisplayRole,totalRates.mRateMaxIn);

2
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View File

@ -751,7 +751,7 @@ bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
if (count == MAX_FILE_ADDED_BEFORE_ASK) if (count == MAX_FILE_ADDED_BEFORE_ASK)
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setText(QString("Warning, selection contains more than %1 items.").arg(MAX_FILE_ADDED_BEFORE_ASK)); msgBox.setText(tr("Warning, selection contains more than %1 items.").arg(MAX_FILE_ADDED_BEFORE_ASK));
msgBox.setInformativeText("Do you want to continue?"); msgBox.setInformativeText("Do you want to continue?");
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);

2
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View File

@ -642,7 +642,7 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
#ifdef ENABLE_GENERATE #ifdef ENABLE_GENERATE
if (generateCheckBox->isChecked()) { if (generateCheckBox->isChecked()) {
generateCount = generateSpinBox->value(); generateCount = generateSpinBox->value();
if (QMessageBox::question(this, "Generate mass data", QString("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) { if (QMessageBox::question(this, tr("Generate mass data"), tr("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return; return;
} }
} }

2
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View File

@ -314,7 +314,7 @@ void CreateGxsForumMsg::createMsg()
#ifdef ENABLE_GENERATE #ifdef ENABLE_GENERATE
if (ui.generateCheckBox->isChecked()) { if (ui.generateCheckBox->isChecked()) {
generateCount = ui.generateSpinBox->value(); generateCount = ui.generateSpinBox->value();
if (QMessageBox::question(this, "Generate mass data", QString("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) { if (QMessageBox::question(this, tr("Generate mass data"), tr("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return; return;
}//if (QMessageBox::question(this, }//if (QMessageBox::question(this,
}//if (ui.generateCheckBox->isChecked()) }//if (ui.generateCheckBox->isChecked())

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

File diff suppressed because it is too large Load Diff

2
retroshare-gui/src/rshare.cpp
View File

@ -564,7 +564,7 @@ Rshare::createDataDirectory(QString *errmsg)
QString path = datadir.absolutePath(); QString path = datadir.absolutePath();
if (!datadir.mkpath(path)) { if (!datadir.mkpath(path)) {
return err(errmsg, return err(errmsg,
QString("Could not create data directory: %1").arg(path)); tr("Could not create data directory: %1").arg(path));
} }
} }
return true; return true;