| e8c90f7e | 2015-03-04 22:07:34 | Slávek Banko |
Fix incorrectly renamed strings |
||
|
M kstars/kstars/data/tips M kstars/kstars/detaildialog.cpp M kstars/kstars/indi/apogee/ApnCamera.cpp M kstars/kstars/indi/apogee/CameraIO_Linux.h M kstars/kstars/indi/fli/libfli.c M kstars/kstars/indi/fli_ccd.c M kstars/kstars/indidevice.cpp M kstars/kstars/indielement.h M kstars/kstars/indiproperty.cpp M kstars/kstars/indistd.cpp M kstars/kstars/ksplanetbase.h M kstars/kstars/kstarsactions.cpp M kstars/kstars/kstarsdcop.cpp M kstars/kstars/opsadvancedui.ui M kstars/kstars/planetcatalog.h M kstars/kstars/skymap.cpp M kstars/kstars/skymap.h M kstars/kstars/skypoint.h M kstars/kstars/tools/argsetaltaz.ui M kstars/kstars/tools/observinglist.cpp M kstars/kstars/tools/scriptbuilder.cpp |
||
diff --git a/kstars/kstars/data/tips b/kstars/kstars/data/tips
index 8e97baa..91f8224 100644
--- a/kstars/kstars/data/tips
+++ b/kstars/kstars/data/tips
@@ -83,7 +83,7 @@
<tip category="KStars|Navigation">
<html>
<p>The status bar displays the current sky coordinates of the mouse cursor,
- in both Equatorial andQt::Horizontal coordinate systems.
+ in both Equatorial and Horizontal coordinate systems.
</p>
</html>
</tip>
@@ -109,7 +109,7 @@
</tip>
<tip category="KStars|Navigation">
<html>
- <p>To switch between Equatorial andQt::Horizontal coordinate
+ <p>To switch between Equatorial and Horizontal coordinate
systems, use the "View->Coordinates" menu item, or press the spacebar.
</p>
</html>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index fe105d5..d90131a 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -57,7 +57,7 @@
#include "devicemanager.h"
#include "indistd.h"
-LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name )
+LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name )
{
setFrameStyle( TQFrame::StyledPanel );
setFrameShadow( TQFrame::Plain );
@@ -69,11 +69,11 @@
TQWidget::focusOutEvent(e);
}
-ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name )
+ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name )
{}
-DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo,
- TQWidget *parent, const char *name ) :
+DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo,
+ TQWidget *parent, const char *name ) :
KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, parent, name ) ,
selectedObject(o), ksw((KStars*)parent), Data(0), Pos(0), Links(0), Adv(0), Log(0)
{
@@ -101,7 +101,7 @@
{
TQFrame *DataTab = addPage(i18n("General"));
Data = new DetailsDataUI( DataTab, "general_data_tab" );
-
+
//Modify colors
Data->Names->setPaletteBackgroundColor( palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
Data->Names->setPaletteForegroundColor( palette().color( TQPalette::Active, TQColorGroup::HighlightedText ) );
@@ -139,7 +139,7 @@
TDEGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place
//distance
- if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas
+ if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas
Data->Distance->setText( TQString(i18n("larger than 2000 parsecs", "> 2000 pc") ) );
else if ( s->distance() > 50.0 ) //show to nearest integer
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg(
@@ -158,18 +158,18 @@
if ( s->isMultiple() && s->isVariable() ) {
Data->AngSizeLabel->setText( i18n( "the star is a multiple star", "multiple" ) + "," );
Data->AngSize->setText( i18n( "the star is a variable star", "variable" ) );
- } else if ( s->isMultiple() )
+ } else if ( s->isMultiple() )
Data->AngSizeLabel->setText( i18n( "the star is a multiple star", "multiple" ) );
- else if ( s->isVariable() )
+ else if ( s->isVariable() )
Data->AngSizeLabel->setText( i18n( "the star is a variable star", "variable" ) );
-
+
break; //end of stars case
case 9: //asteroids [fall through to planets]
case 10: //comets [fall through to planets]
case 2: //planets (including comets and asteroids)
ps = (KSPlanetBase *)selectedObject;
-
+
Data->Names->setText( ps->longname() );
//Type is "G5 star" for Sun
if ( ps->name() == "Sun" )
@@ -177,7 +177,7 @@
else
Data->Type->setText( ps->typeName() );
- Data->Constellation->setText( ps->constellation( ksw->data()->csegmentList,
+ Data->Constellation->setText( ps->constellation( ksw->data()->csegmentList,
ksw->data()->cnameList ) );
//Magnitude: The moon displays illumination fraction instead
@@ -191,20 +191,20 @@
//Distance from Earth. The moon requires a unit conversion
if ( ps->name() == "Moon" ) {
- Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg(
+ Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg(
TDEGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) );
} else {
- Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg(
+ Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg(
TDEGlobal::locale()->formatNumber( ps->rearth() ) ) );
}
//Angular size; moon and sun in arcmin, others in arcsec
if ( ps->angSize() ) {
- if ( ps->name() == "Sun" || ps->name() == "Moon" )
- Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
+ if ( ps->name() == "Sun" || ps->name() == "Moon" )
+ Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
TDEGlobal::locale()->formatNumber( ps->angSize() ) ) );
else
- Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg(
+ Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg(
TDEGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) );
} else {
Data->AngSize->setText( "--" );
@@ -236,7 +236,7 @@
if ( ! oname.isEmpty() ) oname += ", ";
oname += "PGC " + TQString("%1").arg( dso->pgc() );
}
-
+
if ( ! oname.isEmpty() ) pname += ", " + oname;
Data->Names->setText( pname );
@@ -252,20 +252,20 @@
Data->Distance->setText( "--" );
//Only show decimal place for small angular sizes
- if ( dso->a() > 10.0 )
- Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
+ if ( dso->a() > 10.0 )
+ Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
int( dso->a() ) ) );
- else if ( dso->a() )
- Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
+ else if ( dso->a() )
+ Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
TDEGlobal::locale()->formatNumber( dso->a(), 1 ) ) );
- else
+ else
Data->AngSize->setText( "--" );
-
+
break;
}
//Common to all types:
- Data->Constellation->setText( selectedObject->constellation( ksw->data()->csegmentList,
+ Data->Constellation->setText( selectedObject->constellation( ksw->data()->csegmentList,
ksw->data()->cnameList ) );
}
@@ -307,7 +307,7 @@
TQVBoxLayout *vlay = new TQVBoxLayout( PosTab, 0, 0 );
vlay->addWidget( Pos );
-
+
//Coordinates Section:
//Don't use TDELocale::formatNumber() for the epoch string,
//because we don't want a thousands-place separator!
@@ -335,10 +335,10 @@
//Airmass is approximated as the secant of the zenith distance,
//equivalent to 1./sin(Alt). Beware of Inf at Alt=0!
- if ( selectedObject->alt()->Degrees() > 0.0 )
- Pos->Airmass->setText( TDEGlobal::locale()->formatNumber(
+ if ( selectedObject->alt()->Degrees() > 0.0 )
+ Pos->Airmass->setText( TDEGlobal::locale()->formatNumber(
1./sin( selectedObject->alt()->radians() ), 2 ) );
- else
+ else
Pos->Airmass->setText( "--" );
//Rise/Set/Transit Section:
@@ -447,10 +447,10 @@
{
// Don't create an adv tab for an unnamed star or if advinterface file failed loading
// We also don't need adv dialog for solar system objects.
- if (selectedObject->name() == TQString("star") ||
- ksw->data()->ADVtreeList.isEmpty() ||
- selectedObject->type() == SkyObject::PLANET ||
- selectedObject->type() == SkyObject::COMET ||
+ if (selectedObject->name() == TQString("star") ||
+ ksw->data()->ADVtreeList.isEmpty() ||
+ selectedObject->type() == SkyObject::PLANET ||
+ selectedObject->type() == SkyObject::COMET ||
selectedObject->type() == SkyObject::ASTEROID )
return;
@@ -507,7 +507,7 @@
{
TQString URL;
- if ( Links->InfoList->currentItem() != -1 &&
+ if ( Links->InfoList->currentItem() != -1 &&
Links->InfoList->isSelected( Links->InfoList->currentItem() ) )
URL = TQString( *selectedObject->InfoList.at( Links->InfoList->currentItem() ) );
else if ( Links->ImagesList->currentItem() != -1 )
@@ -521,11 +521,11 @@
{
Links->InfoList->clear();
Links->ImagesList->clear();
-
+
TQStringList::Iterator itList = selectedObject->InfoList.begin();
TQStringList::Iterator itTitle = selectedObject->InfoTitle.begin();
TQStringList::Iterator itListEnd = selectedObject->InfoList.end();
-
+
for ( ; itList != itListEnd; ++itList ) {
Links->InfoList->insertItem(TQString(*itTitle));
itTitle++;
@@ -548,10 +548,10 @@
uint i;
TQString defaultURL , entry;
TQFile newFile;
-
+
KDialogBase editDialog(KDialogBase::Plain, i18n("Edit Link"), Ok|Cancel, Ok , this, "editlink", false);
TQFrame *editFrame = editDialog.plainPage();
-
+
editLinkURL = new TQLabel(i18n("URL:"), editFrame);
editLinkField = new TQLineEdit(editFrame, "lineedit");
editLinkField->setMinimumWidth(300);
@@ -559,9 +559,9 @@
editLinkLayout = new TQHBoxLayout(editFrame, 6, 6, "editlinklayout");
editLinkLayout->addWidget(editLinkURL);
editLinkLayout->addWidget(editLinkField);
-
+
currentItemIndex = Links->InfoList->currentItem();
-
+
if (currentItemIndex != -1 && Links->InfoList->isSelected(currentItemIndex))
{
defaultURL = *selectedObject->InfoList.at(currentItemIndex);
@@ -590,8 +590,8 @@
** Diff limit reached (max: 250 lines) **
|
||