rev 10484 - in kde-extras/eva/trunk/debian: . patches
Anthony Fok
foka at alioth.debian.org
Mon May 5 22:18:47 UTC 2008
Author: foka
Date: 2008-05-05 22:18:46 +0000 (Mon, 05 May 2008)
New Revision: 10484
Modified:
kde-extras/eva/trunk/debian/changelog
kde-extras/eva/trunk/debian/patches/08_translation_update.diff
Log:
eva (0.4.921+svn42-2) unstable; urgency=low
* 08_translation_update.diff: Oops, while fixing English typos in source
code, I forgot to update src/ui/evauserinfowidget.cpp too, and some
English text slipped through in the Chinese interface. Fixed.
-- Anthony Fok <foka at debian.org> Tue, 06 May 2008 04:40:34 +0800
Modified: kde-extras/eva/trunk/debian/changelog
===================================================================
--- kde-extras/eva/trunk/debian/changelog 2008-05-05 21:04:11 UTC (rev 10483)
+++ kde-extras/eva/trunk/debian/changelog 2008-05-05 22:18:46 UTC (rev 10484)
@@ -1,3 +1,11 @@
+eva (0.4.921+svn42-2) unstable; urgency=low
+
+ * 08_translation_update.diff: Oops, while fixing English typos in source
+ code, I forgot to update src/ui/evauserinfowidget.cpp too, and some
+ English text slipped through in the Chinese interface. Fixed.
+
+ -- Anthony Fok <foka at debian.org> Tue, 06 May 2008 04:40:34 +0800
+
eva (0.4.921+svn42-1) unstable; urgency=low
[ Zhengpeng Hou ]
Modified: kde-extras/eva/trunk/debian/patches/08_translation_update.diff
===================================================================
--- kde-extras/eva/trunk/debian/patches/08_translation_update.diff 2008-05-05 21:04:11 UTC (rev 10483)
+++ kde-extras/eva/trunk/debian/patches/08_translation_update.diff 2008-05-05 22:18:46 UTC (rev 10484)
@@ -1,6 +1,6 @@
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/eva.pot eva-0.4.921+svn42.new/po/eva.pot
--- eva-0.4.921+svn42/po/eva.pot 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/po/eva.pot 2008-05-06 03:12:20.000000000 +0800
++++ eva-0.4.921+svn42.new/po/eva.pot 2008-05-06 05:03:23.000000000 +0800
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -1443,8 +1443,8 @@
+msgid "Size (W x H):"
msgstr ""
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/zh_CN/eva.po eva-0.4.921+svn42.new/po/zh_CN/eva.po
---- eva-0.4.921+svn42/po/zh_CN/eva.po 2008-05-05 23:26:08.000000000 +0800
-+++ eva-0.4.921+svn42.new/po/zh_CN/eva.po 2008-05-06 03:13:08.000000000 +0800
+--- eva-0.4.921+svn42/po/zh_CN/eva.po 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/po/zh_CN/eva.po 2008-05-06 05:03:23.000000000 +0800
@@ -1,18 +1,21 @@
-# translation of new.po to
-# translation of eva.po to
@@ -3528,7 +3528,7 @@
#~ msgstr "新密码:"
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/zh_TW/eva.po eva-0.4.921+svn42.new/po/zh_TW/eva.po
--- eva-0.4.921+svn42/po/zh_TW/eva.po 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/po/zh_TW/eva.po 2008-05-06 03:12:28.000000000 +0800
++++ eva-0.4.921+svn42.new/po/zh_TW/eva.po 2008-05-06 05:03:23.000000000 +0800
@@ -1,19 +1,21 @@
-# translation of new.po to
-# translation of eva.po to
@@ -5216,7 +5216,7 @@
#~ msgstr "顯示所有%1頁"
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/api/evausersetting.cpp eva-0.4.921+svn42.new/src/api/evausersetting.cpp
--- eva-0.4.921+svn42/src/api/evausersetting.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/api/evausersetting.cpp 2008-05-06 02:26:29.000000000 +0800
++++ eva-0.4.921+svn42.new/src/api/evausersetting.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -868,9 +868,9 @@
for(QStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter)
autoList.push_back(*iter);
@@ -5267,7 +5267,7 @@
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/api/regiongrabber.cpp eva-0.4.921+svn42.new/src/api/regiongrabber.cpp
--- eva-0.4.921+svn42/src/api/regiongrabber.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/api/regiongrabber.cpp 2008-05-06 02:30:59.000000000 +0800
++++ eva-0.4.921+svn42.new/src/api/regiongrabber.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -44,7 +44,7 @@
void SizeTip::setTip( const QRect &rect )
@@ -5279,7 +5279,7 @@
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/evaaddingmanager.cpp eva-0.4.921+svn42.new/src/evaaddingmanager.cpp
--- eva-0.4.921+svn42/src/evaaddingmanager.cpp 2008-04-25 16:09:35.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/evaaddingmanager.cpp 2008-05-05 23:46:01.000000000 +0800
++++ eva-0.4.921+svn42.new/src/evaaddingmanager.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -183,7 +183,7 @@
void EvaAddingManager::slotAddBuddyExReply( const unsigned int id, const unsigned char reply, const unsigned char auth )
{
@@ -5309,7 +5309,7 @@
return;
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/main.cpp eva-0.4.921+svn42.new/src/main.cpp
--- eva-0.4.921+svn42/src/main.cpp 2008-04-25 16:09:35.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/main.cpp 2008-05-06 01:28:11.000000000 +0800
++++ eva-0.4.921+svn42.new/src/main.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -42,7 +42,7 @@
{ "p", 0, 0},
{ "passwd <password>", I18N_NOOP("Password for your QQ number."), 0},
@@ -5340,7 +5340,7 @@
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/createsmileyui.cpp eva-0.4.921+svn42.new/src/ui/createsmileyui.cpp
--- eva-0.4.921+svn42/src/ui/createsmileyui.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/createsmileyui.cpp 2008-05-06 01:47:22.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/createsmileyui.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -133,7 +133,7 @@
lblTop->setText( i18n("<b>Please follow the steps below to create your smiley.</b><br>\n"
"<b>You could select one or more files at a time.</b>" ) );
@@ -5352,7 +5352,7 @@
lblStep2->setText( i18n("2. Input the shortcut key for the smiley. Max length is 6 chars.<br>\n"
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evaadduibase.cpp eva-0.4.921+svn42.new/src/ui/evaadduibase.cpp
--- eva-0.4.921+svn42/src/ui/evaadduibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evaadduibase.cpp 2008-05-06 01:09:20.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evaadduibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -172,7 +172,7 @@
//lblTopic->setText( i18n( "-" ) );
//tbtnFace->setText( i18n( "..." ) );
@@ -5364,7 +5364,7 @@
//lblCodeGraphic->setText( i18n( "-" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evachatuibase.cpp eva-0.4.921+svn42.new/src/ui/evachatuibase.cpp
--- eva-0.4.921+svn42/src/ui/evachatuibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evachatuibase.cpp 2008-05-06 02:42:17.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evachatuibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -327,32 +327,32 @@
tbAddImage->setText("...");
tbAddImage->setAccel( QKeySequence( tr( "Alt+A" ) ) );
@@ -5409,7 +5409,7 @@
QToolTip::add( tbShowBuddy, i18n( "Click to update" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evachatwindow.cpp eva-0.4.921+svn42.new/src/ui/evachatwindow.cpp
--- eva-0.4.921+svn42/src/ui/evachatwindow.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evachatwindow.cpp 2008-05-06 03:11:12.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evachatwindow.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -693,7 +693,7 @@
void EvaChatWindow::slotFileTransferAcceptClicked( const unsigned int showSession)
@@ -5470,7 +5470,7 @@
e->ignore();
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evaqunchatuibase.cpp eva-0.4.921+svn42.new/src/ui/evaqunchatuibase.cpp
--- eva-0.4.921+svn42/src/ui/evaqunchatuibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evaqunchatuibase.cpp 2008-05-06 02:16:43.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evaqunchatuibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -288,41 +288,41 @@
setCaption( i18n( "Qun" ) );
tbQunDetails->setText( i18n( "..." ) );
@@ -5529,7 +5529,7 @@
//listView1->header()->setLabel( 0, i18n( "Column 1" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evasearchwindow.cpp eva-0.4.921+svn42.new/src/ui/evasearchwindow.cpp
--- eva-0.4.921+svn42/src/ui/evasearchwindow.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evasearchwindow.cpp 2008-05-06 02:19:01.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evasearchwindow.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -212,41 +212,41 @@
@@ -5608,7 +5608,7 @@
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evasyssettinguibase.cpp eva-0.4.921+svn42.new/src/ui/evasyssettinguibase.cpp
--- eva-0.4.921+svn42/src/ui/evasyssettinguibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evasyssettinguibase.cpp 2008-05-06 02:20:20.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evasyssettinguibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -1038,9 +1038,9 @@
cbOccupation->insertItem( i18n( "Soldier" ) );
leHomePage->setText( QString::null );
@@ -5763,9 +5763,46 @@
pbAutoNew->setText( i18n("New" ) );
pbAutoDelete->setText( i18n("Delete" ) );
pbFaceDefault->setText( i18n("Default" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evauserinfowidget.cpp eva-0.4.921+svn42.new/src/ui/evauserinfowidget.cpp
+--- eva-0.4.921+svn42/src/ui/evauserinfowidget.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evauserinfowidget.cpp 2008-05-06 05:04:44.000000000 +0800
+@@ -503,7 +503,7 @@
+ lblRealName->setText( tr( "Real Name:" ) );
+ lblNickName->setText( tr( "Nick Name:" ) );
+ lblAge->setText( tr( "Age:" ) );
+- lblArea->setText( tr( "Area:" ) );
++ lblArea->setText( tr( "Region:" ) );
+ leRealName->setText( QString::null );
+ leNickName->setText( QString::null );
+ leAge->setText( QString::null );
+@@ -527,7 +527,7 @@
+ leMobile->setText( QString::null );
+ leOccupation->setText( QString::null );
+ leBlood->setText( QString::null );
+- lblBlood->setText( tr( "Blood:" ) );
++ lblBlood->setText( tr( "Blood Type:" ) );
+ lblOccupation->setText( tr( "Occupation:" ) );
+ leZodiac->setText( QString::null );
+ leHoroscape->setText( QString::null );
+@@ -535,12 +535,12 @@
+ leEmail->setText( QString::null );
+ leAddress->setText( QString::null );
+ leZipCode->setText( QString::null );
+- lblZodiac->setText( tr( "Zodiac:" ) );
+- lblHoroscape->setText( tr( "Horoscape:" ) );
++ lblZodiac->setText( tr( "Chinese Zodiac:" ) );
++ lblHoroscape->setText( tr( "Horoscope:" ) );
+ lblSchool->setText( tr( "School:" ) );
+ lblEmail->setText( tr( "Email:" ) );
+ lblAddress->setText( tr( "Address:" ) );
+- lblZipCode->setText( tr( "Zip Code:" ) );
++ lblZipCode->setText( tr( "Postal Code:" ) );
+ lblPhone->setText( tr( "Phone:" ) );
+ lblHomePage->setText( tr( "Home Page:" ) );
+ lblDetails->setText( tr( "Details" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evauseruibase.cpp eva-0.4.921+svn42.new/src/ui/evauseruibase.cpp
--- eva-0.4.921+svn42/src/ui/evauseruibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/evauseruibase.cpp 2008-05-06 02:15:18.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evauseruibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -293,7 +293,7 @@
lblMemoAddress->setText( i18n( "Address:" ) );
lblMemoEmail->setText( i18n( "Email:" ) );
@@ -5777,7 +5814,7 @@
pbDownloadMemo->setText( i18n( "Download Memo" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/mainlistfontsettinguibase.cpp eva-0.4.921+svn42.new/src/ui/mainlistfontsettinguibase.cpp
--- eva-0.4.921+svn42/src/ui/mainlistfontsettinguibase.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/mainlistfontsettinguibase.cpp 2008-05-06 02:23:11.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/mainlistfontsettinguibase.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -327,7 +327,7 @@
chbBuddySigFontB->setText( i18n("bold" ) );
chbBuddySigFontU->setText( i18n("underline" ) );
@@ -5807,7 +5844,7 @@
chbGroupOnlineFontU->setText( i18n("underline" ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/quncreateui.cpp eva-0.4.921+svn42.new/src/ui/quncreateui.cpp
--- eva-0.4.921+svn42/src/ui/quncreateui.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/quncreateui.cpp 2008-05-06 02:21:51.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/quncreateui.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -217,8 +217,8 @@
lblTip->setText( i18n( "Please input Qun details below, then click \"Next\"" ) );
lblName->setText( i18n( "Name" ) );
@@ -5821,7 +5858,7 @@
rbNoAuthenNeed->setText( i18n( "No authentication needed." ) );
diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/qundetailsui.cpp eva-0.4.921+svn42.new/src/ui/qundetailsui.cpp
--- eva-0.4.921+svn42/src/ui/qundetailsui.cpp 2008-04-25 16:09:34.000000000 +0800
-+++ eva-0.4.921+svn42.new/src/ui/qundetailsui.cpp 2008-05-06 02:30:22.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/qundetailsui.cpp 2008-05-06 05:03:23.000000000 +0800
@@ -346,7 +346,7 @@
lblQunFace->setText( i18n( "Qun Face" ) );
lblCategory->setText( i18n( "Category" ) );
More information about the pkg-kde-commits
mailing list