From 97e9638098f38ac062c31210f73788af629ffd5f Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 27 Jun 2022 17:09:53 +0800 Subject: [PATCH] update translation file --- 0004-update-translation-file.patch | 179 +++++++++++++++++++++++++++++ indicator-china-weather.spec | 8 +- 2 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 0004-update-translation-file.patch diff --git a/0004-update-translation-file.patch b/0004-update-translation-file.patch new file mode 100644 index 0000000..499da8c --- /dev/null +++ b/0004-update-translation-file.patch @@ -0,0 +1,179 @@ +From f0f0c097544cfc115015053525c8c3e9a68a6b15 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Mon, 27 Jun 2022 17:07:15 +0800 +Subject: [PATCH] update translation file + +--- + debian/changelog | 6 +++++ + src/citycollectionwidget.cpp | 6 ++--- + src/citycollectionwidget.ui | 2 +- + translations/indicator-china-weather_bo.ts | 22 +++++++++++++++++-- + translations/indicator-china-weather_zh_CN.ts | 22 +++++++++++++++++-- + 5 files changed, 50 insertions(+), 8 deletions(-) + +diff --git a/debian/changelog b/debian/changelog +index 7838b0a..7b4b0f7 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,9 @@ ++indicator-china-weather (3.1.0-37) v101; urgency=medium ++ ++ * 解决了BUG#30685 程序没有IP定位功能 ++ ++ -- shixiaoshuo Fri,8 Jan 2021 10:33:00 +0800 ++ + indicator-china-weather (3.1.0-36) v101; urgency=medium + + * 修复了一处因为gsetting文件初始化问题引起的严重BUG +diff --git a/src/citycollectionwidget.cpp b/src/citycollectionwidget.cpp +index 21773d4..335d3c9 100644 +--- a/src/citycollectionwidget.cpp ++++ b/src/citycollectionwidget.cpp +@@ -81,8 +81,8 @@ CityCollectionWidget::CityCollectionWidget(QWidget *parent) : + ui->btnCancel->setFocusPolicy(Qt::NoFocus); + ui->lbLeftUpTitle->setText(tr("Kylin Weather")); + ui->lbLeftUpTitle->setFixedWidth(100); +- ui->lbCityCollect->setText("收藏城市"); +- ui->lbCityCurrent->setText("当前城市"); ++ ui->lbCityCollect->setText(tr("Collections")); //收藏城市 ++ ui->lbCityCurrent->setText((tr("Local")); //当前城市 + + ui->lbCityCount->setText("0/8"); + m_citynumber = 0; +@@ -97,7 +97,7 @@ CityCollectionWidget::CityCollectionWidget(QWidget *parent) : + m_tipLabel->setWordWrap(true); + m_tipLabel->setAlignment(Qt::AlignCenter); + m_tipLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); +- m_tipLabel->setText("当前网络异常，请检查网络设置");//Current Network Exception, Please Check Network Settings ++ m_tipLabel->setText(tr("Current Network Exception, Please Check Network Settings"));//当前网络异常，请检查网络设置 + m_tipLabel->move(0, 300); + m_tipLabel->hide(); + +diff --git a/src/citycollectionwidget.ui b/src/citycollectionwidget.ui +index 6f98797..5b25158 100644 +--- a/src/citycollectionwidget.ui ++++ b/src/citycollectionwidget.ui +@@ -70,7 +70,7 @@ + + 45 + 223 +- 72 ++ 101 + 19 + + +diff --git a/translations/indicator-china-weather_bo.ts b/translations/indicator-china-weather_bo.ts +index fafdf61..da5ae2c 100644 +--- a/translations/indicator-china-weather_bo.ts ++++ b/translations/indicator-china-weather_bo.ts +@@ -17,6 +17,21 @@ + Kylin Weather + + ++ ++ ++ Collections ++ ++ ++ ++ ++ Local ++ ++ ++ ++ ++ Current Network Exception, Please Check Network Settings ++ ++ + + + LeftUpSearchBox +@@ -31,7 +46,7 @@ + + + +- ++ + Kylin Weather + + +@@ -133,16 +148,19 @@ + + + +- Help ++ ++ Help + + + + ++ + About + + + + ++ + Quit + + +diff --git a/translations/indicator-china-weather_zh_CN.ts b/translations/indicator-china-weather_zh_CN.ts +index 32aac9b..e656456 100644 +--- a/translations/indicator-china-weather_zh_CN.ts ++++ b/translations/indicator-china-weather_zh_CN.ts +@@ -17,6 +17,21 @@ + Kylin Weather + 麒麟天气 + ++ ++ ++ Collections ++ 收藏城市 ++ ++ ++ ++ Local ++ 当前城市 ++ ++ ++ ++ Current Network Exception, Please Check Network Settings ++ 当前网络异常，请检查网络设置 ++ + + + LeftUpSearchBox +@@ -31,7 +46,7 @@ + + + +- ++ + Kylin Weather + 麒麟天气 + +@@ -137,16 +152,19 @@ + + + +- Help ++ ++ Help + 帮助 + + + ++ + About + 关于 + + + ++ + Quit + 退出 + +-- +2.33.0 + diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec index 8ebe9c3..a65b5bb 100644 --- a/indicator-china-weather.spec +++ b/indicator-china-weather.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: indicator-china-weather Version: 3.1.0 -Release: 10 +Release: 11 Summary: The weather data are from the heweather API s6 version. License: GPL-3.0+ URL: https://github.com/UbuntuKylin/indicator-china-weather @@ -25,6 +25,7 @@ patch0: fix-gsetting-issue.patch patch1: fix-auto-get-location.patch patch2: 0002-Modified-kylin-weather-display-is-incomplete.patch patch3: 0003-add-X-UKUI-AutoRestart-filed-in-desktop.patch +patch4: 0004-update-translation-file.patch %description Indicator that displays China weather information @@ -37,6 +38,8 @@ patch3: 0003-add-X-UKUI-AutoRestart-filed-in-desktop.patch %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro @@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/man/man1/indicator-china-weather.1.gz %changelog +* Mon Jun 27 2022 peijiankang - 3.1.0-11 +- update translation file + * Fri Jun 24 2022 peijiankang - 3.1.0-10 - add-X-UKUI-AutoRestart filed in desktop