Hello community,
here is the log from the commit of package kimtoy for openSUSE:Factory checked in at 2012-06-26 16:06:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kimtoy (Old)
and /work/SRC/openSUSE:Factory/.kimtoy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimtoy", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/kimtoy/kimtoy.changes 2012-06-05 15:32:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kimtoy.new/kimtoy.changes 2012-06-26 16:06:25.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Jun 24 18:49:05 UTC 2012 - i@marguerite.su
+
+- Upstream 1.9.1
+ * try to fix ghost taskbar entry
+ * filter menu is style-sware
+
+-------------------------------------------------------------------
Old:
----
kimtoy-1.9.tar.bz2
New:
----
kimtoy-1.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kimtoy.spec ++++++
--- /var/tmp/diff_new_pack.zxKFnG/_old 2012-06-26 16:06:30.000000000 +0200
+++ /var/tmp/diff_new_pack.zxKFnG/_new 2012-06-26 16:06:30.000000000 +0200
@@ -17,7 +17,7 @@
Name: kimtoy
-Version: 1.9
+Version: 1.9.1
Release: 0
Summary: An input method frontend for KDE
License: GPL-2.0+
++++++ kimtoy-1.9.tar.bz2 -> kimtoy-1.9.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/ChangeLog new/kimtoy-1.9.1/ChangeLog
--- old/kimtoy-1.9/ChangeLog 2012-05-31 15:33:41.000000000 +0200
+++ new/kimtoy-1.9.1/ChangeLog 2012-06-24 15:05:08.000000000 +0200
@@ -1,3 +1,7 @@
+2012-06-24 v1.9.1
+try to fix ghost taskbar entry
+filter menu is style-sware
+
2012-05-30 v1.9
highlight candidate cursor
statusbar filter menu do not popup out of screen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/ChangeLog.zh_CN new/kimtoy-1.9.1/ChangeLog.zh_CN
--- old/kimtoy-1.9/ChangeLog.zh_CN 2012-05-31 15:28:18.000000000 +0200
+++ new/kimtoy-1.9.1/ChangeLog.zh_CN 2012-06-24 15:05:52.000000000 +0200
@@ -1,3 +1,7 @@
+2012-06-24 v1.9.1
+尝试修复任务栏非预期的条目出现问题
+过滤菜单遵循风格设置
+
2012-05-30 v1.9
高亮显示光标处候选词
状态栏过滤菜单弹出位置不再超出屏幕
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/filtermenu.cpp new/kimtoy-1.9.1/filtermenu.cpp
--- old/kimtoy-1.9/filtermenu.cpp 2012-05-25 18:47:21.000000000 +0200
+++ new/kimtoy-1.9.1/filtermenu.cpp 2012-06-24 14:58:29.000000000 +0200
@@ -25,6 +25,9 @@
#include <QApplication>
#include <QDesktopWidget>
#include <QMenu>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionMenuItem>
#include <QVBoxLayout>
#include <KIcon>
@@ -34,6 +37,7 @@
{
setWindowFlags(Qt::Popup);
setAttribute(Qt::WA_DeleteOnClose);
+ setAttribute(Qt::WA_TranslucentBackground, true);
QVBoxLayout* layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
@@ -58,6 +62,19 @@
m_menu->addAction(act);
}
+void FilterMenu::paintEvent(QPaintEvent* event)
+{
+ QPainter p(this);
+
+ QStyleOptionMenuItem menuOpt;
+ menuOpt.initFrom(this);
+ menuOpt.state = QStyle::State_None;
+ menuOpt.checkType = QStyleOptionMenuItem::NotCheckable;
+ menuOpt.maxIconWidth = 0;
+ menuOpt.tabWidth = 0;
+ style()->drawPrimitive(QStyle::PE_PanelMenu, &menuOpt, &p, this);
+}
+
void FilterMenu::showEvent(QShowEvent* /*event*/)
{
/// always popup inside screen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/filtermenu.h new/kimtoy-1.9.1/filtermenu.h
--- old/kimtoy-1.9/filtermenu.h 2012-05-25 18:47:28.000000000 +0200
+++ new/kimtoy-1.9.1/filtermenu.h 2012-06-24 14:45:12.000000000 +0200
@@ -37,6 +37,7 @@
Q_SIGNALS:
void filterChanged(const QString& objectPath, bool checked);
protected:
+ virtual void paintEvent(QPaintEvent* event);
virtual void showEvent(QShowEvent* event);
private Q_SLOTS:
void slotToggled(bool checked);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/main.cpp new/kimtoy-1.9.1/main.cpp
--- old/kimtoy-1.9/main.cpp 2012-05-26 03:52:58.000000000 +0200
+++ new/kimtoy-1.9.1/main.cpp 2012-06-24 15:04:10.000000000 +0200
@@ -29,7 +29,7 @@
int main(int argc, char** argv)
{
KAboutData aboutData("kimtoy", 0, ki18n("KIMToy"),
- "1.9", ki18n("The KDE input method toy"),
+ "1.9.1", ki18n("The KDE input method toy"),
KAboutData::License_GPL, ki18n("(c) 2011-2012, Ni Hui"));
aboutData.addAuthor(ki18n("Ni Hui"), ki18n("Author"), "shuizhuyuanluo@126.com");
aboutData.setProgramIconName("draw-freehand");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/cs.po new/kimtoy-1.9.1/po/cs.po
--- old/kimtoy-1.9/po/cs.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/cs.po 2012-06-24 15:55:13.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-01-09 13:18+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/da.po new/kimtoy-1.9.1/po/da.po
--- old/kimtoy-1.9/po/da.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/da.po 2012-06-24 15:55:12.000000000 +0200
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
-"PO-Revision-Date: 2012-04-29 14:25+0200\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
+"PO-Revision-Date: 2012-06-02 11:33+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
"Language: \n"
@@ -65,7 +65,7 @@
#: statusbar.cpp:106
msgid "C&onfigure input method..."
-msgstr ""
+msgstr "I&ndstil input-metode..."
#. i18n: file: appearance.ui:79
#. i18n: ectx: property (text), widget (QLabel, candidateColorLabel)
@@ -76,9 +76,8 @@
#. i18n: file: appearance.ui:109
#. i18n: ectx: property (text), widget (QLabel, label)
#: rc.cpp:32
-#, fuzzy
msgid "Candidate cursor: "
-msgstr "Kandidatfarve: "
+msgstr "Kandidatmarkør: "
#. i18n: file: appearance.ui:56
#. i18n: ectx: property (text), widget (QLabel, candidateFontLabel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/de.po new/kimtoy-1.9.1/po/de.po
--- old/kimtoy-1.9/po/de.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/de.po 2012-06-24 15:55:13.000000000 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-02-12 21:50+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/es.po new/kimtoy-1.9.1/po/es.po
--- old/kimtoy-1.9/po/es.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/es.po 2012-06-24 15:55:13.000000000 +0200
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
-"PO-Revision-Date: 2012-05-25 12:13+0200\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
+"PO-Revision-Date: 2012-06-09 12:15+0200\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
"Language: es\n"
@@ -66,7 +66,7 @@
#: statusbar.cpp:106
msgid "C&onfigure input method..."
-msgstr ""
+msgstr "C&onfigurar el método de entrada..."
#. i18n: file: appearance.ui:79
#. i18n: ectx: property (text), widget (QLabel, candidateColorLabel)
@@ -77,9 +77,8 @@
#. i18n: file: appearance.ui:109
#. i18n: ectx: property (text), widget (QLabel, label)
#: rc.cpp:32
-#, fuzzy
msgid "Candidate cursor: "
-msgstr "Color candidato: "
+msgstr "Cursor candidato: "
#. i18n: file: appearance.ui:56
#. i18n: ectx: property (text), widget (QLabel, candidateFontLabel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/et.po new/kimtoy-1.9.1/po/et.po
--- old/kimtoy-1.9/po/et.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/et.po 2012-06-24 15:55:13.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-29 06:42+0300\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/ga.po new/kimtoy-1.9.1/po/ga.po
--- old/kimtoy-1.9/po/ga.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/ga.po 2012-06-24 15:55:13.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2011-12-28 12:28-0500\n"
"Last-Translator: Kevin Scannell \n"
"Language-Team: Irish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/ja.po new/kimtoy-1.9.1/po/ja.po
--- old/kimtoy-1.9/po/ja.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/ja.po 2012-06-24 15:55:12.000000000 +0200
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2011-09-25 20:04-0700\n"
"Last-Translator: Japanese KDE translation team \n"
"Language-Team: Japanese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/kimtoy.pot new/kimtoy-1.9.1/po/kimtoy.pot
--- old/kimtoy-1.9/po/kimtoy.pot 2012-05-31 15:46:19.000000000 +0200
+++ new/kimtoy-1.9.1/po/kimtoy.pot 2012-06-24 15:53:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/lt.po new/kimtoy-1.9.1/po/lt.po
--- old/kimtoy-1.9/po/lt.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/lt.po 2012-06-24 15:55:12.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2011-10-14 04:21+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/nds.po new/kimtoy-1.9.1/po/nds.po
--- old/kimtoy-1.9/po/nds.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/nds.po 2012-06-24 15:55:13.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2011-09-21 14:01+0200\n"
"Last-Translator: Manfred Wiese \n"
"Language-Team: Low Saxon \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/nl.po new/kimtoy-1.9.1/po/nl.po
--- old/kimtoy-1.9/po/nl.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/nl.po 2012-06-24 15:55:12.000000000 +0200
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
-"PO-Revision-Date: 2012-05-27 00:49+0200\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
+"PO-Revision-Date: 2012-06-15 23:40+0200\n"
"Last-Translator: Freek de Kruijf \n"
"Language-Team: Dutch \n"
"Language: \n"
@@ -159,7 +159,7 @@
#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableWindowMask)
#: rc.cpp:143
msgid "Enable window shape mask"
-msgstr ""
+msgstr "Masker van venstervorm inschakelen"
#. i18n: file: inputmethod.ui:21
#. i18n: ectx: attribute (title), widget (QWidget, FcitxTab)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/pl.po new/kimtoy-1.9.1/po/pl.po
--- old/kimtoy-1.9/po/pl.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/pl.po 2012-06-24 15:55:13.000000000 +0200
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
-"PO-Revision-Date: 2012-03-31 10:58+0200\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
+"PO-Revision-Date: 2012-06-07 19:31+0200\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -66,7 +66,7 @@
#: statusbar.cpp:106
msgid "C&onfigure input method..."
-msgstr ""
+msgstr "K&onfiguruj metodę wprowadzania..."
#. i18n: file: appearance.ui:79
#. i18n: ectx: property (text), widget (QLabel, candidateColorLabel)
@@ -77,9 +77,8 @@
#. i18n: file: appearance.ui:109
#. i18n: ectx: property (text), widget (QLabel, label)
#: rc.cpp:32
-#, fuzzy
msgid "Candidate cursor: "
-msgstr "Kolor Candidate: "
+msgstr "Kursor Candidate: "
#. i18n: file: appearance.ui:56
#. i18n: ectx: property (text), widget (QLabel, candidateFontLabel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/pt.po new/kimtoy-1.9.1/po/pt.po
--- old/kimtoy-1.9/po/pt.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/pt.po 2012-06-24 15:55:13.000000000 +0200
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-27 16:06+0100\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/pt_BR.po new/kimtoy-1.9.1/po/pt_BR.po
--- old/kimtoy-1.9/po/pt_BR.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/pt_BR.po 2012-06-24 15:55:13.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-27 11:56-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/sk.po new/kimtoy-1.9.1/po/sk.po
--- old/kimtoy-1.9/po/sk.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/sk.po 2012-06-24 15:55:12.000000000 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: kimtoy\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-03-04 19:39+0100\n"
"Last-Translator: Roman Paholík \n"
"Language-Team: Slovak \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/sv.po new/kimtoy-1.9.1/po/sv.po
--- old/kimtoy-1.9/po/sv.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/sv.po 2012-06-24 15:55:12.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-27 10:43+0200\n"
"Last-Translator: Stefan Asserhäll \n"
"Language-Team: Swedish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/uk.po new/kimtoy-1.9.1/po/uk.po
--- old/kimtoy-1.9/po/uk.po 2012-05-31 15:47:38.000000000 +0200
+++ new/kimtoy-1.9.1/po/uk.po 2012-06-24 15:55:12.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-27 09:02+0300\n"
"Last-Translator: Yuri Chornoivan \n"
"Language-Team: Ukrainian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/po/zh_CN.po new/kimtoy-1.9.1/po/zh_CN.po
--- old/kimtoy-1.9/po/zh_CN.po 2012-05-31 15:47:39.000000000 +0200
+++ new/kimtoy-1.9.1/po/zh_CN.po 2012-06-24 15:56:11.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2012-05-31 21:46+0800\n"
+"POT-Creation-Date: 2012-06-24 21:53+0800\n"
"PO-Revision-Date: 2012-05-28 10:04+0800\n"
"Last-Translator: Ni Hui \n"
"Language-Team: Chinese Simplified \n"
@@ -428,26 +428,3 @@
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Ni Hui"
-
-#~ msgid "*.ssf *.fskin"
-#~ msgstr "*.ssf *.fskin"
-
-#, fuzzy
-#~| msgid "Candidate font: "
-#~ msgid "First candidate: "
-#~ msgstr "候选词字体:"
-
-#~ msgid "Import theme: "
-#~ msgstr "导入主题:"
-
-#~ msgid "No theme"
-#~ msgstr "无主题"
-
-#~ msgid "Theme settings"
-#~ msgstr "主题设置"
-
-#~ msgid "Use custom theme"
-#~ msgstr "使用自定义主题"
-
-#~ msgid "Use default plasma theme"
-#~ msgstr "使用默认 plasma 主题"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimtoy-1.9/statusbar.cpp new/kimtoy-1.9.1/statusbar.cpp
--- old/kimtoy-1.9/statusbar.cpp 2012-05-31 15:08:14.000000000 +0200
+++ new/kimtoy-1.9.1/statusbar.cpp 2012-06-24 14:26:23.000000000 +0200
@@ -75,9 +75,9 @@
StatusBar::StatusBar()
{
- setWindowFlags(Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint);
+ setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::KeepAbove);
- KWindowSystem::setType(winId(), NET::PopupMenu);
+ KWindowSystem::setType(winId(), NET::Dock);
ThemerAgent::loadSettings();
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org