diff options
author | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2023-05-02 01:33:20 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-02 01:33:20 +0700 |
commit | 80803cb3d18c20d224c58713f2fe943155336f2a (patch) | |
tree | ae8132d106ca629a5e76da3403c7847d462c1d89 | |
parent | 76ecb16b89cd9fab58f76b175989eb08dc9e003a (diff) | |
parent | 7b59b0c1eeb636a850a78843fda83d42e15947ac (diff) |
Merge branch 'master' into refactoring/tz-datarefactoring/tz-data
57 files changed, 940 insertions, 824 deletions
diff --git a/guide/plg_scenery3d.tex b/guide/plg_scenery3d.tex index 474b2163b5..e48735124e 100644 --- a/guide/plg_scenery3d.tex +++ b/guide/plg_scenery3d.tex @@ -60,6 +60,11 @@ will never see shadows cast by Venus in moonlight), so you could use it for examining sundials, or analyze and simulate light-and-shadow
interactions in archaeological structures.
+Sometimes, \newFeature{23.2} light patches cast through small holes are important, e.g.,
+in churches with \emph{meridiana} ``sundial/calendar'' lines. If these patches
+appear too dim, you can increase the power of the directional light using the
+\menu{Directional light enhancement} switch. (Use value 1.0 to revert to normal.)
+
\section{Hardware Requirements \& Performance}
\label{sec:scenery3d:HardwareRequirements}
@@ -879,8 +884,8 @@ enhancements, and did some code cleanup. Both Andrei and Florian were again supervised by Michael Wimmer~\citep{Zotti:CHNT2015,Zotti:SEAC2015,Zotti:SEAC2017}.
This work has been originally created during the ASTROSIM project supported 2008-2012 by
-the Austrian Science Fund (FWF) under grant number P~21208-G19. Further development is
-partially supported by the Ludwig Boltzmann Institute for Archaeological Prospection and Virtual Archaeology in Vienna, Austria\footnote{%
+the Austrian Science Fund (FWF) under grant number P~21208-G19. Further development has
+partially been supported by the Ludwig Boltzmann Institute for Archaeological Prospection and Virtual Archaeology in Vienna, Austria\footnote{%
\url{https://archpro.lbg.ac.at}}.
If you are using this plugin in scientific work, please cite: \citep{Zotti:CHNT2015,Zotti:SEAC2015,Zotti:SEAC2017,Zotti-etal:SIA2016,Zotti:TAG2016,Zotti-etal:JSA2020.6.2}.
diff --git a/plugins/Exoplanets/src/Exoplanet.cpp b/plugins/Exoplanets/src/Exoplanet.cpp index 8c1318c4e8..19c6bd1107 100644 --- a/plugins/Exoplanets/src/Exoplanet.cpp +++ b/plugins/Exoplanets/src/Exoplanet.cpp @@ -352,7 +352,7 @@ QString Exoplanet::getInfoString(const StelCore* core, const InfoStringGroup& fl { oss << QString("%1: %2 %3").arg(q_("Effective temperature")).arg(effectiveTemp).arg(qc_("K", "temperature")) << "<br />"; } - if (exoplanets.size() > 0) + if (!exoplanets.isEmpty()) { QString qss = "padding: 0 2px 0 0;"; QString planetNameLabel = QString("<td style=\"%2\">%1</td>").arg(q_("Exoplanet"), qss); diff --git a/plugins/Pulsars/src/Pulsar.cpp b/plugins/Pulsars/src/Pulsar.cpp index a8779473d9..3ff7bca0c5 100644 --- a/plugins/Pulsars/src/Pulsar.cpp +++ b/plugins/Pulsars/src/Pulsar.cpp @@ -293,7 +293,7 @@ QString Pulsar::getInfoString(const StelCore* core, const InfoStringGroup& flags if (s1400>0) oss << QString("%1 %2%3: %4 %5<br />").arg(flux, QString::number(1400), freq, QString::number(s1400, 'f', 2), sfd); - if (notes.length()>0) + if (!notes.isEmpty()) oss << QString("<br />%1: %2<br />").arg(q_("Notes"), getPulsarTypeInfoString(notes)); } diff --git a/plugins/RemoteControl/src/RequestHandler.cpp b/plugins/RemoteControl/src/RequestHandler.cpp index eff26a0429..13450e156f 100644 --- a/plugins/RemoteControl/src/RequestHandler.cpp +++ b/plugins/RemoteControl/src/RequestHandler.cpp @@ -281,7 +281,7 @@ void RequestHandler::refreshTemplates() Template tmp(f);
tmp.translate(*transProv);
//check if the file was correctly loaded
- if(tmp.size()>0)
+ if(!tmp.isEmpty())
{
templateMap.insert('/'+line.toUtf8(),tmp);
}
diff --git a/plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp b/plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp index d83335283e..90786ff679 100644 --- a/plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp +++ b/plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp @@ -132,11 +132,11 @@ void HttpResponse::write(QByteArray data, bool lastPart) } // Send data - if (data.size()>0) + if (!data.isEmpty()) { if (chunkedMode) { - if (data.size()>0) + if (!data.isEmpty()) { QByteArray size=QByteArray::number(data.size(),16); writeToSocket(size); diff --git a/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp b/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp index 36725728b4..bbdff5c0cf 100644 --- a/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp +++ b/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp @@ -298,7 +298,7 @@ void RemoteSyncDialog::populateExclusionLists() void RemoteSyncDialog::addPropertiesForExclusion() { QStringList strings; - if (ui->listWidgetAllProperties->selectedItems().length()>0) + if (!ui->listWidgetAllProperties->selectedItems().isEmpty()) { for (const auto* item : ui->listWidgetAllProperties->selectedItems()) { @@ -321,7 +321,7 @@ void RemoteSyncDialog::addPropertiesForExclusion() void RemoteSyncDialog::removePropertiesForExclusion() { QStringList strings; - if (ui->listWidgetSelectedProperties->selectedItems().length()>0) + if (!ui->listWidgetSelectedProperties->selectedItems().isEmpty()) { for (const auto* item : ui->listWidgetSelectedProperties->selectedItems()) { diff --git a/plugins/Satellites/src/Satellite.cpp b/plugins/Satellites/src/Satellite.cpp index bf13603612..c28741a7d0 100644 --- a/plugins/Satellites/src/Satellite.cpp +++ b/plugins/Satellites/src/Satellite.cpp @@ -448,7 +448,7 @@ QString Satellite::getInfoString(const StelCore *core, const InfoStringGroup& fl //Visibility: Full text oss << q_(visibilityDescription.value(visibility, "")) << "<br />"; - if (comms.size() > 0) + if (!comms.isEmpty()) { oss << q_("Radio communication") << ":<br/>"; for (const auto& c : comms) diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp index 7b455f9d9c..0b635e71bb 100644 --- a/plugins/Satellites/src/Satellites.cpp +++ b/plugins/Satellites/src/Satellites.cpp @@ -1676,7 +1676,7 @@ QStringList Satellites::guessGroups(const TleData& tleData) // add "supergroups", based on CelesTrak's groups QStringList superGroup = satSuperGroupsMap.values(groupName); - if (superGroup.size()>0) + if (!superGroup.isEmpty()) { for (int i=0; i<superGroup.size(); i++) { @@ -2392,7 +2392,7 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply) } } updateSources.clear(); - if (newData.size()>0) + if (!newData.isEmpty()) updateSatellites(newData); else emit updateStateChanged(OtherError); diff --git a/plugins/Scenery3d/src/Heightmap.cpp b/plugins/Scenery3d/src/Heightmap.cpp index 4acdf5e031..e2a7cd51c6 100644 --- a/plugins/Scenery3d/src/Heightmap.cpp +++ b/plugins/Scenery3d/src/Heightmap.cpp @@ -29,7 +29,7 @@ #define INF (std::numeric_limits<float>::max()) #define NO_HEIGHT (-INF) -Heightmap::Heightmap() : rootNode(Q_NULLPTR), grid(Q_NULLPTR), nullHeight(0.0) +Heightmap::Heightmap() : rootNode(nullptr), grid(nullptr), nullHeight(0.0) { } @@ -94,7 +94,7 @@ float Heightmap::getHeight(const float x, const float y) const timer.start();*/ Heightmap::GridSpace* space = getSpace(x, y); - if (space == Q_NULLPTR) + if (space == nullptr) { return nullHeight; } @@ -221,7 +221,7 @@ Heightmap::GridSpace* Heightmap::getSpace(const float x, const float y) const if ((ix < 0) || (ix >= GRID_LENGTH) || (iy < 0) || (iy >= GRID_LENGTH)) { - return Q_NULLPTR; + return nullptr; } else { @@ -323,13 +323,13 @@ bool Heightmap::line_intersects_triangle(const Vec2f &t0, const Vec2f &t1, const } Heightmap::QuadTreeNode::QuadTreeNode(const Vec2f &min, const Vec2f &max) - : parent(Q_NULLPTR), children(Q_NULLPTR), level(-1), depth(-1), nodecount(-1) + : parent(nullptr), children(nullptr), level(-1), depth(-1), nodecount(-1) { - init(Q_NULLPTR,min,max); + init(nullptr,min,max); } Heightmap::QuadTreeNode::QuadTreeNode() - : parent(Q_NULLPTR), children(Q_NULLPTR), level(-1), depth(-1), nodecount(-1) + : parent(nullptr), children(nullptr), level(-1), depth(-1), nodecount(-1) { } @@ -474,7 +474,7 @@ void Heightmap::QuadTreeNode::subdivide() curNode->nodecount+=4; //continue upwards to root curNode=curNode->parent; - } while(curNode!=Q_NULLPTR); + } while(curNode!=nullptr); } Heightmap::QuadTreeNode::Quadrant Heightmap::QuadTreeNode::getQuadrantForPoint(const Vec2f &point) const diff --git a/plugins/Scenery3d/src/Heightmap.hpp b/plugins/Scenery3d/src/Heightmap.hpp index 420afce105..23bf9d57d5 100644 --- a/plugins/Scenery3d/src/Heightmap.hpp +++ b/plugins/Scenery3d/src/Heightmap.hpp @@ -37,7 +37,7 @@ public: virtual ~Heightmap(); //! Sets the mesh data to use. If the bbox is given, min/max calculation is skipped and its values are taken. - void setMeshData(const IdxList& indexList, const PosList& posList, const AABBox *bbox = Q_NULLPTR); + void setMeshData(const IdxList& indexList, const PosList& posList, const AABBox *bbox = nullptr); //! Get z Value at (x,y) coordinates. //! In case of ambiguities always returns the maximum height. @@ -89,7 +89,7 @@ private: //the parent node in case of a non-root node QuadTreeNode* parent; - //either Q_NULLPTR in case of a leaf, or array of size 4 + //either nullptr in case of a leaf, or array of size 4 QuadTreeNode* children; //! The level of this node, starting with 0 for the root node diff --git a/plugins/Scenery3d/src/S3DRenderer.cpp b/plugins/Scenery3d/src/S3DRenderer.cpp index 2d96e6d1db..4310b4e16f 100644 --- a/plugins/Scenery3d/src/S3DRenderer.cpp +++ b/plugins/Scenery3d/src/S3DRenderer.cpp @@ -65,16 +65,16 @@ GLExtFuncs* glExtFuncs; S3DRenderer::S3DRenderer(QObject *parent) : QObject(parent), - sun(Q_NULLPTR), moon(Q_NULLPTR), venus(Q_NULLPTR), - currentScene(Q_NULLPTR), + sun(nullptr), moon(nullptr), venus(nullptr), + currentScene(nullptr), supportsGSCubemapping(false), supportsShadows(false), supportsShadowFiltering(false), isANGLE(false), maximumFramebufferSize(0), defaultFBO(0), - torchBrightness(0.5f), torchRange(5.0f), textEnabled(false), debugEnabled(false), fixShadowData(false), + torchBrightness(0.5f), torchRange(5.0f), directionalLightPush(1.0f), textEnabled(false), debugEnabled(false), fixShadowData(false), simpleShadows(false), fullCubemapShadows(false), cubemappingMode(S3DEnum::CM_TEXTURES), //set it to 6 textures as a safe default (Cubemap should work on ANGLE, but does not...) reinitCubemapping(true), reinitShadowmapping(true), cubemapSize(1024),shadowmapSize(1024),wasMovedInLastDrawCall(false), - core(Q_NULLPTR), landscapeMgr(Q_NULLPTR), - backfaceCullState(true), blendEnabled(false), lastMaterial(Q_NULLPTR), curShader(Q_NULLPTR), + core(nullptr), landscapeMgr(nullptr), + backfaceCullState(true), blendEnabled(false), lastMaterial(nullptr), curShader(nullptr), drawnTriangles(0), drawnModels(0), materialSwitches(0), shaderSwitches(0), requiresCubemap(false), cubemappingUsedLastFrame(false), lazyDrawing(false), updateOnlyDominantOnMoving(true), updateSecondDominantOnMoving(true), needsMovementEndUpdate(false), @@ -304,8 +304,8 @@ bool S3DRenderer::drawArrays(bool shading, bool blendAlphaAdditive) //assume backfaceculling is on, and blending turned off backfaceCullState = true; blendEnabled = false; - lastMaterial = Q_NULLPTR; - curShader = Q_NULLPTR; + lastMaterial = nullptr; + curShader = nullptr; initializedShaders.clear(); transparentGroups.clear(); bool success = true; @@ -350,7 +350,7 @@ bool S3DRenderer::drawArrays(bool shading, bool blendAlphaAdditive) } //sort and render transparent objects - if(transparentGroups.size()>0) + if(!transparentGroups.isEmpty()) { zSortValue = currentScene->getEyePosition().toVec3f(); std::sort(transparentGroups.begin(),transparentGroups.end(),zSortFunction); @@ -811,7 +811,7 @@ void S3DRenderer::calculateLighting() { //calculate which light source we need + intensity float ambientBrightness=0.0f, directionalBrightness=0.0f, emissiveFactor; - float eclipseFactor=static_cast<float>(GETSTELMODULE(SolarSystem)->getSolarEclipseFactor(StelApp::getInstance().getCore()).first); + const float eclipseFactor=static_cast<float>(GETSTELMODULE(SolarSystem)->getSolarEclipseFactor(StelApp::getInstance().getCore()).first); Vec3d sunPosition = sun->getAltAzPosAuto(core); sunPosition.normalize(); @@ -861,7 +861,7 @@ void S3DRenderer::calculateLighting() lightInfo.directionalSource = LightParameters::DS_Sun_Horiz; //calculate emissive factor - if(l!=Q_NULLPTR) + if(l!=nullptr) { if(requiresCubemap && lazyDrawing) { @@ -948,6 +948,10 @@ void S3DRenderer::calculateLighting() lightInfo.landscapeOpacity = 0.0f; + // Apply an artificial push to directionalBrightness. + // This may be useful to enhance light patches cast through very tiny holes, e.g. meridiana constructions in Italian churches. + directionalBrightness *= directionalLightPush; + //check landscape occlusion, modify directional if needed if(directionalBrightness>0) { @@ -1243,7 +1247,7 @@ void S3DRenderer::drawFromCubeMap() { //can render in a single draw call glBindTexture(GL_TEXTURE_CUBE_MAP,cubeMapCubeTex); - glDrawElements(GL_TRIANGLES,cubeIndexCount,GL_UNSIGNED_SHORT, Q_NULLPTR); + glDrawElements(GL_TRIANGLES,cubeIndexCount,GL_UNSIGNED_SHORT, nullptr); } else { @@ -1820,7 +1824,7 @@ bool S3DRenderer::initCubemapping() for (uint i=0;i<6;++i) { glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X+i,0,colorFormat, - cubemapSize,cubemapSize,0,GL_RGBA,GL_UNSIGNED_BYTE,Q_NULLPTR); + cubemapSize,cubemapSize,0,GL_RGBA,GL_UNSIGNED_BYTE,nullptr); GET_GLERROR() } glBindTexture(GL_TEXTURE_CUBE_MAP, 0); @@ -1843,7 +1847,7 @@ bool S3DRenderer::initCubemapping() GET_GLERROR() glTexImage2D(GL_TEXTURE_2D,0,colorFormat, - cubemapSize,cubemapSize,0,GL_RGBA,GL_UNSIGNED_BYTE,Q_NULLPTR); + cubemapSize,cubemapSize,0,GL_RGBA,GL_UNSIGNED_BYTE,nullptr); GET_GLERROR() } @@ -1868,7 +1872,7 @@ bool S3DRenderer::initCubemapping() for (uint i=0;i<6;++i) { glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X+i,0,depthFormat, - cubemapSize,cubemapSize,0,GL_DEPTH_COMPONENT,GL_UNSIGNED_BYTE,Q_NULLPTR); + cubemapSize,cubemapSize,0,GL_DEPTH_COMPONENT,GL_UNSIGNED_BYTE,nullptr); GET_GLERROR() } @@ -2151,7 +2155,7 @@ bool S3DRenderer::initCubemapping() void S3DRenderer::deleteShadowmapping() { - if(shadowFBOs.size()>0) //kinda hack that finds out if shadowmap related objects have been created + if(!shadowFBOs.isEmpty()) //kinda hack that finds out if shadowmap related objects have been created { //we can delete them all at once then glDeleteFramebuffers(shadowFBOs.size(),shadowFBOs.constData()); @@ -2231,7 +2235,7 @@ bool S3DRenderer::initShadowmapping() bool pcssEnabled = shaderParameters.pcss && (shaderParameters.shadowFilterQuality == S3DEnum::SFQ_LOW || shaderParameters.shadowFilterQuality == S3DEnum::SFQ_HIGH); //for OpenGL ES2, type has to be UNSIGNED_SHORT or UNSIGNED_INT for depth textures, desktop does probably not care - glTexImage2D(GL_TEXTURE_2D, 0, static_cast<GLint>(pcssEnabled ? depthPcss : depthNormal), shadowmapSize, shadowmapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, Q_NULLPTR); + glTexImage2D(GL_TEXTURE_2D, 0, static_cast<GLint>(pcssEnabled ? depthPcss : depthNormal), shadowmapSize, shadowmapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, nullptr); //we use hardware-accelerated depth compare mode, unless pcss is used shaderParameters.hwShadowSamplers = false; @@ -2462,7 +2466,7 @@ void S3DRenderer::draw(StelCore* core, S3DScene &scene) lastDrawnPosition = currentScene->getEyePosition(); cubemappingUsedLastFrame = requiresCubemap; - currentScene = Q_NULLPTR; + currentScene = nullptr; } void S3DRenderer::rendererMessage(const QString &msg) const diff --git a/plugins/Scenery3d/src/S3DRenderer.hpp b/plugins/Scenery3d/src/S3DRenderer.hpp index 04ff780445..0ab9a58005 100644 --- a/plugins/Scenery3d/src/S3DRenderer.hpp +++ b/plugins/Scenery3d/src/S3DRenderer.hpp @@ -21,19 +21,15 @@ #ifndef S3DRENDERER_HPP #define S3DRENDERER_HPP -#include "StelGui.hpp" #include "StelModule.hpp" #include "StelPainter.hpp" #include "Landscape.hpp" #include "SolarSystem.hpp" #include "StelOBJ.hpp" -#include "StelOpenGLArray.hpp" -#include "Heightmap.hpp" #include "Frustum.hpp" #include "Polyhedron.hpp" #include "S3DEnum.hpp" -#include "SceneInfo.hpp" #include "ShaderManager.hpp" #include <QMatrix4x4> @@ -51,8 +47,8 @@ class S3DRenderer : public QObject, protected QOpenGLFunctions Q_OBJECT public: //! Initializes an empty Scenery3d object. - S3DRenderer(QObject* parent = Q_NULLPTR); - virtual ~S3DRenderer() Q_DECL_OVERRIDE; + S3DRenderer(QObject* parent = nullptr); + ~S3DRenderer() override; //! Draw scenery, called by Scenery3dMgr. void draw(StelCore* core, S3DScene &scene); @@ -121,6 +117,11 @@ public: void setTorchBrightness(float brightness) { torchBrightness = brightness; invalidateCubemap(); } float getTorchRange() const { return torchRange; } void setTorchRange(float range) { torchRange = range; invalidateCubemap(); } + //! Sets the exaggeration strength for directional light (default: 1). + //! Going over 1 can be useful for very tiny holes casting important specks of light into dark interiors. + //! Example: meridiana "sundials" in Italian churches. + void setDirectionalLightPush(const float push) {directionalLightPush = push;} + float getDirectionalLightPush() const { return directionalLightPush;} //Debugging method, save the Frustum to be able to move away from it and analyze it void saveFrusts(); @@ -154,6 +155,7 @@ private: float torchBrightness; // toggle light brightness float torchRange; // used to calculate attenuation like in the second form at http://framebunker.com/blog/lighting-2-attenuation/ + float directionalLightPush; // used to give extra power to the directional light, e.g. to enhance dim light patches shining through small holes. Default: 1. bool textEnabled; // switchable value: display coordinates on screen. THIS IS NOT FOR DEBUGGING, BUT A PROGRAM FEATURE! bool debugEnabled; // switchable value: display debug graphics and debug texts on screen diff --git a/plugins/Scenery3d/src/SceneInfo.cpp b/plugins/Scenery3d/src/SceneInfo.cpp index 8961dee587..a54392b359 100644 --- a/plugins/Scenery3d/src/SceneInfo.cpp +++ b/plugins/Scenery3d/src/SceneInfo.cpp @@ -40,7 +40,7 @@ Q_LOGGING_CATEGORY(storedView,"stel.plugin.scenery3d.storedview") const QString SceneInfo::SCENES_PATH("scenery3d/");
const QString StoredView::USERVIEWS_FILE = SceneInfo::SCENES_PATH + "userviews.ini";
-QSettings* StoredView::userviews = Q_NULLPTR;
+QSettings* StoredView::userviews = nullptr;
int SceneInfo::metaTypeId = qRegisterMetaType<SceneInfo>();
diff --git a/plugins/Scenery3d/src/Scenery3d.cpp b/plugins/Scenery3d/src/Scenery3d.cpp index 2a6f0db3c2..7a32acf080 100644 --- a/plugins/Scenery3d/src/Scenery3d.cpp +++ b/plugins/Scenery3d/src/Scenery3d.cpp @@ -55,16 +55,16 @@ Q_LOGGING_CATEGORY(scenery3d,"stel.plugin.scenery3d") #define S3D_CONFIG_PREFIX QString("Scenery3d") Scenery3d::Scenery3d() : - renderer(Q_NULLPTR), + renderer(nullptr), flagEnabled(false), cleanedUp(false), movementKeyInput(0.0,0.0,0.0), oldProjectionType(StelCore::ProjectionPerspective), forceHorizonPolyline(false), loadCancel(false), - progressBar(Q_NULLPTR), + progressBar(nullptr), currentLoadScene(), - currentScene(Q_NULLPTR), + currentScene(nullptr), currentLoadFuture(this) { setObjectName("Scenery3d"); @@ -285,9 +285,9 @@ void Scenery3d::deinit() } //this is correct the place to delete all OpenGL related stuff, not the destructor delete renderer; - renderer = Q_NULLPTR; + renderer = nullptr; delete currentScene; - currentScene = Q_NULLPTR; + currentScene = nullptr; cleanedUp = true; } @@ -305,6 +305,7 @@ void Scenery3d::loadConfig() renderer->setTorchEnabled(conf->value("torch_enabled", false).toBool()); renderer->setTorchBrightness(conf->value("torch_brightness", 0.5f).toFloat()); renderer->setTorchRange(conf->value("torch_range",5.0f).toFloat()); + renderer->setDirectionalLightPush(conf->value("directional_push", 1.0f).toFloat()); renderer->setBumpsEnabled(conf->value("flag_bumpmap", false).toBool()); renderer->setShadowsEnabled(conf->value("flag_shadow", false).toBool()); renderer->setUseSimpleShadows(conf->value("flag_shadow_simple", false).toBool()); @@ -346,16 +347,16 @@ void Scenery3d::createToolbarButtons() const { StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui()); - if (gui!=Q_NULLPTR) + if (gui!=nullptr) { - StelButton* toolbarEnableButton = new StelButton(Q_NULLPTR, + StelButton* toolbarEnableButton = new StelButton(nullptr, QPixmap(":/Scenery3d/bt_scenery3d_on.png"), QPixmap(":/Scenery3d/bt_scenery3d_off.png"), QPixmap(":/graphicGui/miscGlow32x32.png"), "actionShow_Scenery3d", false, "actionShow_Scenery3d_dialog"); - StelButton* toolbarStoredViewButton = new StelButton(Q_NULLPTR, + StelButton* toolbarStoredViewButton = new StelButton(nullptr, QPixmap(":/Scenery3d/bt_scenery3d_eyepoint_on.png"), QPixmap(":/Scenery3d/bt_scenery3d_eyepoint_off.png"), QPixmap(":/graphicGui/miscGlow32x32.png"), @@ -456,7 +457,7 @@ S3DScene* Scenery3d::loadSceneBackground(const SceneInfo& scene) const std::unique_ptr<S3DScene> newScene(new S3DScene(scene)); if(loadCancel) - return Q_NULLPTR; + return nullptr; updateProgress(q_("Loading model..."),1,0,6); @@ -467,17 +468,17 @@ S3DScene* Scenery3d::loadSceneBackground(const SceneInfo& scene) const if(!modelOBJ.load(modelFile, scene.vertexOrderEnum, scene.sceneryGenerateNormals)) { qCCritical(scenery3d)<<"Failed to load OBJ file"<<modelFile; - return Q_NULLPTR; + return nullptr; } if(loadCancel) - return Q_NULLPTR; + return nullptr; updateProgress(q_("Transforming model..."),2,0,6); newScene->setModel(modelOBJ); if(loadCancel) - return Q_NULLPTR; + return nullptr; if(scene.modelGround.isEmpty()) { @@ -494,19 +495,19 @@ S3DScene* Scenery3d::loadSceneBackground(const SceneInfo& scene) const if(!groundOBJ.load(modelFile, scene.vertexOrderEnum, scene.groundGenerateNormals)) { qCCritical(scenery3d)<<"Failed to load ground model"<<modelFile; - return Q_NULLPTR; + return nullptr; } updateProgress(q_("Transforming ground..."),4,0,6); if(loadCancel) - return Q_NULLPTR; + return nullptr; updateProgress(q_("Calculating collision map..."),5,0,6); newScene->setGround(groundOBJ); } if(loadCancel) - return Q_NULLPTR; + return nullptr; updateProgress(q_("Finalizing load..."),6,0,6); @@ -519,7 +520,7 @@ void Scenery3d::loadSceneCompleted() progressBar->setValue(100); StelApp::getInstance().removeProgressBar(progressBar); - progressBar=Q_NULLPTR; + progressBar=nullptr; if(!result) { @@ -908,6 +909,21 @@ void Scenery3d::setTorchRange(const float torchRange) emit torchRangeChanged(torchRange); } +float Scenery3d::getDirectionalLightPush() const +{ + return renderer->getDirectionalLightPush(); +} + +void Scenery3d::setDirectionalLightPush(const float push) +{ + renderer->setDirectionalLightPush(push); + + conf->setValue(S3D_CONFIG_PREFIX + "/directional_push",push); + + emit directionalLightPushChanged(push); +} + + bool Scenery3d::getEnableLazyDrawing() const { return renderer->getLazyCubemapEnabled(); diff --git a/plugins/Scenery3d/src/Scenery3d.hpp b/plugins/Scenery3d/src/Scenery3d.hpp index 142fc98a76..c96a087631 100644 --- a/plugins/Scenery3d/src/Scenery3d.hpp +++ b/plugins/Scenery3d/src/Scenery3d.hpp @@ -87,6 +87,7 @@ class Scenery3d : public StelModule Q_PROPERTY(bool enableTorchLight READ getEnableTorchLight WRITE setEnableTorchLight NOTIFY enableTorchLightChanged) Q_PROPERTY(float torchStrength READ getTorchStrength WRITE setTorchStrength NOTIFY torchStrengthChanged) Q_PROPERTY(float torchRange READ getTorchRange WRITE setTorchRange NOTIFY torchRangeChanged) + Q_PROPERTY(float directionalLightPush READ getDirectionalLightPush WRITE setDirectionalLightPush NOTIFY directionalLightPushChanged) Q_PROPERTY(bool enableLazyDrawing READ getEnableLazyDrawing WRITE setEnableLazyDrawing NOTIFY enableLazyDrawingChanged) Q_PROPERTY(double lazyDrawingInterval READ getLazyDrawingInterval WRITE setLazyDrawingInterval NOTIFY lazyDrawingIntervalChanged) Q_PROPERTY(bool onlyDominantFaceWhenMoving READ getOnlyDominantFaceWhenMoving WRITE setOnlyDominantFaceWhenMoving NOTIFY onlyDominantFaceWhenMovingChanged) @@ -97,28 +98,28 @@ class Scenery3d : public StelModule Q_PROPERTY(QString loadingSceneID READ getLoadingSceneID NOTIFY loadingSceneIDChanged STORED false) //these properties are only valid after init() has been called - Q_PROPERTY(bool isGeometryShaderSupported READ getIsGeometryShaderSupported) - Q_PROPERTY(bool areShadowsSupported READ getAreShadowsSupported) - Q_PROPERTY(bool isShadowFilteringSupported READ getIsShadowFilteringSupported) - Q_PROPERTY(bool isANGLE READ getIsANGLE) - Q_PROPERTY(uint maximumFramebufferSize READ getMaximumFramebufferSize) + Q_PROPERTY(bool isGeometryShaderSupported READ getIsGeometryShaderSupported CONSTANT) + Q_PROPERTY(bool areShadowsSupported READ getAreShadowsSupported CONSTANT) + Q_PROPERTY(bool isShadowFilteringSupported READ getIsShadowFilteringSupported CONSTANT) + Q_PROPERTY(bool isANGLE READ getIsANGLE CONSTANT) + Q_PROPERTY(uint maximumFramebufferSize READ getMaximumFramebufferSize CONSTANT) public: Scenery3d(); - virtual ~Scenery3d() Q_DECL_OVERRIDE; + ~Scenery3d() override; //StelModule members - virtual void init() Q_DECL_OVERRIDE; - virtual void deinit() Q_DECL_OVERRIDE; - virtual void draw(StelCore* core) Q_DECL_OVERRIDE; - virtual void update(double deltaTime) Q_DECL_OVERRIDE; - virtual double getCallOrder(StelModuleActionName actionName) const Q_DECL_OVERRIDE; - virtual bool configureGui(bool show) Q_DECL_OVERRIDE; + void init() override; + void deinit() override; + void draw(StelCore* core) override; + void update(double deltaTime) override; + double getCallOrder(StelModuleActionName actionName) const override; + bool configureGui(bool show) override; //! Walk/Fly Navigation with Ctrl+Cursor and Ctrl+PgUp/Dn keys. //! Pressing Ctrl-Alt: 5x, Ctrl-Shift: 10x speedup; Ctrl-Shift-Alt: 50x! //! To allow fine control, zoom in. //! If you release Ctrl key while pressing cursor key, movement will continue. - virtual void handleKeys(QKeyEvent* e) Q_DECL_OVERRIDE; + void handleKeys(QKeyEvent* e) override; //! Sends the progressReport() signal, which eventually updates the progress bar. Can be called from another thread. void updateProgress(const QString& str, int val, int min, int max) const; @@ -138,6 +139,7 @@ signals: void enableTorchLightChanged(const bool val); void torchStrengthChanged(const float val); void torchRangeChanged(const float val); + void directionalLightPushChanged(const float val); void enableLazyDrawingChanged(const bool val); void lazyDrawingIntervalChanged(const double val); void onlyDominantFaceWhenMovingChanged(const bool val); @@ -235,6 +237,12 @@ public slots: void setTorchRange(const float torchRange); float getTorchRange() const; + //! Sets the exaggeration strength for directional light (default: 1). + //! Going over 1 can be useful for very tiny holes casting important specks of light into dark interiors. + //! Example: meridiana "sundials" in Italian churches. + void setDirectionalLightPush(const float push); + float getDirectionalLightPush() const; + //! Sets the state of the cubemap lazy-drawing mode void setEnableLazyDrawing(const bool val); bool getEnableLazyDrawing() const; @@ -361,9 +369,9 @@ class Scenery3dStelPluginInterface : public QObject, public StelPluginInterface Q_PLUGIN_METADATA(IID StelPluginInterface_iid) Q_INTERFACES(StelPluginInterface) public: - virtual StelModule* getStelModule() const Q_DECL_OVERRIDE; - virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE; - virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE; + StelModule* getStelModule() const override; + StelPluginInfo getPluginInfo() const override; + QObjectList getExtensionList() const override; }; diff --git a/plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp b/plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp index 72a59943f1..c0596382fe 100644 --- a/plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp +++ b/plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp @@ -36,11 +36,11 @@ public: Scenery3dRemoteControlService(); // RemoteControlServiceInterface interface - virtual QLatin1String getPath() const Q_DECL_OVERRIDE; - virtual bool isThreadSafe() const Q_DECL_OVERRIDE; - virtual void get(const QByteArray &operation, const APIParameters ¶meters, APIServiceResponse &response) Q_DECL_OVERRIDE; - virtual void post(const QByteArray &operation, const APIParameters ¶meters, const QByteArray &data, APIServiceResponse &response) Q_DECL_OVERRIDE; - virtual void update(double deltaTime) Q_DECL_OVERRIDE; + QLatin1String getPath() const override; + bool isThreadSafe() const override; + void get(const QByteArray &operation, const APIParameters ¶meters, APIServiceResponse &response) override; + void post(const QByteArray &operation, const APIParameters ¶meters, const QByteArray &data, APIServiceResponse &response) override; + void update(double deltaTime) override; protected: void performMove(double x,double y, double z); private: diff --git a/plugins/Scenery3d/src/ShaderManager.cpp b/plugins/Scenery3d/src/ShaderManager.cpp index 13ad50c89c..7a6f661978 100644 --- a/plugins/Scenery3d/src/ShaderManager.cpp +++ b/plugins/Scenery3d/src/ShaderManager.cpp @@ -119,10 +119,12 @@ void ShaderMgr::clearCache() //iterate over the shaderContentCache - this contains the same amount of shaders as actually exist!
//the shaderCache could contain duplicate entries
- for (auto* shader : m_shaderContentCache)
+ QHashIterator<QByteArray, QOpenGLShaderProgram*>it(m_shaderContentCache);
+ while (it.hasNext())
{
- if (shader)
- delete shader;
+ it.next();
+ if (it.value())
+ delete it.value();
}
m_shaderCache.clear();
@@ -134,7 +136,7 @@ QOpenGLShaderProgram* ShaderMgr::findOrLoadShader(uint flags) {
auto it = m_shaderCache.find(flags);
- // This may also return Q_NULLPTR if the load failed.
+ // This may also return nullptr if the load failed.
//We wait until user explicitly forces shader reload until we try again to avoid spamming errors.
if(it!=m_shaderCache.end())
return *it;
@@ -148,7 +150,7 @@ QOpenGLShaderProgram* ShaderMgr::findOrLoadShader(uint flags) //load shader files & preprocess
QByteArray vShader,gShader,fShader;
- QOpenGLShaderProgram *prog = Q_NULLPTR;
+ QOpenGLShaderProgram *prog = nullptr;
if(preprocessShader(vShaderFile,flags,vShader) &&
preprocessShader(gShaderFile,flags,gShader) &&
@@ -178,7 +180,7 @@ QOpenGLShaderProgram* ShaderMgr::findOrLoadShader(uint flags) if(!loadShader(*prog,vShader,gShader,fShader))
{
delete prog;
- prog = Q_NULLPTR;
+ prog = nullptr;
qCCritical(shaderMgr)<<"ERROR: Shader '"<<flags<<"' could not be compiled. Fix errors and reload shaders or restart program.";
}
#ifndef NDEBUG
@@ -403,13 +405,15 @@ bool ShaderMgr::loadShader(QOpenGLShaderProgram& program, const QByteArray& vSha QByteArray finalShader = fShader;
if(shaderHasVersion)
{
- const auto shaderVersionString = QString(fShader.simplified()).replace(QRegularExpression("^#version ([0-9]+)\\b.*"), "\\1");
+ static const QRegularExpression versionRE("^#version ([0-9]+)\\b.*");
+ static const QRegularExpression versionRE2("(^|\n)(#version[ \t]+)([0-9]+)\\b");
+ const QString shaderVersionString = QString(fShader.simplified()).replace(versionRE, "\\1");
bool svOK = false;
- const auto shaderVersion = shaderVersionString.toInt(&svOK);
+ const int shaderVersion = shaderVersionString.toInt(&svOK);
- const auto prefixVersionString = QString(globalPrefix.simplified()).replace(QRegularExpression("^#version ([0-9]+)\\b.*"), "\\1");
+ const QString prefixVersionString = QString(globalPrefix.simplified()).replace(versionRE, "\\1");
bool pvOK = false;
- const auto prefixVersion = prefixVersionString.toInt(&pvOK);
+ const int prefixVersion = prefixVersionString.toInt(&pvOK);
bool failed = false;
if(!svOK)
@@ -432,14 +436,13 @@ bool ShaderMgr::loadShader(QOpenGLShaderProgram& program, const QByteArray& vSha }
else if(shaderVersion > prefixVersion)
{
- prefix = QString(globalPrefix).replace(QRegularExpression("(^|\n)(#version[ \t]+)([0-9]+)\\b"),
- QString("\\1\\2%1").arg(shaderVersion)).toUtf8();
+ prefix = QString(globalPrefix).replace(versionRE2, QString("\\1\\2%1").arg(shaderVersion)).toUtf8();
}
else
{
prefix = globalPrefix;
}
- finalShader = QString(fShader).replace(QRegularExpression("(^|\n)(#version[ \t]+)([0-9]+)\\b"), "//\\1\\2\\3").toUtf8();
+ finalShader = QString(fShader).replace(versionRE2, "//\\1\\2\\3").toUtf8();
}
else
{
@@ -513,7 +516,7 @@ void ShaderMgr::buildUniformCache(QOpenGLShaderProgram &program) auto it = uniformStrings.find(str);
- // This may also return Q_NULLPTR if the load failed.
+ // This may also return nullptr if the load failed.
//We wait until user explicitly forces shader reload until we try again to avoid spamming errors.
if(it!=uniformStrings.end())
{
diff --git a/plugins/Scenery3d/src/ShaderManager.hpp b/plugins/Scenery3d/src/ShaderManager.hpp index 31e348359b..644e8c41f1 100644 --- a/plugins/Scenery3d/src/ShaderManager.hpp +++ b/plugins/Scenery3d/src/ShaderManager.hpp @@ -121,7 +121,7 @@ public: };
//! Returns a shader that supports the specified operations. Must be called within a GL context.
- inline QOpenGLShaderProgram* getShader(const GlobalShaderParameters &globals, const S3DScene::Material *mat = Q_NULLPTR);
+ inline QOpenGLShaderProgram* getShader(const GlobalShaderParameters &globals, const S3DScene::Material *mat = nullptr);
//! Returns the Frustum/Boundingbox Debug shader
inline QOpenGLShaderProgram* getDebugShader();
diff --git a/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp b/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp index 5519eb0351..e13ce411d6 100644 --- a/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp +++ b/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp @@ -34,7 +34,7 @@ #include <QStandardItemModel> #include <QTimer> -Scenery3dDialog::Scenery3dDialog(QObject* parent) : StelDialog("Scenery3d", parent), mgr(Q_NULLPTR) +Scenery3dDialog::Scenery3dDialog(QObject* parent) : StelDialog("Scenery3d", parent), mgr(nullptr) { ui = new Ui_scenery3dDialogForm; } @@ -150,6 +150,7 @@ void Scenery3dDialog::createDialogContent() connect(ui->sliderTorchStrength, &QSlider::valueChanged, this, &Scenery3dDialog::on_sliderTorchStrength_valueChanged); connect(ui->sliderTorchRange, &QSlider::valueChanged, this, &Scenery3dDialog::on_sliderTorchRange_valueChanged); + connectDoubleProperty(ui->directionalLightPushSpinBox, "Scenery3d.directionalLightPush"); connect(ui->checkBoxDefaultScene, &QCheckBox::stateChanged, this, &Scenery3dDialog::on_checkBoxDefaultScene_stateChanged); connect(ui->pushButtonOpenStoredViewDialog, &QPushButton::clicked, mgr, &Scenery3d::showStoredViewDialog); @@ -379,7 +380,7 @@ void Scenery3dDialog::updateCurrentScene(const SceneInfo &sceneInfo) { ui->scenery3dListWidget->blockSignals(true); QList<QListWidgetItem*> currentItems = ui->scenery3dListWidget->findItems(sceneInfo.name, Qt::MatchExactly); - if(currentItems.size()>0) + if(!currentItems.isEmpty()) { ui->scenery3dListWidget->setCurrentItem(currentItems.at(0)); } diff --git a/plugins/Scenery3d/src/gui/Scenery3dDialog.hpp b/plugins/Scenery3d/src/gui/Scenery3dDialog.hpp index f89833d51a..5a4928e43f 100644 --- a/plugins/Scenery3d/src/gui/Scenery3dDialog.hpp +++ b/plugins/Scenery3d/src/gui/Scenery3dDialog.hpp @@ -32,14 +32,14 @@ class Scenery3dDialog : public StelDialog { Q_OBJECT public: - Scenery3dDialog(QObject* parent = Q_NULLPTR); - virtual ~Scenery3dDialog() Q_DECL_OVERRIDE; + Scenery3dDialog(QObject* parent = nullptr); + ~Scenery3dDialog() override; public slots: - virtual void retranslate() Q_DECL_OVERRIDE; + void retranslate() override; protected: - virtual void createDialogContent() Q_DECL_OVERRIDE; + void createDialogContent() override; private slots: void on_comboBoxShadowFiltering_currentIndexChanged(int index); diff --git a/plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp b/plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp index 1f7dc8ea93..c4bc9ed870 100644 --- a/plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp +++ b/plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp @@ -38,13 +38,13 @@ private: Scenery3d* mgr; public: - CubemapModeListModel(QObject* parent = Q_NULLPTR) : QAbstractListModel(parent) + CubemapModeListModel(QObject* parent = nullptr) : QAbstractListModel(parent) { mgr = GETSTELMODULE(Scenery3d); Q_ASSERT(mgr); } - virtual int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &parent) const override { Q_UNUSED(parent) if(mgr->getIsANGLE()) @@ -58,7 +58,7 @@ public: return 3; } - virtual QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE + QVariant data(const QModelIndex &index, int role) const override { if(role == Qt::DisplayRole || role == Qt::EditRole) { diff --git a/plugins/Scenery3d/src/gui/StoredViewDialog.cpp b/plugins/Scenery3d/src/gui/StoredViewDialog.cpp index b7aa366c9c..42c44fbb9c 100644 --- a/plugins/Scenery3d/src/gui/StoredViewDialog.cpp +++ b/plugins/Scenery3d/src/gui/StoredViewDialog.cpp @@ -27,7 +27,7 @@ #include "StelModuleMgr.hpp"
#include "StelTranslator.hpp"
-StoredViewDialog::StoredViewDialog(QObject *parent) : StelDialog("Scenery3dViews", parent), mgr(Q_NULLPTR), viewModel(Q_NULLPTR)
+StoredViewDialog::StoredViewDialog(QObject *parent) : StelDialog("Scenery3dViews", parent), mgr(nullptr), viewModel(nullptr)
{
ui = new Ui_storedViewDialogForm;
}
diff --git a/plugins/Scenery3d/src/gui/StoredViewDialog.hpp b/plugins/Scenery3d/src/gui/StoredViewDialog.hpp index 5dcaa4113b..372f792025 100644 --- a/plugins/Scenery3d/src/gui/StoredViewDialog.hpp +++ b/plugins/Scenery3d/src/gui/StoredViewDialog.hpp @@ -31,12 +31,12 @@ class StoredViewDialog : public StelDialog {
Q_OBJECT
public:
- StoredViewDialog(QObject* parent = Q_NULLPTR);
- virtual ~StoredViewDialog() Q_DECL_OVERRIDE;
+ StoredViewDialog(QObject* parent = nullptr);
+ ~StoredViewDialog() override;
public slots:
- virtual void retranslate() Q_DECL_OVERRIDE;
+ void retranslate() override;
protected:
- virtual void createDialogContent() Q_DECL_OVERRIDE;
+ void createDialogContent() override;
private slots:
void updateViewSelection(const QModelIndex &idx);
void resetViewSelection();
diff --git a/plugins/Scenery3d/src/gui/StoredViewDialog_p.hpp b/plugins/Scenery3d/src/gui/StoredViewDialog_p.hpp index e4717ebe17..290f270567 100644 --- a/plugins/Scenery3d/src/gui/StoredViewDialog_p.hpp +++ b/plugins/Scenery3d/src/gui/StoredViewDialog_p.hpp @@ -33,19 +33,19 @@ class CustomTextEdit : public QTextEdit { Q_OBJECT public: - CustomTextEdit(QWidget* parent = Q_NULLPTR) : QTextEdit(parent), textChanged(false), trackChange(false) + CustomTextEdit(QWidget* parent = nullptr) : QTextEdit(parent), textChanged(false), trackChange(false) { connect(this,&QTextEdit::textChanged,this,&CustomTextEdit::handleTextChange); } protected: - virtual void focusInEvent(QFocusEvent* e) Q_DECL_OVERRIDE + void focusInEvent(QFocusEvent* e) override { trackChange = true; textChanged = false; QTextEdit::focusInEvent(e); } - virtual void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE + void focusOutEvent(QFocusEvent *e) override { QTextEdit::focusOutEvent(e); trackChange = false; @@ -74,17 +74,17 @@ class StoredViewModel : public QAbstractListModel { Q_OBJECT public: - StoredViewModel(QObject* parent = Q_NULLPTR) : QAbstractListModel(parent) + StoredViewModel(QObject* parent = nullptr) : QAbstractListModel(parent) { } - virtual int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &parent) const override { if(parent.isValid()) return 0; return global.size() + user.size(); } - virtual QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE + QVariant data(const QModelIndex &index, int role) const override { if(role == Qt::DisplayRole || role == Qt::EditRole) { diff --git a/plugins/Scenery3d/src/gui/scenery3dDialog.ui b/plugins/Scenery3d/src/gui/scenery3dDialog.ui index 7d5503bdcc..f01f777c0f 100644 --- a/plugins/Scenery3d/src/gui/scenery3dDialog.ui +++ b/plugins/Scenery3d/src/gui/scenery3dDialog.ui @@ -103,7 +103,7 @@ <blue>195</blue>
</color>
</brush>
- </colorrole>
+ </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -123,7 +123,7 @@ <blue>195</blue>
</color>
</brush>
- </colorrole>
+ </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -143,13 +143,12 @@ <blue>195</blue>
</color>
</brush>
- </colorrole>
+ </colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
- <weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
@@ -284,10 +283,13 @@ </property>
<property name="html">
<string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
+hr { height: 1px; border-width: 0; }
+li.unchecked::marker { content: "\2610"; }
+li.checked::marker { content: "\2612"; }
+</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></body></html></string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
@@ -399,7 +401,14 @@ p, li { white-space: pre-wrap; } <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
- <item row="1" column="0">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="checkBoxTorchlight">
+ <property name="text">
+ <string>Torchlight (%1)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
<widget class="QLabel" name="labelTorchStrength">
<property name="text">
<string>Torch strength:</string>
@@ -409,7 +418,7 @@ p, li { white-space: pre-wrap; } </property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QSlider" name="sliderTorchStrength">
<property name="maximum">
<number>100</number>
@@ -419,8 +428,8 @@ p, li { white-space: pre-wrap; } </property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="3" column="0">
+ <widget class="QLabel" name="labelTorchRange">
<property name="text">
<string>Torch range:</string>
</property>
@@ -429,7 +438,7 @@ p, li { white-space: pre-wrap; } </property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QSlider" name="sliderTorchRange">
<property name="maximum">
<number>10000</number>
@@ -445,21 +454,14 @@ p, li { white-space: pre-wrap; } </property>
</widget>
</item>
- <item row="0" column="0" colspan="2">
- <widget class="QCheckBox" name="checkBoxTorchlight">
- <property name="text">
- <string>Torchlight (%1)</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2">
+ <item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxShowGridCoordinates">
<property name="text">
<string>Show grid coordinates (%1)</string>
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="7" column="0">
<widget class="QCheckBox" name="overdrawLandscapePolylineCheckBox">
<property name="toolTip">
<string>Overdraw horizon polygon defined in your landscape. This displays the inaccuracies in a very large planar model compared to Earth curvature, of course only for a single point of observation.</string>
@@ -469,6 +471,32 @@ p, li { white-space: pre-wrap; } </property>
</widget>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="labelDirectionalLightPush">
+ <property name="text">
+ <string>Directional light enhancement</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QDoubleSpinBox" name="directionalLightPushSpinBox">
+ <property name="toolTip">
+ <string>Increase the power of directional light, e.g. to enhance contrast for patches of light cast through small holes.</string>
+ </property>
+ <property name="minimum">
+ <double>0.200000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>20.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.050000000000000</double>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
@@ -728,11 +756,11 @@ p, li { white-space: pre-wrap; } <header>Dialog.hpp</header>
<container>1</container>
</customwidget>
- <customwidget> - <class>StelCloseButton</class> - <extends>QPushButton</extends> - <header>gui/StelCloseButton.hpp</header> - </customwidget> + <customwidget>
+ <class>StelCloseButton</class>
+ <extends>QPushButton</extends>
+ <header>gui/StelCloseButton.hpp</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp b/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp index 0e87b5395a..a638b9a0e6 100644 --- a/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp +++ b/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp @@ -186,7 +186,7 @@ void SolarSystemManagerWindow::populateSolarSystemList() void SolarSystemManagerWindow::removeObjects() { - if (ui->listWidgetObjects->selectedItems().length()>0) + if (!ui->listWidgetObjects->selectedItems().isEmpty()) { // we must disconnect the signal or else the list will be rebuilt after the first deletion. disconnect(ssEditor, SIGNAL(solarSystemChanged()), this, SLOT(populateSolarSystemList())); diff --git a/po/stellarium-desktop/is.po b/po/stellarium-desktop/is.po index 3987023087..3a78670fb2 100644 --- a/po/stellarium-desktop/is.po +++ b/po/stellarium-desktop/is.po @@ -1,19 +1,20 @@ +# # Translators: -# Sveinn í Felli <sv1@fellsnet.is>, 2022 # cardinot <mcardinot@gmail.com>, 2022 -# +# Sveinn í Felli <sv1@fellsnet.is>, 2023 +# msgid "" msgstr "" "Project-Id-Version: Stellarium desktop file translation\n" "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n" -"POT-Creation-Date: 2022-10-21 16:56+0700\n" +"POT-Creation-Date: 2023-03-27 11:27+0700\n" "PO-Revision-Date: 2022-10-21 17:46+0000\n" -"Last-Translator: cardinot <mcardinot@gmail.com>, 2022\n" -"Language-Team: Icelandic (https://www.transifex.com/stellarium/teams/80998/is/)\n" -"Language: is\n" +"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>, 2023\n" +"Language-Team: Icelandic (https://app.transifex.com/stellarium/teams/80998/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" #: ../../data/org.stellarium.Stellarium.desktop @@ -44,12 +45,12 @@ msgstr "Opna á öllum skjánum" #: ../../data/org.stellarium.Stellarium.desktop msgctxt "Name" msgid "Open with QPA platform XCB" -msgstr "" +msgstr "Opna með QPA-kerfi XCB" #: ../../data/org.stellarium.Stellarium.desktop msgctxt "Name" msgid "Open with QPA platform theme XCB" -msgstr "" +msgstr "Opna með QPA-kerfi þema XCB" #: ../../data/org.stellarium.Stellarium.desktop msgctxt "Name" diff --git a/po/stellarium-landscapes-descriptions/is.po b/po/stellarium-landscapes-descriptions/is.po index 79aa358922..e74144bb9d 100644 --- a/po/stellarium-landscapes-descriptions/is.po +++ b/po/stellarium-landscapes-descriptions/is.po @@ -4,17 +4,19 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: +# Alexander V. Wolf <alex.v.wolf@gmail.com>, 2022 # cardinot <mcardinot@gmail.com>, 2022 +# Sveinn í Felli <sv1@fellsnet.is>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n" -"POT-Creation-Date: 2021-09-19 19:50+0700\n" -"PO-Revision-Date: 2020-01-06 16:36+0000\n" -"Last-Translator: cardinot <mcardinot@gmail.com>, 2022\n" -"Language-Team: Icelandic (https://www.transifex.com/stellarium/teams/80998/is/)\n" +"POT-Creation-Date: 2022-10-06 00:11+0700\n" +"PO-Revision-Date: 2022-10-05 17:02+0000\n" +"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>, 2023\n" +"Language-Team: Icelandic (https://app.transifex.com/stellarium/teams/80998/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,7 +31,7 @@ msgstr "Garching" #. type: Content of: <p> #: ../../landscapes/garching/description.en.utf8:2 msgid "A view from the ESO headquarters in Garching bei Munchen, Germany." -msgstr "" +msgstr "Útsýni frá höfuðstöðvum ESO í Garching bei Munchen, Þýskalandi." #. type: Content of: <h2> #: ../../landscapes/geneva/description.en.utf8:1 @@ -44,6 +46,10 @@ msgid "" " with permission from <a " "href=\"http://sourceforge.net/p/skychart/code/HEAD/tree/trunk/tools/data/horizon/horizon_Geneve.txt\">here</a>." msgstr "" +"Sjóndeildarhringurinn í Genf. Þetta er dæmi til að sýna samhæfni við sniðið " +"sem <a href=\"http://www.ap-i.net/skychart/en/start\">Cartes du Ciel</a> " +"notar, birt með leyfi <a " +"href=\"http://sourceforge.net/p/skychart/code/HEAD/tree/trunk/tools/data/horizon/horizon_Geneve.txt\">héðan</a>." #. type: Content of: <h2> #: ../../landscapes/grossmugl/description.en.utf8:1 @@ -57,6 +63,9 @@ msgid "" "Lower Austria, primary observing Spot of the Grossmugl Starlight Oasis near " "Vienna." msgstr "" +"Akur rétt hjá Leeberg (risahaugur frá Hallstatt-tímabilinu, 16m) við " +"Grossmugl, Lág-Austurríki - aðal-stjörnuathugunarstaður Grossmugl-" +"stjörnuvinjarinnar nálægt Vínarborg." #. type: Content of: <p> #: ../../landscapes/grossmugl/description.en.utf8:2 @@ -66,11 +75,15 @@ msgid "" "in the sky. In the eastern horizon, red lights indicate a wind park also at " "night. <a href=\"http://starlightoasis.org\">http://starlightoasis.org</a>." msgstr "" +"Þrátt fyrir nálægðina við stóra borg, er ljósmengun aðallega bundin við " +"sjóndeildarhringinn í suðri, og er Vetrarbrautin vel sýnileg þegar hún er " +"hátt á himni. Í austri koma rauð ljós að næturlagi upp um vindmyllugarð. <a" +" href=\"https://starlightoasis.org\">https://starlightoasis.org</a>." #. type: Content of: <h2> #: ../../landscapes/guereins/description.en.utf8:1 msgid "Guéreins" -msgstr "" +msgstr "Guéreins" #. type: Content of: <p> #: ../../landscapes/guereins/description.en.utf8:2 @@ -80,6 +93,10 @@ msgid "" "where the famous wine is produced. It is also the town where Stellarium was " "born :)" msgstr "" +"Guéreins er lítið franskt þorp í dal Saône-árinnar, 50 km norður frá Lyon. " +"Í vestri standa lágvaxnar hæðir Beaujolais-héraðsins þar sem fræg vín með " +"sama nafni eru framleidd. Þetta er líka bærinn þar sem Stellarium kom undir " +":)" #. type: Content of: <h2> #: ../../landscapes/hurricane/description.en.utf8:1 @@ -93,6 +110,9 @@ msgid "" " reality there is an expansive view of the rest of the Olympic range to the " "South but lighting conditions were poor." msgstr "" +"Unnið útsýni frá Hurricane Ridge í Olympic þjóðgarðinum, Washington, BNA. Í " +"rauninni er vítt útsýni til suðurs yfir afganginn af Olympic-fjallgarðinum, " +"en því miður voru birtuaðstæður lélegar." #. type: Content of: <h2> #: ../../landscapes/jupiter/description.en.utf8:1 @@ -102,7 +122,7 @@ msgstr "Júpíter" #. type: Content of: <p> #: ../../landscapes/jupiter/description.en.utf8:2 msgid "Simple Jupiter gas surface (\"top of atmosphere\")" -msgstr "" +msgstr "Einfaldað gasyfirborð Júpiters (\"efst í lofthjúp\")" #. type: Content of: <h2> #: ../../landscapes/mars/description.en.utf8:1 @@ -118,6 +138,11 @@ msgid "" "(Aug. 24 to 27, 2005), shortly after the rover reached the crest of " "\"Husband Hill\" inside Mars' Gusev Crater." msgstr "" +"Víðmyndavél NASA á Mars Exploration Rover Spirit könnunarfarinu tók hundruð " +"mynda sem hafa verið bræddar saman í þessa 360-gráðu sýn, sem kallast " +"\"Husband Hill Summit\" víðmyndin. Myndirnar fengust í leiðangri Spirit á " +"sóldögum 583 til 586 (24. til 27. ágúst, 2005), stuttu eftir að " +"könnunarfarið náði upp á hrygg \"Husband Hill\" innni í Gusev-gígnum á Mars." #. type: Content of: <h2> #: ../../landscapes/moon/description.en.utf8:1 @@ -127,7 +152,7 @@ msgstr "Tungl" #. type: Content of: <p> #: ../../landscapes/moon/description.en.utf8:2 msgid "Photo taken from Apollo 17 Mission" -msgstr "" +msgstr "Mynd tekin í Apollo 17 leiðangrinum" #. type: Content of: <h2> #: ../../landscapes/neptune/description.en.utf8:1 @@ -137,7 +162,7 @@ msgstr "Neptúnus" #. type: Content of: <p> #: ../../landscapes/neptune/description.en.utf8:2 msgid "Simple Neptune gas surface (\"top of atmosphere\")" -msgstr "" +msgstr "Einfaldað gasyfirborð Neptúnusar (\"efst í lofthjúp\")" #. type: Content of: <h2> #: ../../landscapes/ocean/description.en.utf8:1 @@ -147,7 +172,7 @@ msgstr "Úthaf" #. type: Content of: <p> #: ../../landscapes/ocean/description.en.utf8:2 msgid "Made with Terragen." -msgstr "" +msgstr "Gert með Terragen." #. type: Content of: <h2> #: ../../landscapes/saturn/description.en.utf8:1 @@ -157,7 +182,7 @@ msgstr "Satúrnus" #. type: Content of: <p> #: ../../landscapes/saturn/description.en.utf8:2 msgid "Simple Saturn gas surface (\"top of atmosphere\")" -msgstr "" +msgstr "Einfaldað gasyfirborð Satúrnusar (\"efst í lofthjúp\")" #. type: Content of: <h2> #: ../../landscapes/sun/description.en.utf8:1 @@ -167,7 +192,7 @@ msgstr "Sólin" #. type: Content of: <p> #: ../../landscapes/sun/description.en.utf8:2 msgid "Simple Sun gas surface (\"top of photosphere\")" -msgstr "" +msgstr "Einfaldað gasyfirborð Sólar (\"efst í ljóshvolfi\")" #. type: Content of: <h2> #: ../../landscapes/trees/description.en.utf8:1 @@ -177,7 +202,7 @@ msgstr "Tré" #. type: Content of: <p> #: ../../landscapes/trees/description.en.utf8:2 msgid "Trees in Greenlake Park, Seattle" -msgstr "" +msgstr "Tré í Greenlake Park, Seattle, BNA" #. type: Content of: <h2> #: ../../landscapes/uranus/description.en.utf8:1 @@ -187,7 +212,7 @@ msgstr "Úranus" #. type: Content of: <p> #: ../../landscapes/uranus/description.en.utf8:2 msgid "Simple Uranus gas surface (\"top of atmosphere\")" -msgstr "" +msgstr "Einfaldað gasyfirborð Úranusar (\"efst í lofthjúp\")" #. type: Content of: <h2> #: ../../landscapes/zero/description.en.utf8:1 @@ -200,3 +225,5 @@ msgid "" "A simple polygonal landscape that just covers the area below the " "mathematical horizon." msgstr "" +"Einfalt marghyrningalandslag sem einungis þekur svæðið neðan við " +"stærðfræðilega sjóndeildarhringslínu." diff --git a/po/stellarium-metainfo/is.po b/po/stellarium-metainfo/is.po index 480d1d7491..25da5fdbea 100644 --- a/po/stellarium-metainfo/is.po +++ b/po/stellarium-metainfo/is.po @@ -1,16 +1,16 @@ # # Translators: -# Sveinn í Felli <sv1@fellsnet.is>, 2022 # cardinot <mcardinot@gmail.com>, 2022 # Alexander V. Wolf <alex.v.wolf@gmail.com>, 2022 +# Sveinn í Felli <sv1@fellsnet.is>, 2023 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-10-24 02:08+0700\n" +"POT-Creation-Date: 2023-03-27 11:27+0700\n" "PO-Revision-Date: 2022-10-21 17:42+0000\n" -"Last-Translator: Alexander V. Wolf <alex.v.wolf@gmail.com>, 2022\n" -"Language-Team: Icelandic (https://www.transifex.com/stellarium/teams/80998/is/)\n" +"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>, 2023\n" +"Language-Team: Icelandic (https://app.transifex.com/stellarium/teams/80998/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -75,12 +75,12 @@ msgstr "" #. (itstool) path: keywords/keyword #: org.stellarium.Stellarium.appdata.xml:17 msgid "astronomy" -msgstr "" +msgstr "stjörnufræði" #. (itstool) path: keywords/keyword #: org.stellarium.Stellarium.appdata.xml:18 msgid "planetarium" -msgstr "" +msgstr "stjörnuver" #. (itstool) path: keywords/keyword #: org.stellarium.Stellarium.appdata.xml:19 @@ -90,9 +90,9 @@ msgstr "himinn" #. (itstool) path: keywords/keyword #: org.stellarium.Stellarium.appdata.xml:20 msgid "universe" -msgstr "" +msgstr "alheimur" #. (itstool) path: component/developer_name -#: org.stellarium.Stellarium.appdata.xml:126 +#: org.stellarium.Stellarium.appdata.xml:128 msgid "Stellarium team" msgstr "Stellarium teymið" diff --git a/po/stellarium-remotecontrol/is.po b/po/stellarium-remotecontrol/is.po index 2fa99b5b72..34c6a7f293 100644 --- a/po/stellarium-remotecontrol/is.po +++ b/po/stellarium-remotecontrol/is.po @@ -4,19 +4,19 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Sveinn í Felli <sv1@fellsnet.is>, 2022 # Alexander V. Wolf <alex.v.wolf@gmail.com>, 2022 # cardinot <mcardinot@gmail.com>, 2022 +# Sveinn í Felli <sv1@fellsnet.is>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: stellarium-remotecontrol\n" "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n" -"POT-Creation-Date: 2023-03-19 12:54+0700\n" +"POT-Creation-Date: 2023-04-14 20:57+0700\n" "PO-Revision-Date: 2022-10-05 14:25+0000\n" -"Last-Translator: cardinot <mcardinot@gmail.com>, 2022\n" -"Language-Team: Icelandic (https://www.transifex.com/stellarium/teams/80998/is/)\n" +"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>, 2023\n" +"Language-Team: Icelandic (https://app.transifex.com/stellarium/teams/80998/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -311,7 +311,7 @@ msgstr "Digitized Sky Survey (DDS)" #: index.html:275 tablet7in.html:334 msgid "HiPS Survey" -msgstr "" +msgstr "HiPS-rannsóknir" #: index.html:288 tablet7in.html:350 msgid "Show planet markers" @@ -323,7 +323,7 @@ msgstr "Sýna brautir reikistjarna" #: index.html:290 tablet7in.html:352 msgid "Show planet orbits only" -msgstr "" +msgstr "Sýna einungis brautir reikistjarna" #: index.html:291 tablet7in.html:353 msgid "Show orbit for selected planet" @@ -331,7 +331,7 @@ msgstr "Sýna sporbraut valinnar plánetu" #: index.html:292 tablet7in.html:354 msgid "Show planet trails" -msgstr "" +msgstr "Sýna ferla reikistjarna" #: index.html:293 tablet7in.html:355 msgid "Show trail only for selected planet" @@ -343,11 +343,11 @@ msgstr "Stækka tunglið:" #: index.html:299 msgid "Scale Sun:" -msgstr "" +msgstr "Kvarða sól:" #: index.html:300 msgid "Scale Planets:" -msgstr "" +msgstr "Kvarða reikistjörnur:" #: index.html:301 tablet7in.html:363 msgid "Scale minor bodies:" @@ -375,7 +375,7 @@ msgstr "" #: index.html:396 msgid "Center" -msgstr "" +msgstr "Miðja" #: index.html:414 tablet7in.html:481 msgid "Solstices" @@ -399,24 +399,26 @@ msgstr "Núverandi pláneta:" #: index.html:465 tablet7in.html:529 msgid "Catalogue of Reflection Nebulae (Van den Bergh, 1966)" -msgstr "Skrá yfir endurskinsþokur (Van den Bergh, 1966)" +msgstr "Skrá yfir endurskinsþokur (van den Bergh, 1966)" #: index.html:512 tablet7in.html:547 msgid "" "Catalogue of southern stars embedded in nebulosity (van den Bergh+, 1975)" msgstr "" +"Stjörnuskrá yfir suðlægar stjörnur ívafðar þokuslæðu (van den Bergh og " +"Herbst+,1975)" #: index.html:550 msgid "Objects without identifier" -msgstr "" +msgstr "Hlutir án auðkennis" #: index.html:568 msgid "Open Star clusters" -msgstr "" +msgstr "Opnar stjörnuþyrpingar" #: index.html:569 msgid "Globular Star clusters" -msgstr "" +msgstr "Hnattlaga stjörnuþyrpingar" #: index.html:576 tablet7in.html:621 msgid "Bright Nebulae" @@ -432,7 +434,7 @@ msgstr "Hringþokur" #: index.html:580 msgid "Galaxy clusters" -msgstr "" +msgstr "Þyrpingar vetrarbrauta" #: index.html:588 tablet7in.html:632 msgid "Labels and markers" @@ -452,19 +454,19 @@ msgstr "Núverandi landslag" #: index.html:641 tablet7in.html:685 msgid "Show lines with thickness" -msgstr "Sýna línur með þykkt" +msgstr "Sýna línur með breidd" #: index.html:646 tablet7in.html:690 msgid "Show asterisms with thickness" -msgstr "Sýna stjörnusamstæður með þykkt" +msgstr "Sýna stjörnusamstæður með breidd" #: index.html:650 tablet7in.html:694 msgid "Show ray helpers with thickness" -msgstr "" +msgstr "Sýna stoðlínur geisla með breidd" #: index.html:658 tablet7in.html:704 msgid "Show boundaries with thickness" -msgstr "" +msgstr "Sýna mörk með breidd" #: index.html:663 tablet7in.html:709 msgid "Constellation selection isolated" @@ -524,7 +526,7 @@ msgstr "Stýringar fyrir hreyfingar" #: index.html:762 tablet7in.html:818 msgid "Torchlight" -msgstr "" +msgstr "Ljóskastari" #: index.html:769 tablet7in.html:825 msgid "Scene selection" diff --git a/po/stellarium/de.po b/po/stellarium/de.po index 534df62163..716ecf15c7 100644 --- a/po/stellarium/de.po +++ b/po/stellarium/de.po @@ -16551,22 +16551,22 @@ msgstr "Sensor-Rahmen 1 Grad gegen den Uhrzeigersinn rotieren" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:200 #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:330 msgid "Rotate the sensor frame 90 degrees clockwise" -msgstr "Sensor-Rahmen 90 Grad im den Uhrzeigersinn rotieren" +msgstr "Sensor-Rahmen 90 Grad im Uhrzeigersinn rotieren" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:201 #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:320 msgid "Rotate the sensor frame 15 degrees clockwise" -msgstr "Sensor-Rahmen 15 Grad im den Uhrzeigersinn rotieren" +msgstr "Sensor-Rahmen 15 Grad im Uhrzeigersinn rotieren" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:202 #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:310 msgid "Rotate the sensor frame 5 degrees clockwise" -msgstr "Sensor-Rahmen 5 Grad im den Uhrzeigersinn rotieren" +msgstr "Sensor-Rahmen 5 Grad im Uhrzeigersinn rotieren" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:203 #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:300 msgid "Rotate the sensor frame 1 degree clockwise" -msgstr "Sensor-Rahmen 1 Grad im den Uhrzeigersinn rotieren" +msgstr "Sensor-Rahmen 1 Grad im Uhrzeigersinn rotieren" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:205 #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:292 diff --git a/po/stellarium/fi.po b/po/stellarium/fi.po index 717f547d75..4ec37bf98c 100644 --- a/po/stellarium/fi.po +++ b/po/stellarium/fi.po @@ -9,8 +9,8 @@ # Tmsteipainen <tmsteipainen1@gmail.com>, 2022 # cardinot <mcardinot@gmail.com>, 2022 # Veikko Mäkelä, 2022 -# Ilpo Kantonen, 2023 # Alexander V. Wolf <alex.v.wolf@gmail.com>, 2023 +# Ilpo Kantonen, 2023 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n" "POT-Creation-Date: 2023-04-22 18:09+0700\n" "PO-Revision-Date: 2022-10-05 14:25+0000\n" -"Last-Translator: Alexander V. Wolf <alex.v.wolf@gmail.com>, 2023\n" +"Last-Translator: Ilpo Kantonen, 2023\n" "Language-Team: Finnish (https://app.transifex.com/stellarium/teams/80998/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4051,7 +4051,7 @@ msgstr "Az." #: src/core/StelObject.cpp:855 msgctxt "celestial coordinate system" msgid "h" -msgstr "h" +msgstr "h " #: src/core/StelObject.cpp:855 msgctxt "celestial coordinate system" @@ -7477,7 +7477,7 @@ msgstr "Deklinaatio vs. aika" #: plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp:684 msgctxt "time" msgid "h" -msgstr "h" +msgstr "h " #: src/gui/AstroCalcDialog.cpp:6573 msgid "" @@ -23029,7 +23029,7 @@ msgstr "" #: plugins/MeteorShowers/src/gui/MSConfigDialog.cpp:315 msgctxt "time unit" msgid " h" -msgstr " h" +msgstr " h " #: plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp:306 msgid "Potential habitable exoplanets" diff --git a/po/stellarium/hi.po b/po/stellarium/hi.po index 948d264d73..6f3e3b100d 100644 --- a/po/stellarium/hi.po +++ b/po/stellarium/hi.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n" -"POT-Creation-Date: 2023-04-14 20:57+0700\n" +"POT-Creation-Date: 2023-04-22 18:09+0700\n" "PO-Revision-Date: 2022-10-05 14:25+0000\n" "Last-Translator: राजಐயர், 2023\n" "Language-Team: Hindi (https://app.transifex.com/stellarium/teams/80998/hi/)\n" @@ -27,13 +27,13 @@ msgstr "" #. TRANSLATORS: type of object #: src/core/modules/CustomObject.cpp:81 src/core/modules/Asterism.cpp:194 #: src/core/modules/Constellation.cpp:290 -#: src/core/modules/NomenclatureItem.cpp:224 src/core/modules/Nebula.cpp:255 -#: src/core/modules/Nebula.cpp:257 src/core/modules/Planet.cpp:571 +#: src/core/modules/NomenclatureItem.cpp:224 src/core/modules/Nebula.cpp:249 +#: src/core/modules/Nebula.cpp:251 src/core/modules/Planet.cpp:571 #: src/core/modules/Planet.cpp:574 src/core/modules/StarWrapper.cpp:49 #: src/core/modules/StarWrapper.cpp:290 src/core/modules/StarWrapper.cpp:292 #: src/gui/AstroCalcDialog.cpp:892 src/gui/AstroCalcDialog.cpp:2329 #: src/gui/AstroCalcDialog.cpp:2966 src/gui/AstroCalcDialog.cpp:2998 -#: src/gui/AstroCalcDialog.cpp:3385 src/gui/AstroCalcDialog.cpp:8414 +#: src/gui/AstroCalcDialog.cpp:3385 src/gui/AstroCalcDialog.cpp:8389 #: src/gui/ObsListDialog.cpp:260 src/ui_configurationDialog.h:1875 #: plugins/Satellites/src/Satellite.cpp:339 #: plugins/TelescopeControl/src/TelescopeClient.cpp:136 @@ -66,11 +66,11 @@ msgstr "नक्षत्र" #: src/core/modules/GridLinesMgr.cpp:2034 #: src/core/modules/SpecialMarkersMgr.cpp:266 #: src/core/modules/LandscapeMgr.cpp:864 -#: src/core/modules/NomenclatureMgr.cpp:83 src/core/modules/NebulaMgr.cpp:375 -#: src/core/modules/NebulaMgr.cpp:376 src/core/modules/SolarSystem.cpp:297 +#: src/core/modules/NomenclatureMgr.cpp:83 src/core/modules/NebulaMgr.cpp:357 +#: src/core/modules/NebulaMgr.cpp:358 src/core/modules/SolarSystem.cpp:297 #: src/core/modules/MilkyWay.cpp:110 src/core/modules/ZodiacalLight.cpp:114 #: src/core/modules/ToastMgr.cpp:62 src/core/modules/HipsMgr.cpp:156 -#: src/core/StelApp.cpp:655 src/core/StelCore.cpp:295 +#: src/core/StelApp.cpp:656 src/core/StelCore.cpp:295 #: src/core/StelSkyLayerMgr.cpp:83 src/core/StelSkyLayerMgr.cpp:84 #: src/StelMainView.cpp:943 msgid "Display Options" @@ -331,7 +331,7 @@ msgstr "प्रतिशिखर" #. TRANSLATORS: Unit of measure for speed - kilometers per second #: src/core/modules/GridLinesMgr.cpp:1630 src/core/modules/Planet.cpp:695 -#: src/core/modules/Planet.cpp:1181 src/gui/AstroCalcDialog.cpp:9301 +#: src/core/modules/Planet.cpp:1181 src/gui/AstroCalcDialog.cpp:9276 #: plugins/Satellites/src/Satellite.cpp:360 #: plugins/Satellites/src/Satellite.cpp:403 #: plugins/MeteorShowers/src/MeteorShower.cpp:564 @@ -930,7 +930,7 @@ msgstr "व्यास" #: src/core/modules/Planet.cpp:1497 src/core/modules/Comet.cpp:157 #: src/core/modules/Comet.cpp:167 src/gui/StelGuiItems.cpp:900 #: src/gui/AstroCalcDialog.cpp:3202 src/gui/AstroCalcDialog.cpp:3717 -#: src/gui/AstroCalcDialog.cpp:9236 plugins/Satellites/src/Satellites.cpp:2914 +#: src/gui/AstroCalcDialog.cpp:9211 plugins/Satellites/src/Satellites.cpp:2914 #: plugins/Satellites/src/Satellite.cpp:356 #: plugins/Satellites/src/Satellite.cpp:399 #: plugins/Satellites/src/gui/SatellitesDialog.cpp:1160 @@ -1649,240 +1649,240 @@ msgstr "मध्य" msgid "Subsolar" msgstr "उपसौर" -#: src/core/modules/Nebula.cpp:72 +#: src/core/modules/Nebula.cpp:66 msgid "galaxy" msgstr "तारासंगम" -#: src/core/modules/Nebula.cpp:73 +#: src/core/modules/Nebula.cpp:67 msgid "active galaxy" msgstr "सक्रिय तारासंगम" -#: src/core/modules/Nebula.cpp:74 +#: src/core/modules/Nebula.cpp:68 msgid "radio galaxy" msgstr "दीर्घतरंगीय तारासंगम" -#: src/core/modules/Nebula.cpp:75 +#: src/core/modules/Nebula.cpp:69 msgid "interacting galaxy" msgstr "अन्तर्प्रभावी तारासंगम" -#: src/core/modules/Nebula.cpp:76 plugins/Quasars/src/Quasar.hpp:72 +#: src/core/modules/Nebula.cpp:70 plugins/Quasars/src/Quasar.hpp:72 msgid "quasar" msgstr "तारामय दीर्घतरंगज" -#: src/core/modules/Nebula.cpp:77 +#: src/core/modules/Nebula.cpp:71 msgid "star cluster" msgstr "तारासंग्रह" -#: src/core/modules/Nebula.cpp:78 +#: src/core/modules/Nebula.cpp:72 msgid "open star cluster" msgstr "खुला तारासंग्रह" -#: src/core/modules/Nebula.cpp:79 +#: src/core/modules/Nebula.cpp:73 msgid "globular star cluster" msgstr "गोलाकार तारासंग्रह" -#: src/core/modules/Nebula.cpp:80 +#: src/core/modules/Nebula.cpp:74 msgid "stellar association" msgstr "तारासंगठन" -#: src/core/modules/Nebula.cpp:81 +#: src/core/modules/Nebula.cpp:75 msgid "star cloud" msgstr "तारामेघ" -#: src/core/modules/Nebula.cpp:82 +#: src/core/modules/Nebula.cpp:76 msgid "nebula" msgstr "अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:83 +#: src/core/modules/Nebula.cpp:77 msgid "planetary nebula" msgstr "ग्रहमय अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:84 +#: src/core/modules/Nebula.cpp:78 msgid "dark nebula" msgstr "अन्धकारमय अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:85 +#: src/core/modules/Nebula.cpp:79 msgid "reflection nebula" msgstr "प्रतिबिम्ब अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:86 +#: src/core/modules/Nebula.cpp:80 msgid "bipolar nebula" msgstr "द्वयध्रुव अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:87 +#: src/core/modules/Nebula.cpp:81 msgid "emission nebula" msgstr "उत्सर्जन अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:88 +#: src/core/modules/Nebula.cpp:82 msgid "cluster associated with nebulosity" msgstr "तारासंग्रह जिससे अन्तरिक्षमेघ जुडी हो।" -#: src/core/modules/Nebula.cpp:89 +#: src/core/modules/Nebula.cpp:83 msgid "HII region" msgstr "प्रथमकण क्षेत्र" -#: src/core/modules/Nebula.cpp:90 +#: src/core/modules/Nebula.cpp:84 msgid "supernova remnant" msgstr "महानवतारा अवशेष" -#: src/core/modules/Nebula.cpp:91 +#: src/core/modules/Nebula.cpp:85 msgid "interstellar matter" msgstr "तारान्तर पदार्थ" -#: src/core/modules/Nebula.cpp:92 +#: src/core/modules/Nebula.cpp:86 msgid "emission object" msgstr "उत्सर्जन वस्तु" -#: src/core/modules/Nebula.cpp:93 +#: src/core/modules/Nebula.cpp:87 msgid "BL Lac object" msgstr "सक्रिय नाभिक तारासंगम" -#: src/core/modules/Nebula.cpp:94 +#: src/core/modules/Nebula.cpp:88 msgid "blazar" msgstr "केतुधारक स॰ना॰ता॰सं॰" -#: src/core/modules/Nebula.cpp:95 +#: src/core/modules/Nebula.cpp:89 msgid "molecular cloud" msgstr "अणु मेघ" -#: src/core/modules/Nebula.cpp:96 +#: src/core/modules/Nebula.cpp:90 msgid "young stellar object" msgstr "युवा तारामय वस्तु" -#: src/core/modules/Nebula.cpp:97 +#: src/core/modules/Nebula.cpp:91 msgid "possible quasar" msgstr "सम्भवतः तारामय दीर्घतरंगज" -#: src/core/modules/Nebula.cpp:98 +#: src/core/modules/Nebula.cpp:92 msgid "possible planetary nebula" msgstr "सम्भवतः ग्रहमय अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:99 +#: src/core/modules/Nebula.cpp:93 msgid "protoplanetary nebula" msgstr "प्रारम्भिक ग्रहमय अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:100 src/core/modules/Planet.cpp:127 +#: src/core/modules/Nebula.cpp:94 src/core/modules/Planet.cpp:127 #: src/core/modules/StarWrapper.cpp:90 msgid "star" msgstr "तारा" -#: src/core/modules/Nebula.cpp:101 +#: src/core/modules/Nebula.cpp:95 msgid "symbiotic star" msgstr "सहजीवी तारा" -#: src/core/modules/Nebula.cpp:102 +#: src/core/modules/Nebula.cpp:96 msgid "emission-line star" msgstr "उत्सर्जन रेखा तारा" -#: src/core/modules/Nebula.cpp:103 +#: src/core/modules/Nebula.cpp:97 msgid "supernova candidate" msgstr "सम्भाव्य महानवतारा" -#: src/core/modules/Nebula.cpp:104 +#: src/core/modules/Nebula.cpp:98 msgid "supernova remnant candidate" msgstr "सम्भाव्य महानवतारा अवशेष" -#: src/core/modules/Nebula.cpp:105 +#: src/core/modules/Nebula.cpp:99 msgid "cluster of galaxies" msgstr "तारासंगमों का संग्रह" -#: src/core/modules/Nebula.cpp:106 +#: src/core/modules/Nebula.cpp:100 msgid "part of a galaxy" msgstr "तारासंगम का अम्श" -#: src/core/modules/Nebula.cpp:107 +#: src/core/modules/Nebula.cpp:101 msgid "region of the sky" msgstr "आकाश का क्षेत्र" -#: src/core/modules/Nebula.cpp:108 +#: src/core/modules/Nebula.cpp:102 msgid "object of unknown nature" msgstr "अज्ञात चरित्र का वस्तु" -#: src/core/modules/Nebula.cpp:181 src/core/StelObject.cpp:347 +#: src/core/modules/Nebula.cpp:175 src/core/StelObject.cpp:347 #: src/gui/AstroCalcChart.cpp:95 src/gui/AstroCalcChart.cpp:105 #: src/gui/AstroCalcChart.cpp:434 src/gui/AstroCalcChart.cpp:460 #: src/gui/ObsListDialog.cpp:263 plugins/Supernovae/src/Supernova.cpp:127 msgid "Magnitude" msgstr "मात्रा" -#: src/core/modules/Nebula.cpp:183 +#: src/core/modules/Nebula.cpp:177 msgid "Opacity" msgstr "अपारदर्शता" -#: src/core/modules/Nebula.cpp:187 +#: src/core/modules/Nebula.cpp:181 msgid "photometric passband" msgstr "प्रकाशमात्रिक उत्तीर्णित वर्णक्रम" -#: src/core/modules/Nebula.cpp:200 src/core/StelObject.cpp:350 +#: src/core/modules/Nebula.cpp:194 src/core/StelObject.cpp:350 #: plugins/Satellites/src/Satellite.cpp:347 msgid "reduced to" msgstr "इस तक घटित" -#: src/core/modules/Nebula.cpp:200 src/core/StelObject.cpp:350 +#: src/core/modules/Nebula.cpp:194 src/core/StelObject.cpp:350 #: plugins/Satellites/src/Satellite.cpp:347 msgid "by" msgstr "द्वारा" -#: src/core/modules/Nebula.cpp:200 src/core/StelObject.cpp:350 +#: src/core/modules/Nebula.cpp:194 src/core/StelObject.cpp:350 #: plugins/Satellites/src/Satellite.cpp:347 msgid "Airmasses" msgstr "वायुखण्ड" -#: src/core/modules/Nebula.cpp:242 src/core/modules/Planet.cpp:554 +#: src/core/modules/Nebula.cpp:236 src/core/modules/Planet.cpp:554 #: src/core/modules/StarWrapper.cpp:276 msgid "Additional names: " msgstr "अतिरिक्त नाम : " -#: src/core/modules/Nebula.cpp:248 src/core/modules/Planet.cpp:561 +#: src/core/modules/Nebula.cpp:242 src/core/modules/Planet.cpp:561 #: src/core/modules/StarWrapper.cpp:282 msgid "Additional catalog numbers: " msgstr "अतिरिक्त सूचीपत्र संख्या : " -#: src/core/modules/Nebula.cpp:266 src/core/modules/Planet.cpp:789 +#: src/core/modules/Nebula.cpp:260 src/core/modules/Planet.cpp:789 #: src/core/modules/MinorPlanet.cpp:174 src/core/modules/StarWrapper.cpp:54 #: src/core/modules/StarWrapper.cpp:306 plugins/Quasars/src/Quasar.cpp:134 msgid "Color Index (B-V)" msgstr "वर्ण निर्देशिका ( नील दृश्य )" -#: src/core/modules/Nebula.cpp:271 +#: src/core/modules/Nebula.cpp:265 msgid "Surface brightness" msgstr "धरातल चमक" -#: src/core/modules/Nebula.cpp:272 +#: src/core/modules/Nebula.cpp:266 msgid "after extinction" msgstr "विलुप्त होने के पश्चात" -#: src/core/modules/Nebula.cpp:282 src/core/modules/Nebula.cpp:284 +#: src/core/modules/Nebula.cpp:276 src/core/modules/Nebula.cpp:278 #: src/gui/AstroCalcDialog.cpp:1104 src/gui/AstroCalcDialog.cpp:1106 msgctxt "magnitude" msgid "mag" msgstr "मा॰" -#: src/core/modules/Nebula.cpp:282 src/gui/AstroCalcDialog.cpp:1104 +#: src/core/modules/Nebula.cpp:276 src/gui/AstroCalcDialog.cpp:1104 #: src/gui/AstroCalcDialog.cpp:1111 src/gui/AstroCalcDialog.cpp:1186 msgid "arc-min" msgstr "चाप पल" -#: src/core/modules/Nebula.cpp:284 src/gui/AstroCalcDialog.cpp:1106 +#: src/core/modules/Nebula.cpp:278 src/gui/AstroCalcDialog.cpp:1106 msgid "arc-sec" msgstr "चाप विपल" -#: src/core/modules/Nebula.cpp:298 +#: src/core/modules/Nebula.cpp:292 msgid "Contrast index" msgstr "अन्तर निर्देशीका" -#: src/core/modules/Nebula.cpp:306 src/ui_configurationDialog.h:1888 +#: src/core/modules/Nebula.cpp:300 src/ui_configurationDialog.h:1888 msgid "Size" msgstr "आकार" -#: src/core/modules/Nebula.cpp:324 +#: src/core/modules/Nebula.cpp:318 msgid "Orientation angle" msgstr "दिशा अस्र" #. TRANSLATORS: Unit of measure for distance - Light Years #. TRANSLATORS: Unit of measure for distance - light years #. TRANSLATORS: Unit of measure for distance - Light Years -#: src/core/modules/Nebula.cpp:351 src/core/modules/Nebula.cpp:364 +#: src/core/modules/Nebula.cpp:345 src/core/modules/Nebula.cpp:358 #: src/core/modules/StarWrapper.cpp:336 #: plugins/Supernovae/src/Supernova.cpp:158 plugins/Novae/src/Nova.cpp:164 #: plugins/Pulsars/src/Pulsar.cpp:268 plugins/Exoplanets/src/Exoplanet.cpp:333 @@ -1891,7 +1891,7 @@ msgid "ly" msgstr "प्र॰व॰" #. TRANSLATORS: distance -#: src/core/modules/Nebula.cpp:352 src/core/modules/Nebula.cpp:398 +#: src/core/modules/Nebula.cpp:346 src/core/modules/Nebula.cpp:392 #: src/core/modules/Planet.cpp:686 src/core/modules/StarWrapper.cpp:341 #: src/core/modules/StarWrapper.cpp:343 src/gui/AstroCalcDialog.cpp:927 #: src/gui/AstroCalcChart.cpp:92 src/gui/AstroCalcChart.cpp:102 @@ -1902,310 +1902,310 @@ msgid "Distance" msgstr "दूरी" #. TRANSLATORS: Unit of measure for distance - kiloparsecs -#: src/core/modules/Nebula.cpp:362 plugins/Pulsars/src/Pulsar.cpp:265 +#: src/core/modules/Nebula.cpp:356 plugins/Pulsars/src/Pulsar.cpp:265 msgctxt "distance" msgid "kpc" msgstr "स॰ल॰वि॰" #. TRANSLATORS: Unit of measure for distance - Megaparsecs -#: src/core/modules/Nebula.cpp:375 +#: src/core/modules/Nebula.cpp:369 msgctxt "distance" msgid "Mpc" msgstr "प्र॰ल॰वि॰" #. TRANSLATORS: Unit of measure for distance - Millions of Light Years -#: src/core/modules/Nebula.cpp:384 +#: src/core/modules/Nebula.cpp:378 msgctxt "distance" msgid "M ly" msgstr "प्र॰प्र॰व॰" -#: src/core/modules/Nebula.cpp:413 plugins/Quasars/src/Quasar.cpp:146 +#: src/core/modules/Nebula.cpp:407 plugins/Quasars/src/Quasar.cpp:146 msgid "Redshift" msgstr "रक्तवर्णीकरण" -#: src/core/modules/Nebula.cpp:423 src/core/modules/StarWrapper.cpp:370 +#: src/core/modules/Nebula.cpp:417 src/core/modules/StarWrapper.cpp:370 msgid "Parallax" msgstr "लम्बन" #. TRANSLATORS: Unit of measure for annual parallax - milliarcseconds -#: src/core/modules/Nebula.cpp:423 src/core/modules/StarWrapper.cpp:375 +#: src/core/modules/Nebula.cpp:417 src/core/modules/StarWrapper.cpp:375 #: plugins/Pulsars/src/Pulsar.cpp:257 msgctxt "parallax" msgid "mas" msgstr "श॰तम चा॰वि॰" -#: src/core/modules/Nebula.cpp:426 +#: src/core/modules/Nebula.cpp:420 msgid "Discoverer" msgstr "खोजकर्ता" -#: src/core/modules/Nebula.cpp:428 src/ui_searchDialogGui.h:923 +#: src/core/modules/Nebula.cpp:422 src/ui_searchDialogGui.h:923 msgid "Morphological description" msgstr "आकार विवरण" -#: src/core/modules/Nebula.cpp:1334 +#: src/core/modules/Nebula.cpp:1374 msgctxt "Shapley-Sawyer Concentration Class" msgid "high concentration of stars toward the center" msgstr "उच्च एकाग्रता तारों की मध्य की ओर" -#: src/core/modules/Nebula.cpp:1337 +#: src/core/modules/Nebula.cpp:1377 msgctxt "Shapley-Sawyer Concentration Class" msgid "dense central concentration of stars" msgstr "घन मध्य एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1340 +#: src/core/modules/Nebula.cpp:1380 msgctxt "Shapley-Sawyer Concentration Class" msgid "strong inner core of stars" msgstr "प्रबल अन्तरीय अन्तःगोल तारों का" -#: src/core/modules/Nebula.cpp:1343 +#: src/core/modules/Nebula.cpp:1383 msgctxt "Shapley-Sawyer Concentration Class" msgid "intermediate rich concentrations of stars" msgstr "मध्यवर्ती बहुसंख्य एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1348 +#: src/core/modules/Nebula.cpp:1388 msgctxt "Shapley-Sawyer Concentration Class" msgid "intermediate concentrations of stars" msgstr "मध्यवर्ती एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1351 +#: src/core/modules/Nebula.cpp:1391 msgctxt "Shapley-Sawyer Concentration Class" msgid "rather loose concentration of stars towards the center" msgstr "थोडा ढीला एकाग्रता तारों का मध्य की ओर" -#: src/core/modules/Nebula.cpp:1354 +#: src/core/modules/Nebula.cpp:1394 msgctxt "Shapley-Sawyer Concentration Class" msgid "loose concentration of stars towards the center" msgstr "ढीला एकाग्रता तारों का मध्य की ओर" -#: src/core/modules/Nebula.cpp:1357 +#: src/core/modules/Nebula.cpp:1397 msgctxt "Shapley-Sawyer Concentration Class" msgid "loose concentration of stars" msgstr "ढीला एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1360 +#: src/core/modules/Nebula.cpp:1400 msgctxt "Shapley-Sawyer Concentration Class" msgid "very loose concentration of stars towards the center" msgstr "बहुत ढीला एकाग्रता तारों का मध्य की ओर" -#: src/core/modules/Nebula.cpp:1363 +#: src/core/modules/Nebula.cpp:1403 msgctxt "Shapley-Sawyer Concentration Class" msgid "almost no concentration towards the center" msgstr "लगभग शून्य एकाग्रता मध्य की ओर" -#: src/core/modules/Nebula.cpp:1366 +#: src/core/modules/Nebula.cpp:1406 msgctxt "Shapley-Sawyer Concentration Class" msgid "undocumented concentration class" msgstr "अनाभिलिखित एकाग्रता वर्ग" -#: src/core/modules/Nebula.cpp:1387 +#: src/core/modules/Nebula.cpp:1427 msgctxt "Trumpler's Concentration Class" msgid "strong central concentration of stars" msgstr "प्रबल मध्य एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1390 +#: src/core/modules/Nebula.cpp:1430 msgctxt "Trumpler's Concentration Class" msgid "little central concentration of stars" msgstr "अल्पमात्रा मध्य एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1393 +#: src/core/modules/Nebula.cpp:1433 msgctxt "Trumpler's Concentration Class" msgid "no noticeable concentration of stars" msgstr "अध्यातव्य एकाग्रता तारों का" -#: src/core/modules/Nebula.cpp:1396 +#: src/core/modules/Nebula.cpp:1436 msgctxt "Trumpler's Concentration Class" msgid "a star field condensation" msgstr "एक तारा क्षेत्र संघनन" -#: src/core/modules/Nebula.cpp:1399 +#: src/core/modules/Nebula.cpp:1439 msgctxt "Trumpler's Concentration Class" msgid "undocumented concentration class" msgstr "अनाभिलिखित एकाग्रता वर्ग" -#: src/core/modules/Nebula.cpp:1405 +#: src/core/modules/Nebula.cpp:1445 msgctxt "Trumpler's Brightness Class" msgid "small brightness range of cluster members" msgstr "अल्पस्तर विभिन्नता का चमक संग्रह सदस्यों का" -#: src/core/modules/Nebula.cpp:1408 +#: src/core/modules/Nebula.cpp:1448 msgctxt "Trumpler's Brightness Class" msgid "medium brightness range of cluster members" msgstr "मध्यस्तर विभिन्नता का चमक संग्रह सदस्यों का" -#: src/core/modules/Nebula.cpp:1411 +#: src/core/modules/Nebula.cpp:1451 msgctxt "Trumpler's Brightness Class" msgid "large brightness range of cluster members" msgstr "उच्चस्तर विभिन्नता का चमक संग्रह सदस्यों का" -#: src/core/modules/Nebula.cpp:1414 +#: src/core/modules/Nebula.cpp:1454 msgctxt "Trumpler's Brightness Class" msgid "undocumented brightness range of cluster members" msgstr "अनाभिलिखित विभिन्नता स्तर का चमक संग्रह सदस्यों का" -#: src/core/modules/Nebula.cpp:1420 +#: src/core/modules/Nebula.cpp:1460 msgctxt "Trumpler's Number of Members Class" msgid "poor cluster with less than 50 stars" msgstr "अल्पस्तर संख्या का संग्रह जो 50 तारों से न्यून हो" -#: src/core/modules/Nebula.cpp:1423 +#: src/core/modules/Nebula.cpp:1463 msgctxt "Trumpler's Number of Members Class" msgid "moderately rich cluster with 50-100 stars" msgstr "मध्यस्तर संख्या का संग्रह जो 50-100 तारों का हो" -#: src/core/modules/Nebula.cpp:1426 +#: src/core/modules/Nebula.cpp:1466 msgctxt "Trumpler's Number of Members Class" msgid "rich cluster with more than 100 stars" msgstr "उच्चस्तर संख्या का संग्रह जो 100 से उधिक तारों का हो" -#: src/core/modules/Nebula.cpp:1429 +#: src/core/modules/Nebula.cpp:1469 msgctxt "Trumpler's Number of Members Class" msgid "undocumented number of members class" msgstr "अनाभिलिखित वर्ग का सदस्य संख्या" -#: src/core/modules/Nebula.cpp:1433 +#: src/core/modules/Nebula.cpp:1473 msgctxt "nebulosity factor of open clusters" msgid "the cluster lies within nebulosity" msgstr "संग्रह मेघमय क्षेत्र के भीतर है" -#: src/core/modules/Nebula.cpp:1455 +#: src/core/modules/Nebula.cpp:1495 msgctxt "Reflection Nebulae Brightness" msgid "very bright" msgstr "बहुत उज्ज्वल" -#: src/core/modules/Nebula.cpp:1458 +#: src/core/modules/Nebula.cpp:1498 msgctxt "Reflection Nebulae Brightness" msgid "bright" msgstr "उज्ज्वल" -#: src/core/modules/Nebula.cpp:1461 +#: src/core/modules/Nebula.cpp:1501 msgctxt "Reflection Nebulae Brightness" msgid "moderate brightness" msgstr "मध्यस्तर चमक" -#: src/core/modules/Nebula.cpp:1464 +#: src/core/modules/Nebula.cpp:1504 msgctxt "Reflection Nebulae Brightness" msgid "faint" msgstr "धूमिल" -#: src/core/modules/Nebula.cpp:1467 +#: src/core/modules/Nebula.cpp:1507 msgctxt "Reflection Nebulae Brightness" msgid "very faint" msgstr "अति धूमिल" -#: src/core/modules/Nebula.cpp:1470 +#: src/core/modules/Nebula.cpp:1510 msgctxt "Reflection Nebulae Brightness" msgid "uncertain brightness" msgstr "अनिश्चित चमक" -#: src/core/modules/Nebula.cpp:1473 +#: src/core/modules/Nebula.cpp:1513 msgctxt "Reflection Nebulae Brightness" msgid "undocumented brightness of reflection nebulae" msgstr "अनाभिलिखित चमक प्रतिबिम्ब अन्तरिक्षमेघों का" -#: src/core/modules/Nebula.cpp:1479 +#: src/core/modules/Nebula.cpp:1519 msgctxt "Reflection Nebulae Classification" msgid "the illuminating star is embedded in the nebulosity" msgstr "प्रकाशक तारा अन्तरिक्षमेघ में निहित" -#: src/core/modules/Nebula.cpp:1482 +#: src/core/modules/Nebula.cpp:1522 msgctxt "Reflection Nebulae Classification" msgid "star is located outside the illuminated nebulosity" msgstr "तारा स्थित प्रकाशित अन्तरिक्षमेघ के बाहर" -#: src/core/modules/Nebula.cpp:1485 +#: src/core/modules/Nebula.cpp:1525 msgctxt "Reflection Nebulae Classification" msgid "star is located on the corner of the illuminated nebulosity" msgstr "तारा स्थित प्रकाशित अन्तरिक्षमेघ के अस्र पर" #. TRANSLATORS: peculiar: odd or unusual, cf. peculiar star, peculiar galaxy -#: src/core/modules/Nebula.cpp:1490 +#: src/core/modules/Nebula.cpp:1530 msgctxt "Reflection Nebulae Classification" msgid "star is located outside the illuminated peculiar nebulosity" msgstr "तारा स्थित प्रकाशित विचित्र अन्तरिक्षमेघ के बाहर" #. TRANSLATORS: peculiar: odd or unusual, cf. peculiar star, peculiar galaxy -#: src/core/modules/Nebula.cpp:1496 +#: src/core/modules/Nebula.cpp:1536 msgctxt "Reflection Nebulae Classification" msgid "the illuminated peculiar nebulosity" msgstr "प्रकाशित विचित्र अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:1500 +#: src/core/modules/Nebula.cpp:1540 msgctxt "Reflection Nebulae Classification" msgid "undocumented reflection nebulae" msgstr "अनाभिलिखित प्रतिबिम्ब अन्तरिक्षमेघ" -#: src/core/modules/Nebula.cpp:1521 +#: src/core/modules/Nebula.cpp:1561 msgid "circular form" msgstr "वृत्ताकार" -#: src/core/modules/Nebula.cpp:1522 +#: src/core/modules/Nebula.cpp:1562 msgid "elliptical form" msgstr "दीर्घवृत्ताकार" -#: src/core/modules/Nebula.cpp:1523 +#: src/core/modules/Nebula.cpp:1563 msgid "irregular form" msgstr "अनियमित आकार" -#: src/core/modules/Nebula.cpp:1525 +#: src/core/modules/Nebula.cpp:1565 msgid "amorphous structure" msgstr "अनाकार आकार" -#: src/core/modules/Nebula.cpp:1526 +#: src/core/modules/Nebula.cpp:1566 msgid "conventional structure" msgstr "सामान्य आकार" -#: src/core/modules/Nebula.cpp:1527 +#: src/core/modules/Nebula.cpp:1567 msgid "filamentary structure" msgstr "सूत्रमय आकार" -#: src/core/modules/Nebula.cpp:1529 +#: src/core/modules/Nebula.cpp:1569 msgctxt "HII region brightness" msgid "faintest" msgstr "अत्यन्त धूमिल" -#: src/core/modules/Nebula.cpp:1530 +#: src/core/modules/Nebula.cpp:1570 msgctxt "HII region brightness" msgid "moderate brightness" msgstr "मध्यस्तर चमक" -#: src/core/modules/Nebula.cpp:1531 +#: src/core/modules/Nebula.cpp:1571 msgctxt "HII region brightness" msgid "brightest" msgstr "उच्चतमस्तर चमक" -#: src/core/modules/Nebula.cpp:1534 +#: src/core/modules/Nebula.cpp:1574 msgid "undocumented form" msgstr "अनाभिलिखित आकार" -#: src/core/modules/Nebula.cpp:1535 +#: src/core/modules/Nebula.cpp:1575 msgid "undocumented structure" msgstr "अनाभिलिखित आकार" -#: src/core/modules/Nebula.cpp:1536 +#: src/core/modules/Nebula.cpp:1576 msgid "undocumented brightness" msgstr "अनाभिलिखित चमक" -#: src/core/modules/Nebula.cpp:1548 +#: src/core/modules/Nebula.cpp:1588 msgctxt "supernova remnant structure classification" msgid "remnant shows a shell radio structure" msgstr "अवशेष दर्शाता है एक सम्पुट आकार दीर्घतरंगज" -#: src/core/modules/Nebula.cpp:1551 +#: src/core/modules/Nebula.cpp:1591 msgctxt "supernova remnant structure classification" msgid "remnant shows a filled center ('plerion') radio structure" msgstr "अवशेष दर्शाता है एक भरा मध्य आकार ( परिपूर्ण ) दीर्घतरंगज" -#: src/core/modules/Nebula.cpp:1554 +#: src/core/modules/Nebula.cpp:1594 msgctxt "supernova remnant structure classification" msgid "remnant shows a composite (or combination) radio structure" msgstr "अवशेष दर्शाता है एक संयुक्त ( अथवा जोड ) आकार दीर्घतरंगज" -#: src/core/modules/Nebula.cpp:1557 +#: src/core/modules/Nebula.cpp:1597 msgctxt "supernova remnant structure classification" msgid "remnant shows a shell radio structure with some uncertainty" msgstr "अवशेष दर्शाता है एक सम्पुट आकार दीर्घतरंगज पर थोडा अनिश्चित" -#: src/core/modules/Nebula.cpp:1560 +#: src/core/modules/Nebula.cpp:1600 msgctxt "supernova remnant structure classification" msgid "" "remnant shows a filled center ('plerion') radio structure with some " @@ -2213,7 +2213,7 @@ msgid "" msgstr "" "अवशेष दर्शाता है एक भरा मध्य ( परिपूर्ण ) आकार दीर्घतरंगज पर थोडा अनिश्चित" -#: src/core/modules/Nebula.cpp:1563 +#: src/core/modules/Nebula.cpp:1603 msgctxt "supernova remnant structure classification" msgid "" "remnant shows a composite (or combination) radio structure with some " @@ -2221,40 +2221,40 @@ msgid "" msgstr "" "अवशेष दर्शाता है एक संयुक्त ( अथवा जोड ) आकार दीर्घतरंगज पर थोडा अनिश्चित" -#: src/core/modules/Nebula.cpp:1571 +#: src/core/modules/Nebula.cpp:1611 msgid "undocumented type" msgstr "अनाभिलिखित प्रकार" -#: src/core/modules/NebulaMgr.cpp:375 src/gui/AstroCalcDialog.cpp:994 -#: src/gui/AstroCalcDialog.cpp:8323 +#: src/core/modules/NebulaMgr.cpp:357 src/gui/AstroCalcDialog.cpp:994 +#: src/gui/AstroCalcDialog.cpp:8276 msgid "Deep-sky objects" msgstr "गहनाकाश वस्तुएँ" -#: src/core/modules/NebulaMgr.cpp:376 +#: src/core/modules/NebulaMgr.cpp:358 msgid "Toggle DSO type filter" msgstr "गहनाकाश प्रकार छलनी पलटें" -#: src/core/modules/NebulaMgr.cpp:1418 src/gui/StelDialog.cpp:336 +#: src/core/modules/NebulaMgr.cpp:1400 src/gui/StelDialog.cpp:336 #: src/StelMainView.cpp:1039 #: plugins/TelescopeControl/src/TelescopeControl.cpp:773 msgid "Attention!" msgstr "सावधान।" -#: src/core/modules/NebulaMgr.cpp:1418 +#: src/core/modules/NebulaMgr.cpp:1400 msgid "DSO catalog version mismatch" msgstr "गहनाकाश सूचीपत्र प्रकाशन संख्या विसंगत" -#: src/core/modules/NebulaMgr.cpp:1418 src/core/SimbadSearcher.cpp:175 +#: src/core/modules/NebulaMgr.cpp:1400 src/core/SimbadSearcher.cpp:175 #: src/core/SimbadSearcher.cpp:177 #: plugins/OnlineQueries/src/HipOnlineQuery.cpp:93 msgid "Found" msgstr "खोज से प्राप्त" -#: src/core/modules/NebulaMgr.cpp:1418 +#: src/core/modules/NebulaMgr.cpp:1400 msgid "Expected" msgstr "अपेक्षित" -#: src/core/modules/NebulaMgr.cpp:1418 +#: src/core/modules/NebulaMgr.cpp:1400 msgid "See Logfile for instructions." msgstr "आदेशों के लिए कार्याभिलेख देखें।" @@ -2357,7 +2357,7 @@ msgstr "की ओर" #: src/core/modules/Planet.cpp:649 src/gui/AstroCalcDialog.cpp:873 #: src/gui/AstroCalcDialog.cpp:1184 src/gui/AstroCalcDialog.cpp:1473 #: src/gui/AstroCalcDialog.cpp:1758 src/gui/AstroCalcDialog.cpp:1817 -#: src/gui/AstroCalcDialog.cpp:9261 src/gui/AstroCalcChart.cpp:427 +#: src/gui/AstroCalcDialog.cpp:9236 src/gui/AstroCalcChart.cpp:427 #: src/gui/AstroCalcChart.cpp:431 src/gui/AstroCalcChart.cpp:446 #: src/gui/AstroCalcChart.cpp:453 src/gui/AstroCalcChart.cpp:457 #: plugins/Exoplanets/src/Exoplanet.cpp:363 @@ -2370,7 +2370,7 @@ msgstr "ज्यो॰मा॰" #. TRANSLATORS: Unit of measure for distance - milliones kilometers #. TRANSLATORS: Unit of measure for distance - millions kilometers #: src/core/modules/Planet.cpp:665 src/core/modules/Planet.cpp:683 -#: src/core/modules/Comet.cpp:159 src/gui/AstroCalcDialog.cpp:9238 +#: src/core/modules/Comet.cpp:159 src/gui/AstroCalcDialog.cpp:9213 msgctxt "distance" msgid "M km" msgstr "प्र॰स॰मे॰" @@ -2435,14 +2435,14 @@ msgstr "प्रकाशित" msgid "Elong. in Ecl.Long." msgstr "दी॰क्रा॰दे॰" -#: src/core/modules/Planet.cpp:867 src/gui/AstroCalcDialog.cpp:9471 +#: src/core/modules/Planet.cpp:867 src/gui/AstroCalcDialog.cpp:9446 #: src/gui/AstroCalcChart.cpp:472 msgid "Angular distance" msgstr "अस्रीय दूरी" #. TRANSLATORS: Unit of measure for period - days #: src/core/modules/Planet.cpp:885 src/core/modules/StarWrapper.cpp:382 -#: src/gui/AstroCalcDialog.cpp:9272 +#: src/gui/AstroCalcDialog.cpp:9247 msgctxt "duration" msgid "days" msgstr "दिन" @@ -2655,8 +2655,8 @@ msgid "Orthographic" msgstr "लम्बरेखाचित्रीय" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/core/modules/SolarSystem.cpp:298 src/gui/AstroCalcDialog.cpp:6005 -#: src/gui/AstroCalcDialog.cpp:8278 src/translations.h:34 +#: src/core/modules/SolarSystem.cpp:298 src/gui/AstroCalcDialog.cpp:5993 +#: src/gui/AstroCalcDialog.cpp:8266 src/translations.h:34 msgid "Planets" msgstr "ग्रह" @@ -2791,7 +2791,7 @@ msgid "Position angle" msgstr "स्थान अस्र" #: src/core/modules/StarWrapper.cpp:417 src/core/modules/StarWrapper.cpp:422 -#: src/gui/AstroCalcDialog.cpp:6632 +#: src/gui/AstroCalcDialog.cpp:6620 msgid "Separation" msgstr "वियोग" @@ -2947,150 +2947,150 @@ msgstr "दक्षिण अयनान्त अगले वर्ष" msgid "December solstice at previous year" msgstr "दक्षिण अयनान्त पिछले वर्ष" -#: src/core/StelApp.cpp:460 +#: src/core/StelApp.cpp:461 msgid "Initializing textures..." msgstr "बुनाईयों का आरम्भीकरण" -#: src/core/StelApp.cpp:464 +#: src/core/StelApp.cpp:465 msgid "Initializing network access..." msgstr "जाल प्रवेश अधिकार का आरम्भीकरण" -#: src/core/StelApp.cpp:467 +#: src/core/StelApp.cpp:468 msgid "Initializing network disk cache..." msgstr "जाल अल्पकालिक स्मरणकोश का आरम्भीकरण" -#: src/core/StelApp.cpp:481 +#: src/core/StelApp.cpp:482 msgid "Initializing network proxy..." msgstr "जाल मध्यस्थ का आरम्भीकरण" -#: src/core/StelApp.cpp:496 +#: src/core/StelApp.cpp:497 msgid "Initializing Object Database..." msgstr "वस्तु तथ्यकोश का आरम्भीकरण" -#: src/core/StelApp.cpp:502 +#: src/core/StelApp.cpp:503 msgid "Initializing HiPS survey..." msgstr "हईपस सर्वेक्षण का आरम्भीकरण" -#: src/core/StelApp.cpp:508 +#: src/core/StelApp.cpp:509 msgid "Initializing Solar System objects..." msgstr "सौरमण्डल वस्तुओं का आरम्भीकरण" -#: src/core/StelApp.cpp:514 +#: src/core/StelApp.cpp:515 msgid "Initializing planetary nomenclature..." msgstr "ग्रह नामकरण का आरम्भीकरण" -#: src/core/StelApp.cpp:520 +#: src/core/StelApp.cpp:521 msgid "Initializing stars..." msgstr "तारों का आरम्भीकरण" -#: src/core/StelApp.cpp:525 +#: src/core/StelApp.cpp:526 msgid "Initializing core..." msgstr "अन्तःगोल का आरम्भीकरण" -#: src/core/StelApp.cpp:529 +#: src/core/StelApp.cpp:530 msgid "Initializing deep-sky objects..." msgstr "गहनाकाश वस्तुओं का आरम्भीकरण" -#: src/core/StelApp.cpp:535 +#: src/core/StelApp.cpp:536 msgid "Initializing Milky Way..." msgstr "आकाशगंगा का आरम्भीकरण" -#: src/core/StelApp.cpp:541 +#: src/core/StelApp.cpp:542 msgid "Initializing zodiacal light..." msgstr "राशिचक्र प्रकाश का आरम्भीकरण" -#: src/core/StelApp.cpp:547 +#: src/core/StelApp.cpp:548 msgid "Initializing sky image layer..." msgstr "आकाश चित्र स्तर का आरम्भीकरण" -#: src/core/StelApp.cpp:553 +#: src/core/StelApp.cpp:554 msgid "Initializing TOAST surveys..." msgstr "टओएसट सर्वेक्षणों का आरम्भीकरण" -#: src/core/StelApp.cpp:559 +#: src/core/StelApp.cpp:560 msgid "Initializing audio..." msgstr "ध्वनि का आरम्भीकरण" -#: src/core/StelApp.cpp:563 +#: src/core/StelApp.cpp:564 msgid "Initializing video..." msgstr "चलनचित्र का आरम्भीकरण" -#: src/core/StelApp.cpp:569 +#: src/core/StelApp.cpp:570 msgid "Initializing constellations..." msgstr "तारामण्डलों का आरम्भीकरण" -#: src/core/StelApp.cpp:575 +#: src/core/StelApp.cpp:576 msgid "Initializing asterisms..." msgstr "नक्षत्रों का आरम्भीकरण" -#: src/core/StelApp.cpp:581 +#: src/core/StelApp.cpp:582 msgid "Initializing landscape..." msgstr "भूदृश्य का आरम्भीकरण" -#: src/core/StelApp.cpp:586 +#: src/core/StelApp.cpp:587 msgid "Initializing grid lines..." msgstr "जालरेखाओं का आरम्भीकरण" -#: src/core/StelApp.cpp:591 +#: src/core/StelApp.cpp:592 msgid "Initializing special markers..." msgstr "विशिष्ट चिह्नों का आरम्भीकरण" -#: src/core/StelApp.cpp:597 +#: src/core/StelApp.cpp:598 msgid "Initializing sporadic meteors..." msgstr "असामयिक उल्काओं का आरम्भीकरण" -#: src/core/StelApp.cpp:603 +#: src/core/StelApp.cpp:604 msgid "Initializing user labels..." msgstr "उपयोगकर्ता नामसूचकों का आरम्भीकरण" -#: src/core/StelApp.cpp:608 +#: src/core/StelApp.cpp:609 msgid "Initializing sky cultures..." msgstr "आकाश दर्शनों का आरम्भीकरण" -#: src/core/StelApp.cpp:612 +#: src/core/StelApp.cpp:613 msgid "Initializing user markers..." msgstr "उपयोगकर्ता चिह्नों का आरम्भीकरण" -#: src/core/StelApp.cpp:618 +#: src/core/StelApp.cpp:619 msgid "Initializing custom objects..." msgstr "वैयक्तीकृत वस्तुओं का आरम्भीकरण" -#: src/core/StelApp.cpp:624 +#: src/core/StelApp.cpp:625 msgid "Initializing highlights..." msgstr "विशेषताओं का आरम्भीकरण" -#: src/core/StelApp.cpp:630 +#: src/core/StelApp.cpp:631 msgid "Initializing specific time..." msgstr "विशिष्ट समय का आरम्भीकरण" -#: src/core/StelApp.cpp:638 +#: src/core/StelApp.cpp:639 msgid "Initializing scripting..." msgstr "क्रमादेश सुविधा का आरम्भीकरण" -#: src/core/StelApp.cpp:643 +#: src/core/StelApp.cpp:644 msgid "Initializing color scheme..." msgstr "वर्ण शैली का आरम्भीकरण" -#: src/core/StelApp.cpp:655 src/ui_configurationDialog.h:1967 +#: src/core/StelApp.cpp:656 src/ui_configurationDialog.h:1967 msgid "Night mode" msgstr "रात्री अनुकूल शैली" -#: src/core/StelApp.cpp:682 +#: src/core/StelApp.cpp:683 msgid "Initializing SPOUT sender..." msgstr "सपओउट भेजनेवाला का आरम्भीकरण" -#: src/core/StelApp.cpp:692 +#: src/core/StelApp.cpp:693 msgid "Cannot create Spout sender. See log for details." msgstr "सपओउट भेजनेवाला नही बना सके। विवरण कार्याभिलेख में देखें।" -#: src/core/StelApp.cpp:719 +#: src/core/StelApp.cpp:720 msgid "Loading plugin" msgstr "उपलग्न का आरोहण" #: src/core/StelCore.cpp:293 src/gui/StelGui.cpp:225 #: src/gui/AstroCalcDialog.cpp:1738 src/gui/AstroCalcDialog.cpp:2327 #: src/gui/AstroCalcDialog.cpp:2351 src/gui/AstroCalcDialog.cpp:2964 -#: src/gui/AstroCalcDialog.cpp:2993 src/gui/AstroCalcDialog.cpp:6625 +#: src/gui/AstroCalcDialog.cpp:2993 src/gui/AstroCalcDialog.cpp:6613 #: src/ui_dateTimeDialogGui.h:373 src/ui_dateTimeDialogGui.h:376 #: plugins/TextUserInterface/src/TextUserInterface.cpp:172 msgid "Date and Time" @@ -3963,19 +3963,19 @@ msgstr "प्रतीयमान नक्षत्र समय" #. TRANSLATORS: time of transit #: src/core/StelObject.cpp:714 src/gui/AstroCalcDialog.cpp:886 -#: src/gui/AstroCalcDialog.cpp:2085 src/gui/AstroCalcDialog.cpp:8398 +#: src/gui/AstroCalcDialog.cpp:2085 src/gui/AstroCalcDialog.cpp:8373 msgctxt "celestial event; passage across a meridian" msgid "Transit" msgstr "पारगमन" #: src/core/StelObject.cpp:715 src/gui/AstroCalcDialog.cpp:2084 -#: src/gui/AstroCalcDialog.cpp:8397 +#: src/gui/AstroCalcDialog.cpp:8372 msgctxt "celestial event" msgid "Rise" msgstr "उदय" #: src/core/StelObject.cpp:716 src/gui/AstroCalcDialog.cpp:2086 -#: src/gui/AstroCalcDialog.cpp:8401 +#: src/gui/AstroCalcDialog.cpp:8376 msgctxt "celestial event" msgid "Set" msgstr "अस्त" @@ -4047,7 +4047,7 @@ msgstr "उ॰ प॰ दि॰" msgid "Parallactic Angle" msgstr "ल॰अ॰" -#: src/core/StelObject.cpp:925 src/gui/AstroCalcDialog.cpp:8496 +#: src/core/StelObject.cpp:925 src/gui/AstroCalcDialog.cpp:8471 msgid "IAU Constellation" msgstr "एै॰ए॰यु॰ तारामण्डल" @@ -6218,15 +6218,15 @@ msgstr "सिम्बाड खोज अपक्रम" msgid "Simbad Lookup" msgstr "सिम्बाड खोज" -#: src/gui/SearchDialog.cpp:1391 +#: src/gui/SearchDialog.cpp:1392 msgid "University of Strasbourg (France)" msgstr "स्ट्रास्बौर्ग विश्वविद्यालय ( फ्रान्स )" -#: src/gui/SearchDialog.cpp:1392 +#: src/gui/SearchDialog.cpp:1393 msgid "Harvard University (USA)" msgstr "हार्वर्ड विश्वविद्यालय ( यू॰एस॰ए॰ )" -#: src/gui/SearchDialog.cpp:1474 +#: src/gui/SearchDialog.cpp:1475 msgid "Paste and Search" msgstr "चिपकाएँ तथा खोजें" @@ -6309,7 +6309,7 @@ msgstr "" #. TRANSLATORS: name of object #: src/gui/AstroCalcDialog.cpp:833 src/gui/AstroCalcDialog.cpp:920 #: src/gui/AstroCalcDialog.cpp:1737 src/gui/AstroCalcDialog.cpp:2083 -#: src/gui/AstroCalcDialog.cpp:8386 src/ui_configurationDialog.h:1895 +#: src/gui/AstroCalcDialog.cpp:8361 src/ui_configurationDialog.h:1895 #: plugins/TelescopeControl/src/gui/TelescopeDialog.cpp:516 #: plugins/TelescopeControl/src/gui/StoredPointsDialog.cpp:103 #: plugins/Exoplanets/src/Exoplanet.cpp:359 @@ -6328,13 +6328,13 @@ msgid "Dec (J2000)" msgstr "झु॰ (जू॰2000)" #. TRANSLATORS: opacity -#: src/gui/AstroCalcDialog.cpp:851 src/gui/AstroCalcDialog.cpp:8395 +#: src/gui/AstroCalcDialog.cpp:851 src/gui/AstroCalcDialog.cpp:8370 msgid "Opac." msgstr "अपारदर्शिता" #. TRANSLATORS: magnitude #: src/gui/AstroCalcDialog.cpp:856 src/gui/AstroCalcDialog.cpp:1754 -#: src/gui/AstroCalcDialog.cpp:2090 src/gui/AstroCalcDialog.cpp:8390 +#: src/gui/AstroCalcDialog.cpp:2090 src/gui/AstroCalcDialog.cpp:8365 #: plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp:184 msgid "Mag." msgstr "मा॰" @@ -6346,7 +6346,7 @@ msgstr "चा॰प॰" #. TRANSLATORS: separation, arc-seconds #. TRANSLATORS: separation -#: src/gui/AstroCalcDialog.cpp:863 src/gui/AstroCalcDialog.cpp:8405 +#: src/gui/AstroCalcDialog.cpp:863 src/gui/AstroCalcDialog.cpp:8380 msgid "Sep." msgstr "चा॰वि॰" @@ -6381,7 +6381,7 @@ msgid "S.B." msgstr "ध॰च॰" #. TRANSLATORS: elevation -#: src/gui/AstroCalcDialog.cpp:888 src/gui/AstroCalcDialog.cpp:8400 +#: src/gui/AstroCalcDialog.cpp:888 src/gui/AstroCalcDialog.cpp:8375 msgid "Elev." msgstr "ऊँ॰" @@ -6402,7 +6402,7 @@ msgstr "सौरमण्डल वस्तुएँ" msgid "Solar system objects: comets" msgstr "सौरमण्डल वस्तुएँ : धूमकेतु" -#: src/gui/AstroCalcDialog.cpp:997 src/gui/AstroCalcDialog.cpp:6014 +#: src/gui/AstroCalcDialog.cpp:997 src/gui/AstroCalcDialog.cpp:6002 msgid "Solar system objects: minor bodies" msgstr "सौरमण्डल वस्तुएँ : लघु ग्रहें" @@ -6478,11 +6478,11 @@ msgstr "परिकलन किये हुए ग्रहपत्री msgid "Ephemeris" msgstr "ग्रहपत्री" -#: src/gui/AstroCalcDialog.cpp:2091 src/gui/AstroCalcDialog.cpp:6634 +#: src/gui/AstroCalcDialog.cpp:2091 src/gui/AstroCalcDialog.cpp:6622 msgid "Solar Elongation" msgstr "सौर दीर्घकरण" -#: src/gui/AstroCalcDialog.cpp:2092 src/gui/AstroCalcDialog.cpp:6635 +#: src/gui/AstroCalcDialog.cpp:2092 src/gui/AstroCalcDialog.cpp:6623 #: src/gui/AstroCalcChart.cpp:110 src/ui_astroCalcDialog.h:2398 msgid "Lunar Elongation" msgstr "चन्द्र दीर्घकरण" @@ -6703,7 +6703,7 @@ msgid "Lunar Eclipses" msgstr "चन्द्रग्रहणें" #: src/gui/AstroCalcDialog.cpp:2949 src/gui/AstroCalcDialog.cpp:2958 -#: src/gui/AstroCalcDialog.cpp:5001 src/ui_astroCalcDialog.h:2447 +#: src/gui/AstroCalcDialog.cpp:4989 src/ui_astroCalcDialog.h:2447 msgid "" "Note: Local circumstances for eclipses during thousands of years in the past" " and future are not reliable due to uncertainty in ΔT which is caused by " @@ -6823,7 +6823,7 @@ msgstr "आम्शिक ग्रहण अन्त" #. TRANSLATORS: The name of column in AstroCalc/Eclipses tool #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:3399 src/gui/AstroCalcDialog.cpp:5023 +#: src/gui/AstroCalcDialog.cpp:3399 src/gui/AstroCalcDialog.cpp:5011 msgctxt "column name" msgid "Duration" msgstr "अवधि" @@ -6860,7 +6860,7 @@ msgstr "ग्रहण आरम्भ ; प्रथम स्पर्श प msgid "Beginning of center line; central eclipse begins" msgstr "आरम्भ मध्य रेखा का ; मध्य ग्रहण आरम्भ" -#: src/gui/AstroCalcDialog.cpp:3816 src/gui/AstroCalcDialog.cpp:4288 +#: src/gui/AstroCalcDialog.cpp:3816 src/gui/AstroCalcDialog.cpp:4276 msgid "Greatest eclipse" msgstr "अधिकतम ग्रहण" @@ -6888,23 +6888,30 @@ msgstr "पथ की चौडाई पूर्णता अथवा वल msgid "Duration of total or annular phase" msgstr "अवधि पूर्ण अथवा वलय चरण का" -#: src/gui/AstroCalcDialog.cpp:3933 src/gui/AstroCalcDialog.cpp:3986 +#: src/gui/AstroCalcDialog.cpp:3929 src/gui/AstroCalcDialog.cpp:3976 msgid "Greatest eclipse’s point" msgstr "अधिकतम ग्रहण बिन्दु" -#: src/gui/AstroCalcDialog.cpp:3933 +#: src/gui/AstroCalcDialog.cpp:3929 msgid "Eclipse’s contact point" msgstr "ग्रहण का स्पर्श बिन्दु" -#: src/gui/AstroCalcDialog.cpp:3960 src/gui/AstroCalcDialog.cpp:4997 +#. TRANSLATORS: Name of landscape +#: src/gui/AstroCalcDialog.cpp:3932 src/gui/AstroCalcDialog.cpp:3978 +#: src/gui/AstroCalcChart.cpp:83 src/translations.h:461 +#: plugins/ArchaeoLines/src/ArchaeoLines.cpp:1461 +msgid "Sun" +msgstr "सूर्य" + +#: src/gui/AstroCalcDialog.cpp:3954 src/gui/AstroCalcDialog.cpp:4985 msgid "Save calculated solar eclipses as..." msgstr "परिकलन किये हुए सूर्यग्रहणों को अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:3964 src/gui/AstroCalcDialog.cpp:5001 +#: src/gui/AstroCalcDialog.cpp:3958 src/gui/AstroCalcDialog.cpp:4989 msgid "Solar Eclipses" msgstr "सूर्यग्रहणें" -#: src/gui/AstroCalcDialog.cpp:3964 src/gui/AstroCalcDialog.cpp:3973 +#: src/gui/AstroCalcDialog.cpp:3958 src/gui/AstroCalcDialog.cpp:3967 msgid "" "Note: Path of eclipses during thousands of years in the past and future are " "not reliable due to uncertainty in ΔT which is caused by fluctuations in " @@ -6914,105 +6921,105 @@ msgstr "" "विश्वस्नीय नही ∆टी में अनिष्टता के कारण जो पृथ्वी के घुमाव में चंचलता के " "कारण होता है।" -#: src/gui/AstroCalcDialog.cpp:3969 +#: src/gui/AstroCalcDialog.cpp:3963 msgid "Save solar eclipse circumstances as..." msgstr "सूर्यग्रहणों के स्थितियाँ अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:3973 +#: src/gui/AstroCalcDialog.cpp:3967 msgid "Circumstances of Solar Eclipse" msgstr "सूर्यग्रहणों के स्थितियाँ" -#: src/gui/AstroCalcDialog.cpp:4224 +#: src/gui/AstroCalcDialog.cpp:4212 msgid "Save KML as..." msgstr "के॰एम॰एल अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:4275 +#: src/gui/AstroCalcDialog.cpp:4263 msgid "Solar Eclipse" msgstr "सूर्यग्रहण" -#: src/gui/AstroCalcDialog.cpp:4275 +#: src/gui/AstroCalcDialog.cpp:4263 msgid "Created by Stellarium" msgstr "स्टेल्लारियम द्वारा बनाया गया" -#: src/gui/AstroCalcDialog.cpp:4296 +#: src/gui/AstroCalcDialog.cpp:4284 msgid "First contact with Earth" msgstr "पृथ्वी के साथ प्रथम स्पर्श" -#: src/gui/AstroCalcDialog.cpp:4304 +#: src/gui/AstroCalcDialog.cpp:4292 msgid "Last contact with Earth" msgstr "पृथ्वी के साथ अन्तिम स्पर्श" -#: src/gui/AstroCalcDialog.cpp:4513 +#: src/gui/AstroCalcDialog.cpp:4501 msgid "Central eclipse begins" msgstr "मध्य ग्रहण आरम्भ" -#: src/gui/AstroCalcDialog.cpp:4538 +#: src/gui/AstroCalcDialog.cpp:4526 msgid "Central eclipse ends" msgstr "मध्य ग्रहण अन्त" -#: src/gui/AstroCalcDialog.cpp:5007 +#: src/gui/AstroCalcDialog.cpp:4995 msgctxt "column name" msgid "Date of mid-transit" msgstr "पारगमन मध्य का दिनांक" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5009 +#: src/gui/AstroCalcDialog.cpp:4997 msgid "Planet" msgstr "ग्रह" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5011 +#: src/gui/AstroCalcDialog.cpp:4999 msgctxt "column name" msgid "Exterior Ingress" msgstr "बाहरी प्रवेश" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5013 +#: src/gui/AstroCalcDialog.cpp:5001 msgctxt "column name" msgid "Interior Ingress" msgstr "आन्तरिक प्रवेश" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5015 +#: src/gui/AstroCalcDialog.cpp:5003 msgctxt "column name" msgid "Mid-transit" msgstr "पारगमन मध्य" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5017 +#: src/gui/AstroCalcDialog.cpp:5005 msgctxt "column name" msgid "Angular Distance" msgstr "अस्रीय दूरी" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5019 +#: src/gui/AstroCalcDialog.cpp:5007 msgctxt "column name" msgid "Interior Egress" msgstr "आन्तरिक निकास" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5021 +#: src/gui/AstroCalcDialog.cpp:5009 msgctxt "column name" msgid "Exterior Egress" msgstr "बाहरी निकास" #. TRANSLATORS: The name of column in AstroCalc/Eclipses/Transits tool -#: src/gui/AstroCalcDialog.cpp:5025 +#: src/gui/AstroCalcDialog.cpp:5013 msgctxt "column name" msgid "Observable Duration" msgstr "अवलोकनीय अवधि" -#: src/gui/AstroCalcDialog.cpp:5241 +#: src/gui/AstroCalcDialog.cpp:5229 #: plugins/ArchaeoLines/src/ArchaeoLines.cpp:1470 msgid "Mercury" msgstr "बुध" -#: src/gui/AstroCalcDialog.cpp:5246 +#: src/gui/AstroCalcDialog.cpp:5234 #: plugins/ArchaeoLines/src/ArchaeoLines.cpp:1473 msgid "Venus" msgstr "शुक्र" -#: src/gui/AstroCalcDialog.cpp:5467 +#: src/gui/AstroCalcDialog.cpp:5455 msgid "" "The time of first contact, the instant when the planet's disk is externally " "tangent to the Sun (transit begins)" @@ -7020,7 +7027,7 @@ msgstr "" "प्रथम स्पर्श का समय। वह क्षण जब ग्रह का चक्र सूर्य के साथ बाहरी रूप से " "स्पर्शरेखा बनाता है ( पारगमन आरम्भ ) ।" -#: src/gui/AstroCalcDialog.cpp:5482 +#: src/gui/AstroCalcDialog.cpp:5470 msgid "" "The time of second contact, the entire disk of the planet is internally " "tangent to the Sun" @@ -7028,15 +7035,15 @@ msgstr "" "द्वितीय स्पर्श का समय। ग्रह का पूरा चक्र सूर्य के साथ आन्तरिक रूप से " "स्पर्शरेखा बनाता है।" -#: src/gui/AstroCalcDialog.cpp:5500 +#: src/gui/AstroCalcDialog.cpp:5488 msgid "The time of minimum angular distance of planet to Sun's center" msgstr "न्यूनतम अस्रीय दूरी ग्रह से सूर्य के मध्य तक का समय" -#: src/gui/AstroCalcDialog.cpp:5517 +#: src/gui/AstroCalcDialog.cpp:5505 msgid "Minimum angular distance of planet to Sun's center" msgstr "न्यूनतम अस्रीय दूरी ग्रह से सूर्य के मध्य तक" -#: src/gui/AstroCalcDialog.cpp:5532 +#: src/gui/AstroCalcDialog.cpp:5520 msgid "" "The time of third contact, the planet reaches the opposite limb and is once " "again internally tangent to the Sun" @@ -7044,7 +7051,7 @@ msgstr "" "तृतीय स्पर्श का समय। ग्रह पहुंचता है विपक्षीय अंग तथा एक बार फिर सूर्य के " "साथ आन्तरिक रूप से स्पर्शरेखा बनाता है" -#: src/gui/AstroCalcDialog.cpp:5550 +#: src/gui/AstroCalcDialog.cpp:5538 msgid "" "The time of fourth contact, the planet's disk is externally tangent to the " "Sun (transit ends)" @@ -7052,23 +7059,23 @@ msgstr "" "चतुर्थ स्पर्श का समय। ग्रह का चक्र सूर्य के साथ बाहरी रूप से स्पर्शरेखा " "बनाता है ( पारगमन अन्त )" -#: src/gui/AstroCalcDialog.cpp:5561 +#: src/gui/AstroCalcDialog.cpp:5549 msgid "Total duration of transit" msgstr "पारगमन का कुल अवधि" -#: src/gui/AstroCalcDialog.cpp:5612 +#: src/gui/AstroCalcDialog.cpp:5600 msgid "Observable duration of transit" msgstr "पारगमन का अवलोकनीय अवधि" -#: src/gui/AstroCalcDialog.cpp:5691 +#: src/gui/AstroCalcDialog.cpp:5679 msgid "Save calculated transits as..." msgstr "परिकलन किये हुए पारगमनों को अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:5695 +#: src/gui/AstroCalcDialog.cpp:5683 msgid "Transits across the Sun" msgstr "सूर्य पर पारगमनें" -#: src/gui/AstroCalcDialog.cpp:5695 src/ui_astroCalcDialog.h:2455 +#: src/gui/AstroCalcDialog.cpp:5683 src/ui_astroCalcDialog.h:2455 msgid "" "Notes: Time in parentheses means the contact is invisible at current " "location. Transit times during thousands of years in the past and future are" @@ -7079,363 +7086,363 @@ msgstr "" "पारगमनों के समय सहस्र वर्षों के अन्तर्गत अतीत तथा भविष्य में विश्वस्नीय नही " "∆टी में अनिष्टता के कारण जो पृथ्वी के घुमाव में चंचलता के कारण होता है।" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "1 minute" msgstr "1 मिनट" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "10 minutes" msgstr "10 मिनट" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "30 minutes" msgstr "30 मिनट" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "1 hour" msgstr "1 घण्टा" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "6 hours" msgstr "6 घण्टे" -#: src/gui/AstroCalcDialog.cpp:5860 +#: src/gui/AstroCalcDialog.cpp:5848 msgid "12 hours" msgstr "12 घण्टे" -#: src/gui/AstroCalcDialog.cpp:5861 +#: src/gui/AstroCalcDialog.cpp:5849 msgid "1 solar day" msgstr "1 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5861 +#: src/gui/AstroCalcDialog.cpp:5849 msgid "5 solar days" msgstr "5 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5861 +#: src/gui/AstroCalcDialog.cpp:5849 msgid "10 solar days" msgstr "10 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5861 +#: src/gui/AstroCalcDialog.cpp:5849 msgid "15 solar days" msgstr "15 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5861 +#: src/gui/AstroCalcDialog.cpp:5849 msgid "30 solar days" msgstr "30 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5862 +#: src/gui/AstroCalcDialog.cpp:5850 msgid "60 solar days" msgstr "60 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5862 +#: src/gui/AstroCalcDialog.cpp:5850 msgid "100 solar days" msgstr "100 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5862 +#: src/gui/AstroCalcDialog.cpp:5850 msgid "500 solar days" msgstr "500 सौर दिन" -#: src/gui/AstroCalcDialog.cpp:5862 +#: src/gui/AstroCalcDialog.cpp:5850 msgid "1 sidereal day" msgstr "1 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5862 +#: src/gui/AstroCalcDialog.cpp:5850 msgid "5 sidereal days" msgstr "5 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5863 +#: src/gui/AstroCalcDialog.cpp:5851 msgid "10 sidereal days" msgstr "10 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5863 +#: src/gui/AstroCalcDialog.cpp:5851 msgid "15 sidereal days" msgstr "15 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5863 +#: src/gui/AstroCalcDialog.cpp:5851 msgid "30 sidereal days" msgstr "30 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5863 +#: src/gui/AstroCalcDialog.cpp:5851 msgid "60 sidereal days" msgstr "60 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5863 +#: src/gui/AstroCalcDialog.cpp:5851 msgid "100 sidereal days" msgstr "100 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5864 +#: src/gui/AstroCalcDialog.cpp:5852 msgid "500 sidereal days" msgstr "500 नक्षत्र दिन" -#: src/gui/AstroCalcDialog.cpp:5864 +#: src/gui/AstroCalcDialog.cpp:5852 msgid "1 sidereal year" msgstr "1 नक्षत्र वर्ष" -#: src/gui/AstroCalcDialog.cpp:5864 +#: src/gui/AstroCalcDialog.cpp:5852 msgid "1 Julian day" msgstr "1 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5864 +#: src/gui/AstroCalcDialog.cpp:5852 msgid "5 Julian days" msgstr "5 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5864 +#: src/gui/AstroCalcDialog.cpp:5852 msgid "10 Julian days" msgstr "10 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5865 +#: src/gui/AstroCalcDialog.cpp:5853 msgid "15 Julian days" msgstr "15 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5865 +#: src/gui/AstroCalcDialog.cpp:5853 msgid "30 Julian days" msgstr "30 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5865 +#: src/gui/AstroCalcDialog.cpp:5853 msgid "60 Julian days" msgstr "60 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5865 +#: src/gui/AstroCalcDialog.cpp:5853 msgid "100 Julian days" msgstr "100 जूलियन दिन" -#: src/gui/AstroCalcDialog.cpp:5865 +#: src/gui/AstroCalcDialog.cpp:5853 msgid "1 Julian year" msgstr "1 जूलियन वर्ष" -#: src/gui/AstroCalcDialog.cpp:5866 +#: src/gui/AstroCalcDialog.cpp:5854 msgid "1 Gaussian year" msgstr "1 गौस्सियन वर्ष" -#: src/gui/AstroCalcDialog.cpp:5866 +#: src/gui/AstroCalcDialog.cpp:5854 msgid "1 synodic month" msgstr "1 चन्द्रकला मास" -#: src/gui/AstroCalcDialog.cpp:5866 +#: src/gui/AstroCalcDialog.cpp:5854 msgid "1 draconic month" msgstr "1 राहु मास" -#: src/gui/AstroCalcDialog.cpp:5866 +#: src/gui/AstroCalcDialog.cpp:5854 msgid "1 mean tropical month" msgstr "1 मध्यमान अयन मास" -#: src/gui/AstroCalcDialog.cpp:5867 +#: src/gui/AstroCalcDialog.cpp:5855 msgid "1 anomalistic month" msgstr "1 विषम मास" -#: src/gui/AstroCalcDialog.cpp:5867 +#: src/gui/AstroCalcDialog.cpp:5855 msgid "1 anomalistic year" msgstr "1 विषम वर्ष" -#: src/gui/AstroCalcDialog.cpp:5867 +#: src/gui/AstroCalcDialog.cpp:5855 msgid "1 saros" msgstr "1 ग्रहणचक्रावधि" -#: src/gui/AstroCalcDialog.cpp:5867 +#: src/gui/AstroCalcDialog.cpp:5855 msgid "custom interval" msgstr "वैयक्तीकृत अवधि" -#: src/gui/AstroCalcDialog.cpp:6005 +#: src/gui/AstroCalcDialog.cpp:5993 msgid "Latest selected object" msgstr "नवीनतम चयनित वस्तु" -#: src/gui/AstroCalcDialog.cpp:6005 +#: src/gui/AstroCalcDialog.cpp:5993 msgid "Solar system" msgstr "सौरमण्डल" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6005 src/gui/AstroCalcDialog.cpp:8284 +#: src/gui/AstroCalcDialog.cpp:5993 src/gui/AstroCalcDialog.cpp:8268 #: src/translations.h:38 #: plugins/SolarSystemEditor/src/ui_mpcImportWindow.h:515 msgid "Asteroids" msgstr "ग्रहखण्ड" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6006 src/gui/AstroCalcDialog.cpp:8286 +#: src/gui/AstroCalcDialog.cpp:5994 src/gui/AstroCalcDialog.cpp:8268 #: src/translations.h:42 msgid "Plutinos" msgstr "प्लूटोमय" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6006 src/gui/AstroCalcDialog.cpp:8285 +#: src/gui/AstroCalcDialog.cpp:5994 src/gui/AstroCalcDialog.cpp:8268 #: src/translations.h:36 #: plugins/SolarSystemEditor/src/ui_mpcImportWindow.h:516 msgid "Comets" msgstr "धूमकेतु" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6006 src/gui/AstroCalcDialog.cpp:8287 +#: src/gui/AstroCalcDialog.cpp:5994 src/gui/AstroCalcDialog.cpp:8268 #: src/translations.h:44 msgid "Dwarf planets" msgstr "वामनग्रह" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6006 src/gui/AstroCalcDialog.cpp:8288 +#: src/gui/AstroCalcDialog.cpp:5994 src/gui/AstroCalcDialog.cpp:8269 #: src/translations.h:46 msgid "Cubewanos" msgstr "कुइपर क्षेत्र ग्रहखण्ड" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6007 src/gui/AstroCalcDialog.cpp:8289 +#: src/gui/AstroCalcDialog.cpp:5995 src/gui/AstroCalcDialog.cpp:8269 #: src/translations.h:48 msgid "Scattered disc objects" msgstr "विकीर्ण चक्र वस्तु" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6007 src/gui/AstroCalcDialog.cpp:8290 +#: src/gui/AstroCalcDialog.cpp:5995 src/gui/AstroCalcDialog.cpp:8269 #: src/translations.h:50 msgid "Oort cloud objects" msgstr "ऊर्ट मेघ वस्तु" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6007 src/gui/AstroCalcDialog.cpp:8291 +#: src/gui/AstroCalcDialog.cpp:5995 src/gui/AstroCalcDialog.cpp:8270 #: src/translations.h:52 msgid "Sednoids" msgstr "सेडनामय ग्रहखण्ड" -#: src/gui/AstroCalcDialog.cpp:6008 +#: src/gui/AstroCalcDialog.cpp:5996 #, qt-format msgid "Bright stars (<%1 mag)" msgstr "उज्ज्वल तारें ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6008 +#: src/gui/AstroCalcDialog.cpp:5996 #, qt-format msgid "Bright double stars (<%1 mag)" msgstr "उज्ज्वल द्वितारें ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6009 +#: src/gui/AstroCalcDialog.cpp:5997 #, qt-format msgid "Bright variable stars (<%1 mag)" msgstr "उज्ज्वल विकारी तारें ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6009 +#: src/gui/AstroCalcDialog.cpp:5997 #, qt-format msgid "Bright star clusters (<%1 mag)" msgstr "उज्ज्वल तारासंग्रह ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6010 +#: src/gui/AstroCalcDialog.cpp:5998 #, qt-format msgid "Planetary nebulae (<%1 mag)" msgstr "ग्रहमय अन्तरिक्षमेघ ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6010 +#: src/gui/AstroCalcDialog.cpp:5998 #, qt-format msgid "Bright nebulae (<%1 mag)" msgstr "उज्ज्वल अन्तरिक्षमेघ ( <%1 मात्रा )" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6010 src/gui/AstroCalcDialog.cpp:8281 +#: src/gui/AstroCalcDialog.cpp:5998 src/gui/AstroCalcDialog.cpp:8267 #: src/translations.h:289 src/ui_viewDialog.h:3829 #: src/ui_dsoColorsDialog.h:643 msgid "Dark nebulae" msgstr "अन्धकारमय अम्तरिक्षमेघ" -#: src/gui/AstroCalcDialog.cpp:6011 +#: src/gui/AstroCalcDialog.cpp:5999 #, qt-format msgid "Bright galaxies (<%1 mag)" msgstr "उज्ज्वल तारासंगम ( <%1 मात्रा )" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6011 src/gui/AstroCalcDialog.cpp:8296 +#: src/gui/AstroCalcDialog.cpp:5999 src/gui/AstroCalcDialog.cpp:8272 #: src/translations.h:339 src/ui_dsoColorsDialog.h:676 msgid "Symbiotic stars" msgstr "सहजीवी तारें" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6011 src/gui/AstroCalcDialog.cpp:8297 +#: src/gui/AstroCalcDialog.cpp:5999 src/gui/AstroCalcDialog.cpp:8272 #: src/translations.h:341 src/ui_dsoColorsDialog.h:655 msgid "Emission-line stars" msgstr "उत्सर्जन रेखा तारें" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6012 src/gui/AstroCalcDialog.cpp:8302 +#: src/gui/AstroCalcDialog.cpp:6000 src/gui/AstroCalcDialog.cpp:8274 #: src/translations.h:54 msgid "Interstellar objects" msgstr "तारान्तर वस्तुएँ" -#: src/gui/AstroCalcDialog.cpp:6012 +#: src/gui/AstroCalcDialog.cpp:6000 msgid "Planets and Sun" msgstr "ग्रहें तथा सूर्य" -#: src/gui/AstroCalcDialog.cpp:6012 +#: src/gui/AstroCalcDialog.cpp:6000 msgid "Sun, planets and moons of observer location" msgstr "सूर्य ग्रहें तथा उपग्रहें अवलोकनकर्ता के स्थान के" -#: src/gui/AstroCalcDialog.cpp:6013 +#: src/gui/AstroCalcDialog.cpp:6001 #, qt-format msgid "Bright Solar system objects (<%1 mag)" msgstr "उज्ज्वल सौरमण्डल वस्तुएँ ( <%1 मात्रा )" -#: src/gui/AstroCalcDialog.cpp:6014 +#: src/gui/AstroCalcDialog.cpp:6002 msgid "Moons of first body" msgstr "प्रथम ग्रह के उपग्रह" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6015 src/gui/AstroCalcDialog.cpp:8330 +#: src/gui/AstroCalcDialog.cpp:6003 src/gui/AstroCalcDialog.cpp:8279 #: src/translations.h:426 msgid "Bright carbon stars" msgstr "उज्ज्वल अंगारक तारें" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:6015 src/gui/AstroCalcDialog.cpp:8331 +#: src/gui/AstroCalcDialog.cpp:6003 src/gui/AstroCalcDialog.cpp:8279 #: src/translations.h:428 msgid "Bright barium stars" msgstr "उज्ज्वल छप्पनवाँ धातुतत्त्व तारें" -#: src/gui/AstroCalcDialog.cpp:6194 +#: src/gui/AstroCalcDialog.cpp:6182 msgid "Please select object to plot its graph 'Altitude vs. Time'." msgstr "कृपया वस्तु चुनें उसका रेखाचित्र ' ऊँचाई प्र॰ समय ' बनाने के लिए।" -#: src/gui/AstroCalcDialog.cpp:6421 src/gui/AstroCalcDialog.cpp:6435 +#: src/gui/AstroCalcDialog.cpp:6409 src/gui/AstroCalcDialog.cpp:6423 msgid "Magnitude vs. Time" msgstr "मात्रा प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6422 src/gui/AstroCalcDialog.cpp:6436 +#: src/gui/AstroCalcDialog.cpp:6410 src/gui/AstroCalcDialog.cpp:6424 msgid "Phase vs. Time" msgstr "चरण प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6423 src/gui/AstroCalcDialog.cpp:6437 +#: src/gui/AstroCalcDialog.cpp:6411 src/gui/AstroCalcDialog.cpp:6425 msgid "Distance vs. Time" msgstr "दूरी प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6424 src/gui/AstroCalcDialog.cpp:6438 +#: src/gui/AstroCalcDialog.cpp:6412 src/gui/AstroCalcDialog.cpp:6426 msgid "Elongation vs. Time" msgstr "दीर्घकरण प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6425 src/gui/AstroCalcDialog.cpp:6439 +#: src/gui/AstroCalcDialog.cpp:6413 src/gui/AstroCalcDialog.cpp:6427 msgid "Angular size vs. Time" msgstr "अस्रीय आकार प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6426 src/gui/AstroCalcDialog.cpp:6440 +#: src/gui/AstroCalcDialog.cpp:6414 src/gui/AstroCalcDialog.cpp:6428 msgid "Phase angle vs. Time" msgstr "चरण अस्र प्र॰ समय" #. TRANSLATORS: The phrase "Heliocentric distance" may be long in some #. languages and you can short it to use in the drop-down list. -#: src/gui/AstroCalcDialog.cpp:6428 src/gui/AstroCalcDialog.cpp:6442 +#: src/gui/AstroCalcDialog.cpp:6416 src/gui/AstroCalcDialog.cpp:6430 msgid "Heliocentric distance vs. Time" msgstr "सूर्यमध्य दूरी प्र॰ समय" #. TRANSLATORS: The phrase "Transit altitude" may be long in some languages #. and you can short it to use in the drop-down list. -#: src/gui/AstroCalcDialog.cpp:6430 src/gui/AstroCalcDialog.cpp:6444 +#: src/gui/AstroCalcDialog.cpp:6418 src/gui/AstroCalcDialog.cpp:6432 msgid "Transit altitude vs. Time" msgstr "पारगमन ऊँचाई प्र॰ समय" #. TRANSLATORS: The phrase "Right ascension" may be long in some languages and #. you can short it to use in the drop-down list. -#: src/gui/AstroCalcDialog.cpp:6432 src/gui/AstroCalcDialog.cpp:6446 +#: src/gui/AstroCalcDialog.cpp:6420 src/gui/AstroCalcDialog.cpp:6434 msgid "Right ascension vs. Time" msgstr "दाएँ आरोहण प्र॰ समय" -#: src/gui/AstroCalcDialog.cpp:6433 src/gui/AstroCalcDialog.cpp:6447 +#: src/gui/AstroCalcDialog.cpp:6421 src/gui/AstroCalcDialog.cpp:6435 msgid "Declination vs. Time" msgstr "झुकाव प्र॰ समय" #. TRANSLATORS: hours. #. TRANSLATORS: duration #. TRANSLATORS: hours. -#: src/gui/AstroCalcDialog.cpp:6489 src/gui/AstroCalcChart.cpp:442 +#: src/gui/AstroCalcDialog.cpp:6477 src/gui/AstroCalcChart.cpp:442 #: src/gui/AstroCalcChart.cpp:468 #: plugins/Satellites/src/gui/SatellitesDialog.cpp:883 #: plugins/Satellites/src/gui/SatellitesDialog.cpp:1158 @@ -7448,7 +7455,7 @@ msgctxt "time" msgid "h" msgstr "घ॰" -#: src/gui/AstroCalcDialog.cpp:6585 +#: src/gui/AstroCalcDialog.cpp:6573 msgid "" "Please select object to plot its 'Monthly Elevation' graph for the current " "year at selected time." @@ -7456,384 +7463,384 @@ msgstr "" "कृपया वस्तु चुनें उसका रेखाचित्र ' मासिक ऊँचाई ' बनाने के लिए वर्तमान वर्ष " "के चयनित समय के लिए।" -#: src/gui/AstroCalcDialog.cpp:6624 +#: src/gui/AstroCalcDialog.cpp:6612 msgid "Phenomenon" msgstr "घटना" -#: src/gui/AstroCalcDialog.cpp:6626 +#: src/gui/AstroCalcDialog.cpp:6614 msgid "Object 1" msgstr "वस्तु 1" #. TRANSLATORS: Magnitude of object 1 -#: src/gui/AstroCalcDialog.cpp:6628 +#: src/gui/AstroCalcDialog.cpp:6616 msgid "Mag. 1" msgstr "मा॰ 1" -#: src/gui/AstroCalcDialog.cpp:6629 +#: src/gui/AstroCalcDialog.cpp:6617 msgid "Object 2" msgstr "वस्तु 2" #. TRANSLATORS: Magnitude of object 2 -#: src/gui/AstroCalcDialog.cpp:6631 +#: src/gui/AstroCalcDialog.cpp:6619 msgid "Mag. 2" msgstr "मा॰ 2" -#: src/gui/AstroCalcDialog.cpp:6633 +#: src/gui/AstroCalcDialog.cpp:6621 msgid "Elevation" msgstr "ऊँचाई" -#: src/gui/AstroCalcDialog.cpp:6662 src/gui/AstroCalcDialog.cpp:7054 -#: src/gui/AstroCalcDialog.cpp:7312 +#: src/gui/AstroCalcDialog.cpp:6650 src/gui/AstroCalcDialog.cpp:7042 +#: src/gui/AstroCalcDialog.cpp:7300 msgid "Opposition" msgstr "विपक्षता" -#: src/gui/AstroCalcDialog.cpp:6987 +#: src/gui/AstroCalcDialog.cpp:6975 msgid "Save calculated phenomena as..." msgstr "परिकलन किये हुए घटनाओं को अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:6991 src/ui_astroCalcDialog.h:2192 +#: src/gui/AstroCalcDialog.cpp:6979 src/ui_astroCalcDialog.h:2192 msgid "Phenomena" msgstr "घटना" -#: src/gui/AstroCalcDialog.cpp:7006 +#: src/gui/AstroCalcDialog.cpp:6994 msgid "Magnitude of first object" msgstr "प्रथम वस्तु की मात्रा" -#: src/gui/AstroCalcDialog.cpp:7009 +#: src/gui/AstroCalcDialog.cpp:6997 msgid "Magnitude of second object" msgstr "द्वितीय वस्तु की मात्रा" -#: src/gui/AstroCalcDialog.cpp:7015 +#: src/gui/AstroCalcDialog.cpp:7003 msgid "Elevation of first object at moment of phenomena" msgstr "घटना के समय प्रथम वस्तु की ऊँचाई" -#: src/gui/AstroCalcDialog.cpp:7017 src/gui/AstroCalcDialog.cpp:7170 +#: src/gui/AstroCalcDialog.cpp:7005 src/gui/AstroCalcDialog.cpp:7158 msgid "Angular distance from the Sun" msgstr "अस्रीय दूरी सूर्र से" -#: src/gui/AstroCalcDialog.cpp:7020 src/gui/AstroCalcDialog.cpp:7171 +#: src/gui/AstroCalcDialog.cpp:7008 src/gui/AstroCalcDialog.cpp:7159 msgid "Angular distance from the Moon" msgstr "अस्रीय दूरी चन्द्रमा से" -#: src/gui/AstroCalcDialog.cpp:7038 src/gui/AstroCalcDialog.cpp:7223 -#: src/gui/AstroCalcDialog.cpp:7303 +#: src/gui/AstroCalcDialog.cpp:7026 src/gui/AstroCalcDialog.cpp:7211 +#: src/gui/AstroCalcDialog.cpp:7291 msgid "Conjunction" msgstr "संयोग" -#: src/gui/AstroCalcDialog.cpp:7047 +#: src/gui/AstroCalcDialog.cpp:7035 msgid "Shadow transit" msgstr "छाया पारगमन" -#: src/gui/AstroCalcDialog.cpp:7050 src/gui/AstroCalcDialog.cpp:7057 -#: src/gui/AstroCalcDialog.cpp:7113 src/gui/AstroCalcDialog.cpp:7119 -#: src/gui/AstroCalcDialog.cpp:7315 src/gui/AstroCalcDialog.cpp:7331 -#: src/gui/AstroCalcDialog.cpp:7337 +#: src/gui/AstroCalcDialog.cpp:7038 src/gui/AstroCalcDialog.cpp:7045 +#: src/gui/AstroCalcDialog.cpp:7101 src/gui/AstroCalcDialog.cpp:7107 +#: src/gui/AstroCalcDialog.cpp:7303 src/gui/AstroCalcDialog.cpp:7319 +#: src/gui/AstroCalcDialog.cpp:7325 msgid "Eclipse" msgstr "ग्रहण" -#: src/gui/AstroCalcDialog.cpp:7066 +#: src/gui/AstroCalcDialog.cpp:7054 msgid "Greatest eastern elongation" msgstr "अधिकतम पूर्वदिशा दीर्घकरण" -#: src/gui/AstroCalcDialog.cpp:7069 +#: src/gui/AstroCalcDialog.cpp:7057 msgid "Greatest western elongation" msgstr "अधिकतम पश्चिमी दीर्घकरण" -#: src/gui/AstroCalcDialog.cpp:7076 +#: src/gui/AstroCalcDialog.cpp:7064 msgid "Eastern quadrature" msgstr "पूर्वी वर्गाकार" -#: src/gui/AstroCalcDialog.cpp:7079 +#: src/gui/AstroCalcDialog.cpp:7067 msgid "Western quadrature" msgstr "पश्चिमी वर्गाकार" #. TRANSLATORS: The planet are stand still in the equatorial coordinates -#: src/gui/AstroCalcDialog.cpp:7086 +#: src/gui/AstroCalcDialog.cpp:7074 msgid "Stationary (begin retrograde motion)" msgstr "स्थिर ( पीछे चलना आरम्भ करें )" #. TRANSLATORS: The planet are stand still in the equatorial coordinates -#: src/gui/AstroCalcDialog.cpp:7091 +#: src/gui/AstroCalcDialog.cpp:7079 msgid "Stationary (begin prograde motion)" msgstr "स्थिर ( आगे चलना आरम्भ करें )" -#: src/gui/AstroCalcDialog.cpp:7097 +#: src/gui/AstroCalcDialog.cpp:7085 msgid "Perihelion" msgstr "सूर्य के निकटतम" -#: src/gui/AstroCalcDialog.cpp:7099 +#: src/gui/AstroCalcDialog.cpp:7087 msgid "Aphelion" msgstr "सूर्य से अधिकतम दूरी" -#: src/gui/AstroCalcDialog.cpp:7106 src/gui/AstroCalcDialog.cpp:7324 +#: src/gui/AstroCalcDialog.cpp:7094 src/gui/AstroCalcDialog.cpp:7312 msgctxt "passage of the celestial body" msgid "Transit" msgstr "पारगमन" -#: src/gui/AstroCalcDialog.cpp:7109 src/gui/AstroCalcDialog.cpp:7228 -#: src/gui/AstroCalcDialog.cpp:7327 +#: src/gui/AstroCalcDialog.cpp:7097 src/gui/AstroCalcDialog.cpp:7216 +#: src/gui/AstroCalcDialog.cpp:7315 msgid "Occultation" msgstr "प्रच्छादन" -#: src/gui/AstroCalcDialog.cpp:7129 src/gui/AstroCalcDialog.cpp:7131 -#: src/gui/AstroCalcDialog.cpp:7350 src/gui/AstroCalcDialog.cpp:7352 +#: src/gui/AstroCalcDialog.cpp:7117 src/gui/AstroCalcDialog.cpp:7119 +#: src/gui/AstroCalcDialog.cpp:7338 src/gui/AstroCalcDialog.cpp:7340 msgid "Superior conjunction" msgstr "विपक्षीय संयोग" -#: src/gui/AstroCalcDialog.cpp:7129 src/gui/AstroCalcDialog.cpp:7131 -#: src/gui/AstroCalcDialog.cpp:7350 src/gui/AstroCalcDialog.cpp:7352 +#: src/gui/AstroCalcDialog.cpp:7117 src/gui/AstroCalcDialog.cpp:7119 +#: src/gui/AstroCalcDialog.cpp:7338 src/gui/AstroCalcDialog.cpp:7340 msgid "Inferior conjunction" msgstr "समपक्षीय संयोग" -#: src/gui/AstroCalcDialog.cpp:7174 +#: src/gui/AstroCalcDialog.cpp:7162 msgid "Angular distance from the Sun for second object" msgstr "अस्रीय दूरी सूर्य से द्वितीय वस्तु के लिए" -#: src/gui/AstroCalcDialog.cpp:7175 +#: src/gui/AstroCalcDialog.cpp:7163 msgid "Angular distance from the Moon for second object" msgstr "अस्रीय दूरी चन्द्रमा से द्वितीय वस्तु के लिए" -#: src/gui/AstroCalcDialog.cpp:8194 src/gui/AstroCalcDialog.cpp:8199 +#: src/gui/AstroCalcDialog.cpp:8182 src/gui/AstroCalcDialog.cpp:8187 #: src/ui_astroCalcDialog.h:2460 msgid "Table of solar eclipses" msgstr "सूर्यग्रहणों का फलक" -#: src/gui/AstroCalcDialog.cpp:8195 +#: src/gui/AstroCalcDialog.cpp:8183 msgid "Table of solar eclipses visible in current location" msgstr "वर्तमान स्थान से दृश्यमान सूर्यग्रहणों का फलक" -#: src/gui/AstroCalcDialog.cpp:8196 +#: src/gui/AstroCalcDialog.cpp:8184 msgid "Table of lunar eclipses" msgstr "चन्द्रग्रहणों का फलक" -#: src/gui/AstroCalcDialog.cpp:8197 +#: src/gui/AstroCalcDialog.cpp:8185 msgid "Transits of Mercury and Venus across the Sun" msgstr "बुध तथा शुक्र के पारगमन सूर्य पर" -#: src/gui/AstroCalcDialog.cpp:8256 +#: src/gui/AstroCalcDialog.cpp:8244 msgctxt "Celestial object is observed..." msgid "In the Evening" msgstr "सायंकाल में" -#: src/gui/AstroCalcDialog.cpp:8257 +#: src/gui/AstroCalcDialog.cpp:8245 msgctxt "Celestial object is observed..." msgid "In the Morning" msgstr "प्रातःकाल में" -#: src/gui/AstroCalcDialog.cpp:8258 +#: src/gui/AstroCalcDialog.cpp:8246 msgctxt "Celestial object is observed..." msgid "Around Midnight" msgstr "मध्यरात लगभग" -#: src/gui/AstroCalcDialog.cpp:8259 +#: src/gui/AstroCalcDialog.cpp:8247 msgctxt "Celestial object is observed..." msgid "In Any Time of the Night" msgstr "रात में किसी भी समय" -#: src/gui/AstroCalcDialog.cpp:8279 +#: src/gui/AstroCalcDialog.cpp:8266 msgid "Bright stars" msgstr "उज्ज्वल तारें" -#: src/gui/AstroCalcDialog.cpp:8280 src/ui_viewDialog.h:3828 +#: src/gui/AstroCalcDialog.cpp:8266 src/ui_viewDialog.h:3828 msgid "Bright nebulae" msgstr "उज्ज्वल अन्तरिक्षमेघ" -#: src/gui/AstroCalcDialog.cpp:8282 src/ui_viewDialog.h:3832 +#: src/gui/AstroCalcDialog.cpp:8267 src/ui_viewDialog.h:3832 #: src/ui_dsoColorsDialog.h:583 msgid "Galaxies" msgstr "तारासंगम" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8283 src/translations.h:281 +#: src/gui/AstroCalcDialog.cpp:8267 src/translations.h:281 #: src/ui_viewDialog.h:3835 src/ui_dsoColorsDialog.h:587 msgid "Open star clusters" msgstr "खुला तारा संग्रह" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8292 src/translations.h:287 +#: src/gui/AstroCalcDialog.cpp:8270 src/translations.h:287 #: src/ui_viewDialog.h:3827 src/ui_dsoColorsDialog.h:576 msgid "Planetary nebulae" msgstr "ग्रहमय अन्तरिक्षमेघ" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8293 src/translations.h:416 +#: src/gui/AstroCalcDialog.cpp:8270 src/translations.h:416 msgid "Bright double stars" msgstr "उज्ज्वल द्वितारें" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8294 src/translations.h:418 +#: src/gui/AstroCalcDialog.cpp:8271 src/translations.h:418 msgid "Bright variable stars" msgstr "उज्ज्वल विकारी तारें" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8295 src/translations.h:420 +#: src/gui/AstroCalcDialog.cpp:8271 src/translations.h:420 msgid "Bright stars with high proper motion" msgstr "उज्ज्वल तारें उच्च निज गति युक्त" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8298 src/translations.h:317 +#: src/gui/AstroCalcDialog.cpp:8272 src/translations.h:317 #: src/ui_dsoColorsDialog.h:624 msgid "Supernova candidates" msgstr "सम्भाव्य महानवतारा " #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8299 src/translations.h:319 +#: src/gui/AstroCalcDialog.cpp:8273 src/translations.h:319 #: src/ui_dsoColorsDialog.h:662 msgid "Supernova remnant candidates" msgstr "सम्भाव्य महानवतारा अवशेष" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8300 src/translations.h:315 +#: src/gui/AstroCalcDialog.cpp:8273 src/translations.h:315 #: src/ui_viewDialog.h:3834 src/ui_dsoColorsDialog.h:569 msgid "Supernova remnants" msgstr "महानवतारा अवशेष" #. TRANSLATORS: Type of stars (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8301 src/translations.h:343 +#: src/gui/AstroCalcDialog.cpp:8274 src/translations.h:343 #: src/ui_viewDialog.h:3831 src/ui_dsoColorsDialog.h:675 msgid "Clusters of galaxies" msgstr "तारासंगमों का संग्रह" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8303 src/translations.h:283 +#: src/gui/AstroCalcDialog.cpp:8275 src/translations.h:283 #: src/ui_viewDialog.h:3837 src/ui_dsoColorsDialog.h:562 msgid "Globular star clusters" msgstr "गोलाकार तारा संग्रह" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8304 src/translations.h:345 +#: src/gui/AstroCalcDialog.cpp:8275 src/translations.h:345 #: src/ui_dsoColorsDialog.h:688 msgid "Regions of the sky" msgstr "आकाश के क्षेत्र" #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8305 src/translations.h:297 +#: src/gui/AstroCalcDialog.cpp:8275 src/translations.h:297 #: src/ui_viewDialog.h:3826 src/ui_dsoColorsDialog.h:553 msgid "Active galaxies" msgstr "सक्रिय तारासंगम" -#: src/gui/AstroCalcDialog.cpp:8310 plugins/Pulsars/src/Pulsars.cpp:71 -#: plugins/Pulsars/src/Pulsars.cpp:169 plugins/Pulsars/src/Pulsars.cpp:170 -msgid "Pulsars" -msgstr "स्फुरन्ततारा" - -#: src/gui/AstroCalcDialog.cpp:8316 -msgid "Exoplanetary systems" -msgstr "बाह्यग्रह मण्डल" - -#: src/gui/AstroCalcDialog.cpp:8319 -msgid "Bright nova stars" -msgstr "उज्ज्वल नवतारें" - -#: src/gui/AstroCalcDialog.cpp:8321 -msgid "Bright supernova stars" -msgstr "उज्ज्वल महानवतारें" - #. TRANSLATORS: Type of objects (for "Lists" in the search tool) -#: src/gui/AstroCalcDialog.cpp:8322 src/translations.h:301 +#: src/gui/AstroCalcDialog.cpp:8276 src/translations.h:301 #: src/ui_viewDialog.h:3833 src/ui_dsoColorsDialog.h:634 msgid "Interacting galaxies" msgstr "अन्तर्प्रभावी तारासंगम" -#: src/gui/AstroCalcDialog.cpp:8324 +#: src/gui/AstroCalcDialog.cpp:8276 msgid "Messier objects" msgstr "मेस्सियेर वस्तुएँ" -#: src/gui/AstroCalcDialog.cpp:8325 +#: src/gui/AstroCalcDialog.cpp:8277 msgid "NGC/IC objects" msgstr "एन॰जी॰सी॰/एै॰सी॰ वस्तुएँ" -#: src/gui/AstroCalcDialog.cpp:8326 +#: src/gui/AstroCalcDialog.cpp:8277 msgid "Caldwell objects" msgstr "काल्ड्वेल्ल वस्तुएँ" -#: src/gui/AstroCalcDialog.cpp:8327 +#: src/gui/AstroCalcDialog.cpp:8277 msgid "Herschel 400 objects" msgstr "हेर्श्चेल 400 वस्तुएँ" -#: src/gui/AstroCalcDialog.cpp:8328 +#: src/gui/AstroCalcDialog.cpp:8278 msgid "Algol-type eclipsing systems" msgstr "अल्गोल जैसे ग्रहणकारी मण्डलें" -#: src/gui/AstroCalcDialog.cpp:8329 +#: src/gui/AstroCalcDialog.cpp:8278 msgid "The classical cepheids" msgstr "प्रतिष्ठित सेफेइड" +#: src/gui/AstroCalcDialog.cpp:8295 plugins/Pulsars/src/Pulsars.cpp:71 +#: plugins/Pulsars/src/Pulsars.cpp:169 plugins/Pulsars/src/Pulsars.cpp:170 +msgid "Pulsars" +msgstr "स्फुरन्ततारा" + +#: src/gui/AstroCalcDialog.cpp:8301 +msgid "Exoplanetary systems" +msgstr "बाह्यग्रह मण्डल" + +#: src/gui/AstroCalcDialog.cpp:8304 +msgid "Bright nova stars" +msgstr "उज्ज्वल नवतारें" + +#: src/gui/AstroCalcDialog.cpp:8306 +msgid "Bright supernova stars" +msgstr "उज्ज्वल महानवतारें" + #. TRANSLATORS: angular size -#: src/gui/AstroCalcDialog.cpp:8410 +#: src/gui/AstroCalcDialog.cpp:8385 msgid "Ang. Size" msgstr "अस्र॰ आकार" #. TRANSLATORS: IAU Constellation -#: src/gui/AstroCalcDialog.cpp:8413 +#: src/gui/AstroCalcDialog.cpp:8388 msgctxt "IAU Constellation" msgid "Const." msgstr "ता॰म॰" -#: src/gui/AstroCalcDialog.cpp:8533 src/ui_astroCalcDialog.h:2411 +#: src/gui/AstroCalcDialog.cpp:8508 src/ui_astroCalcDialog.h:2411 msgid "Limit angular size:" msgstr "अस्रीय आकार सीमा :" -#: src/gui/AstroCalcDialog.cpp:8534 src/ui_astroCalcDialog.h:2409 +#: src/gui/AstroCalcDialog.cpp:8509 src/ui_astroCalcDialog.h:2409 msgid "Set limits for angular size for visible celestial objects" msgstr "दृश्य खगोलीय वस्तुओं की अस्रीय आकार सीमा स्थापित करें" -#: src/gui/AstroCalcDialog.cpp:8535 src/ui_astroCalcDialog.h:2413 +#: src/gui/AstroCalcDialog.cpp:8510 src/ui_astroCalcDialog.h:2413 msgid "Minimal angular size for visible celestial objects" msgstr "दृश्य खगोलीय वस्तुओं के लिए न्यूनतम अस्रीय आकार" -#: src/gui/AstroCalcDialog.cpp:8536 src/ui_astroCalcDialog.h:2416 +#: src/gui/AstroCalcDialog.cpp:8511 src/ui_astroCalcDialog.h:2416 msgid "Maximum angular size for visible celestial objects" msgstr "दृश्य खगोलीय वस्तुओं के लिए अधिकतम अस्रीय आकार" -#: src/gui/AstroCalcDialog.cpp:8808 +#: src/gui/AstroCalcDialog.cpp:8783 msgid "Limit angular separation:" msgstr "अस्रीय अन्तर सीमा : " -#: src/gui/AstroCalcDialog.cpp:8809 +#: src/gui/AstroCalcDialog.cpp:8784 msgid "Set limits for angular separation for visible double stars" msgstr "दृश्य द्वितारों के अस्रीय अन्तर सीमा स्थापित करें" -#: src/gui/AstroCalcDialog.cpp:8810 +#: src/gui/AstroCalcDialog.cpp:8785 msgid "Minimal angular separation for visible double stars" msgstr "दृश्य द्वितारों के लिए न्यूनतम अस्रीय अन्तर" -#: src/gui/AstroCalcDialog.cpp:8811 +#: src/gui/AstroCalcDialog.cpp:8786 msgid "Maximum angular separation for visible double stars" msgstr "दृश्य द्वितारों के लिए अधिकतम अस्रीय अन्तर" -#: src/gui/AstroCalcDialog.cpp:9186 +#: src/gui/AstroCalcDialog.cpp:9161 msgid "Save list of objects as..." msgstr "वस्तुओं की सूची अभिलिखित करें इस नाम से" -#: src/gui/AstroCalcDialog.cpp:9192 src/ui_astroCalcDialog.h:2198 +#: src/gui/AstroCalcDialog.cpp:9167 src/ui_astroCalcDialog.h:2198 msgid "What's Up Tonight" msgstr "आज रात क्या चल रहा है" #. TRANSLATORS: Part of unit of measure for mean motion - degrees per day -#: src/gui/AstroCalcDialog.cpp:9270 +#: src/gui/AstroCalcDialog.cpp:9245 msgctxt "mean motion" msgid "day" msgstr "दिन" -#: src/gui/AstroCalcDialog.cpp:9334 +#: src/gui/AstroCalcDialog.cpp:9309 msgid "Linear and angular distances between selected objects" msgstr "सीधा तथा अस्रीय दूरी चयनित वस्तुओं के बीच" -#: src/gui/AstroCalcDialog.cpp:9404 +#: src/gui/AstroCalcDialog.cpp:9379 msgid "Angular distance between the Moon and selected object" msgstr "अस्रीय दूरी चन्द्रमा तथा चयनित वस्तु के बीच" -#: src/gui/AstroCalcDialog.cpp:9470 +#: src/gui/AstroCalcDialog.cpp:9445 msgid "Angular distance between the Moon and celestial object" msgstr "अस्रीय दूरी चन्द्रमा तथा खगोलीय वस्तु के बीच" -#: src/gui/AstroCalcDialog.cpp:9621 +#: src/gui/AstroCalcDialog.cpp:9596 #: plugins/Satellites/src/gui/SatellitesDialog.cpp:1581 msgid "CSV (Comma delimited)" msgstr "सी॰एस॰वी ( अल्पविराम चिह्न सीमांकित )" -#: src/gui/AstroCalcDialog.cpp:9622 +#: src/gui/AstroCalcDialog.cpp:9597 #: plugins/Satellites/src/gui/SatellitesDialog.cpp:1582 msgid "Microsoft Excel Open XML Spreadsheet" msgstr "मैक्रोसोफ्ट एक्सेल ओपन एक्स॰एम॰एल॰ फलकपत्र" @@ -7846,12 +7853,6 @@ msgstr "अब" msgid "Culmination" msgstr "शिरोबिन्दु के निकटतम होना" -#. TRANSLATORS: Name of landscape -#: src/gui/AstroCalcChart.cpp:83 src/translations.h:461 -#: plugins/ArchaeoLines/src/ArchaeoLines.cpp:1461 -msgid "Sun" -msgstr "सूर्य" - #: src/gui/AstroCalcChart.cpp:84 plugins/NavStars/src/ui_navStarsWindow.h:587 msgid "Civil Twilight" msgstr "नागरिक लालिमा आकाश" @@ -16248,8 +16249,8 @@ msgstr "दा॰आ॰/झु॰ ( जू॰2000.0 ) जालीचिह् #. TRANSLATORS: Unit of measure for scale - arc-seconds per pixel #: plugins/Oculars/src/Oculars.cpp:1768 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:689 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:861 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:721 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:909 msgid "\"/px" msgstr "चा॰वि॰प्र॰व॰" @@ -16269,37 +16270,37 @@ msgid "s" msgstr "से॰" #: plugins/Oculars/src/Oculars.cpp:2037 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:481 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:513 msgid "Binocular" msgstr "द्वयोपनेत्र" #: plugins/Oculars/src/Oculars.cpp:2037 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:479 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:511 msgid "Ocular" msgstr "उपनेत्र" #. TRANSLATORS: FL = Focal length #: plugins/Oculars/src/Oculars.cpp:2057 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:524 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:556 #, qt-format msgid "Ocular FL: %1 mm" msgstr "उपनेत्र ती॰दू॰ : %1 श॰तम मे॰" #. TRANSLATORS: aFOV = apparent field of view #: plugins/Oculars/src/Oculars.cpp:2064 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:533 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:565 #, qt-format msgid "Ocular aFOV: %1" msgstr "उपनेत्र स्प॰दृ॰क्षे॰ : %1" #: plugins/Oculars/src/Oculars.cpp:2075 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:563 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:595 #, qt-format msgid "Lens #%1" msgstr "ताल #%1" #: plugins/Oculars/src/Oculars.cpp:2079 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:567 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:599 #, qt-format msgid "Lens #%1: %2" msgstr "ताल #%1 : %2" @@ -16309,56 +16310,56 @@ msgid "Lens: none" msgstr "ताल : कुछ नही" #: plugins/Oculars/src/Oculars.cpp:2099 plugins/Oculars/src/Oculars.cpp:2160 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:809 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:857 #, qt-format msgid "Telescope #%1" msgstr "दूरदर्शक #%1" #: plugins/Oculars/src/Oculars.cpp:2108 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:911 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:959 #, qt-format msgid "Magnification: %1" msgstr "बृहत्तरकरण : %1" #: plugins/Oculars/src/Oculars.cpp:2115 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:922 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:970 #, qt-format msgid "Exit pupil: %1 mm" msgstr "निकास पुतली : %1 श॰तम मे॰" #: plugins/Oculars/src/Oculars.cpp:2122 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:930 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:978 #, qt-format msgid "FOV: %1" msgstr "दृ॰क्षे॰ : %1" #: plugins/Oculars/src/Oculars.cpp:2143 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:677 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:853 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:709 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:901 #, qt-format msgid "Dimensions: %1" msgstr "मात्राएँ : %1" #: plugins/Oculars/src/Oculars.cpp:2144 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:683 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:857 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:715 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:905 msgid "Binning" msgstr "वर्गीकरण" #: plugins/Oculars/src/Oculars.cpp:2148 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:637 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:669 #, qt-format msgid "Sensor #%1" msgstr "मापक #%1" #: plugins/Oculars/src/Oculars.cpp:2152 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:641 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:673 #, qt-format msgid "Sensor #%1: %2" msgstr "मापक #%1 : %2" #: plugins/Oculars/src/Oculars.cpp:2165 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:813 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:861 #, qt-format msgid "Telescope #%1: %2" msgstr "दूरदर्शक #%1 : %2" @@ -16392,241 +16393,261 @@ msgid "&Next telescope" msgstr "अगला दूरदर्शक" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:186 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:212 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:216 msgid "Previous ocular" msgstr "पूर्व उपनेत्र" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:187 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:214 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:218 msgid "Next ocular" msgstr "अगला उपनेत्र" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:188 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:216 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:220 msgid "Previous lens" msgstr "पूर्व ताल" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:189 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:218 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:222 msgid "Next lens" msgstr "अगला ताल" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:190 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:220 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:224 msgid "Previous CCD frame" msgstr "पूर्व वि॰सं॰य॰ चौखट" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:191 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:222 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:226 msgid "Next CCD frame" msgstr "अगला वि॰सं॰य॰ चौखट" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:192 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:224 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:228 msgid "Previous telescope" msgstr "पूर्व दूरदर्शक" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:193 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:226 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:230 msgid "Next telescope" msgstr "अगला दूरदर्शक" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:195 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:276 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:290 msgid "Reset the sensor frame rotation" msgstr "मापक चौखट घुमाव पुनर्स्थापित करें" #: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:196 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:246 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:250 +msgid "Rotate the sensor frame 90 degrees counterclockwise" +msgstr "मापक चौखट को घुमाएँ 90 अम्श बाएँ ओर" + +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:197 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:260 msgid "Rotate the sensor frame 15 degrees counterclockwise" msgstr "मापक चौखट को घुमाएँ 15 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:197 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:256 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:198 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:270 msgid "Rotate the sensor frame 5 degrees counterclockwise" msgstr "मापक चौखट को घुमाएँ 5 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:198 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:266 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:199 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:280 msgid "Rotate the sensor frame 1 degree counterclockwise" msgstr "मापक चौखट को घुमाएँ 1 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:199 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:306 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:200 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:330 +msgid "Rotate the sensor frame 90 degrees clockwise" +msgstr "मापक चौखट को घुमाएँ 90 अम्श दाएँ ओर" + +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:201 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:320 msgid "Rotate the sensor frame 15 degrees clockwise" msgstr "मापक चौखट को घुमाएँ 15 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:200 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:296 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:202 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:310 msgid "Rotate the sensor frame 5 degrees clockwise" msgstr "मापक चौखट को घुमाएँ 5 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:201 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:286 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:203 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:300 msgid "Rotate the sensor frame 1 degree clockwise" msgstr "मापक चौखट को घुमाएँ 1 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:203 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:278 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:205 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:292 msgid "Reset the prism rotation" msgstr "वर्णविभाजक का घुमाव पुनर्स्थापित करें" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:204 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:248 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:206 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:252 +msgid "Rotate the prism 90 degrees counterclockwise" +msgstr "वर्णविभाजक को घुमाएँ 90 अम्श बाएँ ओर" + +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:207 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:262 msgid "Rotate the prism 15 degrees counterclockwise" msgstr "वर्णविभाजक को घुमाएँ 15 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:205 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:258 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:208 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:272 msgid "Rotate the prism 5 degrees counterclockwise" msgstr "वर्णविभाजक को घुमाएँ 5 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:206 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:268 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:209 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:282 msgid "Rotate the prism 1 degree counterclockwise" msgstr "वर्णविभाजक को घुमाएँ 1 अम्श बाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:207 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:308 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:210 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:332 +msgid "Rotate the prism 90 degrees clockwise" +msgstr "वर्णविभाजक को घुमाएँ 90 अम्श दाएँ ओर" + +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:211 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:322 msgid "Rotate the prism 15 degrees clockwise" msgstr "वर्णविभाजक को घुमाएँ 15 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:208 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:298 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:212 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:312 msgid "Rotate the prism 5 degrees clockwise" msgstr "वर्णविभाजक को घुमाएँ 5 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:209 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:288 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:213 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:302 msgid "Rotate the prism 1 degree clockwise" msgstr "वर्णविभाजक को घुमाएँ 1 अम्श दाएँ ओर" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:526 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:558 msgid "Effective focal length of the ocular" msgstr "प्रभावी दृश्य तीक्ष्णता दूरी उपनेत्र का" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:536 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:568 msgid "Apparent field of view of the ocular" msgstr "प्रतीयमान दृश्यक्षेत्र उपनेत्र का" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:569 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:601 #, qt-format msgid "Multiplicity: %1" msgstr "बहुलता : %1" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:574 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:606 msgid "Lens: None" msgstr "ताल : कुछ नही" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:575 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:607 msgid "Multiplicity: N/A" msgstr "बहुलता : अनुपलब्ध" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:579 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:611 msgid "Focal length of eyepiece" msgstr "दृश्य तीक्ष्णता दूरी उपनेत्र की" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:679 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:855 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:711 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:903 msgid "Dimensions field of view" msgstr "मात्राएँ दृश्यक्षेत्र" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:690 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:862 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:722 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:910 msgid "X scale" msgstr "एक्स॰ मापदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:691 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:863 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:723 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:911 msgid "Horizontal scale" msgstr "क्षितिजवत मापदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:695 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:864 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:727 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:912 msgid "Y scale" msgstr "वै॰ मापदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:696 -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:865 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:728 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:913 msgid "Vertical scale" msgstr "लम्बवत मापदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:702 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:734 #, qt-format msgid "Rotation: %1" msgstr "घुमाव : %1" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:740 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:778 #, qt-format msgid "PA of prism: %1" msgstr "स्था॰अ॰ वर्णविभाजक का : %1" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:743 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:781 msgid "Position angle of the off-axis guider' prism" msgstr "स्थान अस्र अतिरिक्त अक्ष मार्गदर्शक वर्णविभाजक का" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:892 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:940 msgid "Magnification provided by these binoculars" msgstr "बृहत्तरकरण उपलब्ध इन द्वयोपनेत्रों से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:893 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:941 msgid "Actual field of view provided by these binoculars" msgstr "वास्तविक दृश्यक्षेत्र उपलब्ध इन द्वयोपनेत्रों से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:894 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:942 msgid "Exit pupil provided by these binoculars" msgstr "निकास पुतली उपलब्ध इन द्वयोपनेत्रों से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:902 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:950 msgid "Magnification provided by this ocular/lens/telescope combination" msgstr "बृहत्तरकरण उपलब्ध इस उपनेत्र/ताल/दूरदर्शक संयोजन से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:903 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:951 msgid "" "Actual field of view provided by this ocular/lens/telescope combination" msgstr "वास्तविक दृश्यक्षेत्र उपलब्ध इस उपनेत्र/ताल/दूरदर्शक संयोजन से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:904 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:952 msgid "Exit pupil provided by this ocular/lens/telescope combination" msgstr "निकास पुतली उपलब्ध इस उपनेत्र/ताल/दूरदर्शक संयोजन से" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:947 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:995 msgid "Rayleigh criterion" msgstr "रेयलिय्घ मानदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:949 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:997 msgid "The Rayleigh resolution criterion" msgstr "रेयलिय्घ सुलझाव मानदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:954 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1002 msgid "Dawes' limit" msgstr "डाव्स सीमा" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:956 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1004 msgid "Dawes' resolution criterion" msgstr "डाव्स सुलझाव मानदण्ड" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:961 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1009 msgid "Abbe's limit" msgstr "आब्बे सीमा" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:963 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1011 msgid "Abbe’s diffraction resolution limit" msgstr "आब्बे वक्रकरण सुलझाव सीमा" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:968 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1016 msgid "Sparrow's limit" msgstr "स्पार्रौव सीमा" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:970 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1018 msgid "Sparrow's resolution limit" msgstr "स्पार्रौव सुलझाव सीमा" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:996 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1044 msgid "Visual resolution" msgstr "दृश्य सुलझाव" -#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:998 +#: plugins/Oculars/src/gui/OcularsGuiPanel.cpp:1046 msgid "Visual resolution is based on eye properties and magnification" msgstr "दृश्य सुलझाव आधारित है आँख के लक्षण तथा बृहत्तरकरण पर" diff --git a/src/core/StelCore.cpp b/src/core/StelCore.cpp index c5fda18649..1a2ca6b8ba 100644 --- a/src/core/StelCore.cpp +++ b/src/core/StelCore.cpp @@ -1228,7 +1228,7 @@ void StelCore::moveObserverToSelected() // Let's try guess name of location... LocationMap results = StelApp::getInstance().getLocationMgr().pickLocationsNearby(loc.planetName, loc.getLongitude(), loc.getLatitude(), 1.0f); - if (results.size()>0) + if (!results.isEmpty()) loc = results.value(results.firstKey()); // ...and use it! moveObserverTo(loc); @@ -1278,7 +1278,7 @@ void StelCore::setObserver(StelObserver *obs) { delete position; position = obs; - if (!getUseCustomTimeZone() && obs->getCurrentLocation().ianaTimeZone.length()>0) + if (!getUseCustomTimeZone() && !obs->getCurrentLocation().ianaTimeZone.isEmpty()) setCurrentTimeZone(obs->getCurrentLocation().ianaTimeZone); } diff --git a/src/core/StelFileMgr.cpp b/src/core/StelFileMgr.cpp index 1aa2902bb9..3d1c47755d 100644 --- a/src/core/StelFileMgr.cpp +++ b/src/core/StelFileMgr.cpp @@ -71,7 +71,7 @@ void StelFileMgr::init() } #else QByteArray userDirCand=qgetenv("STEL_USERDIR"); - if (userDirCand.length()>0) + if (!userDirCand.isEmpty()) { userDir=QString::fromLocal8Bit(userDirCand); } diff --git a/src/core/StelObject.cpp b/src/core/StelObject.cpp index da02012beb..ef25c6f4ef 100644 --- a/src/core/StelObject.cpp +++ b/src/core/StelObject.cpp @@ -1160,7 +1160,7 @@ QVariantMap StelObject::getInfoMap(const StelCore *core) const void StelObject::setExtraInfoString(const InfoStringGroup& flags, const QString &str) { extraInfoStrings.remove(flags); // delete all entries with these flags - if (str.length()>0) + if (!str.isEmpty()) extraInfoStrings.insert(flags, str); } void StelObject::addToExtraInfoString(const StelObject::InfoStringGroup &flags, const QString &str) diff --git a/src/core/StelObjectMgr.cpp b/src/core/StelObjectMgr.cpp index be09a2f150..3abfaefdc8 100644 --- a/src/core/StelObjectMgr.cpp +++ b/src/core/StelObjectMgr.cpp @@ -683,7 +683,7 @@ QVariantMap StelObjectMgr::getObjectInfo(const StelObjectP obj) void StelObjectMgr::setExtraInfoString(const StelObject::InfoStringGroup& flags, const QString &str) { extraInfoStrings.remove(flags); // delete all entries with these flags - if (str.length()>0) + if (!str.isEmpty()) extraInfoStrings.insert(flags, str); } void StelObjectMgr::addToExtraInfoString(const StelObject::InfoStringGroup &flags, const QString &str) diff --git a/src/core/StelPainter.cpp b/src/core/StelPainter.cpp index db4a81df9f..a755e5fbf8 100644 --- a/src/core/StelPainter.cpp +++ b/src/core/StelPainter.cpp @@ -661,7 +661,7 @@ struct StringTexture ~StringTexture() {delete texture;} }; -StringTexture* StelPainter::getTexTexture(const QString& str, int pixelSize) const +StringTexture* StelPainter::getTextTexture(const QString& str, int pixelSize) const { // Render first the text into a QPixmap, then create a QOpenGLTexture // from it. We could optimize by directly using a QImage, but for some @@ -700,11 +700,11 @@ void StelPainter::drawText(float x, float y, const QString& str, float angleDeg, { //qDebug() << "Text texture" << str; // This is taken from branch text-use-opengl-buffer. This is essential on devices like Raspberry Pi (2016-03). - StringTexture* tex = getTexTexture(str, currentFont.pixelSize()); + StringTexture* tex = getTextTexture(str, currentFont.pixelSize()); Q_ASSERT(tex); if (!noGravity) angleDeg += prj->defaultAngleForGravityText; - tex->texture->bind(); + tex->texture->bind(0); static float vertexData[8]; // compute the vertex coordinates applying the translation and the rotation @@ -732,11 +732,11 @@ void StelPainter::drawText(float x, float y, const QString& str, float angleDeg, } } - float* texCoords = new float[8]; + float texCoords[8]; for (int i=0;i<4;i++) { texCoords[i*2+0] = static_cast<float>(tex->getTexSize().width()) * (i % 2); - texCoords[i*2+1] = static_cast<float>(tex->getTexSize().height()) * (1 - static_cast<float>(i) / 2); + texCoords[i*2+1] = static_cast<float>(tex->getTexSize().height()) * (1 - i / 2); } setTexCoordPointer(2, GL_FLOAT, texCoords); @@ -750,7 +750,6 @@ void StelPainter::drawText(float x, float y, const QString& str, float angleDeg, setBlending(oldBlending, oldSrc, oldDst); enableClientStates(false, false); tex->texture->release(); - delete[] texCoords; } else { @@ -2415,7 +2414,7 @@ void StelPainter::drawFixedColorWideLinesAsQuads(const ArrayDesc& vertexArray, i else newVertices.reserve(count*6); newVertices.resize((count-1)*6); - assert(vertexArray.type == GL_FLOAT); + Q_ASSERT(vertexArray.type == GL_FLOAT); const auto lineVertData = static_cast<const float*>(vertexArray.pointer) + vertexArray.size*offset; const int step = mode==Lines ? 2 : 1; for(int n = 0; n < count-1; n += step) @@ -2443,7 +2442,7 @@ void StelPainter::drawFixedColorWideLinesAsQuads(const ArrayDesc& vertexArray, i default: in0 = Vec4f(0.f); in1 = Vec4f(0.f); - assert(!"Bad number of elements in vertex array"); + qCritical("Bad number of elements in vertex array"); // or qFatal()? } const Vec4f clip0 = projMat * Vec4f(in0); @@ -2481,7 +2480,7 @@ void StelPainter::drawFixedColorWideLinesAsQuads(const ArrayDesc& vertexArray, i { // Connect the ends const auto lastN = newVertices.size()-1; - assert(lastN >= 2); + Q_ASSERT(lastN >= 2); newVertices.push_back(newVertices[lastN-2]); newVertices.push_back(newVertices[lastN]); newVertices.push_back(newVertices[0]); diff --git a/src/core/StelPainter.hpp b/src/core/StelPainter.hpp index b226e7d61b..53ad5d9f91 100644 --- a/src/core/StelPainter.hpp +++ b/src/core/StelPainter.hpp @@ -357,7 +357,7 @@ private: // From text-use-opengl-buffer static QCache<QByteArray, struct StringTexture> texCache; - struct StringTexture* getTexTexture(const QString& str, int pixelSize) const; + struct StringTexture* getTextTexture(const QString& str, int pixelSize) const; //! Struct describing one opengl array typedef struct ArrayDesc diff --git a/src/core/StelPropertyMgr.cpp b/src/core/StelPropertyMgr.cpp index 76942ab31d..5ec1e8be56 100644 --- a/src/core/StelPropertyMgr.cpp +++ b/src/core/StelPropertyMgr.cpp @@ -1,5 +1,4 @@ #include "StelPropertyMgr.hpp"
-#include "StelApp.hpp"
#include <QtDebug>
#include <QApplication>
@@ -143,7 +142,7 @@ void StelPropertyMgr::registerObject(QObject *obj) if(!registeredObjects.contains(name))
{
//just a sanity check that we dont have the same object registered under a different name
- Q_ASSERT(!registeredObjects.values().contains(obj));
+ Q_ASSERT(registeredObjects.key(obj).isEmpty());
#ifndef NDEBUG
qDebug()<<"[StelPropertyMgr] Registering object"<<name;
diff --git a/src/core/StelPropertyMgr.hpp b/src/core/StelPropertyMgr.hpp index 2a88cf1391..e7fe0d8e84 100644 --- a/src/core/StelPropertyMgr.hpp +++ b/src/core/StelPropertyMgr.hpp @@ -22,6 +22,7 @@ #include <QObject>
#include <QSet>
#include <QMetaProperty>
+#include "StelApp.hpp"
class StelProperty;
@@ -194,6 +195,8 @@ signals: //!
//! //alternatively, use this to skip having to get the StelProperty instance:
//! //StelApp::getInstance().getStelPropertyManager()->setStelPropertyValue("MyCustomModule.awesomeProperty", 123);
+//! // or even, much shorter, assuming awesomeProperty is an int,
+//! // GETSTELPROPERTYVALUE("MyCustomModule.awesomeProperty").toInt();
//!
//! //to see the effect
//! MyCustomModule *module = GETSTELMODULE(MyCustomModule);
@@ -337,4 +340,6 @@ private: StelPropertyMap propMap;
};
+#define GETSTELPROPERTYVALUE(pName) StelApp::getInstance().getStelPropertyManager()->getStelPropertyValue(pName, false)
+
#endif
diff --git a/src/core/TextureAverageComputer.cpp b/src/core/TextureAverageComputer.cpp index d5c627a928..20844bca39 100644 --- a/src/core/TextureAverageComputer.cpp +++ b/src/core/TextureAverageComputer.cpp @@ -97,7 +97,7 @@ void TextureAverageComputer::init() { GLuint texture = -1; gl.glGenTextures(1, &texture); - assert(texture>0); + Q_ASSERT(texture>0); gl.glActiveTexture(GL_TEXTURE0); gl.glBindTexture(GL_TEXTURE_2D, texture); @@ -174,7 +174,7 @@ TextureAverageComputer::TextureAverageComputer(QOpenGLFunctions_3_3_Core& gl, co gl.glBindFramebuffer(GL_DRAW_FRAMEBUFFER,potFBO); gl.glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER,GL_COLOR_ATTACHMENT0,GL_TEXTURE_2D,potTex,0); [[maybe_unused]] const auto status=gl.glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER); - assert(status==GL_FRAMEBUFFER_COMPLETE); + Q_ASSERT(status==GL_FRAMEBUFFER_COMPLETE); gl.glBindFramebuffer(GL_DRAW_FRAMEBUFFER,0); gl.glGenVertexArrays(1, &vao); diff --git a/src/core/modules/AsterismMgr.cpp b/src/core/modules/AsterismMgr.cpp index 2c48647212..064c4b46c2 100644 --- a/src/core/modules/AsterismMgr.cpp +++ b/src/core/modules/AsterismMgr.cpp @@ -797,7 +797,7 @@ void AsterismMgr::deselectAsterisms(void) } // If any asterism is selected at the moment, then let's do not touch to it! - if (omgr->getWasSelected() && selected.size()>0) + if (omgr->getWasSelected() && !selected.empty()) selected.pop_back(); // Let's hide all previously selected asterisms diff --git a/src/core/modules/ConstellationMgr.cpp b/src/core/modules/ConstellationMgr.cpp index 28d5fc5dfc..68ae40c3bc 100644 --- a/src/core/modules/ConstellationMgr.cpp +++ b/src/core/modules/ConstellationMgr.cpp @@ -292,7 +292,7 @@ void ConstellationMgr::deselectConstellations(void) } // If any constellation is selected at the moment, then let's do not touch to it! - if (omgr->getWasSelected() && selected.size()>0) + if (omgr->getWasSelected() && !selected.empty()) selected.pop_back(); // Let's hide all previously selected constellations diff --git a/src/core/modules/GridLinesMgr.cpp b/src/core/modules/GridLinesMgr.cpp index 74ce57ea91..06b009b7d0 100644 --- a/src/core/modules/GridLinesMgr.cpp +++ b/src/core/modules/GridLinesMgr.cpp @@ -1238,7 +1238,7 @@ void SkyLine::draw(StelCore *core) const const QString &label=it.value(); // draw and labels: derive the irregular tick lengths from labeling Vec3d start=fpt; - Vec3d end= (label.length()>0) ? part10 : part1; + Vec3d end= label.isEmpty() ? part1 : part10; if (label.contains("5")) end=part5; Vec3d end10=part10; @@ -1250,7 +1250,7 @@ void SkyLine::draw(StelCore *core) const sPainter.drawGreatCircleArc(start, end, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR); - if (label.length()>0 && ( + if (!label.isEmpty() && ( currentFoV<60. // all labels || (currentFoV<=180. && !label.contains("5")) // 1.MM/10.MM/20.MM || label.startsWith("1.") // in any case diff --git a/src/core/modules/Landscape.cpp b/src/core/modules/Landscape.cpp index 4ca48f486d..61531f284b 100644 --- a/src/core/modules/Landscape.cpp +++ b/src/core/modules/Landscape.cpp @@ -182,7 +182,7 @@ void Landscape::loadCommon(const QSettings& landscapeIni, const QString& landsca location.landscapeKey = name; QString tzString=landscapeIni.value("location/timezone", "").toString(); - if ((tzString.length() > 0)) + if (!tzString.isEmpty()) location.ianaTimeZone=StelLocationMgr::sanitizeTimezoneStringFromLocationDB(tzString); auto defaultBortleIndex = landscapeIni.value("location/light_pollution", -1).toInt(); @@ -471,7 +471,7 @@ LandscapeOldStyle::~LandscapeOldStyle() } if (sides) delete [] sides; - if (sidesImages.size()>0) + if (!sidesImages.isEmpty()) { qDeleteAll(sidesImages); sidesImages.clear(); diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp index d1e23a5cc8..35feae7b1c 100644 --- a/src/core/modules/LandscapeMgr.cpp +++ b/src/core/modules/LandscapeMgr.cpp @@ -1144,7 +1144,7 @@ void LandscapeMgr::onTargetLocationChanged(const StelLocation &loc, const QStrin { // if (loc.planetName != currentPlanetName) { - if (landscapeID.length()>0) + if (!landscapeID.isEmpty()) setCurrentLandscapeID(landscapeID); else if (flagLandscapeAutoSelection) { @@ -1361,7 +1361,7 @@ QString LandscapeMgr::getCurrentLandscapeHtmlDescription() const if (extcoeff>-1.0) atmosphere.append(QString("%1: %2").arg(q_("extinction coefficient"), QString::number(extcoeff, 'f', 2))); - if (atmosphere.size()>0) + if (!atmosphere.isEmpty()) desc += QString("<b>%1</b>: %2<br />").arg(q_("Atmospheric conditions"), atmosphere.join(", ")); const auto lightPollutionLum = landscape->getDefaultLightPollutionLuminance(); diff --git a/src/core/modules/Nebula.cpp b/src/core/modules/Nebula.cpp index 2102b39157..5c346058a7 100644 --- a/src/core/modules/Nebula.cpp +++ b/src/core/modules/Nebula.cpp @@ -232,13 +232,13 @@ QString Nebula::getInfoString(const StelCore *core, const InfoStringGroup& flags if (flags&Name) { QStringList extraNames=getExtraInfoStrings(Name); - if (extraNames.length()>0) + if (!extraNames.isEmpty()) oss << q_("Additional names: ") << extraNames.join(", ") << "<br/>"; } if (flags&CatalogNumber) { QStringList extraCat=getExtraInfoStrings(CatalogNumber); - if (extraCat.length()>0) + if (!extraCat.isEmpty()) oss << q_("Additional catalog numbers: ") << extraCat.join(", ") << "<br/>"; } @@ -571,7 +571,7 @@ float Nebula::getSelectPriority(const StelCore* core) const else if (nType==NebHII) // Sharpless and LBN lim=10.0f - 2.0f*qMin(1.5f, majorAxisSize); // Unfortunately, in Sh catalog, we always have mag=99=unknown! - if (std::min(mLim, lim)<=maxMagHint || outlineSegments.size()>0 || nType==NebRegion) // High priority for big DSO (with outlines) or regions + if (std::min(mLim, lim)<=maxMagHint || !outlineSegments.empty() || nType==NebRegion) // High priority for big DSO (with outlines) or regions selectPriority = -10.f; else selectPriority -= 5.f; diff --git a/src/core/modules/NebulaMgr.cpp b/src/core/modules/NebulaMgr.cpp index 933b5e2e86..b7a78c6eb8 100644 --- a/src/core/modules/NebulaMgr.cpp +++ b/src/core/modules/NebulaMgr.cpp @@ -1140,11 +1140,6 @@ void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool de QDataStream dsoOutStream(&dsoOut); dsoOutStream.setVersion(QDataStream::Qt_5_2); - int id, orientationAngle, NGC, IC, M, C, B, Sh2, VdB, RCW, LDN, LBN, Cr, Mel, PGC, UGC, Arp, VV, DWB, Tr, St, Ru, VdBHa; - float raRad, decRad, bMag, vMag, majorAxisSize, minorAxisSize, dist, distErr, z, zErr, plx, plxErr; - QString oType, mType, Ced, PK, PNG, SNRG, ACO, HCG, ESO, VdBH, ra, dec; - Nebula::NebulaType nType; - int readOk = 0; // how many records were read without problems while (!dsoIn.atEnd()) { @@ -1171,55 +1166,56 @@ void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool de QStringList list=record.split("\t", QString::KeepEmptyParts); #endif - id = list.at(0).toInt(); // ID (inner identification number) - ra = list.at(1).trimmed(); - dec = list.at(2).trimmed(); - bMag = list.at(3).toFloat(); // B magnitude - vMag = list.at(4).toFloat(); // V magnitude - oType = list.at(5).trimmed(); // Object type - mType = list.at(6).trimmed(); // Morphological type of object - majorAxisSize = list.at(7).toFloat(); // major axis size (arcmin) - minorAxisSize = list.at(8).toFloat(); // minor axis size (arcmin) - orientationAngle = list.at(9).toInt(); // orientation angle (degrees) - z = list.at(10).toFloat(); // redshift - zErr = list.at(11).toFloat(); // error of redshift - plx = list.at(12).toFloat(); // parallax (mas) - plxErr = list.at(13).toFloat(); // error of parallax (mas) - dist = list.at(14).toFloat(); // distance (Mpc for galaxies, kpc for other objects) - distErr = list.at(15).toFloat(); // distance error (Mpc for galaxies, kpc for other objects) + int id = list.at(0).toInt(); // ID (inner identification number) + QString ra = list.at(1).trimmed(); + QString dec = list.at(2).trimmed(); + float bMag = list.at(3).toFloat(); // B magnitude + float vMag = list.at(4).toFloat(); // V magnitude + QString oType = list.at(5).trimmed(); // Object type + QString mType = list.at(6).trimmed(); // Morphological type of object + float majorAxisSize = list.at(7).toFloat(); // major axis size (arcmin) + float minorAxisSize = list.at(8).toFloat(); // minor axis size (arcmin) + int orientationAngle = list.at(9).toInt(); // orientation angle (degrees) + float z = list.at(10).toFloat(); // redshift + float zErr = list.at(11).toFloat(); // error of redshift + float plx = list.at(12).toFloat(); // parallax (mas) + float plxErr = list.at(13).toFloat(); // error of parallax (mas) + float dist = list.at(14).toFloat(); // distance (Mpc for galaxies, kpc for other objects) + float distErr = list.at(15).toFloat(); // distance error (Mpc for galaxies, kpc for other objects) // ----------------------------------------------- // cross-identification data // ----------------------------------------------- - NGC = list.at(16).toInt(); // NGC number - IC = list.at(17).toInt(); // IC number - M = list.at(18).toInt(); // M number - C = list.at(19).toInt(); // C number - B = list.at(20).toInt(); // B number - Sh2 = list.at(21).toInt(); // Sh2 number - VdB = list.at(22).toInt(); // VdB number - RCW = list.at(23).toInt(); // RCW number - LDN = list.at(24).toInt(); // LDN number - LBN = list.at(25).toInt(); // LBN number - Cr = list.at(26).toInt(); // Cr number (alias: Col) - Mel = list.at(27).toInt(); // Mel number - PGC = list.at(28).toInt(); // PGC number (subset) - UGC = list.at(29).toInt(); // UGC number (subset) - Ced = list.at(30).trimmed(); // Ced number - Arp = list.at(31).toInt(); // Arp number - VV = list.at(32).toInt(); // VV number - PK = list.at(33).trimmed(); // PK number - PNG = list.at(34).trimmed(); // PN G number - SNRG = list.at(35).trimmed(); // SNR G number - ACO = list.at(36).trimmed(); // ACO number - HCG = list.at(37).trimmed(); // HCG number - ESO = list.at(38).trimmed(); // ESO number - VdBH = list.at(39).trimmed(); // VdBH number - DWB = list.at(40).toInt(); // DWB number - Tr = list.at(41).toInt(); // Tr number - St = list.at(42).toInt(); // St number - Ru = list.at(43).toInt(); // Ru number - VdBHa = list.at(44).toInt(); // VdB-Ha number - + int NGC = list.at(16).toInt(); // NGC number + int IC = list.at(17).toInt(); // IC number + int M = list.at(18).toInt(); // M number + int C = list.at(19).toInt(); // C number + int B = list.at(20).toInt(); // B number + int Sh2 = list.at(21).toInt(); // Sh2 number + int VdB = list.at(22).toInt(); // VdB number + int RCW = list.at(23).toInt(); // RCW number + int LDN = list.at(24).toInt(); // LDN number + int LBN = list.at(25).toInt(); // LBN number + int Cr = list.at(26).toInt(); // Cr number (alias: Col) + int Mel = list.at(27).toInt(); // Mel number + int PGC = list.at(28).toInt(); // PGC number (subset) + int UGC = list.at(29).toInt(); // UGC number (subset) + QString Ced = list.at(30).trimmed(); // Ced number + int Arp = list.at(31).toInt(); // Arp number + int VV = list.at(32).toInt(); // VV number + QString PK = list.at(33).trimmed(); // PK number + QString PNG = list.at(34).trimmed(); // PN G number + QString SNRG = list.at(35).trimmed(); // SNR G number + QString ACO = list.at(36).trimmed(); // ACO number + QString HCG = list.at(37).trimmed(); // HCG number + QString ESO = list.at(38).trimmed(); // ESO number + QString VdBH = list.at(39).trimmed(); // VdBH number + int DWB = list.at(40).toInt(); // DWB number + int Tr = list.at(41).toInt(); // Tr number + int St = list.at(42).toInt(); // St number + int Ru = list.at(43).toInt(); // Ru number + int VdBHa = list.at(44).toInt(); // VdB-Ha number + + float raRad, decRad; if (decimal) { // Convert from deg to rad @@ -1254,8 +1250,7 @@ void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool de // Warning: Hyades and LMC has visual magnitude less than 1.0 (0.5^m and 0.9^m) if (bMag <= 0.f) bMag = 99.f; if (vMag <= 0.f) vMag = 99.f; - // TODO: The map could be sorted by probability (number of total objects). More common objects at start... - static const QMap<QString, Nebula::NebulaType> oTypesMap = { + static const QHash<QString, Nebula::NebulaType> oTypesHash({ { "G" , Nebula::NebGx }, { "GX" , Nebula::NebGx }, { "GC" , Nebula::NebGc }, @@ -1337,8 +1332,8 @@ void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool de { "PSR" , Nebula::NebSNR }, { "HH" , Nebula::NebISM }, { "V*" , Nebula::NebStar }, - { "*IN" , Nebula::NebCn }, - { "SN*" , Nebula::NebStar }, + { "*IN" , Nebula::NebCn }, + { "SN*" , Nebula::NebStar }, { "PA?" , Nebula::NebPPN }, { "BUB" , Nebula::NebISM }, { "CLG" , Nebula::NebGxCl }, @@ -1347,9 +1342,9 @@ void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool de { "SCG" , Nebula::NebGxCl }, { "REG" , Nebula::NebRegion }, { "?" , Nebula::NebUnknown } - }; + }); - nType=oTypesMap.value(oType.toUpper(), Nebula::NebUnknown); + Nebula::NebulaType nType=oTypesHash.value(oType.toUpper(), Nebula::NebUnknown); if (nType == Nebula::NebUnknown) qDebug() << "Record with ID" << id <<"has unknown type of object:" << oType; diff --git a/src/core/modules/Planet.cpp b/src/core/modules/Planet.cpp index b27e19fa03..4ccc6fb9a5 100644 --- a/src/core/modules/Planet.cpp +++ b/src/core/modules/Planet.cpp @@ -550,14 +550,14 @@ QString Planet::getInfoString(const StelCore* core, const InfoStringGroup& flags oss << getInfoStringName(core, flags); QStringList extraNames=getExtraInfoStrings(Name); - if (extraNames.length()>0) + if (!extraNames.isEmpty()) oss << q_("Additional names: ") << extraNames.join(", ") << "<br/>"; } if (flags&CatalogNumber) { QStringList extraCat=getExtraInfoStrings(CatalogNumber); - if (extraCat.length()>0) + if (!extraCat.isEmpty()) oss << q_("Additional catalog numbers: ") << extraCat.join(", ") << "<br/>"; } @@ -2357,7 +2357,7 @@ QPair<Vec4d, Vec3d> Planet::getSubSolarObserverPoints(const StelCore *core, bool // )); // // StelObjectMgr& objMgr = StelApp::getInstance().getStelObjectMgr(); -// if (objMgr.getSelectedObject().length()>0) +// if (!objMgr.getSelectedObject().isEmpty()) // objMgr.getSelectedObject()[0]->addToExtraInfoString(StelObject::DebugAid, debugAid); return ret; } diff --git a/src/core/modules/StarWrapper.cpp b/src/core/modules/StarWrapper.cpp index 069b202b11..760b342fe3 100644 --- a/src/core/modules/StarWrapper.cpp +++ b/src/core/modules/StarWrapper.cpp @@ -272,13 +272,13 @@ QString StarWrapper1::getInfoString(const StelCore *core, const InfoStringGroup& if (flags&Name) { QStringList extraNames=getExtraInfoStrings(Name); - if (extraNames.length()>0) + if (!extraNames.isEmpty()) oss << q_("Additional names: ") << extraNames.join(", ") << "<br/>"; } if (flags&CatalogNumber) { QStringList extraCat=getExtraInfoStrings(CatalogNumber); - if (extraCat.length()>0) + if (!extraCat.isEmpty()) oss << q_("Additional catalog numbers: ") << extraCat.join(", ") << "<br/>"; } diff --git a/src/gui/AstroCalcDialog.cpp b/src/gui/AstroCalcDialog.cpp index cb140b32db..4f512aeeb6 100644 --- a/src/gui/AstroCalcDialog.cpp +++ b/src/gui/AstroCalcDialog.cpp @@ -1795,7 +1795,7 @@ void AstroCalcDialog::saveIgnoreDateTestFlag(bool b) void AstroCalcDialog::reGenerateEphemeris(bool withSelection) { - if (EphemerisList.size() > 0) + if (!EphemerisList.isEmpty()) { int row = ui->ephemerisTreeWidget->currentIndex().row(); generateEphemeris(); // Update list of ephemeris @@ -9122,7 +9122,7 @@ void AstroCalcDialog::calculateWutObjects() enableAngularLimits(enableAngular); core->setJD(JD); adjustWUTColumns(); - if (objectsList.size()>0) + if (!objectsList.isEmpty()) ui->saveObjectsButton->setEnabled(true); else ui->saveObjectsButton->setEnabled(false); @@ -9594,18 +9594,17 @@ void AstroCalcDialog::saveTableAsXLSX(const QString& fileName, QTreeWidget* tWid QPair<QString, QString> AstroCalcDialog::askTableFilePath(const QString &caption, const QString& fileName) { QString csv = QString("%1 (*.csv)").arg(q_("CSV (Comma delimited)")); - QString xlsx = QString("%1 (*.xlsx)").arg(q_("Microsoft Excel Open XML Spreadsheet")); - QString filter, defaultExtension; #ifdef ENABLE_XLSX - defaultExtension = "xlsx"; - filter = QString("%1;;%2").arg(xlsx, csv); + QString xlsx = QString("%1 (*.xlsx)").arg(q_("Microsoft Excel Open XML Spreadsheet")); + QString defaultExtension = "xlsx"; + QString filter = QString("%1;;%2").arg(xlsx, csv); #else - defaultExtension = "csv"; - filter = csv; + QString defaultExtension = "csv"; + QString filter = csv; #endif - QString dir = QString("%1/%2.%3").arg(QDir::homePath(), fileName, defaultExtension); + QString dir = QString("%1/%2.%3").arg(QDir::homePath(), fileName, defaultExtension); QString defaultFilter = QString("(*.%1)").arg(defaultExtension); QString filePath = QFileDialog::getSaveFileName(nullptr, caption, dir, filter, &defaultFilter); diff --git a/src/gui/HelpDialog.cpp b/src/gui/HelpDialog.cpp index d1cd220d72..b0c2aad274 100644 --- a/src/gui/HelpDialog.cpp +++ b/src/gui/HelpDialog.cpp @@ -220,8 +220,7 @@ void HelpDialog::downloadComplete(QNetworkReply *reply) QString latestVersion = map["name"].toString(); latestVersion.replace("v","", Qt::CaseInsensitive); QStringList v = latestVersion.split("."); - if (v.count()==2) - v.append("0"); + v.append("0"); // the latest number (PATCH) is always 0 for releases QString appVersion = StelUtils::getApplicationVersion(); QStringList c = appVersion.split("."); diff --git a/src/gui/SearchDialog.cpp b/src/gui/SearchDialog.cpp index 478b7564fd..70e729cd7f 100644 --- a/src/gui/SearchDialog.cpp +++ b/src/gui/SearchDialog.cpp @@ -617,8 +617,8 @@ void SearchDialog::recentSearchClearDataClicked() void SearchDialog::setRecentSearchClearDataPushButton() { - // Enable clear button if recent list is greater than 0 - bool toEnable = recentObjectSearchesData.recentList.size() > 0; + // Enable clear button if recent list is not empty + bool toEnable = !recentObjectSearchesData.recentList.isEmpty(); ui->recentSearchClearDataPushButton->setEnabled(toEnable); // Tool tip depends on recent list size QString toolTipText = toEnable ? q_("Clear search history: delete all search objects data") : q_("Clear search history: no data to delete"); diff --git a/src/gui/StelGuiItems.cpp b/src/gui/StelGuiItems.cpp index 19d98a1a4d..ac31f91a14 100644 --- a/src/gui/StelGuiItems.cpp +++ b/src/gui/StelGuiItems.cpp @@ -194,7 +194,7 @@ StelButton::StelButton(QGraphicsItem* parent, { StelAction *action = StelApp::getInstance().getStelActionManager()->findAction(actionId); StelAction *otherAction=Q_NULLPTR; - if (otherActionId.length()>0) + if (!otherActionId.isEmpty()) otherAction = StelApp::getInstance().getStelActionManager()->findAction(otherActionId); initCtor(pixOn, pixOff, QPixmap(), pixHover, action, otherAction, noBackground, false); diff --git a/src/main.cpp b/src/main.cpp index 260d970128..196298f39e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -167,7 +167,9 @@ int main(int argc, char **argv) QCoreApplication::setOrganizationName("stellarium"); QCoreApplication::setAttribute(Qt::AA_CompressHighFrequencyEvents); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents); +#endif // Support high DPI pixmaps and fonts #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); @@ -224,7 +226,7 @@ int main(int argc, char **argv) // add contents of STEL_OPTS environment variable. QString envStelOpts(qgetenv("STEL_OPTS").constData()); - if (envStelOpts.length()>0) + if (!envStelOpts.isEmpty()) { argList+= envStelOpts.split(" "); argStr += " " + envStelOpts; diff --git a/src/scripting/StelMainScriptAPI.cpp b/src/scripting/StelMainScriptAPI.cpp index 3a49753812..6395bff2aa 100644 --- a/src/scripting/StelMainScriptAPI.cpp +++ b/src/scripting/StelMainScriptAPI.cpp @@ -355,10 +355,10 @@ void StelMainScriptAPI::screenshot(const QString& prefix, bool invert, const QSt const bool oldInvertSetting = StelMainView::getInstance().getFlagInvertScreenShotColors(); const QString oldFormat=StelMainView::getInstance().getScreenshotFormat(); - if ((format.length()>0) && (format.length()<=4)) + if ((!format.isEmpty()) && (format.length()<=4)) StelMainView::getInstance().setScreenshotFormat(format); // Check requested against set image format. - if ((format.length()>0) && (StelMainView::getInstance().getScreenshotFormat() != format)) + if ((!format.isEmpty()) && (StelMainView::getInstance().getScreenshotFormat() != format)) { qWarning() << "Screenshot format" << format << "not supported. Not saving screenshot."; return; |