Commit 6ffed452 authored by Samikshan Bairagya's avatar Samikshan Bairagya

Made some more changes wrt translation of QML interface and user-settings...

Made some more changes wrt translation of QML interface and user-settings wizard. Also have meaningful variable names for the the wizard's ui file.
parent 757143d2
......@@ -3,7 +3,7 @@
# (LW 18/04/2002) Stripped trailing slashes from comments, to keep make happy
# (JH 16/08/2002) Patch submitted by Stefan Asserhall to deal with diacritic characters properly
# (JH 16/08/2002) modified to sort strings alphabetically and filter through uniq.
# (HE 31/08/2002) treat cities, regions, countries separatedly
# (HE 31/08/2002) treat cities, regions, countries separately
rm -f kstars_i18n.cpp
rm -f cities.tmp
......@@ -67,9 +67,15 @@ rm -f image_url.tmp
rm -f info_url.tmp
rm -f tips.cpp
$EXTRACTRC xplanet/*.ui *.ui printing/*.ui tools/*.ui tools/whatsinteresting/*.ui dialogs/*.ui fitsviewer/*.ui indi/*.ui options/*.ui oal/*.ui *.rc *.kcfg >> rc.cpp || exit 11
$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp || exit 11
(cd data && $PREPARETIPS > ../tips.cpp)
$XGETTEXT *.cpp *.h printing/*.cpp tools/*.cpp tools/*.h tools/whatsinteresting/*.h tools/whatsinteresting/*.cpp skycomponents/*.cpp widgets/*.cpp dialogs/*.cpp dialogs/*.h fitsviewer/*.cpp fitsviewer/*.h indi/*.cpp indi/*.h options/*.cpp options/*.h skyobjects/*.cpp skyobjects/*.h xplanet/*.cpp oal/*.h oal/*.cpp -o $podir/kstars.pot
$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kstars.pot
#$EXTRACTRC xplanet/*.ui *.ui printing/*.ui tools/*.ui tools/whatsinteresting/*.ui dialogs/*.ui fitsviewer/*.ui indi/*.ui options/*.ui oal/*.ui *.rc *.kcfg >> rc.cpp || exit 11
#$XGETTEXT *.cpp *.h printing/*.cpp tools/*.cpp tools/*.h tools/whatsinteresting/*.h tools/whatsinteresting/*.cpp tools/whatsinteresting/qml/*.qml skycomponents/*.cpp widgets/*.cpp dialogs/*.cpp dialogs/*.h fitsviewer/*.cpp fitsviewer/*.h indi/*.cpp indi/*.h options/*.cpp options/*.h skyobjects/*.cpp skyobjects/*.h xplanet/*.cpp oal/*.h oal/*.cpp -o $podir/kstars.pot
rm -f tips.cpp
rm -f kstars_i18n.cpp
rm -f rc.cpp
......@@ -24,7 +24,7 @@ Rectangle {
width: 209
height: 46
color: "#59ad0e"
text: qsTr("What's Interesting...")
text: i18n("What's Interesting...")
verticalAlignment: Text.AlignVCenter
font.family: "Cantarell"
font.bold: false
......@@ -90,7 +90,7 @@ Rectangle {
x: 0
y: 0
color: "#e4800d"
text: qsTr("Planets")
text: i18n("Planets")
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
......@@ -128,7 +128,7 @@ Rectangle {
x: 0
y: 0
color: "#e4800d"
text: qsTr("Bright Stars")
text: qsTr("Stars")
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
......@@ -209,7 +209,7 @@ Rectangle {
x: 0
y: 0
color: "#e4800d"
text: qsTr("Deep-sky Objects")
text: i18n("Deep-sky Objects")
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
......@@ -243,7 +243,7 @@ Rectangle {
x: 0
y: 0
color: "#6b6660"
text: qsTr("Galaxies")
text: i18n("Galaxies")
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>612</width>
<height>354</height>
<height>360</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -23,7 +23,7 @@
<enum>QWizard::ClassicStyle</enum>
</property>
<widget class="QWizardPage" name="welcomePage">
<widget class="QLabel" name="label">
<widget class="QLabel" name="welcomePageLabel">
<property name="geometry">
<rect>
<x>30</x>
......@@ -49,7 +49,7 @@
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="welcomePageText">
<property name="geometry">
<rect>
<x>140</x>
......@@ -65,9 +65,15 @@
<bold>true</bold>
</font>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>Use this wizard to provide details of your location conditions and equipment specifications</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
......@@ -117,7 +123,7 @@
<number>1</number>
</property>
</widget>
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="lightPollutionPageLabel">
<property name="geometry">
<rect>
<x>420</x>
......@@ -140,7 +146,7 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="lightPollutionText">
<property name="geometry">
<rect>
<x>20</x>
......@@ -150,7 +156,7 @@
</rect>
</property>
<property name="text">
<string>How light-polluted is your night-sky? Rate your night-sky conditions from 1-9 based on the Bortle Dark-Sky Scale. A rating of 1 represents an excellent dark-sky site, while 9 represents a brilliantly lit inner-city sky.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How light-polluted is your night-sky? Rate your night-sky conditions from 1-9 based on the &lt;span style=&quot; font-weight:600;&quot;&gt;Bortle Dark-Sky Scale&lt;/span&gt;. A rating of &lt;span style=&quot; font-weight:600;&quot;&gt;1&lt;/span&gt; represents an &lt;span style=&quot; font-weight:600;&quot;&gt;excellent dark-sky site&lt;/span&gt;, while &lt;span style=&quot; font-weight:600;&quot;&gt;9&lt;/span&gt; represents a &lt;span style=&quot; font-weight:600;&quot;&gt;brilliantly lit inner-city sky&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
......@@ -162,7 +168,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_9">
<widget class="QLabel" name="lightPollutionLink">
<property name="geometry">
<rect>
<x>250</x>
......@@ -181,7 +187,7 @@
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
<widget class="QLabel" name="label_10">
<widget class="QLabel" name="scaleLabel1">
<property name="geometry">
<rect>
<x>70</x>
......@@ -197,7 +203,7 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_11">
<widget class="QLabel" name="scaleLabel5">
<property name="geometry">
<rect>
<x>290</x>
......@@ -213,7 +219,7 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_12">
<widget class="QLabel" name="scaleLabel9">
<property name="geometry">
<rect>
<x>500</x>
......@@ -231,7 +237,7 @@
</widget>
</widget>
<widget class="QWizardPage" name="equipTypePage">
<widget class="QLabel" name="label_5">
<widget class="QLabel" name="equipSpecPageLabel">
<property name="geometry">
<rect>
<x>10</x>
......@@ -298,7 +304,7 @@
</widget>
</widget>
<widget class="QWizardPage" name="equipParamPage">
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="equipParamPageLabel">
<property name="geometry">
<rect>
<x>10</x>
......@@ -324,7 +330,7 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_7">
<widget class="QLabel" name="apertureLabel">
<property name="geometry">
<rect>
<x>240</x>
......@@ -373,7 +379,7 @@
</property>
</item>
</widget>
<widget class="QLabel" name="label_8">
<widget class="QLabel" name="telescopeTypeLabel">
<property name="geometry">
<rect>
<x>238</x>
......
......@@ -22,6 +22,7 @@
#include "dialogs/detaildialog.h"
#include "kstandarddirs.h"
#include "kdeclarative.h"
WIView::WIView(QWidget *parent, ObsConditions *obs) : QWidget(parent), m_Obs(obs)
{
......@@ -116,13 +117,13 @@ void WIView::loadDetailsView(SkyObjItem *soitem, int index)
if (soitem->getType() == SkyObjItem::Constellation)
magText = i18n("Magnitude: --");
else
magText = i18n("Magnitude: %1 %2", soitem->getMagnitude(), " mag");
magText = i18n("Magnitude") + ": " + QString::number(soitem->getMagnitude()) + " mag";
magTextObj->setProperty("text", magText);
QString sbText = i18n("Surface Brightness: %1", soitem->getSurfaceBrightness());
QString sbText = i18n("Surface Brightness") + ": " + soitem->getSurfaceBrightness();
sbTextObj->setProperty("text", sbText);
QString sizeText = i18n("Size: %1", soitem->getSize());
QString sizeText = i18n("Size") + ": " + soitem->getSize();
sizeTextObj->setProperty("text", sizeText);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment