rpms/stardict/devel stardict-3.0.0-floatwin.patch, NONE, 1.1 stardict.spec, 1.33, 1.34
Hu Zheng (zhu)
fedora-extras-commits at redhat.com
Thu Aug 23 02:38:34 UTC 2007
Author: zhu
Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16092/devel
Modified Files:
stardict.spec
Added Files:
stardict-3.0.0-floatwin.patch
Log Message:
stardict-3.0.0-2
stardict-3.0.0-floatwin.patch:
--- NEW FILE stardict-3.0.0-floatwin.patch ---
diff -ru stardict-3.0.0.orig/po/fr.po stardict-3.0.0/po/fr.po
--- stardict-3.0.0.orig/po/fr.po 2007-08-10 14:40:45.000000000 +0800
+++ stardict-3.0.0/po/fr.po 2007-08-23 10:11:47.000000000 +0800
@@ -1,23 +1,20 @@
-# French translation of StarDict // Traduction française de StarDict
-# Copyright (C) 2003 Hu Zheng <huzheng_001 at 163.com>
-# This file is distributed under the same license as the StarDict package.
-# Hu Zheng <huzheng_001 at 163.com>, 2003.
-#
+#
msgid ""
msgstr ""
-"Project-Id-Version: StarDict 2.4.7\n"
+"Project-Id-Version: StarDict 3.0 beta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-10 14:40+0800\n"
-"PO-Revision-Date: 2007-06-21 22:57+0800\n"
+"POT-Creation-Date: 2007-07-25 10:01+0800\n"
+"PO-Revision-Date: 2007-08-12 22:41+0200\n"
"Last-Translator: P&C Durville <cdurpp at ifrance.com>\n"
-"Language-Team: \n"
+"Language-Team: French <gnomefr at traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
#: ../data/GNOME_Stardict.server.in.h:1
msgid "stardict application"
msgstr "Application StarDict"
+""
#: ../data/GNOME_Stardict.server.in.h:2
msgid "stardict automation factory"
@@ -29,8 +26,8 @@
#. gtk_widget_set_app_paintable(window, TRUE);
#: ../data/stardict.desktop.in.h:2 ../src/docklet.cpp:31
-#: ../src/docklet.cpp:199 ../src/mainwin.cpp:473 ../src/splash.cpp:84
-#: ../src/stardict.cpp:239 ../src/stardict.cpp:299 ../src/stardict.cpp:2347
+#: ../src/docklet.cpp:199 ../src/mainwin.cpp:470 ../src/splash.cpp:84
+#: ../src/stardict.cpp:239 ../src/stardict.cpp:299 ../src/stardict.cpp:2279
#: ../src/win32/systray.cpp:216 ../src/win32/systray.cpp:264
msgid "StarDict"
msgstr "StarDict"
@@ -50,16 +47,15 @@
#: ../data/stardict.schemas.in.h:3
#, fuzzy
msgid "Dictionary configure xml"
-msgstr "Ordre des dictionnaires"
+msgstr "XML de configuration du dictionnaire"
#: ../data/stardict.schemas.in.h:4
msgid "Dictionary order"
msgstr "Ordre des dictionnaires"
#: ../data/stardict.schemas.in.h:5
-#, fuzzy
msgid "Disabled plug-in list"
-msgstr "Liste des dictionnaires désactivés"
+msgstr "Liste des greffons désactivés"
#: ../data/stardict.schemas.in.h:6
msgid "Disabled tree dictionary list"
@@ -70,17 +66,17 @@
msgstr "Activer le son pour les évènements"
#: ../data/stardict.schemas.in.h:8
-#, fuzzy
msgid "Enable to use TTS program"
-msgstr "Le nom du programme"
+msgstr "Activer le programme TTS"
#: ../data/stardict.schemas.in.h:9
msgid "Engine index"
-msgstr ""
+msgstr "Index du moteur"
#: ../data/stardict.schemas.in.h:10
+#, fuzzy
msgid "From-language index"
-msgstr ""
+msgstr "De l'indice de langage"
#: ../data/stardict.schemas.in.h:11
msgid "Hide floating window when modifier key is released"
@@ -111,14 +107,12 @@
msgstr "Lister les dictionnaires dans l'ordre."
#: ../data/stardict.schemas.in.h:17
-#, fuzzy
msgid "List the plugins in order."
-msgstr "Lister les dictionnaires dans l'ordre."
+msgstr "Lister les greffons dans l'ordre."
#: ../data/stardict.schemas.in.h:18
-#, fuzzy
msgid "List the plugins which are disabled."
-msgstr "Lister les dictionnaires qui sont désactivés."
+msgstr "Lister les greffons qui sont désactivés."
#: ../data/stardict.schemas.in.h:19
msgid "List the search websites."
@@ -162,7 +156,7 @@
#: ../data/stardict.schemas.in.h:27
msgid "Plug-in order"
-msgstr ""
+msgstr "Ordre des greffons"
#: ../data/stardict.schemas.in.h:28
msgid "Pronounce the word when it pops up."
@@ -197,11 +191,11 @@
#: ../data/stardict.schemas.in.h:35
msgid "TTS program commandline"
-msgstr ""
+msgstr "Programme TTS en ligne de commande"
#: ../data/stardict.schemas.in.h:36
msgid "The commandline to use external TTS program to pronounce words."
-msgstr ""
+msgstr "La ligne de commande pour un programme TTS externe afin d'énoncer oralement les mots."
#: ../data/stardict.schemas.in.h:37
msgid "The height of the main stardict window."
@@ -213,17 +207,18 @@
"Position du délimiteur entre la liste de termes et le cadre définition."
#: ../data/stardict.schemas.in.h:39
+#, fuzzy
msgid "The index of the from-language for translating."
msgstr ""
#: ../data/stardict.schemas.in.h:40
+#, fuzzy
msgid "The index of the to-language for translating."
msgstr ""
#: ../data/stardict.schemas.in.h:41
-#, fuzzy
msgid "The index of the translate engine."
-msgstr "Largeur de la fenêtre principale de StarDict."
+msgstr "L'index du moteur de traduction."
#: ../data/stardict.schemas.in.h:42
msgid "The maximum height of the floating stardict window."
@@ -238,6 +233,7 @@
msgstr "Largeur de la fenêtre principale de StarDict."
#: ../data/stardict.schemas.in.h:45
+#, fuzzy
msgid "To-language index"
msgstr ""
@@ -270,6 +266,7 @@
msgid ""
"Whether to enable startdict to use external TTS program to pronounce words."
msgstr ""
+"Autoriser StarDict à utiliser un programme TTS externe pour énoncer des mots"
#: ../data/stardict.schemas.in.h:52
msgid "Whether to hide the main window on startup, or not."
@@ -347,39 +344,36 @@
#: ../src/articleview.cpp:170
msgid "XDXF data parse plug-in is not found!"
-msgstr ""
+msgstr "Le greffon de lecture des données XDXF est absent!"
#: ../src/articleview.cpp:175
msgid "PowerWord data parse plug-in is not found!"
-msgstr ""
+msgstr "Le greffon de lecture des données PowerWord est absent!"
#: ../src/articleview.cpp:180
msgid "Wiki data parse plug-in is not found!"
-msgstr ""
+msgstr "Le greffon de lecture de données wiki est absent!"
#: ../src/articleview.cpp:185
msgid "HTML data parse plug-in is not found!"
-msgstr ""
+msgstr "Le greffon de lecture de données HTML est absent!"
#: ../src/articleview.cpp:231
msgid "<span foreground=\"red\">[Load image error!]</span>"
-msgstr ""
+msgstr "<span·foreground=\"red\">[Erreur au chargement de l'image!]</span>"
#: ../src/articleview.cpp:235
msgid "<span foreground=\"red\">[Missing Image]</span>"
-msgstr ""
+msgstr "<span·foreground=\"red\">[Image manquante]</span>"
+""
#: ../src/articleview.cpp:249
msgid "Unkown data type, please upgrade StarDict!"
-msgstr ""
[...3817 lines suppressed...]
-#~ msgid "Documented by"
-#~ msgstr "文件編寫"
+msgid "Documented by"
+msgstr "文件編寫"
-#~ msgid "C_redits"
-#~ msgstr "é³´è¬(_R)"
+msgid "C_redits"
+msgstr "é³´è¬(_r)"
-#~ msgid "Program version"
-#~ msgstr "軟體版本"
+msgid "Program version"
+msgstr "軟體版本"
-#~ msgid "The version of the program"
-#~ msgstr "軟體的版本"
+msgid "The version of the program"
+msgstr "軟體的版本"
-#~ msgid "Copyright string"
-#~ msgstr "版權說明"
+msgid "Copyright string"
+msgstr "版權說明"
-#~ msgid "Copyright information for the program"
-#~ msgstr "軟體的版權訊æ¯"
+msgid "Copyright information for the program"
+msgstr "軟體的版權訊æ¯"
-#~ msgid "Comments string"
-#~ msgstr "備註說明"
+msgid "Comments string"
+msgstr "備註說明"
-#~ msgid "Comments about the program"
-#~ msgstr "關於本軟體的說明"
+msgid "Comments about the program"
+msgstr "關於本軟體的說明"
-#~ msgid "Authors"
-#~ msgstr "作者"
+msgid "Authors"
+msgstr "作者"
-#~ msgid "List of authors of the programs"
-#~ msgstr "軟體作者åå–®"
+msgid "List of authors of the programs"
+msgstr "軟體作者åå–®"
-#~ msgid "Author entry"
-#~ msgstr "ä½œè€…é …ç›®"
+msgid "Author entry"
+msgstr "ä½œè€…é …ç›®"
-#~ msgid "A single author entry"
-#~ msgstr "å–®ä¸€ä½œè€…é …ç›®"
+msgid "A single author entry"
+msgstr "å–®ä¸€ä½œè€…é …ç›®"
-#~ msgid "Documenters"
-#~ msgstr "文件編寫人員"
+msgid "Documenters"
+msgstr "文件編寫人員"
-#~ msgid "List of people documenting the program"
-#~ msgstr "為本軟體編寫文件的人員åå–®"
+msgid "List of people documenting the program"
+msgstr "為本軟體編寫文件的人員åå–®"
-#~ msgid "Documenter entry"
-#~ msgstr "æ–‡ä»¶é …ç›®"
+msgid "Documenter entry"
+msgstr "æ–‡ä»¶é …ç›®"
-#~ msgid "A single documenter entry"
-#~ msgstr "å–®ä¸€æ–‡ä»¶é …ç›®"
+msgid "A single documenter entry"
+msgstr "å–®ä¸€æ–‡ä»¶é …ç›®"
-#~ msgid "Translator credits"
-#~ msgstr "ç¿»è¯è€…資料"
+msgid "Translator credits"
+msgstr "Tetralet <tetralet at gmail.com>\n"
+"Semigod Ju <shinesemigod at gmail.com>"
-#~ msgid ""
-#~ "Credits to the translators. This string should be marked as translatable"
-#~ msgstr "ç¿»è¯è€…資料。本å—串應標注為å¯ç¿»è¯"
+msgid ""
+"Credits to the translators. This string should be marked as translatable"
+msgstr "ç¿»è¯è€…資料。本å—串應標注為å¯ç¿»è¯"
-#~ msgid "Logo"
-#~ msgstr "標誌"
+msgid "Logo"
+msgstr "標誌"
-#~ msgid "A logo for the about box"
-#~ msgstr "『關於ã€çš„標誌"
+msgid "A logo for the about box"
+msgstr "『關於ã€çš„標誌"
-#~ msgid "About %s"
-#~ msgstr "關於 %s"
+msgid "About %s"
+msgstr "關於 %s"
-#, fuzzy
-#~ msgid "Cannot connect to gconf.\n"
-#~ msgstr "無法連接至 GConf"
+msgid "Cannot connect to gconf.\n"
+msgstr "無法連接至 GConf。\n"
-#~ msgid "Find"
-#~ msgstr "尋找"
+msgid "Find"
+msgstr "尋找"
-#~ msgid "_Win"
-#~ msgstr "_Win"
+msgid "_Win"
+msgstr "_Win"
-#~ msgid "_Shift"
-#~ msgstr "_Shift"
+msgid "_Shift"
+msgstr "_Shift"
-#~ msgid "_Alt"
-#~ msgstr "_Alt"
+msgid "_Alt"
+msgstr "_Alt"
-#~ msgid "_Ctrl"
-#~ msgstr "_Ctrl"
+msgid "_Ctrl"
+msgstr "_Ctrl"
-#~ msgid ""
-#~ "use_custom_font=1\n"
-#~ "custom_font=sans 8\n"
-#~ msgstr ""
-#~ "use_custom_font=1\n"
-#~ "custom_font=simsun 8\n"
+msgid ""
+"use_custom_font=1\n"
+"custom_font=sans 8\n"
+msgstr "use_custom_font=1\n"
+"custom_font=simsun 8\n"
-#~ msgid ""
-#~ "window_width=551\n"
-#~ "window_height=357\n"
-#~ "hpaned_pos=165\n"
-#~ msgstr ""
-#~ "window_width=551\n"
-#~ "window_height=357\n"
-#~ "hpaned_pos=165\n"
+msgid ""
+"window_width=551\n"
+"window_height=357\n"
+"hpaned_pos=165\n"
+msgstr "window_width=551\n"
+"window_height=357\n"
+"hpaned_pos=165\n"
diff -ru stardict-3.0.0.orig/src/floatwin.cpp stardict-3.0.0/src/floatwin.cpp
--- stardict-3.0.0.orig/src/floatwin.cpp 2007-08-07 16:23:17.000000000 +0800
+++ stardict-3.0.0/src/floatwin.cpp 2007-08-23 10:13:59.000000000 +0800
@@ -911,8 +911,7 @@
gboolean FloatWin::vMotionNotifyCallback (GtkWidget * widget, GdkEventMotion * event , FloatWin *oFloatWin)
{
- if (event->window == oFloatWin->FloatWindow->window || (event->state & GDK_BUTTON1_MASK))
- {
+ if (event->state & GDK_BUTTON1_MASK) {
gint x,y;
x = oFloatWin->press_window_x + (gint)(event->x_root) - oFloatWin->press_x_root;
y = oFloatWin->press_window_y + (gint)(event->y_root) - oFloatWin->press_y_root;
diff -ru stardict-3.0.0.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.0/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
--- stardict-3.0.0.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2007-07-18 14:25:37.000000000 +0800
+++ stardict-3.0.0/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2007-08-23 10:14:43.000000000 +0800
@@ -397,9 +397,14 @@
}
}
} else {
- p++;
- res += "<";
- cur_pos++;
+ next = strchr(p+1, '>');
+ if (!next) {
+ p++;
+ res += "<";
+ cur_pos++;
+ continue;
+ }
+ p = next + 1;
}
cycle_end:
;
Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- stardict.spec 13 Aug 2007 06:57:48 -0000 1.33
+++ stardict.spec 23 Aug 2007 02:38:01 -0000 1.34
@@ -5,11 +5,12 @@
Name: %{name}
Summary: A powerful dictionary platform written in GTK+2
Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/System
License: GPL
URL: http://stardict.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0: stardict-3.0.0-floatwin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libgnome >= 2.2.0
@@ -39,6 +40,7 @@
%prep
%setup -q
+%patch0 -p1 -b .floatwin
%build
@@ -78,8 +80,11 @@
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
+* Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-2
+- Add floatwin patch.
+
* Mon Aug 13 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-1
-* Update to upstream.
+- Update to upstream.
* Fri Jun 22 2007 Hu Zheng <zhu at redhat.com> - 2.4.8-3
- Add dic and treedict directory.
More information about the fedora-extras-commits
mailing list