diff options
92 files changed, 2210 insertions, 819 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 5c3586e..212193b 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 372db29..fde47f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,17 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### project( tdetoys ) -set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -34,7 +38,6 @@ include( CheckCXXSourceCompiles ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) diff --git a/admin b/admin -Subproject a7f75ac0ff587d5b8694a1b78557597161f8104 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/amor/amor.cpp b/amor/amor.cpp index 2580794..c6de8af 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -136,37 +136,37 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() mState = Normal; mWin = new KWinModule; - connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(slotWindowActivate(WId))); - connect(mWin, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(slotWindowRemove(WId))); - connect(mWin, TQT_SIGNAL(stackingOrderChanged()), - this, TQT_SLOT(slotStackingChanged())); - connect(mWin, TQT_SIGNAL(windowChanged(WId, const unsigned long *)), - this, TQT_SLOT(slotWindowChange(WId, const unsigned long *))); - connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotDesktopChange(int))); + connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(slotWindowActivate(WId))); + connect(mWin, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(slotWindowRemove(WId))); + connect(mWin, TQ_SIGNAL(stackingOrderChanged()), + this, TQ_SLOT(slotStackingChanged())); + connect(mWin, TQ_SIGNAL(windowChanged(WId, const unsigned long *)), + this, TQ_SLOT(slotWindowChange(WId, const unsigned long *))); + connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotDesktopChange(int))); mAmor = new AmorWidget(); - connect(mAmor, TQT_SIGNAL(mouseClicked(const TQPoint &)), - TQT_SLOT(slotMouseClicked(const TQPoint &))); - connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), - TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); + connect(mAmor, TQ_SIGNAL(mouseClicked(const TQPoint &)), + TQ_SLOT(slotMouseClicked(const TQPoint &))); + connect(mAmor, TQ_SIGNAL(dragged(const TQPoint &, bool)), + TQ_SLOT(slotWidgetDragged(const TQPoint &, bool))); mAmor->resize(mTheme.maximumSize()); mTimer = new TQTimer(this); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); mStackTimer = new TQTimer(this); - connect(mStackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(restack())); + connect(mStackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(restack())); mBubbleTimer = new TQTimer(this); - connect(mBubbleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBubbleTimeout())); + connect(mBubbleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBubbleTimeout())); time(&mActiveTime); mCursPos = TQCursor::pos(); mCursorTimer = new TQTimer(this); - connect(mCursorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCursorTimeout())); + connect(mCursorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCursorTimeout())); mCursorTimer->start( 500 ); if (mWin->activeWindow()) @@ -610,10 +610,10 @@ void Amor::slotMouseClicked(const TQPoint &pos) TDEPopupMenu* helpMnu = help->menu(); mMenu = new TDEPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed - mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQT_SLOT(quit())); + mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQ_SLOT(quit())); } mMenu->exec(pos); @@ -710,9 +710,9 @@ void Amor::slotConfigure() if (!mAmorDialog) { mAmorDialog = new AmorDialog(); - connect(mAmorDialog, TQT_SIGNAL(changed()), TQT_SLOT(slotConfigChanged())); - connect(mAmorDialog, TQT_SIGNAL(offsetChanged(int)), - TQT_SLOT(slotOffsetChanged(int))); + connect(mAmorDialog, TQ_SIGNAL(changed()), TQ_SLOT(slotConfigChanged())); + connect(mAmorDialog, TQ_SIGNAL(offsetChanged(int)), + TQ_SLOT(slotOffsetChanged(int))); } mAmorDialog->show(); @@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget() { // the only function of this widget is to catch & forward the // saveYourself() signal from the session manager - connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(wm_saveyourself())); + connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself())); } void AmorSessionWidget::wm_saveyourself() diff --git a/amor/amor.h b/amor/amor.h index 3e75183..b4a4abe 100644 --- a/amor/amor.h +++ b/amor/amor.h @@ -72,7 +72,7 @@ private: // class Amor : public TQObject, virtual public AmorIface { - Q_OBJECT + TQ_OBJECT public: Amor(); @@ -153,7 +153,7 @@ private: class AmorSessionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorSessionWidget(); diff --git a/amor/amorbubble.h b/amor/amorbubble.h index 3a99b7d..5006a0e 100644 --- a/amor/amorbubble.h +++ b/amor/amorbubble.h @@ -44,7 +44,7 @@ class TQTimer; // class AmorBubble : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorBubble(); diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index 5abb0e3..9af3b47 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -57,7 +57,7 @@ AmorDialog::AmorDialog() TQLabel *label = new TQLabel(i18n("Theme:"), themeBox); mThemeListBox = new TQListBox(themeBox); - connect(mThemeListBox,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotHighlighted(int))); + connect(mThemeListBox,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotHighlighted(int))); mThemeListBox->setMinimumSize( fontMetrics().maxWidth()*20, fontMetrics().lineSpacing()*6 ); @@ -74,24 +74,24 @@ AmorDialog::AmorDialog() label = new TQLabel(i18n("Offset:"), offsetBox); TQSlider *slider = new TQSlider(-40, 40, 5, mConfig.mOffset, - Qt::Vertical, offsetBox); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotOffset(int))); + TQt::Vertical, offsetBox); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotOffset(int))); // Always on top TQCheckBox *checkBox = new TQCheckBox(i18n("Always on top"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOnTop(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOnTop(bool))); checkBox->setChecked(mConfig.mOnTop); checkBox = new TQCheckBox(i18n("Show random tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTips(bool))); checkBox->setChecked(mConfig.mTips); // always keep this one after the connect, or the TQPtrList would not be grayed when it should checkBox = new TQCheckBox(i18n("Use a random character"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTheme(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTheme(bool))); checkBox->setChecked(mConfig.mRandomTheme); checkBox = new TQCheckBox(i18n("Allow application tips"), mainwidget); - connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotApplicationTips(bool))); + connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotApplicationTips(bool))); checkBox->setChecked(mConfig.mAppTips); readThemes(); diff --git a/amor/amordialog.h b/amor/amordialog.h index d2d2d0c..cfd6896 100644 --- a/amor/amordialog.h +++ b/amor/amordialog.h @@ -40,7 +40,7 @@ // class AmorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index 38dd0d3..c60cd5d 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -98,7 +98,7 @@ void AmorWidget::mousePressEvent(TQMouseEvent *me) // void AmorWidget::mouseMoveEvent(TQMouseEvent *me) { - if ( me->state() == Qt::LeftButton ) { + if ( me->state() == TQt::LeftButton ) { if ( !dragging && (clickPos-me->globalPos()).manhattanLength() > 3 ) dragging = true; if ( dragging ) { @@ -116,7 +116,7 @@ void AmorWidget::mouseReleaseEvent(TQMouseEvent *me) { if ( dragging ) emit dragged( me->globalPos() - clickPos, true ); - else if ( me->state() == Qt::RightButton ) + else if ( me->state() == TQt::RightButton ) emit mouseClicked(clickPos); clickPos = TQPoint(); diff --git a/amor/amorwidget.h b/amor/amorwidget.h index d5cdd88..9d4b5db 100644 --- a/amor/amorwidget.h +++ b/amor/amorwidget.h @@ -40,7 +40,7 @@ // class AmorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AmorWidget(); diff --git a/doc/amor/CMakeLists.txt b/doc/amor/CMakeLists.txt index d4791cc..490c236 100644 --- a/doc/amor/CMakeLists.txt +++ b/doc/amor/CMakeLists.txt @@ -11,7 +11,7 @@ tde_create_handbook( DESTINATION amor ) -INSTALL( +install( FILES amor.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/kodo/CMakeLists.txt b/doc/kodo/CMakeLists.txt index 93fc8cf..d6f7386 100644 --- a/doc/kodo/CMakeLists.txt +++ b/doc/kodo/CMakeLists.txt @@ -11,7 +11,7 @@ tde_create_handbook( DESTINATION kodo ) -INSTALL( +install( FILES kodo.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/kteatime/CMakeLists.txt b/doc/kteatime/CMakeLists.txt index 73c6c43..35fbaf6 100644 --- a/doc/kteatime/CMakeLists.txt +++ b/doc/kteatime/CMakeLists.txt @@ -11,7 +11,7 @@ tde_create_handbook( DESTINATION kteatime ) -INSTALL( +install( FILES kteatime.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/ktux/CMakeLists.txt b/doc/ktux/CMakeLists.txt index d844881..3ab85aa 100644 --- a/doc/ktux/CMakeLists.txt +++ b/doc/ktux/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES ktux.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/kweather/CMakeLists.txt b/doc/kweather/CMakeLists.txt index 6088ebc..56153c3 100644 --- a/doc/kweather/CMakeLists.txt +++ b/doc/kweather/CMakeLists.txt @@ -11,7 +11,7 @@ tde_create_handbook( DESTINATION kweather ) -INSTALL( +install( FILES kweatherreport.1 kweatherservice.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/kworldclock/CMakeLists.txt b/doc/kworldclock/CMakeLists.txt index fec1933..196bfc9 100644 --- a/doc/kworldclock/CMakeLists.txt +++ b/doc/kworldclock/CMakeLists.txt @@ -11,7 +11,7 @@ tde_create_handbook( DESTINATION kworldclock ) -INSTALL( +install( FILES kworldclock.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/eyesapplet/eyes.h b/eyesapplet/eyes.h index fa2242a..d5cc291 100644 --- a/eyesapplet/eyes.h +++ b/eyesapplet/eyes.h @@ -24,7 +24,7 @@ class EyesApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index 787c8a1..d2ffd9d 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -93,8 +93,8 @@ PiecesTable::PiecesTable(TQWidget* parent, const char* name ) : QtTableView(parent, name), _activeRow(-1), _activeCol(-1), _randomized(false) { _menu = new TQPopupMenu(this); - _menu->insertItem(i18n("R&andomize Pieces"), this, TQT_SLOT(randomizeMap())); - _menu->insertItem(i18n("&Reset Pieces"), this, TQT_SLOT(resetMap())); + _menu->insertItem(i18n("R&andomize Pieces"), this, TQ_SLOT(randomizeMap())); + _menu->insertItem(i18n("&Reset Pieces"), this, TQ_SLOT(resetMap())); _menu->adjustSize(); // setup table view setFrameStyle(StyledPanel | Sunken); @@ -227,7 +227,7 @@ void PiecesTable::mousePressEvent(TQMouseEvent* e) { QtTableView::mousePressEvent(e); - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { // execute RMB popup and check result _menu->exec(mapToGlobal(e->pos())); e->accept(); diff --git a/fifteenapplet/fifteenapplet.h b/fifteenapplet/fifteenapplet.h index 1ef45c9..15fdc65 100644 --- a/fifteenapplet/fifteenapplet.h +++ b/fifteenapplet/fifteenapplet.h @@ -34,7 +34,7 @@ class TDEAboutData; class PiecesTable : public QtTableView { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ private: class FifteenApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp index 0048c5b..bbd5f2f 100644 --- a/fifteenapplet/qttableview.cpp +++ b/fifteenapplet/qttableview.cpp @@ -1391,7 +1391,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQRect r = viewR; r.setLeft( xPos ); r.setBottom( yPos<maxY?yPos:maxY ); - if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) ) + if ( inherits( "TQMultiLineEdit" ) ) paint.fillRect( r.intersect( updateR ), g.base() ); else paint.eraseRect( r.intersect( updateR ) ); @@ -1399,7 +1399,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) if ( yPos <= maxY ) { TQRect r = viewR; r.setTop( yPos ); - if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) ) + if ( inherits( "TQMultiLineEdit" ) ) paint.fillRect( r.intersect( updateR ), g.base() ); else paint.eraseRect( r.intersect( updateR ) ); @@ -1439,20 +1439,20 @@ TQScrollBar *QtTableView::verticalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !vScrollBar ) { - TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that ); + TQScrollBar *sb = new TQScrollBar( TQt::Vertical, that ); #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif sb->resize( sb->sizeHint() ); // height is irrelevant TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); - sb->setFocusPolicy( TQ_NoFocus ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(verSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(verSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(verSbSlidingDone())); + sb->setFocusPolicy( TQWidget::NoFocus ); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(verSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(verSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(verSbSlidingDone())); sb->hide(); that->vScrollBar = sb; return sb; @@ -1470,20 +1470,20 @@ TQScrollBar *QtTableView::horizontalScrollBar() const { QtTableView *that = (QtTableView*)this; // semantic const if ( !hScrollBar ) { - TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that ); + TQScrollBar *sb = new TQScrollBar( TQt::Horizontal, that ); #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif sb->resize( sb->sizeHint() ); // width is irrelevant - sb->setFocusPolicy( TQ_NoFocus ); + sb->setFocusPolicy( TQWidget::NoFocus ); TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(horSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(horSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(horSbSlidingDone())); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(horSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(horSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(horSbSlidingDone())); sb->hide(); that->hScrollBar = sb; return sb; diff --git a/fifteenapplet/qttableview.h b/fifteenapplet/qttableview.h index 68ab617..72b0d31 100644 --- a/fifteenapplet/qttableview.h +++ b/fifteenapplet/qttableview.h @@ -25,7 +25,7 @@ class QCornerSquare; class QtTableView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: virtual void setBackgroundColor( const TQColor & ); diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index 706a550..7ece643 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -62,9 +62,9 @@ MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions, popup = new TQPopupMenu(); popup->insertItem(SmallIcon("kmoon"), i18n("&About"), this, - TQT_SLOT(showAbout())); + TQ_SLOT(showAbout())); popup->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, - TQT_SLOT(settings())); + TQ_SLOT(settings())); // missuse timerEvent for initialising timerEvent(0); @@ -134,11 +134,11 @@ void MoonPAWidget::mousePressEvent( TQMouseEvent *e) if (!popup) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { popup->popup(mapToGlobal(e->pos())); popup->exec(); } - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { showAbout(); } } diff --git a/kmoon/kmoonapplet.h b/kmoon/kmoonapplet.h index b9d5607..d13a5ca 100644 --- a/kmoon/kmoonapplet.h +++ b/kmoon/kmoonapplet.h @@ -31,7 +31,7 @@ class MoonWidget; class MoonPAWidget : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp index 5473a30..eeafbcc 100644 --- a/kmoon/kmoondlg.cpp +++ b/kmoon/kmoondlg.cpp @@ -54,13 +54,13 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) "at this angle."); TQWhatsThis::add(label, text); - slider = new TQSlider( -90, 90, 2, angle, Qt::Horizontal, hbox1, "slider" ); + slider = new TQSlider( -90, 90, 2, angle, TQt::Horizontal, hbox1, "slider" ); slider->setTickmarks(TQSlider::Above); slider->setTickInterval(45); slider->setEnabled(TQPixmap::defaultDepth() > 8); label->setEnabled(TQPixmap::defaultDepth() > 8); TQWhatsThis::add(slider, text); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(angleChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(angleChanged(int))); TQHBox *hbox2 = new TQHBox(vbox); hbox2->setSpacing(spacingHint()); @@ -69,13 +69,13 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) hemitoggle->setText(north ? i18n("Switch to Southern Hemisphere") : i18n("Switch to Northern Hemisphere")); - connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi())); + connect(hemitoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleHemi())); masktoggle = new TQPushButton(hbox2); masktoggle->setText(mask ? i18n("Switch Masking Off") : i18n("Switch Masking On")); - connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask())); + connect(masktoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleMask())); topLayout->addWidget(vbox); moon = new MoonWidget(page, "preview"); @@ -84,7 +84,7 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name) TQWhatsThis::add(moon, i18n("The moon as KMoon would display it\n" "following your current setting and time.")); topLayout->addWidget(moon); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(help())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(help())); // disableResize(); } diff --git a/kmoon/kmoondlg.h b/kmoon/kmoondlg.h index 9cddb77..a010bec 100644 --- a/kmoon/kmoondlg.h +++ b/kmoon/kmoondlg.h @@ -28,7 +28,7 @@ class MoonWidget; class TQPushButton; class KMoonDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index e25860e..711beaf 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -336,7 +336,7 @@ void MoonWidget::renderGraphic() TQRgb *destline = (TQRgb*)dest.scanLine(y); TQRgb *sourceline = (TQRgb*)Mask2.scanLine(y); for (int x = 0; x < mw; x++) { - destline[x] = (destline[x] & TQRGB_MASK)|(tqRed(sourceline[x]) << 24); + destline[x] = (destline[x] & TQT_RGB_MASK)|(tqRed(sourceline[x]) << 24); } } } diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h index 6c66948..cddc5c1 100644 --- a/kmoon/kmoonwidget.h +++ b/kmoon/kmoonwidget.h @@ -29,7 +29,7 @@ class TQPopupMenu; class MoonWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kodo/kimagenumber.h b/kodo/kimagenumber.h index 7051048..0fa78c1 100644 --- a/kodo/kimagenumber.h +++ b/kodo/kimagenumber.h @@ -31,7 +31,7 @@ class KImageNumber : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( double m_value READ value WRITE setValue ) public: diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp index 8468190..473b27e 100644 --- a/kodo/kodometer.cpp +++ b/kodo/kodometer.cpp @@ -88,18 +88,18 @@ Kodometer::Kodometer(TQWidget* parent, const char* name) menu->insertTitle(kapp->miniIcon(), TDEGlobal::instance()->aboutData()->programName()); - enabledID = menu->insertItem(i18n("&Enable"), this, TQT_SLOT(toggleEnabled())); + enabledID = menu->insertItem(i18n("&Enable"), this, TQ_SLOT(toggleEnabled())); metricID = menu->insertItem(i18n("&Metric Display"), this, - TQT_SLOT(toggleUnits())); + TQ_SLOT(toggleUnits())); autoResetID = menu->insertItem(i18n("Auto &Reset Trip"), this, - TQT_SLOT(toggleAutoReset())); - menu->insertItem(i18n("Reset &Trip"), this, TQT_SLOT(resetTrip())); - menu->insertItem(i18n("Reset &Odometer"), this, TQT_SLOT(resetTotal())); + TQ_SLOT(toggleAutoReset())); + menu->insertItem(i18n("Reset &Trip"), this, TQ_SLOT(resetTrip())); + menu->insertItem(i18n("Reset &Odometer"), this, TQ_SLOT(resetTotal())); menu->insertSeparator(); menu->insertItem(SmallIconSet("help"), i18n("&Help"), helpMnu); - menu->insertItem(SmallIconSet("system-log-out"), i18n("&Quit"), this, TQT_SLOT(quit())); + menu->insertItem(SmallIconSet("system-log-out"), i18n("&Quit"), this, TQ_SLOT(quit())); menu->setCheckable(true); menu->setItemChecked(enabledID, Enabled); @@ -156,9 +156,9 @@ void Kodometer::FindAllScreens(void) vPixelsPerMM = (double)Dh / (double)DhMM; hPixelsPerMM = (double)Dw / (double)DwMM; screenInfo[i].PixelsPerMM = (vPixelsPerMM + hPixelsPerMM) / 2.0; -// kdDebug() << " Qt::Vertical pixels/mm are " << vPixelsPerMM << +// kdDebug() << " Vertical pixels/mm are " << vPixelsPerMM << // "mm" << endl; -// kdDebug() << " Qt::Horizontal pixels/mm are " << hPixelsPerMM << +// kdDebug() << " Horizontal pixels/mm are " << hPixelsPerMM << // "mm" << endl; // kdDebug() << " Average pixels/mm are " << // screenInfo[i].PixelsPerMM << "mm" << endl; diff --git a/kodo/kodometer.h b/kodo/kodometer.h index 3bfb891..d2c0346 100644 --- a/kodo/kodometer.h +++ b/kodo/kodometer.h @@ -88,7 +88,7 @@ typedef struct conversionEntry { class Kodometer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp index 221029d..032b12e 100644 --- a/kteatime/timeedit.cpp +++ b/kteatime/timeedit.cpp @@ -71,10 +71,10 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) layout->addWidget(secondBox); layout->addWidget(sec); - connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) ); - connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) ); - connect(secondBox, TQT_SIGNAL(wrapUp()), TQT_SLOT(wrappedUp())); - connect(secondBox, TQT_SIGNAL(wrapDown()), TQT_SLOT(wrappedDown())); + connect(minuteBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) ); + connect(secondBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int)) ); + connect(secondBox, TQ_SIGNAL(wrapUp()), TQ_SLOT(wrappedUp())); + connect(secondBox, TQ_SIGNAL(wrapDown()), TQ_SLOT(wrappedDown())); } TimeEdit::~TimeEdit() @@ -107,7 +107,7 @@ int TimeEdit::value() return minuteBox->value()*60 + secondBox->value(); } -/** SLOT: Handle wrap-up of seconds-box */ +/** Slot: Handle wrap-up of seconds-box */ void TimeEdit::wrappedUp() { if (minuteBox->value() != minuteBox->maxValue()) { @@ -117,7 +117,7 @@ void TimeEdit::wrappedUp() } } -/** SLOT: Handle wrap-down of seconds-box */ +/** Slot: Handle wrap-down of seconds-box */ void TimeEdit::wrappedDown() { // well, the "if" should always be true @@ -128,7 +128,7 @@ void TimeEdit::wrappedDown() } } -/** SLOT: Handle any change in minutes of seconds */ +/** Slot: Handle any change in minutes of seconds */ void TimeEdit::spinBoxValueChanged(int) { if (value() == 0) { @@ -139,7 +139,7 @@ void TimeEdit::spinBoxValueChanged(int) emit valueChanged(value()); } -/** TQT_SLOT (overloading TQSpinBox): set focus */ +/** Slot (overloading TQSpinBox): set focus */ void TimeEdit::setFocus() { minuteBox->setFocus(); diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h index 8b317b8..6fe4b95 100644 --- a/kteatime/timeedit.h +++ b/kteatime/timeedit.h @@ -20,7 +20,7 @@ class TQBoxLayout; */ class WrappingSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: @@ -42,7 +42,7 @@ signals: */ class TimeEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index 2d0ee03..f38437a 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -118,24 +118,24 @@ TopLevel::TopLevel() : KSystemTray() startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start"); + this, TQ_SLOT(start()), actionCollection(), "start"); stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0, - TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQ_SLOT(stop()), actionCollection(), "stop"); confAct = new TDEAction(i18n("&Configure..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); + this, TQ_SLOT(config()), actionCollection(), "configure"); anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous"); + this, TQ_SLOT(anonymous()), actionCollection(), "anonymous"); // TDEAction *quitAct = actionCollection()->action("file_quit"); // create app menu (displayed on right-click) menu = new TQPopupMenu(); menu->setCheckable(true); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaSelected(int))); // this menu will be displayed when no tea is steeping, and left mouse button is clicked start_menu = new TQPopupMenu(); start_menu->setCheckable(true); // menu isn't tickable, but this gives some add. spacing - connect(start_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(teaStartSelected(int))); + connect(start_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(teaStartSelected(int))); rebuildTeaMenus(); // populate tops of menus with tea-entries from config @@ -152,13 +152,13 @@ TopLevel::TopLevel() : KSystemTray() menu->insertSeparator(); confAct->plug(menu); menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQT_SLOT(quit())); + menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQ_SLOT(quit())); // quitAct->plug(menu); // FIXME: this doesn't seem to work with above definition of quitAct? // (need special 'quit'-method?) // this menu will be displayed when a tea is steeping, and left mouse button is clicked steeping_menu = new TQPopupMenu(); -// steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQT_SLOT(stop())); +// steeping_menu->insertItem(SmallIcon("cancel"), i18n("Just &Cancel Current"), this, TQ_SLOT(stop())); stopAct->plug(steeping_menu); // FIXME: can provide different text for this incarnation? // start_menu->insertSeparator(); @@ -225,7 +225,7 @@ void TopLevel::showEvent ( TQShowEvent * ) /** Handle mousePressEvent */ void TopLevel::mousePressEvent(TQMouseEvent *event) { - if (event->button() == Qt::LeftButton) { + if (event->button() == TQt::LeftButton) { if (ready) { stop(); // reset tooltip and stop animation } else { @@ -234,7 +234,7 @@ void TopLevel::mousePressEvent(TQMouseEvent *event) else start_menu->popup(TQCursor::pos()); } - } else if (event->button() == Qt::RightButton) + } else if (event->button() == TQt::RightButton) menu->popup(TQCursor::pos()); // else if (event->button() == MidButton) // currently unused } @@ -452,7 +452,7 @@ void TopLevel::start() } // else both are already defined by dialog handler - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer(1000); // 1000ms = 1s (sufficient resolution) running = true; @@ -466,7 +466,7 @@ void TopLevel::start() /* menu-slot: "stop" selected in menu */ void TopLevel::stop() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); running = false; ready = false; @@ -682,7 +682,7 @@ void TopLevel::config() /* left side - tea list and list-modifying buttons */ TQBoxLayout *leftside = new TQVBoxLayout(box); - TQGroupBox *listgroup = new TQGroupBox(2,Qt::Vertical, i18n("Tea List"), page); + TQGroupBox *listgroup = new TQGroupBox(2,TQt::Vertical, i18n("Tea List"), page); leftside->addWidget(listgroup, 0, 0); listbox = new TQListView(listgroup, "listBox"); @@ -691,7 +691,7 @@ void TopLevel::config() listbox->addColumn(i18n("Time")); listbox->header()->setClickEnabled(false, listbox->header()->count()-1); listbox->setSorting(-1); - connect(listbox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(listBoxItemSelected())); + connect(listbox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(listBoxItemSelected())); // now buttons for editing the tea-list TQWidget *listgroup_widget = new TQWidget(listgroup); @@ -701,35 +701,35 @@ void TopLevel::config() TQToolTip::add(btn_new, i18n("New")); btn_new->setPixmap(SmallIcon("document-new")); btn_new->setMinimumSize(btn_new->sizeHint() * 1.2); - connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked())); + connect(btn_new, TQ_SIGNAL(clicked()), TQ_SLOT(newButtonClicked())); hbox->addWidget(btn_new); btn_del = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_del, i18n("Delete")); btn_del->setIconSet(SmallIconSet("edit-delete")); btn_del->setMinimumSize(btn_new->sizeHint() * 1.2); - connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked())); + connect(btn_del, TQ_SIGNAL(clicked()), TQ_SLOT(delButtonClicked())); hbox->addWidget(btn_del); btn_up = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_up, i18n("Up")); btn_up->setIconSet(SmallIconSet("go-up")); btn_up->setMinimumSize(btn_up->sizeHint() * 1.2); - connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked())); + connect(btn_up, TQ_SIGNAL(clicked()), TQ_SLOT(upButtonClicked())); hbox->addWidget(btn_up); btn_down = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_down, i18n("Down")); btn_down->setIconSet(SmallIconSet("go-down")); btn_down->setMinimumSize(btn_down->sizeHint() * 1.2); - connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked())); + connect(btn_down, TQ_SIGNAL(clicked()), TQ_SLOT(downButtonClicked())); hbox->addWidget(btn_down); hbox->addStretch(10); /* right side - tea properties */ TQBoxLayout *rightside = new TQVBoxLayout(box); - editgroup = new TQGroupBox(2,Qt::Vertical, i18n("Tea Properties"), page); + editgroup = new TQGroupBox(2,TQt::Vertical, i18n("Tea Properties"), page); rightside->addWidget(editgroup, 0, 0); TQHBox *propbox = new TQHBox(editgroup); @@ -742,23 +742,23 @@ void TopLevel::config() nameEdit->setAlignment(TQLineEdit::AlignLeft); TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft); l->setFixedSize(l->sizeHint()); - connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) ); + connect(nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(nameEditTextChanged(const TQString&)) ); timeEdit = new TimeEdit(propright); timeEdit->setFixedHeight(timeEdit->sizeHint().height()); l = new TQLabel(timeEdit, i18n("Tea time:"), propleft); l->setFixedSize(l->sizeHint()); - connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int))); + connect(timeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinBoxValueChanged(int))); /* bottom - timeout actions */ - TQGroupBox *actiongroup = new TQGroupBox(4,Qt::Vertical, i18n("Action"), page); + TQGroupBox *actiongroup = new TQGroupBox(4,TQt::Vertical, i18n("Action"), page); top_box->addWidget(actiongroup, 0, 0); TQWidget *actionconf_widget = new TQWidget(actiongroup); TQBoxLayout *actionconf_hbox = new TQHBoxLayout(actionconf_widget); btn_conf = new TQPushButton(i18n("Configure Events..."), actionconf_widget); actionconf_hbox->addWidget(btn_conf); - connect(btn_conf, TQT_SIGNAL(clicked()), TQT_SLOT(confButtonClicked())); + connect(btn_conf, TQ_SIGNAL(clicked()), TQ_SLOT(confButtonClicked())); actionconf_hbox->addStretch(10); eventEnable = new TQCheckBox(i18n("Event"), actiongroup); @@ -773,7 +773,7 @@ void TopLevel::config() actionEdit = new TQLineEdit(actionbox); actionEdit->setFixedHeight(actionEdit->sizeHint().height()); TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea")); - connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool))); + connect(actionEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(actionEnableToggled(bool))); rightside->addStretch(); // single checkbox @@ -784,7 +784,7 @@ void TopLevel::config() // let listbox claim all remaining vertical space top_box->setStretchFactor(box, 10); - connect(confdlg, TQT_SIGNAL(helpClicked()), TQT_SLOT(help())); + connect(confdlg, TQ_SIGNAL(helpClicked()), TQ_SLOT(help())); } // now add all defined teas (and their times) to the listview diff --git a/kteatime/toplevel.h b/kteatime/toplevel.h index 02d8c20..7eebf8f 100644 --- a/kteatime/toplevel.h +++ b/kteatime/toplevel.h @@ -42,7 +42,7 @@ class TimeEdit; class TopLevel : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp index a59b6f4..eda20a5 100644 --- a/ktux/sprite.cpp +++ b/ktux/sprite.cpp @@ -64,9 +64,9 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) tl11->addStretch(1); tl11->addWidget(label); - TQSlider *sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, this ); + TQSlider *sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, this ); tl11->addWidget(sb); - connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); + connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) ); preview = new TQWidget( this ); preview->setFixedSize( 220, 170 ); @@ -77,14 +77,14 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) KButtonBox *bbox = new KButtonBox(this); TQButton *button = bbox->addButton( i18n("About")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT(slotAbout() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT(slotAbout() ) ); bbox->addStretch(1); button = bbox->addButton( KStdGuiItem::ok()); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) ); button = bbox->addButton(KStdGuiItem::cancel()); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); bbox->layout(); tl->addWidget(bbox); @@ -144,7 +144,7 @@ KSpriteSaver::KSpriteSaver( WId id ) : KScreenSaver( id ) readSettings(); blank(); - connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); mTimer.start(120-mSpeed, true); } diff --git a/ktux/sprite.h b/ktux/sprite.h index 58c27f2..405d71b 100644 --- a/ktux/sprite.h +++ b/ktux/sprite.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- class KSpriteSaver : public KScreenSaver { - Q_OBJECT + TQ_OBJECT public: KSpriteSaver( WId id ); @@ -49,7 +49,7 @@ protected: class KSpriteSetup : public TQDialog { - Q_OBJECT + TQ_OBJECT public: KSpriteSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index 1d423a5..d8a5f85 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -29,16 +29,18 @@ #include <kdebug.h> #include <tdeglobalsettings.h> #include <tdelocale.h> +#include <kiconloader.h> dockwidget::dockwidget(const TQString &location, TQWidget *parent, - const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal ) + const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(TQt::Horizontal ) { m_font = TDEGlobalSettings::generalFont(); setBackgroundOrigin( AncestorOrigin ); initDock(); - connect(m_button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( buttonClicked() )); + connect(m_button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( buttonClicked() )); m_weatherService = new WeatherService_stub( "KWeatherService", "WeatherService" ); + updateIcon(); } dockwidget::~dockwidget() @@ -101,7 +103,7 @@ void dockwidget::showWeather() m_weatherService->stationName( m_locationCode ) + " (" + m_weatherService->stationCountry( m_locationCode ) + ")</nobr></center></h3>"; - if ( m_weatherService->currentIconString( m_locationCode ) == "weather-none-available" ) // no data + if ( !m_weatherService->weatherDataAvailable(m_locationCode) ) // no data tip += "<center><nobr>" + i18n("The network is currently offline...") + "</nobr></center>"; tip += TQString("<br><table>" @@ -143,8 +145,7 @@ void dockwidget::showWeather() tip += "</qt>"; - // On null or empty location code, or if the station needs maintenance, this will return the dunno icon. - TQPixmap icon = m_weatherService->icon( m_locationCode ); + updateIcon(); TQToolTip::remove(this); TQToolTip::add(this, tip); @@ -158,7 +159,6 @@ void dockwidget::showWeather() m_lblWind->setText(wind); m_lblPres->setText(pressure); - m_button->setPixmap( icon ); } void dockwidget::initDock() @@ -195,7 +195,7 @@ void dockwidget::initDock() updateFont(); - TQTimer::singleShot( 0, this, TQT_SLOT( showWeather() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showWeather() ) ); } /** resize the view **/ @@ -204,13 +204,13 @@ void dockwidget::resizeView( const TQSize &size ) kdDebug(12004) << "Changing to size " << size << endl; resize(size); - if ( m_orientation ==Qt::Horizontal ) // Kicker in horizontal mode + if ( m_orientation == TQt::Horizontal ) // Kicker in horizontal mode { int h = size.height(); if ( m_mode == ShowAll ) { - if ( h <= 128 ) // left to right layout + if ( h <= TDEIcon::SizeEnormous ) // left to right layout { static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight); m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); @@ -221,7 +221,7 @@ void dockwidget::resizeView( const TQSize &size ) { static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom); TQFontMetrics fm(m_font); - h = 128 - (3 * fm.height()); // 3 lines of text below the button + h = TDEIcon::SizeEnormous - (3 * fm.height()); // 3 lines of text below the button m_lblTemp->setAlignment(TQt::AlignCenter); m_lblWind->setAlignment(TQt::AlignCenter); m_lblPres->setAlignment(TQt::AlignCenter); @@ -239,14 +239,14 @@ void dockwidget::resizeView( const TQSize &size ) { static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom); TQFontMetrics fm(m_font); - h = TQMIN(128, h) - fm.height(); + h = TQMIN(TDEIcon::SizeEnormous, h) - fm.height(); m_lblTemp->setAlignment(TQt::AlignCenter); } m_button->setFixedSize(h, h); } else { - h = TQMIN(h, 128); + h = TQMIN(h, TDEIcon::SizeEnormous); m_button->setFixedSize(h, h); } } @@ -257,7 +257,7 @@ void dockwidget::resizeView( const TQSize &size ) if ( m_mode == ShowAll ) { - if ( w <= 128 ) // top to bottom + if ( w <= TDEIcon::SizeEnormous ) // top to bottom { static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom); m_lblTemp->setAlignment(TQt::AlignCenter); @@ -279,7 +279,7 @@ void dockwidget::resizeView( const TQSize &size ) } else if ( m_mode == ShowTempOnly ) { - if ( w <= 128 ) // top to bottom + if ( w <= TDEIcon::SizeEnormous ) // top to bottom { static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom); m_lblTemp->setAlignment(TQt::AlignCenter); @@ -297,7 +297,7 @@ void dockwidget::resizeView( const TQSize &size ) } else { - w = TQMIN(w, 128); + w = TQMIN(w, TDEIcon::SizeEnormous); m_button->setFixedSize(w, w); } } @@ -310,7 +310,7 @@ int dockwidget::widthForHeight(int h) if ( m_mode == ShowAll ) { - if ( h <= 128 ) // left to right layout + if ( h <= TDEIcon::SizeEnormous ) // left to right layout { int pixelSize = h/3 - 3; pixelSize = TQMIN(pixelSize, fi.pixelSize()); // don't make it too large @@ -330,7 +330,7 @@ int dockwidget::widthForHeight(int h) } TQFontMetrics fm(m_font); // size of icon - h = 128 - (3 * fm.height()); // 3 lines of text below the button + h = TDEIcon::SizeEnormous - (3 * fm.height()); // 3 lines of text below the button w = TQMAX(fm.width(m_lblWind->text()), fm.width(m_lblPres->text())) + 1; w = TQMAX(h, w); // at least width of square icon } @@ -357,17 +357,18 @@ int dockwidget::widthForHeight(int h) } TQFontMetrics fm(m_font); // size of icon - h = TQMIN(128, h) - fm.height(); + h = TQMIN(TDEIcon::SizeEnormous, h) - fm.height(); w = fm.width(m_lblTemp->text()) + 1; w = TQMAX(h, w); // at least width of square icon } } else { - w = TQMIN(128, h); // don't make it too large + w = TQMIN(TDEIcon::SizeEnormous, h); // don't make it too large } updateFont(); + updateIcon(); return w + 4; } @@ -380,7 +381,7 @@ int dockwidget::heightForWidth( int w ) TQFontMetrics fmg(TDEGlobalSettings::generalFont()); int maxWidth = fmg.width("888 km/h NNWW"); // a good approximation - if ( w <= 128 ) // top to bottom + if ( w <= TDEIcon::SizeEnormous ) // top to bottom { if ( maxWidth <= w ) // enough space to use global font { @@ -415,7 +416,7 @@ int dockwidget::heightForWidth( int w ) TQFontMetrics fmg(TDEGlobalSettings::generalFont()); int maxWidth = fmg.width("888.88 CC"); // a good approximation - if ( w <= 128 ) // top to bottom + if ( w <= TDEIcon::SizeEnormous ) // top to bottom { if ( maxWidth <= w ) // enough space to use global font { @@ -446,10 +447,11 @@ int dockwidget::heightForWidth( int w ) } else { - h = TQMIN(128, w); // don't make it too large + h = TQMIN(TDEIcon::SizeEnormous, w); // don't make it too large } updateFont(); + updateIcon(); return h; } @@ -462,4 +464,11 @@ void dockwidget::updateFont() m_lblPres->setFont(m_font); } +void dockwidget::updateIcon() +{ + // On null or empty location code, or if the station needs maintenance, this will return the dunno icon. + TQPixmap icon = m_weatherService->icon( m_locationCode, m_button->height() ); + m_button->setPixmap( icon ); +} + #include "dockwidget.moc" diff --git a/kweather/dockwidget.h b/kweather/dockwidget.h index 01cf4ce..89c5133 100644 --- a/kweather/dockwidget.h +++ b/kweather/dockwidget.h @@ -30,7 +30,7 @@ class WeatherButton; class dockwidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ public: void setLocationCode(const TQString &locationCode); void setViewMode(int); - void setOrientation(Qt::Orientation o) { m_orientation = o; } + void setOrientation(TQt::Orientation o) { m_orientation = o; } /** resize the view **/ void resizeView(const TQSize &size); int widthForHeight(int h); @@ -56,6 +56,7 @@ signals: // Signals private: void initDock(); void updateFont(); + void updateIcon(); int m_mode; TQString m_locationCode; @@ -65,7 +66,7 @@ private: TQLabel *m_lblTemp; TQLabel *m_lblWind; TQLabel *m_lblPres; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; WeatherService_stub *m_weatherService; }; diff --git a/kweather/kcmweatherapplet.cpp b/kweather/kcmweatherapplet.cpp index 87decad..20b4cb4 100644 --- a/kweather/kcmweatherapplet.cpp +++ b/kweather/kcmweatherapplet.cpp @@ -63,12 +63,12 @@ KCMWeatherApplet::KCMWeatherApplet( TQWidget *parent, const char *name ) fillStationList(); load(); - connect( mWidget->m_viewMode, TQT_SIGNAL( released( int ) ), - TQT_SLOT( changeViewMode( int ) ) ); - connect( mWidget->m_reportLocation, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( reportLocationChanged() ) ); - connect( mWidget->m_textColor, TQT_SIGNAL( changed(const TQColor &) ), - TQT_SLOT( textColorChanged(const TQColor &) ) ); + connect( mWidget->m_viewMode, TQ_SIGNAL( released( int ) ), + TQ_SLOT( changeViewMode( int ) ) ); + connect( mWidget->m_reportLocation, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( reportLocationChanged() ) ); + connect( mWidget->m_textColor, TQ_SIGNAL( changed(const TQColor &) ), + TQ_SLOT( textColorChanged(const TQColor &) ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmweatherapplet" ), diff --git a/kweather/kcmweatherapplet.h b/kweather/kcmweatherapplet.h index adb6f98..41df3f6 100644 --- a/kweather/kcmweatherapplet.h +++ b/kweather/kcmweatherapplet.h @@ -29,7 +29,7 @@ class appletConfig; class KCMWeatherApplet : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMWeatherApplet( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp index af48790..f014ff7 100644 --- a/kweather/kcmweatherservice.cpp +++ b/kweather/kcmweatherservice.cpp @@ -63,10 +63,10 @@ KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name ) layout->addStretch(); load(); - connect( mWidget->m_enableLog, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( enableLogWidgets( bool ) ) ); - connect( mWidget->m_iconTheme, TQT_SIGNAL( released( int ) ), - TQT_SLOT( changed() ) ); + connect( mWidget->m_enableLog, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( enableLogWidgets( bool ) ) ); + connect( mWidget->m_iconTheme, TQ_SIGNAL( released( int ) ), + TQ_SLOT( changed() ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmweatherservice" ), diff --git a/kweather/kcmweatherservice.h b/kweather/kcmweatherservice.h index d6dee62..51c60e0 100644 --- a/kweather/kcmweatherservice.h +++ b/kweather/kcmweatherservice.h @@ -29,7 +29,7 @@ class serviceConfig; class KCMWeatherService : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMWeatherService( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kweather/kcmweatherstations.cpp b/kweather/kcmweatherstations.cpp index 3d60f5a..73e257d 100644 --- a/kweather/kcmweatherstations.cpp +++ b/kweather/kcmweatherstations.cpp @@ -45,7 +45,7 @@ KCMWeatherStations::KCMWeatherStations( TQWidget *parent, const char *name ) mWidget = new StationsConfigWidget( this ); // not needed, as a change immediately changes the service - //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + //connect(mWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); layout->addWidget( mWidget ); TDEAboutData *about = new TDEAboutData( "kcmweatherstations", diff --git a/kweather/kcmweatherstations.h b/kweather/kcmweatherstations.h index 7660457..a235b61 100644 --- a/kweather/kcmweatherstations.h +++ b/kweather/kcmweatherstations.h @@ -30,7 +30,7 @@ class StationsConfigWidget; class KCMWeatherStations : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 8d0b618..9b8969a 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -65,12 +65,12 @@ kweather::kweather(const TQString& configFile, Type t, int actions, initDCOP(); dockWidget = new dockwidget(reportLocation, this, "dockwidget"); - connect(dockWidget, TQT_SIGNAL(buttonClicked()), TQT_SLOT(doReport())); + connect(dockWidget, TQ_SIGNAL(buttonClicked()), TQ_SLOT(doReport())); dockWidget->setViewMode(mViewMode); setLabelColor(); timeOut = new TQTimer(this, "timeOut" ); - connect(timeOut, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(timeOut, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timeOut->start(10*60*1000); if(mFirstRun) @@ -89,13 +89,13 @@ void kweather::initContextMenu() mContextMenu = new TDEPopupMenu(this); mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0); mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"), - this, TQT_SLOT(doReport()), 0, -1, 1); + this, TQ_SLOT(doReport()), 0, -1, 1); mContextMenu->insertItem(SmallIcon("reload"), i18n("&Update Now"), - this, TQT_SLOT(slotUpdateNow()), 0, -1, 2); + this, TQ_SLOT(slotUpdateNow()), 0, -1, 2); mContextMenu->insertSeparator(); - mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQT_SLOT(about())); + mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQ_SLOT(about())); mContextMenu->insertItem(SmallIcon("configure"), - i18n("&Configure KWeather..."), this, TQT_SLOT(preferences())); + i18n("&Configure KWeather..."), this, TQ_SLOT(preferences())); setCustomMenu(mContextMenu); } @@ -159,7 +159,7 @@ void kweather::preferences() if ( settingsDialog == 0 ) { settingsDialog = new KCMultiDialog( this ); - connect( settingsDialog, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotPrefsAccepted() ) ); + connect( settingsDialog, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotPrefsAccepted() ) ); settingsDialog->addModule( "kcmweatherapplet.desktop" ); settingsDialog->addModule( "kcmweatherservice.desktop" ); @@ -191,7 +191,7 @@ void kweather::doReport() { mReport = new reportView(reportLocation); - connect( mReport, TQT_SIGNAL( finished() ), TQT_SLOT( slotReportFinished() ) ); + connect( mReport, TQ_SIGNAL( finished() ), TQ_SLOT( slotReportFinished() ) ); } mReport->show(); @@ -302,7 +302,7 @@ void kweather::timeout() int kweather::widthForHeight(int h) const { //kdDebug(12004) << "widthForHeight " << h << endl; - dockWidget->setOrientation(Qt::Horizontal); + dockWidget->setOrientation(TQt::Horizontal); int w = dockWidget->widthForHeight(h); return w; } @@ -310,7 +310,7 @@ int kweather::widthForHeight(int h) const int kweather::heightForWidth(int w) const { kdDebug(12004) << "heightForWidth " << w<< endl; - dockWidget->setOrientation(Qt::Vertical); + dockWidget->setOrientation(TQt::Vertical); int h = dockWidget->heightForWidth( w ); return h; } @@ -373,7 +373,7 @@ void kweather::slotPrefsAccepted() void kweather::mousePressEvent(TQMouseEvent *e) { - if ( e->button() != Qt::RightButton ) + if ( e->button() != TQt::RightButton ) { KPanelApplet::mousePressEvent( e ); return; diff --git a/kweather/kweather.h b/kweather/kweather.h index 28c4e25..9762535 100644 --- a/kweather/kweather.h +++ b/kweather/kweather.h @@ -32,7 +32,7 @@ class TQPalette; class kweather : public KPanelApplet, public weatherIface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kweather/main.cpp b/kweather/main.cpp index 5c8d494..595e653 100644 --- a/kweather/main.cpp +++ b/kweather/main.cpp @@ -29,7 +29,7 @@ int main (int argc, char *argv[]) // This app is started automatically, no need for session management app.disableSessionManagement(); kdDebug() << "starting dcopservice " << endl; - new WeatherService(TQT_TQOBJECT(&app), "WeatherService"); + new WeatherService(&app, "WeatherService"); return app.exec(); } diff --git a/kweather/metar_parser.cpp b/kweather/metar_parser.cpp index 9aa2c8b..b582300 100644 --- a/kweather/metar_parser.cpp +++ b/kweather/metar_parser.cpp @@ -58,7 +58,6 @@ void MetarParser::reset() { // Initialize the WeatherInfo structure weatherInfo.theWeather = TQString(); - weatherInfo.iconPath = TQString(); weatherInfo.clouds = 0; weatherInfo.windMPH = 0; weatherInfo.tempC = 0; @@ -78,6 +77,9 @@ void MetarParser::reset() weatherInfo.qsHeatIndex = TQString(); weatherInfo.qsWindDirection = TQString(); weatherInfo.stationNeedsMaintenance = false; + weatherInfo.wiCondition = 0; + weatherInfo.wiStrength = 0; + weatherInfo.wiNight = false; } struct WeatherInfo MetarParser::processData(const TQString &stationID, const TQString &metar) @@ -259,7 +261,7 @@ bool MetarParser::parseCurrent(const TQString &s) if (sCode.contains("DZ")) { phenomena = i18n("Drizzle"); - saveIconNamePath( WeatherIcon::LightRain, false ); + saveIconData( WeatherIcon::LightRain, false ); } else if (sCode.contains("RA")) { @@ -274,32 +276,32 @@ bool MetarParser::parseCurrent(const TQString &s) else if (sCode.contains("SG")) { phenomena = i18n("Snow Grains"); - saveIconNamePath( WeatherIcon::Snow, false, 4 ); + saveIconData( WeatherIcon::Snow, false, 4 ); } else if (sCode.contains("IC")) { phenomena = i18n("Ice Crystals"); - saveIconNamePath( WeatherIcon::Hail, false ); + saveIconData( WeatherIcon::Hail, false ); } else if (sCode.contains("PE")) { phenomena = i18n("Ice Pellets"); - saveIconNamePath( WeatherIcon::Hail, false ); + saveIconData( WeatherIcon::Hail, false ); } else if (s.contains("GR")) { phenomena = i18n("Hail"); - saveIconNamePath( WeatherIcon::Hail, false ); + saveIconData( WeatherIcon::Hail, false ); } else if (sCode.contains("GS")) { phenomena = i18n("Small Hail Pellets"); - saveIconNamePath( WeatherIcon::Hail, false ); + saveIconData( WeatherIcon::Hail, false ); } else if (s.contains("UP")) { phenomena = i18n("Unknown Precipitation"); - saveIconNamePath( WeatherIcon::Showers, isNight(weatherInfo.reportLocation), 1); + saveIconData( WeatherIcon::Showers, isNight(weatherInfo.reportLocation), 1); } else if (sCode.contains("BR")) { @@ -728,17 +730,17 @@ void MetarParser::calcCurrentIcon() if (weatherInfo.theWeather.isEmpty()) { if (weatherInfo.clouds == 0) - saveIconNamePath( WeatherIcon::Sunny, night ); + saveIconData( WeatherIcon::Sunny, night ); else if (weatherInfo.clouds > 0 && weatherInfo.clouds <= 2) - saveIconNamePath( WeatherIcon::Cloudy, night, 1 ); + saveIconData( WeatherIcon::Cloudy, night, 1 ); else if ( weatherInfo.clouds > 2 && weatherInfo.clouds <= 4) - saveIconNamePath( WeatherIcon::Cloudy, night, 2 ); + saveIconData( WeatherIcon::Cloudy, night, 2 ); else if ( weatherInfo.clouds > 4 && weatherInfo.clouds <= 8) - saveIconNamePath( WeatherIcon::Cloudy, night, 3 ); + saveIconData( WeatherIcon::Cloudy, night, 3 ); else if ( weatherInfo.clouds > 8 && weatherInfo.clouds < 63) - saveIconNamePath( WeatherIcon::Cloudy, night, 4 ); + saveIconData( WeatherIcon::Cloudy, night, 4 ); else - saveIconNamePath( WeatherIcon::Cloudy, night, 5 ); + saveIconData( WeatherIcon::Cloudy, night, 5 ); } else if (weatherInfo.theWeather == "tstorm") { @@ -746,11 +748,11 @@ void MetarParser::calcCurrentIcon() weatherInfo.clouds = 30; if (weatherInfo.clouds >= 0 && weatherInfo.clouds <= 10) - saveIconNamePath( WeatherIcon::Thunderstorm, night, 1 ); + saveIconData( WeatherIcon::Thunderstorm, night, 1 ); else if ( weatherInfo.clouds > 10 && weatherInfo.clouds <= 20) - saveIconNamePath( WeatherIcon::Thunderstorm, night, 2 ); + saveIconData( WeatherIcon::Thunderstorm, night, 2 ); else - saveIconNamePath( WeatherIcon::Thunderstorm, night, 3 ); + saveIconData( WeatherIcon::Thunderstorm, night, 3 ); } else if (weatherInfo.theWeather == "shower") { @@ -758,11 +760,11 @@ void MetarParser::calcCurrentIcon() weatherInfo.clouds = 30; if (weatherInfo.clouds >= 0 && weatherInfo.clouds <= 10) - saveIconNamePath( WeatherIcon::Showers, night, 1 ); + saveIconData( WeatherIcon::Showers, night, 1 ); else if ( weatherInfo.clouds > 10 && weatherInfo.clouds <= 20) - saveIconNamePath( WeatherIcon::Showers, night, 2 ); + saveIconData( WeatherIcon::Showers, night, 2 ); else - saveIconNamePath( WeatherIcon::Showers, night, 3 ); + saveIconData( WeatherIcon::Showers, night, 3 ); } else if (weatherInfo.theWeather == "snow") { @@ -770,22 +772,22 @@ void MetarParser::calcCurrentIcon() weatherInfo.clouds = 30; if (weatherInfo.clouds >= 0 && weatherInfo.clouds <= 8) - saveIconNamePath( WeatherIcon::Snow, night, 1 ); + saveIconData( WeatherIcon::Snow, night, 1 ); else if ( weatherInfo.clouds > 8 && weatherInfo.clouds <= 16) - saveIconNamePath( WeatherIcon::Snow, night, 2 ); + saveIconData( WeatherIcon::Snow, night, 2 ); else if (weatherInfo.clouds > 16 && weatherInfo.clouds <= 24) - saveIconNamePath( WeatherIcon::Snow, night, 3 ); + saveIconData( WeatherIcon::Snow, night, 3 ); else - saveIconNamePath( WeatherIcon::Snow, night, 5 ); + saveIconData( WeatherIcon::Snow, night, 5 ); } else if ( weatherInfo.theWeather == "mist" || weatherInfo.theWeather == "fog" ) { if ( weatherInfo.clouds >= 63 ) - saveIconNamePath( WeatherIcon::Cloudy, night, 5 ); + saveIconData( WeatherIcon::Cloudy, night, 5 ); else if ( weatherInfo.theWeather == "mist" ) - saveIconNamePath( WeatherIcon::Mist, night ); + saveIconData( WeatherIcon::Mist, night ); else if ( weatherInfo.theWeather == "fog" ) - saveIconNamePath( WeatherIcon::Fog, night ); + saveIconData( WeatherIcon::Fog, night ); } kdDebug(12006) << "Clouds: " << weatherInfo.clouds << ", Icon: " @@ -861,23 +863,10 @@ bool MetarParser::isNight(const TQString &stationID) const } } -void MetarParser::saveIconNamePath( int condition, bool night, int strength ) +void MetarParser::saveIconData( int condition, bool night, int strength ) { - if( strength != 0 ) - { - // Ranged - WeatherIcon* wi = new WeatherIcon( condition, night, strength ); - weatherInfo.iconName = wi->name(); - weatherInfo.iconPath = wi->path(); - delete wi; - } - else - { - // Simple - WeatherIcon* wi = new WeatherIcon( condition, night ); - weatherInfo.iconName = wi->name(); - weatherInfo.iconPath = wi->path(); - delete wi; - } + weatherInfo.wiCondition = condition; + weatherInfo.wiStrength = strength; + weatherInfo.wiNight = night; } diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h index 4f276e8..fd202d8 100644 --- a/kweather/metar_parser.h +++ b/kweather/metar_parser.h @@ -32,8 +32,6 @@ struct WeatherInfo { /** The current weather state outside */ TQString theWeather; - TQString iconName; - TQString iconPath; int clouds; float windMPH; float tempC; @@ -54,6 +52,11 @@ struct WeatherInfo TQString qsWindDirection; TQString reportLocation; bool stationNeedsMaintenance; + + /* For WeatherIcon */ + int wiCondition; + int wiStrength; + bool wiNight; }; @@ -94,7 +97,7 @@ class MetarParser void calcCurrentIcon(); void calcWindChill(); bool isNight(const TQString &stationID) const; - void saveIconNamePath( int condition, bool night, int strength = 0 ); + void saveIconData( int condition, bool night, int strength = 0 ); /* * Reset the internal WeatherInfo struct of the class so that diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp index 88dadd1..97c308f 100644 --- a/kweather/reportview.cpp +++ b/kweather/reportview.cpp @@ -22,6 +22,7 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <tdeglobalsettings.h> +#include <kiconloader.h> #include <tqvbox.h> #include <tqpixmap.h> @@ -46,7 +47,7 @@ reportView::reportView(const TQString &reportLocation) m_weatherService = new WeatherService_stub( "KWeatherService", "WeatherService" ); - TQPixmap icon = m_weatherService->icon( m_locationCode ); + TQPixmap icon = m_weatherService->icon( m_locationCode, IconSize(TDEIcon::Panel) ); setIcon( icon ); render(); @@ -89,7 +90,7 @@ void reportView::render(){ TQString sunRiseTime = m_weatherService->sunRiseTime(m_locationCode ); TQString sunSetTime = m_weatherService->sunSetTime(m_locationCode ); TQString date = m_weatherService->date(m_locationCode ); - TQString icon = m_weatherService->iconFileName(m_locationCode ); + TQString icon = m_weatherService->iconPath(m_locationCode, IconSize(TDEIcon::Panel)); TQStringList cover = m_weatherService->cover(m_locationCode ); TQStringList weather = m_weatherService->weather(m_locationCode ); diff --git a/kweather/reportview.h b/kweather/reportview.h index a89d96b..941c466 100644 --- a/kweather/reportview.h +++ b/kweather/reportview.h @@ -30,7 +30,7 @@ class WeatherService_stub; */ class reportView : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index 7c9a6e7..dc481ec 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -45,9 +45,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) toolbar->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TDEAction *refresh = new TDEAction( i18n("Refresh"), SmallIcon("view-refresh"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotRefresh()), this, "refresh" ); + 0, this, TQ_SLOT(slotRefresh()), this, "refresh" ); TDEAction *prefs = new TDEAction( i18n("Settings"), SmallIcon("configure"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), this, "preferences" ); + 0, this, TQ_SLOT(slotConfigure()), this, "preferences" ); refresh->plug(toolbar); prefs->plug(toolbar); @@ -90,7 +90,7 @@ void sidebarwidget::slotConfigure() if ( settingsDialog == 0 ) { settingsDialog = new KCMultiDialog(0); - connect( settingsDialog, TQT_SIGNAL( configCommitted() ), this, TQT_SLOT( slotRefresh() ) ); + connect( settingsDialog, TQ_SIGNAL( configCommitted() ), this, TQ_SLOT( slotRefresh() ) ); settingsDialog->addModule( "kcmweatherstations.desktop" ); settingsDialog->addModule( "kcmweatherservice.desktop" ); diff --git a/kweather/sidebarwidget.h b/kweather/sidebarwidget.h index 7778cff..4ed141c 100644 --- a/kweather/sidebarwidget.h +++ b/kweather/sidebarwidget.h @@ -32,7 +32,7 @@ class DCOPRef; class sidebarwidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: sidebarwidget(TQWidget* parent, const char* name = 0); diff --git a/kweather/stationsconfig.ui b/kweather/stationsconfig.ui index 5ad40b6..68ec70a 100644 --- a/kweather/stationsconfig.ui +++ b/kweather/stationsconfig.ui @@ -247,13 +247,13 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>exitWeatherService()</slot> <slot>removeStation()</slot> <slot>updateStations()</slot> <slot>addStation()</slot> <slot>selectionChanged( TQListViewItem* )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp index b02d4be..5ba7aee 100644 --- a/kweather/stationsconfigwidget.cpp +++ b/kweather/stationsconfigwidget.cpp @@ -30,6 +30,7 @@ #include <tdelocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> +#include <kiconloader.h> #include "stationsconfigwidget.h" #include "weatherservice_stub.h" @@ -59,8 +60,8 @@ StationsConfigWidget::StationsConfigWidget( TQWidget *parent, const char *name ) : stationsConfig( parent, name ), mService(0) { mService = new WeatherService_stub( "KWeatherService", "WeatherService" ); - connect( mAllStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( addStation() ) ); - connect( mSelectedStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( removeStation() ) ); + connect( mAllStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( addStation() ) ); + connect( mSelectedStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( removeStation() ) ); initGUI(); loadLocations(); @@ -129,10 +130,7 @@ void StationsConfigWidget::scanStations() mSelectedStations->clear(); for ( uint i = 0; i < list.count(); ++i ) { - TQPixmap pm = mService->icon( list[ i ] ); - TQImage img = pm.convertToImage(); - img = img.smoothScale( 22, 22 ); - pm.convertFromImage( img ); + TQPixmap pm = mService->icon( list[ i ], TDEIcon::SizeSmall ); TQString uid = list[ i ]; if (mStationMap[ uid ].isEmpty()) diff --git a/kweather/stationsconfigwidget.h b/kweather/stationsconfigwidget.h index afdac56..3056dd6 100644 --- a/kweather/stationsconfigwidget.h +++ b/kweather/stationsconfigwidget.h @@ -27,7 +27,7 @@ class WeatherService_stub; class StationsConfigWidget : public stationsConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/kweather/weather_icon.cpp b/kweather/weather_icon.cpp index 59f55da..bce9073 100644 --- a/kweather/weather_icon.cpp +++ b/kweather/weather_icon.cpp @@ -36,59 +36,67 @@ bool WeatherIconPrivate::usingIconTheme() return m_useIconTheme; } -TQPair<TQString,TQString> WeatherIconPrivate::findIcon( TQStringList fallback ) +/** Returns the name of the best matching icon, either from the icon theme or the KWeather icons */ +struct WeatherSingleIconData WeatherIconPrivate::findIcon(TQStringList fallback, uint size) { + struct WeatherSingleIconData iconData; + kdDebug(12006) << "[findIcon] Use icon theme? " << m_useIconTheme << endl; - if( m_useIconTheme ) + if (m_useIconTheme) { // Check in theme - for ( TQStringList::Iterator icon = fallback.begin(); icon != fallback.end(); ++icon ) + for (TQStringList::Iterator icon = fallback.begin(); icon != fallback.end(); ++icon) { kdDebug(12006) << "[findIcon] Searching for `" << *icon << "` in theme" << endl; - TQString iPath = iconPath(*icon, true); - if( !( iPath.isNull() ) ) + TQString iPath = iconPath(*icon, size, true); + if (!iPath.isNull()) { kdDebug(12006) << "[findIcon] Found `" << *icon << "` in theme: " << iPath << endl; - return qMakePair(*icon, iPath); + iconData = { *icon, iPath, true, size }; + return iconData; } } } // Check in kweather fallback - for ( TQStringList::Iterator icon = fallback.begin(); icon != fallback.end(); ++icon ) + for (TQStringList::Iterator icon = fallback.begin(); icon != fallback.end(); ++icon) { kdDebug(12006) << "[findIcon] Searching for `" << *icon << "` in kweather icons" << endl; - TQString iPath = iconPath(*icon, false); - if( !( iPath.isNull() ) ) + TQString iPath = iconPath(*icon, size, false); + if (!iPath.isEmpty()) { kdDebug(12006) << "[findIcon] Found `" << *icon << "` in kweather icons: " << iPath << endl; - return qMakePair(*icon, iPath); + iconData = { *icon, iPath, false, size }; + return iconData; } } - return qMakePair(WeatherIcon::unknown(), iconPath(WeatherIcon::unknown())); + + return WeatherIcon::unknown(size); } -TQString WeatherIconPrivate::iconPath( TQString icon, bool inTheme ) +TQString WeatherIconPrivate::iconPath( TQString icon, uint size, bool inTheme ) { - if( inTheme ) - { - return iconLoader->iconPath(icon, TDEIcon::Desktop, true); + TQString path = TQString::null; + if (inTheme) { + path = iconLoader->iconPath(icon, size, true); + if (path.isEmpty()) { + // maybe there is a scalable icon? + path = iconLoader->iconPath(icon, 0, true); + } } - else - { - return locate( "data", "kweather/" + icon + ".png" ); + else { + path = locate( "data", "kweather/" + icon + ".png" ); } + return path; } -TQString WeatherIconPrivate::iconPath( TQString icon ) +TQString WeatherIconPrivate::iconPath( TQString icon, uint size ) { - return iconPath(icon, m_useIconTheme); + return iconPath(icon, size, m_useIconTheme); } WeatherIcon::WeatherIcon( int condition, bool night ) { - TQStringList fallback; - switch( condition ) { case Sunny: @@ -98,7 +106,6 @@ WeatherIcon::WeatherIcon( int condition, bool night ) fallback << "weather-clear-night"; //xdg, kweather } fallback << "weather-clear"; // xdg, kweather - break; } @@ -109,7 +116,6 @@ WeatherIcon::WeatherIcon( int condition, bool night ) fallback << "weather-fog-night"; // themes, kweather } fallback << "weather-fog"; // xdg, kweather - break; } @@ -126,14 +132,12 @@ WeatherIcon::WeatherIcon( int condition, bool night ) fallback << "weather-fog-night"; // themes, kweather } fallback << "weather-fog"; // xdg, kweather - break; } case Overcast: { fallback << "weather-overcast"; // xdg, kweather - break; } @@ -142,14 +146,12 @@ WeatherIcon::WeatherIcon( int condition, bool night ) fallback << "weather-hail"; // themes fallback << "weather-freezing-rain"; // themes, kweather fallback << "weather-snow"; // xdg, kweather - break; } case LightRain: { fallback << "weather-showers-scattered"; // xdg, kweather - break; } @@ -157,21 +159,13 @@ WeatherIcon::WeatherIcon( int condition, bool night ) { fallback << "weather-snow-rain"; // themes, kweather fallback << "weather-snow"; // xdg, kweather - break; } } - - TQPair<TQString,TQString> foundIcon = WeatherIconPrivate::instance()->findIcon(fallback); - iconName = foundIcon.first; - iconPath = foundIcon.second; - return; } WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) { - TQStringList fallback; - switch ( condition ) { case Cloudy: @@ -185,7 +179,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-few-clouds-night"; // xdg, kweather } fallback << "weather-few-clouds"; // xdg, kweather - break; } @@ -202,7 +195,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-few-clouds-night"; // xdg, kweather } fallback << "weather-few-clouds"; // xdg, kweather - break; } @@ -218,7 +210,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-few-clouds-night"; // xdg, kweather } fallback << "weather-few-clouds"; // xdg, kweather - break; } @@ -229,30 +220,23 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-ample-clouds-night"; // kweather } fallback << "weather-ample-clouds"; // kweather - fallback << "weather-many-clouds"; // themes, kweather - fallback << "weather-overcast"; // xdg, kweather - break; } case 5: { fallback << "weather-many-clouds"; // themes, kweather - fallback << "weather-overcast"; // xdg, kweather - break; } default: { fallback << "weather-clouds"; // themes, kweather - fallback << "weather-few-clouds"; // xdg, kweather break; } } - break; } @@ -270,9 +254,7 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) { fallback << "weather-showers-scattered-day"; // themes, kweather } - fallback << "weather-showers-scattered"; // xdg, kweather - break; } @@ -286,9 +268,7 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) { fallback << "weather-showers-day"; // themes, kweather } - fallback << "weather-showers"; // xdg, kweather - break; } @@ -296,7 +276,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) default: { fallback << "weather-showers"; // xdg, kweather - break; } } @@ -320,9 +299,7 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) } fallback << "weather-snow-scattered"; // xdg, kweather - fallback << "weather-snow"; // workaround for some themes - break; } case 2: @@ -348,9 +325,7 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) } fallback << "weather-snow-scattered"; // xdg, kweather - fallback << "weather-snow"; // workaround for some themes - break; } @@ -364,21 +339,15 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) { fallback << "weather-snow-ample-day"; // kweather } - fallback << "weather-snow-ample"; // kweather - - fallback << "weather-snow"; // xdg, kweather - break; } case 4: { fallback << "weather-snow-scattered"; // xdg, kweather - fallback << "weather-snow"; // workaround for some themes - break; } @@ -386,7 +355,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) default: { fallback << "weather-snow"; // xdg, kweather - break; } } @@ -408,7 +376,6 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-storm-day"; // themes, kweather } fallback << "weather-storm"; // xdg, kweather - break; } @@ -433,28 +400,44 @@ WeatherIcon::WeatherIcon( int condition, bool night, unsigned int strength ) fallback << "weather-storm-day"; // themes, kweather } fallback << "weather-storm"; // xdg, kweather - break; } case 3: default: { fallback << "weather-storm"; // xdg, kweather - break; } } - break; } +} - TQPair<TQString,TQString> foundIcon = WeatherIconPrivate::instance()->findIcon(fallback); - iconName = foundIcon.first; - iconPath = foundIcon.second; - return; +// Unknown weather conditions +WeatherIcon::WeatherIcon() { + fallback << "weather-none-available"; } WeatherIcon::~WeatherIcon() { - iconName = TQString::null; +} + +struct WeatherSingleIconData WeatherIcon::iconData(uint size) { + return WeatherIconPrivate::instance()->findIcon(fallback, size); +} + +struct WeatherSingleIconData WeatherIcon::unknown(uint size) { + WeatherIcon *unknown = new WeatherIcon(); + struct WeatherSingleIconData unknownData = unknown->iconData(size); + delete unknown; + return unknownData; +} + +// convenience functions +TQString WeatherIcon::name(uint size) { + return iconData(size).name; +} + +TQString WeatherIcon::path(uint size) { + return iconData(size).path; }
\ No newline at end of file diff --git a/kweather/weather_icon.h b/kweather/weather_icon.h index f18c472..011fb06 100644 --- a/kweather/weather_icon.h +++ b/kweather/weather_icon.h @@ -1,4 +1,11 @@ -class TDEIconLoader; +#include <kiconloader.h> + +struct WeatherSingleIconData { + TQString name; + TQString path; + bool inTheme; + uint size; +}; class WeatherIconPrivate { friend class WeatherIcon; @@ -9,18 +16,18 @@ class WeatherIconPrivate { static WeatherIconPrivate* instance(); - void useIconTheme( bool use ); + void useIconTheme(bool use); bool usingIconTheme(); - TQString iconPath( TQString icon, bool inTheme ); - TQString iconPath( TQString icon ); + TQString iconPath(TQString icon, uint size, bool inTheme); + TQString iconPath(TQString icon, uint size); private: static WeatherIconPrivate* s_instance; TDEIconLoader* iconLoader; bool m_useIconTheme; - TQPair<TQString,TQString> findIcon( TQStringList fallback ); + struct WeatherSingleIconData findIcon(TQStringList fallback, uint size); }; class WeatherIcon { @@ -30,13 +37,15 @@ class WeatherIcon { WeatherIcon( int condition /* SimpleCondition */, bool night ); WeatherIcon( int condition /* RangedCondition */, bool night, unsigned int strength ); + WeatherIcon(); /* Unknown conditions */ ~WeatherIcon(); - static TQString unknown() { return "weather-none-available"; }; - TQString name() { return iconName; } - TQString path() { return iconPath; } + static struct WeatherSingleIconData unknown(uint size); // for convenience + + struct WeatherSingleIconData iconData(uint size); + TQString name(uint size); + TQString path(uint size); private: - TQString iconName; - TQString iconPath; + TQStringList fallback; }; diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index f191358..3570c1b 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -63,7 +63,7 @@ KonqSidebarWeather::KonqSidebarWeather(TDEInstance* inst, TQObject* parent, kdDebug() << "attached dcop signals..." << endl; timeOut = new TQTimer(this, "timeOut" ); - connect(timeOut, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateWidgets())); + connect(timeOut, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateWidgets())); updateWidgets(); } diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h index eca74d6..349b82f 100644 --- a/kweather/weatherbar.h +++ b/kweather/weatherbar.h @@ -37,7 +37,7 @@ class TQLabel; class KonqSidebarWeather: public KonqSidebarPlugin, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index f507be5..986eebf 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -34,10 +34,10 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name ) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); @@ -98,7 +98,7 @@ void WeatherButton::generateIcons() return; TQImage image = pixmap()->convertToImage(); - image = image.smoothScale( pixmapSize(), TQ_ScaleMin ); + image = image.smoothScale( pixmapSize(), TQImage::ScaleMin ); TDEIconEffect effect; diff --git a/kweather/weatherbutton.h b/kweather/weatherbutton.h index 237b6fc..9e40818 100644 --- a/kweather/weatherbutton.h +++ b/kweather/weatherbutton.h @@ -25,7 +25,7 @@ class WeatherButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index 5ca6640..31e6c5a 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -185,8 +185,12 @@ void WeatherLib::slotCopyDone(TDEIO::Job* job) kdDebug( 12006 ) << "Offline now..." << endl; d->clear(); d->wi.theWeather = "dunno"; - d->wi.qsCurrentList.append(i18n("The network is currently offline...")); - d->wi.qsCurrentList.append(i18n("Please update later.")); + + TQString offlineStr = i18n("The network is currently offline..."); + if (!d->wi.qsCurrentList.contains(offlineStr)) { + d->wi.qsCurrentList.append(offlineStr); + d->wi.qsCurrentList.append(i18n("Please update later.")); + } emit fileUpdate(d->wi.reportLocation); } else @@ -217,8 +221,8 @@ void WeatherLib::getData(Data *d, bool force /* try even if host was down last t d->job = TDEIO::file_copy( url, local, -1, true, false, false); d->job->addMetaData("cache", "reload"); // Make sure to get fresh info - connect( d->job, TQT_SIGNAL( result( TDEIO::Job *)), - TQT_SLOT(slotCopyDone(TDEIO::Job *))); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job *)), + TQ_SLOT(slotCopyDone(TDEIO::Job *))); kdDebug( 12006 ) << "Copying " << url.prettyURL() << " to " << local.prettyURL() << endl; emit fileUpdating(d->wi.reportLocation); @@ -277,51 +281,68 @@ TQString WeatherLib::windChill(const TQString &stationID){ return d->wi.qsWindChill; } -TQString WeatherLib::iconName(const TQString &stationID){ - - TQString result; - - // isEmpty is true for null or 0 length strings - if ( !stationID.isEmpty() ) - { - Data *d = findData(stationID); - result = d->wi.iconName; +TQString WeatherLib::iconName(const TQString &stationID, uint iconSize) { + TQString result = TQString::null; + if (!stationID.isEmpty()) { + WeatherIcon *wi = weatherIcon(stationID); + result = wi->name(iconSize); + delete wi; } - if( result == TQString::null ) - result = WeatherIcon::unknown(); + if (result.isEmpty()) + result = WeatherIcon::unknown(iconSize).name; return result; } -TQString WeatherLib::iconPath(const TQString &stationID){ +TQString WeatherLib::iconName(const TQString &stationID) { + return iconName(stationID, IconSize(TDEIcon::Panel)); +} - TQString result; - - // isEmpty is true for null or 0 length strings - if ( !stationID.isEmpty() ) - { - Data *d = findData(stationID); - result = d->wi.iconPath; +TQString WeatherLib::iconPath(const TQString &stationID, uint iconSize) { + TQString result = TQString::null; + if (!stationID.isEmpty()) { + WeatherIcon *wi = weatherIcon(stationID); + result = wi->path(iconSize); + delete wi; } - if( result == TQString::null ) - result = WeatherIconPrivate::instance()->iconPath(WeatherIcon::unknown()); + if (result.isEmpty()) + result = WeatherIcon::unknown(iconSize).path; return result; } -TQString WeatherLib::date(const TQString &stationID){ +/** Returns a WeatherIcon object for the current weather conditions */ +WeatherIcon* WeatherLib::weatherIcon(const TQString &stationID) { Data *d = findData(stationID); + if (d->wi.theWeather == "dunno") + { + return new WeatherIcon(); + } + + int condition = d->wi.wiCondition; + int strength = d->wi.wiStrength; + bool night = d->wi.wiNight; - if ( ! d->wi.qsDate.isValid() ) - return ""; - else - { - TQDateTime gmtDateTime(d->wi.qsDate, d->wi.qsTime); - TQDateTime localDateTime = gmtDateTime.addSecs(KRFCDate::localUTCOffset() * 60); - return TDEGlobal::locale()->formatDateTime(localDateTime, false, false); - } + WeatherIcon* wi; + if (d->wi.wiStrength != 0) // Ranged condition + wi = new WeatherIcon(condition, night, strength); + + else // Simple condition + wi = new WeatherIcon(condition, night); + + return wi; +} + +TQString WeatherLib::date(const TQString &stationID){ + Data *d = findData(stationID); + if (d->wi.qsDate.isValid()) { + TQDateTime gmtDateTime(d->wi.qsDate, d->wi.qsTime); + TQDateTime localDateTime = gmtDateTime.addSecs(KRFCDate::localUTCOffset() * 60); + return TDEGlobal::locale()->formatDateTime(localDateTime, false, false); + } + return TQString::null; } /** Returns the current cover */ @@ -348,6 +369,12 @@ bool WeatherLib::stationNeedsMaintenance(const TQString &stationID) return d->wi.stationNeedsMaintenance; } +bool WeatherLib::weatherDataAvailable(const TQString &stationID) +{ + Data *d = findData(stationID); + return !(d->wi.theWeather == "dunno"); +} + void WeatherLib::update(const TQString &stationID) { // Only grab new data if its more than 50 minutes old diff --git a/kweather/weatherlib.h b/kweather/weatherlib.h index 5dde37c..07b638d 100644 --- a/kweather/weatherlib.h +++ b/kweather/weatherlib.h @@ -28,12 +28,12 @@ namespace TDEIO } class StationDatabase; +class WeatherIcon; class WeatherLib : public TQObject { - Q_OBJECT - - + TQ_OBJECT + public: class Data; @@ -48,16 +48,18 @@ class WeatherLib : public TQObject TQString wind(const TQString &stationID); TQString pressure(const TQString &stationID); TQString iconName(const TQString &stationID); - TQString iconPath(const TQString &stationID); + TQString iconName(const TQString &stationID, uint iconSize); + TQString iconPath(const TQString &stationID, uint iconSize); TQString date(const TQString &stationID); TQStringList weather(const TQString &stationID); TQString visibility(const TQString &stationID); TQStringList cover(const TQString &stationID); bool stationNeedsMaintenance(const TQString &stationID); - + bool weatherDataAvailable(const TQString &stationID); + TQStringList stations(); bool isNight(const TQString &stationID) const; - + void update(const TQString &stationID); void forceUpdate(const TQString &stationID); void remove(const TQString &stationID); @@ -72,6 +74,7 @@ class WeatherLib : public TQObject private: Data* findData(const TQString &stationID); + WeatherIcon* weatherIcon(const TQString &stationID); void clearData(Data *d); void getData(Data *d, bool force = false); void processData(const TQString &metar, Data *d); diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp index aa8454a..3ec47c9 100644 --- a/kweather/weatherservice.cpp +++ b/kweather/weatherservice.cpp @@ -40,12 +40,12 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p stationDB = new StationDatabase(); m_weatherLib = new WeatherLib(stationDB, this, "WeatherLib"); - connect(m_weatherLib, TQT_SIGNAL(fileUpdating( const TQString&)), - TQT_SLOT(updating( const TQString&))); - connect(m_weatherLib, TQT_SIGNAL(fileUpdate( const TQString&)), - TQT_SLOT(updated( const TQString&))); - connect(m_weatherLib, TQT_SIGNAL(stationRemoved(const TQString&)), - TQT_SLOT(slotStationRemoved(const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(fileUpdating( const TQString&)), + TQ_SLOT(updating( const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(fileUpdate( const TQString&)), + TQ_SLOT(updated( const TQString&))); + connect(m_weatherLib, TQ_SIGNAL(stationRemoved(const TQString&)), + TQ_SLOT(slotStationRemoved(const TQString&))); TDEConfig *conf = kapp->config(); @@ -139,18 +139,33 @@ TQString WeatherService::pressure(const TQString &stationID) return m_weatherLib->pressure(stationID); } +TQPixmap WeatherService::icon(const TQString &stationID, uint iconSize) +{ + return kapp->iconLoader()->loadIcon( + iconPath(stationID, iconSize), + TDEIcon::Panel, iconSize + ); +} + +TQString WeatherService::iconName(const TQString &stationID, uint iconSize) +{ + return m_weatherLib->iconName(stationID, iconSize); +} + +TQString WeatherService::iconPath(const TQString &stationID, uint iconSize) +{ + return m_weatherLib->iconPath(stationID, iconSize); +} + +/*** (Begin) Deprecated: functions kept for compatibility reasons */ TQPixmap WeatherService::currentIcon(const TQString &stationID) { - return icon( stationID ); + return icon(stationID, IconSize(TDEIcon::Panel)); } TQPixmap WeatherService::icon(const TQString &stationID) { - kdDebug(12006) << "Get the current weather icon.." << endl; - return kapp->iconLoader()->loadIcon( - iconFileName(stationID), - TDEIcon::Desktop - ); + return icon(stationID, IconSize(TDEIcon::Panel)); } TQString WeatherService::currentIconString(const TQString &stationID) @@ -160,8 +175,9 @@ TQString WeatherService::currentIconString(const TQString &stationID) TQString WeatherService::iconFileName(const TQString &stationID) { - return m_weatherLib->iconPath(stationID); + return iconPath(stationID, IconSize(TDEIcon::Panel)); } +/*** (End) Deprecated: functions kept for compatibility reasons */ void WeatherService::useIconTheme(bool use) { @@ -199,6 +215,11 @@ bool WeatherService::stationNeedsMaintenance(const TQString &stationID) return m_weatherLib->stationNeedsMaintenance(stationID); } +bool WeatherService::weatherDataAvailable(const TQString &stationID) +{ + return m_weatherLib->weatherDataAvailable(stationID); +} + void WeatherService::update(const TQString &stationID) { m_weatherLib->update(stationID); diff --git a/kweather/weatherservice.h b/kweather/weatherservice.h index 2ec63be..6b06133 100644 --- a/kweather/weatherservice.h +++ b/kweather/weatherservice.h @@ -31,7 +31,7 @@ class StationDatabase; class WeatherService : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP @@ -61,15 +61,21 @@ class WeatherService : public TQObject, public DCOPObject TQString windChill(const TQString &stationID); TQString wind(const TQString &stationID); TQString pressure(const TQString &stationID); - TQPixmap currentIcon(const TQString &stationID); - TQPixmap icon(const TQString &stationID); - TQString currentIconString(const TQString &stationID); - TQString iconFileName(const TQString &stationID); + TQPixmap icon(const TQString &stationID, uint iconSize); + TQString iconName(const TQString &stationID, uint iconSize); + TQString iconPath(const TQString &stationID, uint iconSize); TQString date(const TQString &stationID); TQString visibility(const TQString &stationID); TQStringList cover(const TQString &stationID); TQStringList weather(const TQString &stationID); bool stationNeedsMaintenance(const TQString &stationID); + bool weatherDataAvailable(const TQString &stationID); + + /* compatibility */ + TQPixmap currentIcon(const TQString &stationID) KDE_DEPRECATED; + TQPixmap icon(const TQString &stationID) KDE_DEPRECATED; + TQString currentIconString(const TQString &stationID) KDE_DEPRECATED; + TQString iconFileName(const TQString &stationID) KDE_DEPRECATED; TQString stationName(const TQString &stationID); TQString stationCountry(const TQString &stationID); diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui index bd9cd69..2eb6ff2 100644 --- a/kworldwatch/about.ui +++ b/kworldwatch/about.ui @@ -209,9 +209,9 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string> <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<Q_SLOTS> +<slots> <slot>PushButton2_clicked()</slot> <slot>accept()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp index f358dac..aa7be5a 100644 --- a/kworldwatch/applet.cpp +++ b/kworldwatch/applet.cpp @@ -94,7 +94,7 @@ bool KWWApplet::eventFilter( TQObject *o, TQEvent *e ) { if ((e->type() == TQEvent::MouseButtonPress) || (e->type() == TQEvent::MouseButtonDblClick)) { - mousePressEvent(TQT_TQMOUSEEVENT(e)); + mousePressEvent(static_cast<TQMouseEvent*>(e)); return true; } @@ -115,7 +115,7 @@ void KWWApplet::mousePressEvent(TQMouseEvent *e) clicked = e->type() == TQMouseEvent::MouseButtonDblClick; } - if (clicked && e->button() == Qt::LeftButton) + if (clicked && e->button() == TQt::LeftButton) { KRun::run("kworldclock", KURL::List()); } diff --git a/kworldwatch/applet.h b/kworldwatch/applet.h index 63f2036..5b4f22e 100644 --- a/kworldwatch/applet.h +++ b/kworldwatch/applet.h @@ -41,7 +41,7 @@ class MapWidget; class KWWApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp index 519ed85..3d7a0c0 100644 --- a/kworldwatch/flow.cpp +++ b/kworldwatch/flow.cpp @@ -68,7 +68,7 @@ int SimpleFlow::heightForWidth( int w ) const void SimpleFlow::addItem( TQLayoutItem *item) { - list.append( TQT_TQLAYOUTITEM(item) ); + list.append( item ); } bool SimpleFlow::hasHeightForWidth() const @@ -83,22 +83,12 @@ TQSize SimpleFlow::sizeHint() const TQSizePolicy::ExpandData SimpleFlow::expanding() const { -#ifdef USE_QT4 - return (Qt::Orientation)TQSizePolicy::NoDirection; -#else // USE_QT4 return TQSizePolicy::NoDirection; -#endif // USE_QT4 } TQLayoutIterator SimpleFlow::iterator() { - // [FIXME] -#ifdef USE_QT4 - #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 - return TQLayoutIterator(this); // [FIXME] -#else // USE_QT4 return TQLayoutIterator( new SimpleFlowIterator( &list ) ); -#endif // USE_QT4 } void SimpleFlow::setGeometry( const TQRect &r ) @@ -142,34 +132,3 @@ TQSize SimpleFlow::minimumSize() const } return s; } - -#ifdef USE_QT4 -/*! - \reimp -*/ -int SimpleFlow::count() const { - return list.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* SimpleFlow::itemAt(int index) const { - return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* SimpleFlow::takeAt(int index) { - if (index < 0 || index >= list.count()) - return 0; - TQLayoutItem *item = list.at(index); - list.remove(list.at(index)); - delete item; - - invalidate(); - return item; -} -#endif // USE_QT4 - diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h index e027e64..6eed52e 100644 --- a/kworldwatch/flow.h +++ b/kworldwatch/flow.h @@ -42,10 +42,6 @@ public: TQLayoutIterator iterator(); TQSizePolicy::ExpandData expanding() const; -#ifdef USE_QT4 - QLAYOUT_REQUIRED_METHOD_DECLARATIONS -#endif // USE_QT4 - protected: void setGeometry( const TQRect& ); diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index e113d3a..5f8df3b 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -66,8 +66,8 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name) _clocks = new ZoneClockPanel(w); vbox->addWidget(_clocks); - connect(_map, TQT_SIGNAL(addClockClicked(const TQString &)), _clocks, TQT_SLOT(addClock(const TQString &))); - connect(_map, TQT_SIGNAL(saveSettings()), this, TQT_SLOT(doSave())); + connect(_map, TQ_SIGNAL(addClockClicked(const TQString &)), _clocks, TQ_SLOT(addClock(const TQString &))); + connect(_map, TQ_SIGNAL(saveSettings()), this, TQ_SLOT(doSave())); if (restore) load(kapp->config()); diff --git a/kworldwatch/main.h b/kworldwatch/main.h index ba7e233..5069480 100644 --- a/kworldwatch/main.h +++ b/kworldwatch/main.h @@ -39,7 +39,7 @@ class ZoneClockPanel; class WorldWideWatch : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ private: class WatchApplication : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index 5acc5ce..452a0ba 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -88,19 +88,19 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na int id; _flagPopup = new TQPopupMenu(this); TQPixmap flag = TQPixmap(locate("data", "kworldclock/pics/flag-red.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 0); flag = TQPixmap(locate("data", "kworldclock/pics/flag-green.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 1); flag = TQPixmap(locate("data", "kworldclock/pics/flag-blue.png")); - id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 2); - id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQT_SLOT(addFlag(int))); + id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQ_SLOT(addFlag(int))); _flagPopup->setItemParameter(id, 3); _flagPopup->insertSeparator(); - _flagPopup->insertItem(i18n("&Remove Flag"), this, TQT_SLOT(removeFlag())); - _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQT_SLOT(removeAllFlags())); + _flagPopup->insertItem(i18n("&Remove Flag"), this, TQ_SLOT(removeFlag())); + _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQ_SLOT(removeAllFlags())); _themePopup = new TQPopupMenu(this); _themes = MapLoader::themes(); @@ -108,13 +108,13 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na TQPtrListIterator<MapTheme> it(_themes); for ( ; it.current(); ++it) { - int id = _themePopup->insertItem(it.current()->name(), this, TQT_SLOT(themeSelected(int))); + int id = _themePopup->insertItem(it.current()->name(), this, TQ_SLOT(themeSelected(int))); _themePopup->setItemParameter(id, cnt++); it.current()->setID(id); } TQPopupMenu *_clocksPopup = new TQPopupMenu(this); - _clocksPopup->insertItem(i18n("&Add..."), this, TQT_SLOT(addClock())); + _clocksPopup->insertItem(i18n("&Add..."), this, TQ_SLOT(addClock())); _popup = new TQPopupMenu(this); _popup->insertItem(i18n("&Flags"), _flagPopup); @@ -124,21 +124,21 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na _popup->insertSeparator(); _popup->insertItem(i18n("&Map Theme"), _themePopup); - _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQT_SLOT(toggleIllumination())); - _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQT_SLOT(toggleCities())); - _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQT_SLOT(toggleFlags())); + _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQ_SLOT(toggleIllumination())); + _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQ_SLOT(toggleCities())); + _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQ_SLOT(toggleFlags())); if (!applet) { _popup->insertSeparator(); - _popup->insertItem(i18n("&Save Settings"), this, TQT_SLOT(slotSaveSettings())); + _popup->insertItem(i18n("&Save Settings"), this, TQ_SLOT(slotSaveSettings())); } _popup->insertSeparator(); - _popup->insertItem(i18n("&About"), this, TQT_SLOT(about())); + _popup->insertItem(i18n("&About"), this, TQ_SLOT(about())); TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); timer->start(1000); _cityIndicator = new TQLabel(0,0, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); @@ -154,7 +154,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na if (restore && !applet) load(kapp->config()); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCityIndicator())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator())); } @@ -410,7 +410,7 @@ void MapWidget::themeSelected(int index) void MapWidget::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::RightButton) + if (ev->button() == TQt::RightButton) { _flagPos = ev->pos(); _popup->exec(ev->globalPos()); diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h index 21126cb..b7704a4 100644 --- a/kworldwatch/mapwidget.h +++ b/kworldwatch/mapwidget.h @@ -55,7 +55,7 @@ class FlagList; class MapWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index a2279c2..e791b98 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -69,9 +69,9 @@ ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *paren hbox->addWidget(_timeLabel, 0, TQt::AlignRight); _popup = new TQPopupMenu(this); - _popup->insertItem(i18n("&Edit..."), this, TQT_SLOT(editClock())); - _popup->insertItem(i18n("&Add..."), this, TQT_SLOT(slotAddClock())); - _popup->insertItem(i18n("&Remove"), this, TQT_SLOT(slotRemoveClock())); + _popup->insertItem(i18n("&Edit..."), this, TQ_SLOT(editClock())); + _popup->insertItem(i18n("&Add..."), this, TQ_SLOT(slotAddClock())); + _popup->insertItem(i18n("&Remove"), this, TQ_SLOT(slotRemoveClock())); _nameLabel->installEventFilter(this); _timeLabel->installEventFilter(this); @@ -87,7 +87,7 @@ void ZoneClock::slotRemoveClock() // So instead we fire up an idle event triggering the delete // after the return. - TQTimer::singleShot(0, this, TQT_SLOT(removeTimeout())); + TQTimer::singleShot(0, this, TQ_SLOT(removeTimeout())); } @@ -138,7 +138,7 @@ bool ZoneClock::eventFilter(TQObject *obj, TQEvent *ev) if (ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent *e = (TQMouseEvent*)ev; - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) _popup->exec(e->globalPos()); } @@ -172,7 +172,7 @@ ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name) TQTimer *t = new TQTimer(this); - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateTimer())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateTimer())); t->start(500); _clocks.setAutoDelete(true); @@ -202,9 +202,9 @@ void ZoneClockPanel::addClock(const TQString &zone, const TQString &name) realign(); - connect(zc, TQT_SIGNAL(addClock(const TQString &)), this, TQT_SLOT(addClock(const TQString &))); - connect(zc, TQT_SIGNAL(changed()), this, TQT_SLOT(realign())); - connect(zc, TQT_SIGNAL(removeMe(ZoneClock *)), this, TQT_SLOT(removeClock(ZoneClock *))); + connect(zc, TQ_SIGNAL(addClock(const TQString &)), this, TQ_SLOT(addClock(const TQString &))); + connect(zc, TQ_SIGNAL(changed()), this, TQ_SLOT(realign())); + connect(zc, TQ_SIGNAL(removeMe(ZoneClock *)), this, TQ_SLOT(removeClock(ZoneClock *))); } diff --git a/kworldwatch/zoneclock.h b/kworldwatch/zoneclock.h index ba8c6b6..55af262 100644 --- a/kworldwatch/zoneclock.h +++ b/kworldwatch/zoneclock.h @@ -45,7 +45,7 @@ class ClockDialog; class ZoneClock : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ private: class ZoneClockPanel : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/translations/desktop_files/amor.desktop/de.po b/translations/desktop_files/amor.desktop/de.po index 78a2c1a..3b23d78 100644 --- a/translations/desktop_files/amor.desktop/de.po +++ b/translations/desktop_files/amor.desktop/de.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:09+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/amor-amordesktop/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: amor.desktop:2 msgid "AMOR" -msgstr "" +msgstr "AMOR" #. GenericName #: amor.desktop:7 diff --git a/translations/desktop_files/amor.desktop/ru.po b/translations/desktop_files/amor.desktop/ru.po index d025885..60dde7f 100644 --- a/translations/desktop_files/amor.desktop/ru.po +++ b/translations/desktop_files/amor.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:09+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/amor-amordesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: amor.desktop:2 msgid "AMOR" -msgstr "" +msgstr "AMOR" #. GenericName #: amor.desktop:7 diff --git a/translations/desktop_files/kodo.desktop/de.po b/translations/desktop_files/kodo.desktop/de.po index 27f2e18..bd61ce9 100644 --- a/translations/desktop_files/kodo.desktop/de.po +++ b/translations/desktop_files/kodo.desktop/de.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kodo-kododesktop/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. GenericName #: kodo.desktop:7 @@ -24,4 +25,4 @@ msgstr "Entfernungsmesser für die Maus" #. Name #: kodo.desktop:9 msgid "Kodo" -msgstr "" +msgstr "Kodo" diff --git a/translations/desktop_files/kodo.desktop/ru.po b/translations/desktop_files/kodo.desktop/ru.po index da69fad..5bc3882 100644 --- a/translations/desktop_files/kodo.desktop/ru.po +++ b/translations/desktop_files/kodo.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kodo-kododesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kodo.desktop:7 @@ -24,4 +26,4 @@ msgstr "Мышеспидометр" #. Name #: kodo.desktop:9 msgid "Kodo" -msgstr "" +msgstr "Kodo" diff --git a/translations/desktop_files/kteatime.desktop/de.po b/translations/desktop_files/kteatime.desktop/de.po index 552f8ef..74e21e3 100644 --- a/translations/desktop_files/kteatime.desktop/de.po +++ b/translations/desktop_files/kteatime.desktop/de.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kteatime-kteatimedesktop/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: kteatime.desktop:2 msgid "KTeaTime" -msgstr "" +msgstr "KTeaTime" #. GenericName #: kteatime.desktop:3 diff --git a/translations/desktop_files/kteatime.desktop/ru.po b/translations/desktop_files/kteatime.desktop/ru.po index a5bbd66..e50c587 100644 --- a/translations/desktop_files/kteatime.desktop/ru.po +++ b/translations/desktop_files/kteatime.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kteatime-kteatimedesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kteatime.desktop:2 msgid "KTeaTime" -msgstr "" +msgstr "KTeaTime" #. GenericName #: kteatime.desktop:3 diff --git a/translations/desktop_files/ktux.desktop/de.po b/translations/desktop_files/ktux.desktop/de.po index 95c8770..5493c3d 100644 --- a/translations/desktop_files/ktux.desktop/de.po +++ b/translations/desktop_files/ktux.desktop/de.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/ktux-ktuxdesktop/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: ktux.desktop:2 msgid "KTux" -msgstr "" +msgstr "KTux" #. Name #: ktux.desktop:12 diff --git a/translations/desktop_files/ktux.desktop/ru.po b/translations/desktop_files/ktux.desktop/ru.po index d66c915..4594d83 100644 --- a/translations/desktop_files/ktux.desktop/ru.po +++ b/translations/desktop_files/ktux.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/ktux-ktuxdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ktux.desktop:2 msgid "KTux" -msgstr "" +msgstr "KTux" #. Name #: ktux.desktop:12 diff --git a/translations/desktop_files/kweather-desktops/cs.po b/translations/desktop_files/kweather-desktops/cs.po index 7dad211..edc995d 100644 --- a/translations/desktop_files/kweather-desktops/cs.po +++ b/translations/desktop_files/kweather-desktops/cs.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Slávek Banko <slavek.banko@axis.cz>, 2021. +# Slávek Banko <slavek.banko@axis.cz>, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-26 18:18+0000\n" -"PO-Revision-Date: 2021-08-31 03:14+0000\n" +"PO-Revision-Date: 2022-07-07 10:46+0000\n" "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" "tdetoys/kweather-desktop-files/cs/>\n" @@ -15,62 +15,52 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.8\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: kcmweatherapplet.desktop:12 msgid "Applet" -msgstr "" +msgstr "Aplet" #. Comment #: kcmweatherapplet.desktop:13 msgid "Applet Config" -msgstr "" +msgstr "Konfigurace apletu" #. Keywords #: kcmweatherapplet.desktop:14 -#, fuzzy -#| msgid "kweather; weather; configure; settings; display;" msgid "kweather; weather; configure; settings; display; applet;" -msgstr "kweather;počasí;nastavení;zobrazení;" +msgstr "kweather;počasí;konfigurace;nastavení;zobrazení;aplet;" #. Name #: kcmweatherservice.desktop:13 -#, fuzzy -#| msgid "Weather Service" msgid "Service" -msgstr "Služba počasí" +msgstr "Služba" #. Comment #: kcmweatherservice.desktop:14 -#, fuzzy -#| msgid "Weather Service" msgid "Weather Service Config" -msgstr "Služba počasí" +msgstr "Konfigurace služby počasí" #. Keywords #: kcmweatherservice.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; service;" -msgstr "kweather;služba počasí;nastavení;" +msgstr "kweather;služba počasí;konfigurace;nastavení;služba;" #. Name #: kcmweatherstations.desktop:13 msgid "Stations" -msgstr "" +msgstr "Stanice" #. Comment #: kcmweatherstations.desktop:14 msgid "Weather Stations Config" -msgstr "" +msgstr "Konfigurace stanic počasí" #. Keywords #: kcmweatherstations.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; stations;" -msgstr "kweather;služba počasí;nastavení;" +msgstr "kweather;služba počasí;konfigurace;nastavení;stanice;" #. Comment #: kweather.desktop:3 diff --git a/translations/desktop_files/kweather-desktops/de.po b/translations/desktop_files/kweather-desktops/de.po index 9dabea9..b525020 100644 --- a/translations/desktop_files/kweather-desktops/de.po +++ b/translations/desktop_files/kweather-desktops/de.po @@ -1,75 +1,66 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-26 18:18+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kweather-desktop-files/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: kcmweatherapplet.desktop:12 msgid "Applet" -msgstr "" +msgstr "Applet" #. Comment #: kcmweatherapplet.desktop:13 msgid "Applet Config" -msgstr "" +msgstr "Applet-Konfiguration" #. Keywords #: kcmweatherapplet.desktop:14 -#, fuzzy -#| msgid "kweather; weather; configure; settings; display;" msgid "kweather; weather; configure; settings; display; applet;" -msgstr "kweather; kwetter; wetter; einrichten; einstellungen; anzeige;" +msgstr "kweather; kwetter; wetter; einrichten; einstellungen; anzeige; applet;" #. Name #: kcmweatherservice.desktop:13 -#, fuzzy -#| msgid "Weather Service" msgid "Service" -msgstr "Wetterdienst" +msgstr "Dienst" #. Comment #: kcmweatherservice.desktop:14 -#, fuzzy -#| msgid "Weather Service" msgid "Weather Service Config" -msgstr "Wetterdienst" +msgstr "Wetterdienst-Konfiguration" #. Keywords #: kcmweatherservice.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; service;" -msgstr "kweather; kwetter; wetterdienst; einrichten; einstellungen;" +msgstr "kweather; kwetter; wetterdienst; einrichten; einstellungen; dienst;" #. Name #: kcmweatherstations.desktop:13 msgid "Stations" -msgstr "" +msgstr "Stationen" #. Comment #: kcmweatherstations.desktop:14 msgid "Weather Stations Config" -msgstr "" +msgstr "Wetterstationen-Einstellungen" #. Keywords #: kcmweatherstations.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; stations;" -msgstr "kweather; kwetter; wetterdienst; einrichten; einstellungen;" +msgstr "kweather; kwetter; wetterdienst; einrichten; einstellungen; stationen;" #. Comment #: kweather.desktop:3 @@ -83,21 +74,18 @@ msgstr "Wetterbericht" #. Name #: kweatherservice.desktop:3 -#, fuzzy msgid "KWeatherService" -msgstr "Wetterdienst" +msgstr "KWetterdienst" #. Comment #: kweatherservice.desktop:8 msgid "A DCOP service to provide weather data." -msgstr "DCOP-Dienst für Wetterdaten" +msgstr "Ein DCOP-Dienst für Bereitstellung von Wetterdaten." #. Name #: weatherbar.desktop:4 weatherbar_add.desktop:4 -#, fuzzy -#| msgid "Weather Report" msgid "Weather" -msgstr "Wetterbericht" +msgstr "Wetter" #~ msgid "Display" #~ msgstr "Anzeige" diff --git a/translations/desktop_files/kweather-desktops/ru.po b/translations/desktop_files/kweather-desktops/ru.po index 7662d20..c7f3984 100644 --- a/translations/desktop_files/kweather-desktops/ru.po +++ b/translations/desktop_files/kweather-desktops/ru.po @@ -1,75 +1,73 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-26 18:18+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kweather-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcmweatherapplet.desktop:12 msgid "Applet" -msgstr "" +msgstr "Апплет" #. Comment #: kcmweatherapplet.desktop:13 msgid "Applet Config" -msgstr "" +msgstr "Настройки апплета" #. Keywords #: kcmweatherapplet.desktop:14 -#, fuzzy -#| msgid "kweather; weather; configure; settings; display;" msgid "kweather; weather; configure; settings; display; applet;" -msgstr "kweather; weather; configure; settings; display; настройка; погода;" +msgstr "" +"kweather; weather; configure; settings; display; applet; настройка; погода; " +"апплет;" #. Name #: kcmweatherservice.desktop:13 -#, fuzzy -#| msgid "Weather Service" msgid "Service" -msgstr "Погода" +msgstr "Служба" #. Comment #: kcmweatherservice.desktop:14 -#, fuzzy -#| msgid "Weather Service" msgid "Weather Service Config" -msgstr "Погода" +msgstr "Настройка службы погоды" #. Keywords #: kcmweatherservice.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; service;" -msgstr "kweather; weather service; configure; settings; настройки; погода;" +msgstr "" +"kweather; weather service; configure; settings; service; служба; настройки; " +"погода;" #. Name #: kcmweatherstations.desktop:13 msgid "Stations" -msgstr "" +msgstr "Станции" #. Comment #: kcmweatherstations.desktop:14 msgid "Weather Stations Config" -msgstr "" +msgstr "Настройка станций погоды" #. Keywords #: kcmweatherstations.desktop:15 -#, fuzzy -#| msgid "kweather; weather service; configure; settings;" msgid "kweather; weather service; configure; settings; stations;" -msgstr "kweather; weather service; configure; settings; настройки; погода;" +msgstr "" +"kweather; weather service; configure; settings; stations; настройки; погода; " +"станции;" #. Comment #: kweather.desktop:3 @@ -93,10 +91,8 @@ msgstr "Сервис DCOP, предоставляющий данные о пог #. Name #: weatherbar.desktop:4 weatherbar_add.desktop:4 -#, fuzzy -#| msgid "Weather Report" msgid "Weather" -msgstr "Информация о погоде" +msgstr "Погода" #~ msgid "Display" #~ msgstr "Показ" diff --git a/translations/desktop_files/kweather-stations/de.po b/translations/desktop_files/kweather-stations/de.po index ca7569d..6fb6baa 100644 --- a/translations/desktop_files/kweather-stations/de.po +++ b/translations/desktop_files/kweather-stations/de.po @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Stefan Krusche <linux@stefan-krusche.de>, 2021. +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-10 11:17+0000\n" -"PO-Revision-Date: 2021-09-10 11:17+0000\n" -"Last-Translator: Stefan Krusche <linux@stefan-krusche.de>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdetoys/kweather-stations/de/>\n" "Language: de\n" @@ -15,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.4\n" +"X-Generator: Weblate 4.12.2\n" #. name #: weather_stations.desktop.in:5 @@ -29,10 +30,8 @@ msgstr "Vereinigte Arabische Emirate" #. name #: weather_stations.desktop.in:12 -#, fuzzy -#| msgid "Pakistan" msgid "Afghanistan" -msgstr "Pakistan" +msgstr "Afghanistan" #. name #: weather_stations.desktop.in:15 @@ -72,17 +71,17 @@ msgstr "Libanon" #. name #: weather_stations.desktop.in:36 msgid "Iran" -msgstr "" +msgstr "Iran" #. name #: weather_stations.desktop.in:39 msgid "Iraq" -msgstr "" +msgstr "Irak" #. name #: weather_stations.desktop.in:42 msgid "Jordan" -msgstr "" +msgstr "Jordanien" #. name #: weather_stations.desktop.in:45 @@ -92,7 +91,7 @@ msgstr "Kuwait" #. name #: weather_stations.desktop.in:48 msgid "Syria" -msgstr "" +msgstr "Syrien" #. name #: weather_stations.desktop.in:51 @@ -397,7 +396,7 @@ msgstr "Nordwest-Territorien" #. name #: weather_stations.desktop.in:236 msgid "Nunavut" -msgstr "" +msgstr "Nunavut" #. name #: weather_stations.desktop.in:239 @@ -407,7 +406,7 @@ msgstr "Ontario" #. name #: weather_stations.desktop.in:242 msgid "Prince Edward Island" -msgstr "" +msgstr "Prinz-Eduard-Insel" #. name #: weather_stations.desktop.in:245 @@ -426,17 +425,13 @@ msgstr "Yukon" #. name #: weather_stations.desktop.in:254 -#, fuzzy -#| msgid "South Africa" msgid "North America" -msgstr "Süd-Afrika" +msgstr "Nordamerika" #. name #: weather_stations.desktop.in:258 -#, fuzzy -#| msgid "Ireland" msgid "Greenland" -msgstr "Irland" +msgstr "Grönland" #. name #: weather_stations.desktop.in:261 @@ -446,7 +441,7 @@ msgstr "Mexiko" #. name #: weather_stations.desktop.in:264 msgid "Saint Pierre and Miquelon" -msgstr "" +msgstr "Saint-Pierre und Miquelon" #. name #: weather_stations.desktop.in:267 @@ -470,8 +465,6 @@ msgstr "Belgien" #. name #: weather_stations.desktop.in:280 -#, fuzzy -#| msgid "Bosnia-Herzegovina" msgid "Bosnia and Herzegovina" msgstr "Bosnien-Herzegowina" @@ -532,10 +525,8 @@ msgstr "Luxemburg" #. name #: weather_stations.desktop.in:319 -#, fuzzy -#| msgid "Korea, Republic of" msgid "Macedonia, The Republic of" -msgstr "Südkorea" +msgstr "Mazedonien, Republik" #. name #: weather_stations.desktop.in:322 @@ -660,7 +651,7 @@ msgstr "Vereinigtes Königreich" #. name #: weather_stations.desktop.in:394 msgid "Serbia and Montenegro" -msgstr "" +msgstr "Serbien und Montenegro" #. name #: weather_stations.desktop.in:397 @@ -675,78 +666,72 @@ msgstr "Algerien" #. name #: weather_stations.desktop.in:404 msgid "Angola" -msgstr "" +msgstr "Angola" #. name #: weather_stations.desktop.in:407 msgid "Benin" -msgstr "" +msgstr "Benin" #. name #: weather_stations.desktop.in:410 msgid "Botswana" -msgstr "" +msgstr "Botswana" #. name #: weather_stations.desktop.in:413 msgid "Burkina Faso" -msgstr "" +msgstr "Burkina Faso" #. name #: weather_stations.desktop.in:416 msgid "Burundi" -msgstr "" +msgstr "Burundi" #. name #: weather_stations.desktop.in:419 msgid "Cape Verde" -msgstr "" +msgstr "Kap Verde" #. name #: weather_stations.desktop.in:422 msgid "Chad" -msgstr "" +msgstr "Tschad" #. name #: weather_stations.desktop.in:425 msgid "Comoros" -msgstr "" +msgstr "Komoren" #. name #: weather_stations.desktop.in:428 msgid "Cote d'Ivoire" -msgstr "" +msgstr "Elfenbeinküste" #. name #: weather_stations.desktop.in:431 -#, fuzzy -#| msgid "Korea, Democratic People's Republic of" msgid "Congo, Democratic Republic of the" -msgstr "Nordkorea" +msgstr "Kongo, Demokratische Republik" #. name #: weather_stations.desktop.in:434 -#, fuzzy -#| msgid "Dominican Republic" msgid "Central African Republic" -msgstr "Dominikanische Republik" +msgstr "Zentralafrikanische Republik" #. name #: weather_stations.desktop.in:437 -#, fuzzy -#| msgid "Korea, Republic of" msgid "Congo, Republic of the" -msgstr "Südkorea" +msgstr "Kongo, Republik" #. name #: weather_stations.desktop.in:440 msgid "Cameroon" -msgstr "" +msgstr "Kamerun" #. name #: weather_stations.desktop.in:443 msgid "Djibouti" -msgstr "" +msgstr "Dschibuti" #. name #: weather_stations.desktop.in:446 @@ -756,52 +741,52 @@ msgstr "Ägypten" #. name #: weather_stations.desktop.in:449 msgid "Ethiopia" -msgstr "" +msgstr "Äthiopien" #. name #: weather_stations.desktop.in:452 msgid "Equatorial Guinea" -msgstr "" +msgstr "Äquatorialguinea" #. name #: weather_stations.desktop.in:455 msgid "Gabon" -msgstr "" +msgstr "Gabun" #. name #: weather_stations.desktop.in:458 msgid "Gambia, The" -msgstr "" +msgstr "Gambia" #. name #: weather_stations.desktop.in:461 msgid "Ghana" -msgstr "" +msgstr "Ghana" #. name #: weather_stations.desktop.in:464 msgid "Guinea" -msgstr "" +msgstr "Guinea" #. name #: weather_stations.desktop.in:467 msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea-Bissau" #. name #: weather_stations.desktop.in:470 msgid "Kenya" -msgstr "" +msgstr "Kenia" #. name #: weather_stations.desktop.in:473 msgid "Lesotho" -msgstr "" +msgstr "Lesotho" #. name #: weather_stations.desktop.in:476 msgid "Liberia" -msgstr "" +msgstr "Liberia" #. name #: weather_stations.desktop.in:479 @@ -811,29 +796,27 @@ msgstr "Libyen" #. name #: weather_stations.desktop.in:482 msgid "Madagascar" -msgstr "" +msgstr "Madagaskar" #. name #: weather_stations.desktop.in:485 msgid "Malawi" -msgstr "" +msgstr "Malawi" #. name #: weather_stations.desktop.in:488 msgid "Mali" -msgstr "" +msgstr "Mali" #. name #: weather_stations.desktop.in:491 -#, fuzzy -#| msgid "Lithuania" msgid "Mauritania" -msgstr "Litauen" +msgstr "Mauretanien" #. name #: weather_stations.desktop.in:494 msgid "Mauritius" -msgstr "" +msgstr "Mauritius" #. name #: weather_stations.desktop.in:497 @@ -843,64 +826,62 @@ msgstr "Marokko" #. name #: weather_stations.desktop.in:500 msgid "Mozambique" -msgstr "" +msgstr "Mosambik" #. name #: weather_stations.desktop.in:503 msgid "Namibia" -msgstr "" +msgstr "Namibia" #. name #: weather_stations.desktop.in:506 -#, fuzzy -#| msgid "Algeria" msgid "Nigeria" -msgstr "Algerien" +msgstr "Nigeria" #. name #: weather_stations.desktop.in:509 msgid "Niger" -msgstr "" +msgstr "Niger" #. name #: weather_stations.desktop.in:512 msgid "Reunion" -msgstr "" +msgstr "Reunion" #. name #: weather_stations.desktop.in:515 msgid "Rwanda" -msgstr "" +msgstr "Ruanda" #. name #: weather_stations.desktop.in:518 msgid "Saint Helena" -msgstr "" +msgstr "Sankt Helena" #. name #: weather_stations.desktop.in:521 msgid "Sao Tome and Principe" -msgstr "" +msgstr "Sao Tome und Principe" #. name #: weather_stations.desktop.in:524 msgid "Senegal" -msgstr "" +msgstr "Senegal" #. name #: weather_stations.desktop.in:527 msgid "Seychelles" -msgstr "" +msgstr "Seychellen" #. name #: weather_stations.desktop.in:530 msgid "Sierra Leone" -msgstr "" +msgstr "Sierra Leone" #. name #: weather_stations.desktop.in:533 msgid "Somalia" -msgstr "" +msgstr "Somalia" #. name #: weather_stations.desktop.in:536 @@ -910,61 +891,57 @@ msgstr "Süd-Afrika" #. name #: weather_stations.desktop.in:539 msgid "South Georgia and the Islands" -msgstr "" +msgstr "Südgeorgien und die Inseln" #. name #: weather_stations.desktop.in:542 msgid "Sudan" -msgstr "" +msgstr "Sudan" #. name #: weather_stations.desktop.in:545 -#, fuzzy -#| msgid "Thailand" msgid "Swaziland" -msgstr "Thailand" +msgstr "Eswatini" #. name #: weather_stations.desktop.in:548 msgid "Tanzania" -msgstr "" +msgstr "Tansania" #. name #: weather_stations.desktop.in:551 msgid "Togo" -msgstr "" +msgstr "Togo" #. name #: weather_stations.desktop.in:554 msgid "Tunisia" -msgstr "" +msgstr "Tunesien" #. name #: weather_stations.desktop.in:557 msgid "Uganda" -msgstr "" +msgstr "Uganda" #. name #: weather_stations.desktop.in:560 msgid "Western Sahara" -msgstr "" +msgstr "Westsahara" #. name #: weather_stations.desktop.in:563 msgid "Zambia" -msgstr "" +msgstr "Sambia" #. name #: weather_stations.desktop.in:566 msgid "Zimbabwe" -msgstr "" +msgstr "Simbabwe" #. name #: weather_stations.desktop.in:570 -#, fuzzy -#| msgid "Australasia" msgid "Australia and Oceania" -msgstr "Australasien" +msgstr "Australien und Ozeanien" #. name #: weather_stations.desktop.in:574 @@ -974,65 +951,57 @@ msgstr "Australien" #. name #: weather_stations.desktop.in:577 msgid "Brunei" -msgstr "" +msgstr "Brunei" #. name #: weather_stations.desktop.in:580 -#, fuzzy -#| msgid "Cayman Islands" msgid "Cook Islands" -msgstr "Kayman-Inseln" +msgstr "Cookinseln" #. name #: weather_stations.desktop.in:583 -#, fuzzy -#| msgid "Cayman Islands" msgid "Christmas Island" -msgstr "Kayman-Inseln" +msgstr "Weihnachtsinsel" #. name #: weather_stations.desktop.in:586 msgid "Fiji" -msgstr "" +msgstr "Fidschi" #. name #: weather_stations.desktop.in:589 msgid "French Polynesia" -msgstr "" +msgstr "Französisch-Polynesien" #. name #: weather_stations.desktop.in:592 msgid "Kiribati" -msgstr "" +msgstr "Kiribati" #. name #: weather_stations.desktop.in:595 msgid "Malaysia" -msgstr "" +msgstr "Malaysia" #. name #: weather_stations.desktop.in:598 -#, fuzzy -#| msgid "Cayman Islands" msgid "Marshall Islands" -msgstr "Kayman-Inseln" +msgstr "Marshallinseln" #. name #: weather_stations.desktop.in:601 msgid "Micronesia, Federated States of" -msgstr "" +msgstr "Mikronesien, Föderierte Staaten" #. name #: weather_stations.desktop.in:604 -#, fuzzy -#| msgid "FYR Macedonia" msgid "New Caledonia" -msgstr "Makedonien" +msgstr "Neukaledonien" #. name #: weather_stations.desktop.in:607 msgid "Nauru" -msgstr "" +msgstr "Nauru" #. name #: weather_stations.desktop.in:610 @@ -1042,59 +1011,57 @@ msgstr "Neuseeland" #. name #: weather_stations.desktop.in:613 msgid "NORTHERN MARIANA ISLAND" -msgstr "" +msgstr "Nördliche Marianen" #. name #: weather_stations.desktop.in:616 msgid "Indonesia" -msgstr "" +msgstr "Indonesien" #. name #: weather_stations.desktop.in:619 msgid "Palau" -msgstr "" +msgstr "Palau" #. name #: weather_stations.desktop.in:622 msgid "Papua New Guinea" -msgstr "" +msgstr "Papua-Neuguinea" #. name #: weather_stations.desktop.in:625 msgid "Philippines" -msgstr "" +msgstr "Phillippinen" #. name #: weather_stations.desktop.in:628 -#, fuzzy -#| msgid "Cayman Islands" msgid "Solomon Islands" -msgstr "Kayman-Inseln" +msgstr "Salomonen" #. name #: weather_stations.desktop.in:631 msgid "Samoa" -msgstr "" +msgstr "Samoa" #. name #: weather_stations.desktop.in:634 msgid "Tonga" -msgstr "" +msgstr "Tonga" #. name #: weather_stations.desktop.in:637 msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" #. name #: weather_stations.desktop.in:640 msgid "United States Minor Outlying Islands" -msgstr "" +msgstr "Vereinigte Staaten Außengebiete" #. name #: weather_stations.desktop.in:643 msgid "Vanuatu" -msgstr "" +msgstr "Vanuatu" #. name #: weather_stations.desktop.in:646 @@ -1104,32 +1071,32 @@ msgstr "Asien" #. name #: weather_stations.desktop.in:650 msgid "Armenia" -msgstr "" +msgstr "Armenien" #. name #: weather_stations.desktop.in:653 msgid "Azerbaijan" -msgstr "" +msgstr "Aserbaidschan" #. name #: weather_stations.desktop.in:656 msgid "Bangladesh" -msgstr "" +msgstr "Bangladesch" #. name #: weather_stations.desktop.in:659 msgid "Cambodia" -msgstr "" +msgstr "Kambodscha" #. name #: weather_stations.desktop.in:662 msgid "China" -msgstr "" +msgstr "China" #. name #: weather_stations.desktop.in:665 msgid "East Timor" -msgstr "" +msgstr "Osttimor" #. name #: weather_stations.desktop.in:668 @@ -1148,55 +1115,53 @@ msgstr "Japan" #. name #: weather_stations.desktop.in:677 -#, fuzzy -#| msgid "Pakistan" msgid "Kazakhstan" -msgstr "Pakistan" +msgstr "Kasachstan" #. name #: weather_stations.desktop.in:680 msgid "Korea, South" -msgstr "" +msgstr "Korea, Süd" #. name #: weather_stations.desktop.in:683 msgid "Korea, North" -msgstr "" +msgstr "Korea, Nord" #. name #: weather_stations.desktop.in:686 msgid "Kyrgyzstan" -msgstr "" +msgstr "Kirgisistan" #. name #: weather_stations.desktop.in:689 msgid "Laos" -msgstr "" +msgstr "Laos" #. name #: weather_stations.desktop.in:692 msgid "Macau" -msgstr "" +msgstr "Macau" #. name #: weather_stations.desktop.in:695 msgid "Maldives" -msgstr "" +msgstr "Malediven" #. name #: weather_stations.desktop.in:698 msgid "Mongolia" -msgstr "" +msgstr "Mongolei" #. name #: weather_stations.desktop.in:701 msgid "Myanmar" -msgstr "" +msgstr "Myanmar" #. name #: weather_stations.desktop.in:704 msgid "Nepal" -msgstr "" +msgstr "Nepal" #. name #: weather_stations.desktop.in:707 @@ -1211,14 +1176,12 @@ msgstr "Singapur" #. name #: weather_stations.desktop.in:713 msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" #. name #: weather_stations.desktop.in:716 -#, fuzzy -#| msgid "Pakistan" msgid "Tajikistan" -msgstr "Pakistan" +msgstr "Tadschikistan" #. name #: weather_stations.desktop.in:719 @@ -1232,10 +1195,8 @@ msgstr "Thailand" #. name #: weather_stations.desktop.in:725 -#, fuzzy -#| msgid "Pakistan" msgid "Turkmenistan" -msgstr "Pakistan" +msgstr "Turkmenistan" #. name #: weather_stations.desktop.in:728 @@ -1244,8 +1205,6 @@ msgstr "Usbekistan" #. name #: weather_stations.desktop.in:731 -#, fuzzy -#| msgid "Viet Nam" msgid "Vietnam" msgstr "Vietnam" @@ -1257,12 +1216,12 @@ msgstr "Zentral- und Südamerika" #. name #: weather_stations.desktop.in:738 msgid "Anguilla" -msgstr "" +msgstr "Anguilla" #. name #: weather_stations.desktop.in:741 msgid "Antigua and Barbuda" -msgstr "Antigua and Barbuda" +msgstr "Antigua und Barbuda" #. name #: weather_stations.desktop.in:744 @@ -1272,19 +1231,17 @@ msgstr "Argentinien" #. name #: weather_stations.desktop.in:747 msgid "Aruba" -msgstr "" +msgstr "Aruba" #. name #: weather_stations.desktop.in:750 msgid "Barbados" -msgstr "" +msgstr "Barbados" #. name #: weather_stations.desktop.in:753 -#, fuzzy -#| msgid "Bahamas" msgid "Bahamas, The" -msgstr "Bahamas" +msgstr "Bahamas, Die" #. name #: weather_stations.desktop.in:756 @@ -1309,7 +1266,7 @@ msgstr "Brazilien" #. name #: weather_stations.desktop.in:768 msgid "British Virgin Islands" -msgstr "" +msgstr "Britische Jungferninseln" #. name #: weather_stations.desktop.in:771 @@ -1338,10 +1295,8 @@ msgstr "Kuba" #. name #: weather_stations.desktop.in:786 -#, fuzzy -#| msgid "Dominican Republic" msgid "Dominica" -msgstr "Dominikanische Republik" +msgstr "Dominica" #. name #: weather_stations.desktop.in:789 @@ -1361,19 +1316,17 @@ msgstr "El Salvador" #. name #: weather_stations.desktop.in:798 msgid "French Guiana" -msgstr "" +msgstr "Französisch-Guayana" #. name #: weather_stations.desktop.in:801 msgid "Falkland Islands, Islas Malvinas" -msgstr "" +msgstr "Falklandinseln, Islas Malvinas" #. name #: weather_stations.desktop.in:804 -#, fuzzy -#| msgid "Canada" msgid "Grenada" -msgstr "Kanada" +msgstr "Grenada" #. name #: weather_stations.desktop.in:807 @@ -1383,12 +1336,12 @@ msgstr "Guatemala" #. name #: weather_stations.desktop.in:810 msgid "Guadeloupe" -msgstr "" +msgstr "Guadeloupe" #. name #: weather_stations.desktop.in:813 msgid "Guyana" -msgstr "" +msgstr "Guyana" #. name #: weather_stations.desktop.in:816 @@ -1408,14 +1361,12 @@ msgstr "Jamaika" #. name #: weather_stations.desktop.in:825 msgid "Martinique" -msgstr "" +msgstr "Martinique" #. name #: weather_stations.desktop.in:828 -#, fuzzy -#| msgid "Netherlands" msgid "Netherlands Antilles" -msgstr "Niederlande" +msgstr "Niederländische Antillen" #. name #: weather_stations.desktop.in:831 @@ -1445,17 +1396,17 @@ msgstr "Paraguay" #. name #: weather_stations.desktop.in:846 msgid "Saint Kitts and Nevis" -msgstr "" +msgstr "Sankt Kitts und Nevis" #. name #: weather_stations.desktop.in:849 msgid "Saint Lucia" -msgstr "" +msgstr "Sankt Lucia" #. name #: weather_stations.desktop.in:852 msgid "Saint Vincent and the Grenadines" -msgstr "" +msgstr "Sankt Vincent und die Grenadinen" #. name #: weather_stations.desktop.in:855 @@ -1465,12 +1416,12 @@ msgstr "Surinam" #. name #: weather_stations.desktop.in:858 msgid "Trinidad and Tobago" -msgstr "" +msgstr "Trinidad und Tobago" #. name #: weather_stations.desktop.in:861 msgid "Turks and Caicos Islands" -msgstr "" +msgstr "Turks- und Caicosinseln" #. name #: weather_stations.desktop.in:864 @@ -1484,10 +1435,8 @@ msgstr "Venezuela" #. name #: weather_stations.desktop.in:870 -#, fuzzy -#| msgid "Cayman Islands" msgid "Virgin Islands" -msgstr "Kayman-Inseln" +msgstr "Jungferninseln" #. name #: weather_stations.desktop.in:873 weather_stations.desktop.in:877 diff --git a/translations/desktop_files/kweather-stations/ru.po b/translations/desktop_files/kweather-stations/ru.po new file mode 100644 index 0000000..849ad3a --- /dev/null +++ b/translations/desktop_files/kweather-stations/ru.po @@ -0,0 +1,1444 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-09-10 11:17+0000\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kweather-stations/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. name +#: weather_stations.desktop.in:5 +msgid "Middle East" +msgstr "Ближний Восток" + +#. name +#: weather_stations.desktop.in:9 +msgid "United Arab Emirates" +msgstr "Объединённые Арабские Эмираты" + +#. name +#: weather_stations.desktop.in:12 +msgid "Afghanistan" +msgstr "Афганистан" + +#. name +#: weather_stations.desktop.in:15 +msgid "Bahrain" +msgstr "Бахрейн" + +#. name +#: weather_stations.desktop.in:18 +msgid "Qatar" +msgstr "Катар" + +#. name +#: weather_stations.desktop.in:21 +msgid "Oman" +msgstr "Оман" + +#. name +#: weather_stations.desktop.in:24 +msgid "Yemen" +msgstr "Йемен" + +#. name +#: weather_stations.desktop.in:27 +msgid "Saudi Arabia" +msgstr "Саудовская Аравия" + +#. name +#: weather_stations.desktop.in:30 +msgid "Israel" +msgstr "Израиль" + +#. name +#: weather_stations.desktop.in:33 +msgid "Lebanon" +msgstr "Ливан" + +#. name +#: weather_stations.desktop.in:36 +msgid "Iran" +msgstr "Иран" + +#. name +#: weather_stations.desktop.in:39 +msgid "Iraq" +msgstr "Ирак" + +#. name +#: weather_stations.desktop.in:42 +msgid "Jordan" +msgstr "Иордания" + +#. name +#: weather_stations.desktop.in:45 +msgid "Kuwait" +msgstr "Кувейт" + +#. name +#: weather_stations.desktop.in:48 +msgid "Syria" +msgstr "Сирия" + +#. name +#: weather_stations.desktop.in:51 +msgid "United States" +msgstr "США" + +#. name +#: weather_stations.desktop.in:55 +msgid "Alaska" +msgstr "Штат Аляска" + +#. name +#: weather_stations.desktop.in:58 +msgid "Arkansas" +msgstr "Штат Арканзас" + +#. name +#: weather_stations.desktop.in:61 +msgid "District of Columbia" +msgstr "Округ Колумбия" + +#. name +#: weather_stations.desktop.in:64 +msgid "Idaho" +msgstr "Штат Айдахо" + +#. name +#: weather_stations.desktop.in:67 weather_stations.desktop.in:154 +msgid "Indiana" +msgstr "Штат Индиана" + +#. name +#: weather_stations.desktop.in:70 +msgid "Iowa" +msgstr "Штат Айова" + +#. name +#: weather_stations.desktop.in:73 +msgid "Kansas" +msgstr "Штат Канзас" + +#. name +#: weather_stations.desktop.in:76 +msgid "Kentucky" +msgstr "Штат Кентукки" + +#. name +#: weather_stations.desktop.in:79 +msgid "Lousiana" +msgstr "Штат Луизиана" + +#. name +#: weather_stations.desktop.in:82 +msgid "Maine" +msgstr "Штат Мэн" + +#. name +#: weather_stations.desktop.in:85 +msgid "Mississippi" +msgstr "Штат Миссисипи" + +#. name +#: weather_stations.desktop.in:88 +msgid "Missouri" +msgstr "Штат Миссури" + +#. name +#: weather_stations.desktop.in:91 +msgid "Montana" +msgstr "Штат Монтана" + +#. name +#: weather_stations.desktop.in:94 +msgid "Nebraska" +msgstr "Штат Небраска" + +#. name +#: weather_stations.desktop.in:97 +msgid "New Hampshire" +msgstr "Штат Нью-Гэмпшир" + +#. name +#: weather_stations.desktop.in:100 +msgid "New Mexico" +msgstr "Штат Нью-Мексико" + +#. name +#: weather_stations.desktop.in:103 +msgid "North Dakota" +msgstr "Штат Северная Дакота" + +#. name +#: weather_stations.desktop.in:106 +msgid "Oklahoma" +msgstr "Штат Оклахома" + +#. name +#: weather_stations.desktop.in:109 +msgid "South Dakota" +msgstr "Штат Южная Дакота" + +#. name +#: weather_stations.desktop.in:112 +msgid "Utah" +msgstr "Штат Юта" + +#. name +#: weather_stations.desktop.in:115 +msgid "Vermont" +msgstr "Штат Вермонт" + +#. name +#: weather_stations.desktop.in:118 +msgid "Wyoming" +msgstr "Штат Вайоминг" + +#. name +#: weather_stations.desktop.in:121 +msgid "Pennsylvania" +msgstr "Штат Пенсильвания" + +#. name +#: weather_stations.desktop.in:124 +msgid "California" +msgstr "Штат Калифорния" + +#. name +#: weather_stations.desktop.in:127 +msgid "Alabama" +msgstr "Штат Алабама" + +#. name +#: weather_stations.desktop.in:130 +msgid "Arizona" +msgstr "Штат Аризона" + +#. name +#: weather_stations.desktop.in:133 +msgid "Colorado" +msgstr "Штат Колорадо" + +#. name +#: weather_stations.desktop.in:136 +msgid "Connecticut" +msgstr "Штат Коннектикут" + +#. name +#: weather_stations.desktop.in:139 +msgid "Delaware" +msgstr "Штат Делавер" + +#. name +#: weather_stations.desktop.in:142 +msgid "Florida" +msgstr "Штат Флорида" + +#. name +#: weather_stations.desktop.in:145 weather_stations.desktop.in:304 +msgid "Georgia" +msgstr "Штат Джорджия" + +#. name +#: weather_stations.desktop.in:148 +msgid "Hawaii" +msgstr "Штат Гавайи" + +#. name +#: weather_stations.desktop.in:151 +msgid "Illinois" +msgstr "Штат Иллинойс" + +#. name +#: weather_stations.desktop.in:157 +msgid "Maryland" +msgstr "Штат Мэриленд" + +#. name +#: weather_stations.desktop.in:160 +msgid "Michigan" +msgstr "Штат Мичиган" + +#. name +#: weather_stations.desktop.in:163 +msgid "Minnesota" +msgstr "Штат Миннесота" + +#. name +#: weather_stations.desktop.in:166 +msgid "Nevada" +msgstr "Штат Невада" + +#. name +#: weather_stations.desktop.in:169 +msgid "New Jersey" +msgstr "Штат Нью-Джерси" + +#. name +#: weather_stations.desktop.in:172 +msgid "North Carolina" +msgstr "Штат Северная Каролина" + +#. name +#: weather_stations.desktop.in:175 +msgid "Ohio" +msgstr "Штат Огайо" + +#. name +#: weather_stations.desktop.in:178 +msgid "Oregon" +msgstr "Штат Орегон" + +#. name +#: weather_stations.desktop.in:181 +msgid "Rhode Island" +msgstr "Штат Род-Айленд" + +#. name +#: weather_stations.desktop.in:184 +msgid "South Carolina" +msgstr "Штат Южная Каролина" + +#. name +#: weather_stations.desktop.in:187 +msgid "Tennessee" +msgstr "Штат Теннесси" + +#. name +#: weather_stations.desktop.in:190 +msgid "Texas" +msgstr "Штат Техас" + +#. name +#: weather_stations.desktop.in:193 +msgid "Virginia" +msgstr "Штат Виргиния" + +#. name +#: weather_stations.desktop.in:196 +msgid "West Virginia" +msgstr "Штат Западная Виргиния" + +#. name +#: weather_stations.desktop.in:199 +msgid "Wisconsin" +msgstr "Штат Висконсин" + +#. name +#: weather_stations.desktop.in:202 +msgid "Massachusetts" +msgstr "Штат Массачусетс" + +#. name +#: weather_stations.desktop.in:205 +msgid "New York" +msgstr "Штат Нью-Йорк" + +#. name +#: weather_stations.desktop.in:208 +msgid "Washington" +msgstr "Штат Вашингтон" + +#. name +#: weather_stations.desktop.in:211 +msgid "Canada" +msgstr "Канада" + +#. name +#: weather_stations.desktop.in:215 +msgid "Alberta" +msgstr "Альберта" + +#. name +#: weather_stations.desktop.in:218 +msgid "British Columbia" +msgstr "Британская Колумбия" + +#. name +#: weather_stations.desktop.in:221 +msgid "Manitoba" +msgstr "Манитоба" + +#. name +#: weather_stations.desktop.in:224 +msgid "New Brunswick" +msgstr "Нью-Брансуик" + +#. name +#: weather_stations.desktop.in:227 +msgid "Newfoundland" +msgstr "Ньюфаундленд" + +#. name +#: weather_stations.desktop.in:230 +msgid "Nova Scotia" +msgstr "Новая Шотландия" + +#. name +#: weather_stations.desktop.in:233 +msgid "Northwest Territories" +msgstr "Северо-Западные территории" + +#. name +#: weather_stations.desktop.in:236 +msgid "Nunavut" +msgstr "Нунавут" + +#. name +#: weather_stations.desktop.in:239 +msgid "Ontario" +msgstr "Онтарио" + +#. name +#: weather_stations.desktop.in:242 +msgid "Prince Edward Island" +msgstr "Остров Принца Эдуарда" + +#. name +#: weather_stations.desktop.in:245 +msgid "Quebec" +msgstr "Квебек" + +#. name +#: weather_stations.desktop.in:248 +msgid "Saskatchewan" +msgstr "Саскачеван" + +#. name +#: weather_stations.desktop.in:251 +msgid "Yukon" +msgstr "Юкон" + +#. name +#: weather_stations.desktop.in:254 +msgid "North America" +msgstr "Северная Америка" + +#. name +#: weather_stations.desktop.in:258 +msgid "Greenland" +msgstr "Гренландия" + +#. name +#: weather_stations.desktop.in:261 +msgid "Mexico" +msgstr "Мексика" + +#. name +#: weather_stations.desktop.in:264 +msgid "Saint Pierre and Miquelon" +msgstr "Сен-Пьер и Микелон" + +#. name +#: weather_stations.desktop.in:267 +msgid "Europe" +msgstr "Европа" + +#. name +#: weather_stations.desktop.in:271 +msgid "Albania" +msgstr "Албания" + +#. name +#: weather_stations.desktop.in:274 +msgid "Austria" +msgstr "Австрия" + +#. name +#: weather_stations.desktop.in:277 +msgid "Belgium" +msgstr "Бельгия" + +#. name +#: weather_stations.desktop.in:280 +msgid "Bosnia and Herzegovina" +msgstr "Босния и Герцеговина" + +#. name +#: weather_stations.desktop.in:283 +msgid "Bulgaria" +msgstr "Болгария" + +#. name +#: weather_stations.desktop.in:286 +msgid "Belarus" +msgstr "Беларусь" + +#. name +#: weather_stations.desktop.in:289 +msgid "Czech Republic" +msgstr "Чехия" + +#. name +#: weather_stations.desktop.in:292 +msgid "Croatia" +msgstr "Хорватия" + +#. name +#: weather_stations.desktop.in:295 +msgid "Denmark" +msgstr "Дания" + +#. name +#: weather_stations.desktop.in:298 +msgid "Estonia" +msgstr "Эстония" + +#. name +#: weather_stations.desktop.in:301 +msgid "Gibraltar" +msgstr "Гибралтар" + +#. name +#: weather_stations.desktop.in:307 +msgid "Iceland" +msgstr "Исландия" + +#. name +#: weather_stations.desktop.in:310 +msgid "Latvia" +msgstr "Латвия" + +#. name +#: weather_stations.desktop.in:313 +msgid "Lithuania" +msgstr "Литва" + +#. name +#: weather_stations.desktop.in:316 +msgid "Luxembourg" +msgstr "Люксембург" + +#. name +#: weather_stations.desktop.in:319 +msgid "Macedonia, The Republic of" +msgstr "Северная Македония" + +#. name +#: weather_stations.desktop.in:322 +msgid "Malta" +msgstr "Мальта" + +#. name +#: weather_stations.desktop.in:325 +msgid "Moldova" +msgstr "Молдавия" + +#. name +#: weather_stations.desktop.in:328 +msgid "Norway" +msgstr "Норвегия" + +#. name +#: weather_stations.desktop.in:331 +msgid "Poland" +msgstr "Польша" + +#. name +#: weather_stations.desktop.in:334 +msgid "Portugal" +msgstr "Португалия" + +#. name +#: weather_stations.desktop.in:337 +msgid "Romania" +msgstr "Румыния" + +#. name +#: weather_stations.desktop.in:340 +msgid "Russia" +msgstr "Россия" + +#. name +#: weather_stations.desktop.in:343 +msgid "Ukraine" +msgstr "Украина" + +#. name +#: weather_stations.desktop.in:346 +msgid "Slovakia" +msgstr "Словакия" + +#. name +#: weather_stations.desktop.in:349 +msgid "Slovenia" +msgstr "Словения" + +#. name +#: weather_stations.desktop.in:352 +msgid "Sweden" +msgstr "Швеция" + +#. name +#: weather_stations.desktop.in:355 +msgid "Switzerland" +msgstr "Швейцария" + +#. name +#: weather_stations.desktop.in:358 +msgid "Turkey" +msgstr "Турция" + +#. name +#: weather_stations.desktop.in:361 +msgid "Cyprus" +msgstr "Кипр" + +#. name +#: weather_stations.desktop.in:364 +msgid "Finland" +msgstr "Финляндия" + +#. name +#: weather_stations.desktop.in:367 +msgid "France" +msgstr "Франция" + +#. name +#: weather_stations.desktop.in:370 +msgid "Germany" +msgstr "Германия" + +#. name +#: weather_stations.desktop.in:373 +msgid "Greece" +msgstr "Греция" + +#. name +#: weather_stations.desktop.in:376 +msgid "Hungary" +msgstr "Венгрия" + +#. name +#: weather_stations.desktop.in:379 +msgid "Ireland" +msgstr "Ирландия" + +#. name +#: weather_stations.desktop.in:382 +msgid "Italy" +msgstr "Италия" + +#. name +#: weather_stations.desktop.in:385 +msgid "Netherlands" +msgstr "Нидерланды" + +#. name +#: weather_stations.desktop.in:388 +msgid "Spain" +msgstr "Испания" + +#. name +#: weather_stations.desktop.in:391 +msgid "United Kingdom" +msgstr "Великобритания" + +#. name +#: weather_stations.desktop.in:394 +msgid "Serbia and Montenegro" +msgstr "Сербия и Черногория" + +#. name +#: weather_stations.desktop.in:397 +msgid "Africa" +msgstr "Африка" + +#. name +#: weather_stations.desktop.in:401 +msgid "Algeria" +msgstr "Алжир" + +#. name +#: weather_stations.desktop.in:404 +msgid "Angola" +msgstr "Ангола" + +#. name +#: weather_stations.desktop.in:407 +msgid "Benin" +msgstr "Бенин" + +#. name +#: weather_stations.desktop.in:410 +msgid "Botswana" +msgstr "Ботсвана" + +#. name +#: weather_stations.desktop.in:413 +msgid "Burkina Faso" +msgstr "Буркина-Фасо" + +#. name +#: weather_stations.desktop.in:416 +msgid "Burundi" +msgstr "Бурунди" + +#. name +#: weather_stations.desktop.in:419 +msgid "Cape Verde" +msgstr "Кабо-Верде" + +#. name +#: weather_stations.desktop.in:422 +msgid "Chad" +msgstr "Чад" + +#. name +#: weather_stations.desktop.in:425 +msgid "Comoros" +msgstr "Коморские острова" + +#. name +#: weather_stations.desktop.in:428 +msgid "Cote d'Ivoire" +msgstr "Кот-д’Ивуар" + +#. name +#: weather_stations.desktop.in:431 +msgid "Congo, Democratic Republic of the" +msgstr "Демократическая Республика Конго" + +#. name +#: weather_stations.desktop.in:434 +msgid "Central African Republic" +msgstr "Центральноафриканская Республика" + +#. name +#: weather_stations.desktop.in:437 +msgid "Congo, Republic of the" +msgstr "Республика Конго" + +#. name +#: weather_stations.desktop.in:440 +msgid "Cameroon" +msgstr "Камерун" + +#. name +#: weather_stations.desktop.in:443 +msgid "Djibouti" +msgstr "Джибути" + +#. name +#: weather_stations.desktop.in:446 +msgid "Egypt" +msgstr "Египет" + +#. name +#: weather_stations.desktop.in:449 +msgid "Ethiopia" +msgstr "Эфиопия" + +#. name +#: weather_stations.desktop.in:452 +msgid "Equatorial Guinea" +msgstr "Экваториальная Гвинея" + +#. name +#: weather_stations.desktop.in:455 +msgid "Gabon" +msgstr "Габон" + +#. name +#: weather_stations.desktop.in:458 +msgid "Gambia, The" +msgstr "Гамбия" + +#. name +#: weather_stations.desktop.in:461 +msgid "Ghana" +msgstr "Гана" + +#. name +#: weather_stations.desktop.in:464 +msgid "Guinea" +msgstr "Гвинея" + +#. name +#: weather_stations.desktop.in:467 +msgid "Guinea-Bissau" +msgstr "Гвинея-Бисау" + +#. name +#: weather_stations.desktop.in:470 +msgid "Kenya" +msgstr "Кения" + +#. name +#: weather_stations.desktop.in:473 +msgid "Lesotho" +msgstr "Лесото" + +#. name +#: weather_stations.desktop.in:476 +msgid "Liberia" +msgstr "Либерия" + +#. name +#: weather_stations.desktop.in:479 +msgid "Libya" +msgstr "Ливия" + +#. name +#: weather_stations.desktop.in:482 +msgid "Madagascar" +msgstr "Мадагаскар" + +#. name +#: weather_stations.desktop.in:485 +msgid "Malawi" +msgstr "Малави" + +#. name +#: weather_stations.desktop.in:488 +msgid "Mali" +msgstr "Мали" + +#. name +#: weather_stations.desktop.in:491 +msgid "Mauritania" +msgstr "Мавритания" + +#. name +#: weather_stations.desktop.in:494 +msgid "Mauritius" +msgstr "Маврикий" + +#. name +#: weather_stations.desktop.in:497 +msgid "Morocco" +msgstr "Марокко" + +#. name +#: weather_stations.desktop.in:500 +msgid "Mozambique" +msgstr "Мозамбик" + +#. name +#: weather_stations.desktop.in:503 +msgid "Namibia" +msgstr "Намибия" + +#. name +#: weather_stations.desktop.in:506 +msgid "Nigeria" +msgstr "Нигерия" + +#. name +#: weather_stations.desktop.in:509 +msgid "Niger" +msgstr "Нигер" + +#. name +#: weather_stations.desktop.in:512 +msgid "Reunion" +msgstr "Реюньон" + +#. name +#: weather_stations.desktop.in:515 +msgid "Rwanda" +msgstr "Руанда" + +#. name +#: weather_stations.desktop.in:518 +msgid "Saint Helena" +msgstr "Остров Святой Елены" + +#. name +#: weather_stations.desktop.in:521 +msgid "Sao Tome and Principe" +msgstr "Сан-Томе и Принсипи" + +#. name +#: weather_stations.desktop.in:524 +msgid "Senegal" +msgstr "Сенегал" + +#. name +#: weather_stations.desktop.in:527 +msgid "Seychelles" +msgstr "Сейшельские Острова" + +#. name +#: weather_stations.desktop.in:530 +msgid "Sierra Leone" +msgstr "Сьерра-Леоне" + +#. name +#: weather_stations.desktop.in:533 +msgid "Somalia" +msgstr "Сомали" + +#. name +#: weather_stations.desktop.in:536 +msgid "South Africa" +msgstr "ЮАР" + +#. name +#: weather_stations.desktop.in:539 +msgid "South Georgia and the Islands" +msgstr "Южная Георгия и Южные Сандвичевы Острова" + +#. name +#: weather_stations.desktop.in:542 +msgid "Sudan" +msgstr "Судан" + +#. name +#: weather_stations.desktop.in:545 +msgid "Swaziland" +msgstr "Свазиленд" + +#. name +#: weather_stations.desktop.in:548 +msgid "Tanzania" +msgstr "Танзания" + +#. name +#: weather_stations.desktop.in:551 +msgid "Togo" +msgstr "Того" + +#. name +#: weather_stations.desktop.in:554 +msgid "Tunisia" +msgstr "Тунис" + +#. name +#: weather_stations.desktop.in:557 +msgid "Uganda" +msgstr "Уганда" + +#. name +#: weather_stations.desktop.in:560 +msgid "Western Sahara" +msgstr "Западная Сахара" + +#. name +#: weather_stations.desktop.in:563 +msgid "Zambia" +msgstr "Замбия" + +#. name +#: weather_stations.desktop.in:566 +msgid "Zimbabwe" +msgstr "Зимбабве" + +#. name +#: weather_stations.desktop.in:570 +msgid "Australia and Oceania" +msgstr "Австралия и Океания" + +#. name +#: weather_stations.desktop.in:574 +msgid "Australia" +msgstr "Австралия" + +#. name +#: weather_stations.desktop.in:577 +msgid "Brunei" +msgstr "Бруней" + +#. name +#: weather_stations.desktop.in:580 +msgid "Cook Islands" +msgstr "Острова Кука" + +#. name +#: weather_stations.desktop.in:583 +msgid "Christmas Island" +msgstr "Остров Рождества" + +#. name +#: weather_stations.desktop.in:586 +msgid "Fiji" +msgstr "Фиджи" + +#. name +#: weather_stations.desktop.in:589 +msgid "French Polynesia" +msgstr "Французская Полинезия" + +#. name +#: weather_stations.desktop.in:592 +msgid "Kiribati" +msgstr "Кирибати" + +#. name +#: weather_stations.desktop.in:595 +msgid "Malaysia" +msgstr "Малайзия" + +#. name +#: weather_stations.desktop.in:598 +msgid "Marshall Islands" +msgstr "Маршалловы Острова" + +#. name +#: weather_stations.desktop.in:601 +msgid "Micronesia, Federated States of" +msgstr "Микронезия" + +#. name +#: weather_stations.desktop.in:604 +msgid "New Caledonia" +msgstr "Новая Каледония" + +#. name +#: weather_stations.desktop.in:607 +msgid "Nauru" +msgstr "Науру" + +#. name +#: weather_stations.desktop.in:610 +msgid "New Zealand" +msgstr "Новая Зеландия" + +#. name +#: weather_stations.desktop.in:613 +msgid "NORTHERN MARIANA ISLAND" +msgstr "Северные Марианские острова" + +#. name +#: weather_stations.desktop.in:616 +msgid "Indonesia" +msgstr "Индонезия" + +#. name +#: weather_stations.desktop.in:619 +msgid "Palau" +msgstr "Палау" + +#. name +#: weather_stations.desktop.in:622 +msgid "Papua New Guinea" +msgstr "Папуа Новая Гвинея" + +#. name +#: weather_stations.desktop.in:625 +msgid "Philippines" +msgstr "Филиппины" + +#. name +#: weather_stations.desktop.in:628 +msgid "Solomon Islands" +msgstr "Соломоновы Острова" + +#. name +#: weather_stations.desktop.in:631 +msgid "Samoa" +msgstr "Самоа" + +#. name +#: weather_stations.desktop.in:634 +msgid "Tonga" +msgstr "Тонга" + +#. name +#: weather_stations.desktop.in:637 +msgid "Tuvalu" +msgstr "Тувалу" + +#. name +#: weather_stations.desktop.in:640 +msgid "United States Minor Outlying Islands" +msgstr "Внешние малые острова США" + +#. name +#: weather_stations.desktop.in:643 +msgid "Vanuatu" +msgstr "Вануату" + +#. name +#: weather_stations.desktop.in:646 +msgid "Asia" +msgstr "Азия" + +#. name +#: weather_stations.desktop.in:650 +msgid "Armenia" +msgstr "Армения" + +#. name +#: weather_stations.desktop.in:653 +msgid "Azerbaijan" +msgstr "Азербайджан" + +#. name +#: weather_stations.desktop.in:656 +msgid "Bangladesh" +msgstr "Бангладеш" + +#. name +#: weather_stations.desktop.in:659 +msgid "Cambodia" +msgstr "Камбоджа" + +#. name +#: weather_stations.desktop.in:662 +msgid "China" +msgstr "Китай" + +#. name +#: weather_stations.desktop.in:665 +msgid "East Timor" +msgstr "Восточный Тимор" + +#. name +#: weather_stations.desktop.in:668 +msgid "Hong Kong" +msgstr "Гонконг" + +#. name +#: weather_stations.desktop.in:671 +msgid "India" +msgstr "Индия" + +#. name +#: weather_stations.desktop.in:674 +msgid "Japan" +msgstr "Япония" + +#. name +#: weather_stations.desktop.in:677 +msgid "Kazakhstan" +msgstr "Казахстан" + +#. name +#: weather_stations.desktop.in:680 +msgid "Korea, South" +msgstr "Южная Корея" + +#. name +#: weather_stations.desktop.in:683 +msgid "Korea, North" +msgstr "Северная Корея" + +#. name +#: weather_stations.desktop.in:686 +msgid "Kyrgyzstan" +msgstr "Киргизия" + +#. name +#: weather_stations.desktop.in:689 +msgid "Laos" +msgstr "Лаос" + +#. name +#: weather_stations.desktop.in:692 +msgid "Macau" +msgstr "Макао" + +#. name +#: weather_stations.desktop.in:695 +msgid "Maldives" +msgstr "Мальдивы" + +#. name +#: weather_stations.desktop.in:698 +msgid "Mongolia" +msgstr "Монголия" + +#. name +#: weather_stations.desktop.in:701 +msgid "Myanmar" +msgstr "Мьянма" + +#. name +#: weather_stations.desktop.in:704 +msgid "Nepal" +msgstr "Непал" + +#. name +#: weather_stations.desktop.in:707 +msgid "Pakistan" +msgstr "Пакистан" + +#. name +#: weather_stations.desktop.in:710 +msgid "Singapore" +msgstr "Сингапур" + +#. name +#: weather_stations.desktop.in:713 +msgid "Sri Lanka" +msgstr "Шри-Ланка" + +#. name +#: weather_stations.desktop.in:716 +msgid "Tajikistan" +msgstr "Таджикистан" + +#. name +#: weather_stations.desktop.in:719 +msgid "Taiwan" +msgstr "Тайвань" + +#. name +#: weather_stations.desktop.in:722 +msgid "Thailand" +msgstr "Таиланд" + +#. name +#: weather_stations.desktop.in:725 +msgid "Turkmenistan" +msgstr "Туркменистан" + +#. name +#: weather_stations.desktop.in:728 +msgid "Uzbekistan" +msgstr "Узбекистан" + +#. name +#: weather_stations.desktop.in:731 +msgid "Vietnam" +msgstr "Вьетнам" + +#. name +#: weather_stations.desktop.in:734 +msgid "Central and South America" +msgstr "Южная и Центральная Америка" + +#. name +#: weather_stations.desktop.in:738 +msgid "Anguilla" +msgstr "Ангилья" + +#. name +#: weather_stations.desktop.in:741 +msgid "Antigua and Barbuda" +msgstr "Антигуа и Барбуда" + +#. name +#: weather_stations.desktop.in:744 +msgid "Argentina" +msgstr "Аргентина" + +#. name +#: weather_stations.desktop.in:747 +msgid "Aruba" +msgstr "Аруба" + +#. name +#: weather_stations.desktop.in:750 +msgid "Barbados" +msgstr "Барбадос" + +#. name +#: weather_stations.desktop.in:753 +msgid "Bahamas, The" +msgstr "Багамы" + +#. name +#: weather_stations.desktop.in:756 +msgid "Belize" +msgstr "Белиз" + +#. name +#: weather_stations.desktop.in:759 +msgid "Bermuda" +msgstr "Бермуды" + +#. name +#: weather_stations.desktop.in:762 +msgid "Bolivia" +msgstr "Боливия" + +#. name +#: weather_stations.desktop.in:765 +msgid "Brazil" +msgstr "Бразилия" + +#. name +#: weather_stations.desktop.in:768 +msgid "British Virgin Islands" +msgstr "Британские Виргинские острова" + +#. name +#: weather_stations.desktop.in:771 +msgid "Cayman Islands" +msgstr "Острова Кайман" + +#. name +#: weather_stations.desktop.in:774 +msgid "Chile" +msgstr "Чили" + +#. name +#: weather_stations.desktop.in:777 +msgid "Costa Rica" +msgstr "Коста-Рика" + +#. name +#: weather_stations.desktop.in:780 +msgid "Colombia" +msgstr "Колумбия" + +#. name +#: weather_stations.desktop.in:783 +msgid "Cuba" +msgstr "Куба" + +#. name +#: weather_stations.desktop.in:786 +msgid "Dominica" +msgstr "Доминика" + +#. name +#: weather_stations.desktop.in:789 +msgid "Dominican Republic" +msgstr "Доминиканская Республика" + +#. name +#: weather_stations.desktop.in:792 +msgid "Ecuador" +msgstr "Эквадор" + +#. name +#: weather_stations.desktop.in:795 +msgid "El Salvador" +msgstr "Сальвадор" + +#. name +#: weather_stations.desktop.in:798 +msgid "French Guiana" +msgstr "Французская Гвиана" + +#. name +#: weather_stations.desktop.in:801 +msgid "Falkland Islands, Islas Malvinas" +msgstr "Фолклендские острова (Мальвинские)" + +#. name +#: weather_stations.desktop.in:804 +msgid "Grenada" +msgstr "Гренада" + +#. name +#: weather_stations.desktop.in:807 +msgid "Guatemala" +msgstr "Гватемала" + +#. name +#: weather_stations.desktop.in:810 +msgid "Guadeloupe" +msgstr "Гваделупа" + +#. name +#: weather_stations.desktop.in:813 +msgid "Guyana" +msgstr "Гайана" + +#. name +#: weather_stations.desktop.in:816 +msgid "Haiti" +msgstr "Гаити" + +#. name +#: weather_stations.desktop.in:819 +msgid "Honduras" +msgstr "Гондурас" + +#. name +#: weather_stations.desktop.in:822 +msgid "Jamaica" +msgstr "Ямайка" + +#. name +#: weather_stations.desktop.in:825 +msgid "Martinique" +msgstr "Мартиника" + +#. name +#: weather_stations.desktop.in:828 +msgid "Netherlands Antilles" +msgstr "Нидерландские Антильские острова" + +#. name +#: weather_stations.desktop.in:831 +msgid "Nicaragua" +msgstr "Никарагуа" + +#. name +#: weather_stations.desktop.in:834 +msgid "Panama" +msgstr "Панама" + +#. name +#: weather_stations.desktop.in:837 +msgid "Peru" +msgstr "Перу" + +#. name +#: weather_stations.desktop.in:840 +msgid "Puerto Rico" +msgstr "Пуэрто-Рико" + +#. name +#: weather_stations.desktop.in:843 +msgid "Paraguay" +msgstr "Парагвай" + +#. name +#: weather_stations.desktop.in:846 +msgid "Saint Kitts and Nevis" +msgstr "Сент-Китс и Невис" + +#. name +#: weather_stations.desktop.in:849 +msgid "Saint Lucia" +msgstr "Сент-Люсия" + +#. name +#: weather_stations.desktop.in:852 +msgid "Saint Vincent and the Grenadines" +msgstr "Сент-Винсент и Гренадины" + +#. name +#: weather_stations.desktop.in:855 +msgid "Suriname" +msgstr "Суринам" + +#. name +#: weather_stations.desktop.in:858 +msgid "Trinidad and Tobago" +msgstr "Тринидад и Тобаго" + +#. name +#: weather_stations.desktop.in:861 +msgid "Turks and Caicos Islands" +msgstr "Острова Теркс и Кайкос" + +#. name +#: weather_stations.desktop.in:864 +msgid "Uruguay" +msgstr "Уругвай" + +#. name +#: weather_stations.desktop.in:867 +msgid "Venezuela" +msgstr "Венесуэла" + +#. name +#: weather_stations.desktop.in:870 +msgid "Virgin Islands" +msgstr "Виргинские острова" + +#. name +#: weather_stations.desktop.in:873 weather_stations.desktop.in:877 +msgid "Antarctica" +msgstr "Антарктика" diff --git a/translations/desktop_files/kworldwatch-desktops/de.po b/translations/desktop_files/kworldwatch-desktops/de.po index 3ebf1b6..9a4e9c9 100644 --- a/translations/desktop_files/kworldwatch-desktops/de.po +++ b/translations/desktop_files/kworldwatch-desktops/de.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Begett <weblate-tde@bunbun.de>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-06-21 16:11+0000\n" +"Last-Translator: Lian Begett <weblate-tde@bunbun.de>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kworldclock-desktop-files/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Comment #: kdeworld.desktop:2 @@ -23,9 +24,8 @@ msgstr "TDE-Weltzeituhr" #. Name #: kworldclock.desktop:2 -#, fuzzy msgid "KWorldClock" -msgstr "Weltzeituhr" +msgstr "KWorldClock" #. GenericName #: kworldclock.desktop:4 diff --git a/translations/desktop_files/kworldwatch-desktops/ru.po b/translations/desktop_files/kworldwatch-desktops/ru.po index c393968..94ebe5a 100644 --- a/translations/desktop_files/kworldwatch-desktops/ru.po +++ b/translations/desktop_files/kworldwatch-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-14 14:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdetoys/kworldclock-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: kdeworld.desktop:2 @@ -23,9 +25,8 @@ msgstr "Всемирные часы TDE от Matthias Hoelzer-Kluepfel" #. Name #: kworldclock.desktop:2 -#, fuzzy msgid "KWorldClock" -msgstr "Всемирные часы" +msgstr "KWorldClock" #. GenericName #: kworldclock.desktop:4 |