[xine-cvs] CVS: gnome-xine/po zh_CN.po,1.7,1.8

[Darren Salt <dsalt@us...>]

Update of /cvsroot/xine/gnome-xine/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1650/po

Modified Files:
	zh_CN.po 
Log Message:
Minor tweaks: s/: error,/: error:/ and update of the FSF address.
Also some updates from the translator.

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/xine/gnome-xine/po/zh_CN.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zh_CN.po	18 Oct 2005 17:40:20 -0000	1.7
+++ zh_CN.po	19 Oct 2005 19:22:39 -0000	1.8
@@ -8,14 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?\n";
-"POT-Creation-Date: 2005-09-12 22:42+0100\n"
-"PO-Revision-Date: 2005-10-18 14:33+0800\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?";
+"group_id=9655&atid=109655\n"
+"POT-Creation-Date: 2005-10-19 15:00+0100\n"
+"PO-Revision-Date: 2005-10-19 13:58+0800\n"
 "Last-Translator: Dong Changdao <dcd03@...>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: src/client.c:62
 #, c-format
@@ -187,8 +188,8 @@
 
 #: src/gtkvideo.c:551
 #, c-format
-msgid "gtkxine: video driver %s failed.\n"
-msgstr "gtkxine: 视频驱动 %s 失败 \n"
+msgid "gtkvideo: video driver %s failed.\n"
+msgstr "gtkvideo: 视频驱动 %s 失败 \n"
 
 #: src/gtkvideo.c:955
 #, c-format
@@ -226,7 +227,8 @@
 "%s\n"
 ":\n"
 "%s"
-msgstr "错误发生在试图下载\n"
+msgstr ""
+"错误发生在试图下载\n"
 "%s\n"
 ":\n"
 "%s"
@@ -267,7 +269,7 @@
 
 #: src/http.c:466
 msgid "HTTP 'Location:' redirection not implemented"
-msgstr "HTTP ”位置:“ 重定向无法实现"
+msgstr "HTTP ”Location:“ (位置) 重定向无法实现"
 
 #. FIXME: report errno in a window?
 #: src/http.c:521
@@ -562,18 +564,19 @@
 
 #: src/key_events.c:591
 #, c-format
-msgid "key_events: error, %s is not a valid gxine keybindings file\n"
-msgstr "key_events: 错误， %s 不是合法的gxine快捷键绑定文件\n"
+msgid "key_events: error: %s is not a valid gxine keybindings file\n"
+msgstr "key_events: 错误： %s 不是合法的gxine快捷键绑定文件\n"
 
 #: src/key_events.c:596
 #, c-format
-msgid "key_events: error, cannot load keybindings file %s (xml parsing failed)\n"
-msgstr "key_events: 错误，无法装载快捷键绑定文件 %s (xml 语法分析失败)\n"
+msgid ""
+"key_events: error: cannot load keybindings file %s (xml parsing failed)\n"
+msgstr "key_events: 错误：无法装载快捷键绑定文件 %s (xml 语法分析失败)\n"
 
 #: src/key_events.c:604
 #, c-format
-msgid "key_events: error, cannot open keybindings file %s\n"
-msgstr "key_events: 错误，无法打开快捷键绑定文件 %s\n"
+msgid "key_events: error: cannot open keybindings file %s\n"
+msgstr "key_events: 错误：无法打开快捷键绑定文件 %s\n"
 
 #: src/key_events.c:634
 #, c-format
@@ -582,7 +585,7 @@
 
 #: src/key_events.c:929
 msgid "error: input_menu() expects an int between 1 and 7.\n"
-msgstr "error: input_menu() 需要在 1 和 7 之间的整数。\n"
+msgstr "错误： input_menu() 需要在 1 和 7 之间的整数。\n"
 
 #: src/key_events.c:1226
 msgid "Keybindings editor"
@@ -761,18 +764,18 @@
 
 #: src/mediamarks.c:212
 #, c-format
-msgid "mediamarks: error, unknown node type %s\n"
-msgstr "媒体书签：错误，未知节点类型 %s\n"
+msgid "mediamarks: error: unknown node type %s\n"
+msgstr "媒体书签：错误：未知节点类型 %s\n"
 
 #: src/mediamarks.c:222
 #, c-format
-msgid "mediamarks: ERROR, root node must be GXINEMM\n"
-msgstr "媒体书签： 错误! 根节点必须是 GXINEMM\n"
+msgid "mediamarks: error: root node must be GXINEMM\n"
+msgstr "媒体书签：错误：根节点必须是 GXINEMM\n"
 
 #: src/mediamarks.c:281
 #, c-format
 msgid "mediamarks: media marks file %s corrupted - ignoring rest of file\n"
-msgstr "媒体书签: 媒体标记文件 %s 崩溃 - 忽略剩余部分\n"
+msgstr "媒体书签：媒体标记文件 %s 崩溃 - 忽略剩余部分\n"
 
 #: src/mediamarks.c:328
 #, c-format
@@ -859,6 +862,7 @@
 msgid "menu function %s"
 msgstr "菜单功能 %s"
 
+#. Menu entry text
 #: src/menu.c:328
 msgid "_File"
 msgstr "文件(_F)"
@@ -1059,6 +1063,7 @@
 msgid "_200%"
 msgstr "200%(_2)"
 
+#. Aspect ratio menu text
 #: src/menu.c:416 src/menu.c:428
 msgid "_Auto"
 msgstr "自动(_A)"
@@ -1079,9 +1084,10 @@
 msgid "_2:1"
 msgstr "2:1(_2)"
 
+#. Subtitles menu text
 #: src/menu.c:423 src/menu.c:427 src/wizards.c:214
 msgid "_None"
-msgstr "无"
+msgstr "无(_N)"
 
 #: src/menu.c:429
 msgid "Channel _0"
@@ -1238,50 +1244,56 @@
 msgid "audio driver %s failed\n"
 msgstr "音频驱动 %s 失败\n"
 
+#. Text is help for the commands. Format is:
+#. *   To the left of the semicolon, a comma-separated list of
+#. *     VARIABLE[=TYPE] or METHOD([PARAMETER TYPE,...])
+#. *   To the right, descriptive text
+#.
 #: src/player.c:1065
 msgid "v=int, min, max; playback speed"
-msgstr "v=int, min, max; 重现速率"
+msgstr "v=整数, min [最小], max [最大]; 重现速率"
 
 #: src/player.c:1066
 msgid "v=int; aspect ratio"
-msgstr "v=int; 外观比率"
+msgstr "v=整数; 外观比率"
 
 #: src/player.c:1067
 msgid "v=int, min, max; subtitle channel"
-msgstr "v=int, min, max; 字幕频道"
+msgstr "v=整数, min [最小], max [最大]; 字幕频道"
 
 #: src/player.c:1068
 msgid "v=int, min, max; video zoom (within window)"
-msgstr "v=int, min, max; 视频缩放(在窗口内)"
+msgstr "v=整数, min [最小], max [最大]; 视频缩放(在窗口内)"
 
 #: src/player.c:1072
 msgid "v=bool, toggle(): audio mute"
-msgstr "v=bool, toggle(): 静音"
+msgstr "v=布尔, toggle(): 静音"
 
 #: src/player.c:1073
 msgid "v=bool, toggle(): auto-resize video on frame shape change"
-msgstr "v=bool, toggle(): 自动调整视频框架形状"
+msgstr "v=布尔, toggle(): 自动调整视频框架形状"
 
 #: src/player.c:1074
 msgid "v=bool, toggle(): double size of low-resolution video"
-msgstr "v=bool, toggle():双倍 low-resolution 视频"
+msgstr "v=布尔, toggle():双倍低分辨率视频大小"
 
 #: src/player.c:1075
 msgid "v=bool, toggle(): full-screen mode"
-msgstr "v=bool, toggle(): 全屏模式"
+msgstr "v=布尔, toggle(): 全屏模式"
 
 #: src/player.c:1076
 msgid "v=bool, toggle(): enable deinterlacing"
-msgstr "v=bool, toggle(): 使能纠错"
+msgstr "v=布尔, toggle(): 使能纠错"
 
 #: src/player.c:1077
 msgid "v=bool, toggle(): audio post-processing; set_chain(string): plugin chain"
-msgstr "v=bool, toggle(): 音频预处理; set_chain(string): 插件链"
+msgstr "v=布尔, toggle(): 音频次处理; set_chain(字符串): 插件链"
 
 #: src/player.c:1078
 msgid "v=bool, toggle(): video post-processing; set_chain(string): plugin chain"
-msgstr "v=bool, toggle(): 视频预处理; set_chain(string): 插件链"
+msgstr "v=布尔, toggle(): 视频次处理; set_chain(字符串): 插件链"
 
+#. help text describes function parameters
 #: src/player.c:1099
 msgid "[mrl] [, pos, time]"
 msgstr "[mrl] [, 百分比, 时间]"
@@ -1345,7 +1357,7 @@
 #: src/playlist.c:333
 #, c-format
 msgid "Unknown or incorrect ASX version number in '%s'"
-msgstr "未知或错误的 ASX version 数字在 '%s' 中"
+msgstr "未知或错误的 ASX 版本数字在 '%s' 中"
 
 #: src/playlist.c:383
 #, c-format
@@ -1447,15 +1459,15 @@
 
 #: src/post.c:82
 msgid "Configure deinterlace post-plugins"
-msgstr "设置纠错插件"
+msgstr "设置纠错次插件"
 
 #: src/post.c:83
 msgid "Configure video post-plugins"
-msgstr "设置视频插件"
+msgstr "设置视频次插件"
 
 #: src/post.c:84
 msgid "Configure audio post-plugins"
-msgstr "设置音频插件"
+msgstr "设置音频次插件"
 
 #. recognised & writeable
 #: src/post.c:237
@@ -1529,6 +1541,7 @@
 msgstr "一个 GTK 媒体播放器界面，基于 xine-lib"
 
 #. roughly formatted for a typical variable-width font
+#. Translators: rewrap this as required
 #: src/script_engine.c:276
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
@@ -1544,8 +1557,8 @@
 "\n"
 "You should have received a copy of the GNU General Public\n"
 "Licence along with this program; if not, write to the Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
+"Boston, MA  02110-1301  USA\n"
 msgstr ""
 "本程序是自由软件。在满足自由软件组织发布的\n"
 "GNU通用出版许可的条款下，您可以重新发布它\n"
@@ -1559,8 +1572,8 @@
 "\n"
 "您应该已经随着本程序得到一份GNU通用出版\n"
 "许可的复件。否则，可以写信到Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Software Foundation, Inc., 51 Franklin St,\n"
+"Fifth Floor, Boston, MA  02110-1301  USA\n"
 
 #: src/script_engine.c:323
 msgid "JS callback"
@@ -1732,6 +1745,7 @@
 msgid "_Default"
 msgstr "默认(_D)"
 
+#. Snapshot processing options. I *think* that "Hyper" is trilinear
 #: src/snapshot.c:132
 msgid "Nearest"
 msgstr "最近的"
@@ -1924,7 +1938,7 @@
 
 #: src/ui.c:668 src/ui.c:679 src/ui.c:690
 msgid "Format: plugin:arg=value,arg=value,...;plugin:..."
-msgstr "格式： plugin:arg=value,arg=value,...;plugin:..."
+msgstr "格式： 插件:参数=值,参数=值,...;插件:..."
 
 #: src/ui.c:673
 msgid "Enable deinterlacing at startup"
@@ -1932,19 +1946,19 @@
 
 #: src/ui.c:678
 msgid "Video post-processing plugins' names and parameters"
-msgstr "视频预设插件' 名字和参数"
+msgstr "视频次插件' 名字和参数"
 
 #: src/ui.c:684
 msgid "Enable video post-processing at startup"
-msgstr "启动时启用视频插件"
+msgstr "启动时启用视频次处理"
 
 #: src/ui.c:689
 msgid "Audio post-processing plugins' names and parameters"
-msgstr "音频预设插件' 名字和参数"
+msgstr "音频次插件' 名字和参数"
 
 #: src/ui.c:695
 msgid "Enable audio post-processing at startup"
-msgstr "启动时启用音频插件"
+msgstr "启动时启用音频次插件"
 
 #: src/ui.c:702
 msgid "None"
@@ -1968,19 +1982,19 @@
 
 #: src/ui.c:794
 msgid "v=bool, toggle(): full-screen toolbar visibility"
-msgstr "v=bool, toggle(): 全屏工具栏可见性"
+msgstr "v=布尔, toggle(): 全屏工具栏可见性"
 
 #: src/ui.c:795
 msgid "v=bool, toggle(): windowed-mode toolbar visibility"
-msgstr "v=bool, toggle(): 窗口模式工具栏可见性"
+msgstr "v=布尔, toggle(): 窗口模式工具栏可见性"
 
 #: src/ui.c:799
 msgid "v=bool, toggle(): full-screen toolbar position"
-msgstr "v=bool, toggle(): 全屏工具栏位置"
+msgstr "v=布尔, toggle(): 全屏工具栏位置"
 
 #: src/ui.c:803
 msgid "v=bool, toggle(): windowed-mode toolbar attachment"
-msgstr "v=bool, toggle(): 窗口模式工具栏复件"
+msgstr "v=布尔, toggle(): 窗口模式工具栏复件"
 
 #: src/ui.c:812
 msgid "bool"

[xine-cvs] CVS: gnome-xine/po cs.po,1.25,1.26 de.po,1.32,1.33

[Darren Salt <dsalt@us...>]

Update of /cvsroot/xine/gnome-xine/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv887/po

Modified Files:
	cs.po de.po 
Log Message:
Minor tweaks: s/: error,/: error:/ and update of the FSF address.
And a little automatic reformatting...

Index: cs.po
===================================================================
RCS file: /cvsroot/xine/gnome-xine/po/cs.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cs.po	14 Oct 2005 20:13:06 -0000	1.25
+++ cs.po	19 Oct 2005 19:19:55 -0000	1.26
@@ -8,7 +8,7 @@
 "Project-Id-Version: gxine 0.4.2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?";
 "group_id=9655&atid=109655\n"
-"POT-Creation-Date: 2005-09-19 18:40+0200\n"
+"POT-Creation-Date: 2005-10-19 15:00+0100\n"
 "PO-Revision-Date: 2005-09-19 12:52+0200\n"
 "Last-Translator: František Dvořák <valtri@...>\n"
 "Language-Team: Czech <cs@...>\n"
@@ -186,8 +186,8 @@
 
 #: src/gtkvideo.c:555
 #, c-format
-msgid "gtkxine: video driver %s failed.\n"
-msgstr "gtkxine: ovladač videa %s selhal.\n"
+msgid "gtkvideo: video driver %s failed.\n"
+msgstr "gtkvideo: ovladač videa %s selhal.\n"
 
 #: src/gtkvideo.c:936
 #, c-format
@@ -562,21 +562,21 @@
 
 #: src/key_events.c:591
 #, c-format
-msgid "key_events: error, %s is not a valid gxine keybindings file\n"
-msgstr "key_events: chyba, %s není platný soubor klávesových zkratek gxine\n"
+msgid "key_events: error: %s is not a valid gxine keybindings file\n"
+msgstr "key_events: chyba: %s není platný soubor klávesových zkratek gxine\n"
 
 #: src/key_events.c:596
 #, c-format
 msgid ""
-"key_events: error, cannot load keybindings file %s (xml parsing failed)\n"
+"key_events: error: cannot load keybindings file %s (xml parsing failed)\n"
 msgstr ""
-"key_events: chyba, nelze nahrát soubor klávesových zkratek %s (parsování "
-"xml selhalo)\n"
+"key_events: chyba: nelze nahrát soubor klávesových zkratek %s (parsování xml "
+"selhalo)\n"
 
 #: src/key_events.c:604
 #, c-format
-msgid "key_events: error, cannot open keybindings file %s\n"
-msgstr "key_events: chyba, nelze otevřít soubor klávesových zkratek %s\n"
+msgid "key_events: error: cannot open keybindings file %s\n"
+msgstr "key_events: chyba: nelze otevřít soubor klávesových zkratek %s\n"
 
 #: src/key_events.c:634
 #, c-format
@@ -764,13 +764,13 @@
 
 #: src/mediamarks.c:215
 #, c-format
-msgid "mediamarks: error, unknown node type %s\n"
-msgstr "mediamarks: chyba, neznámý typ uzlu %s\n"
+msgid "mediamarks: error: unknown node type %s\n"
+msgstr "mediamarks: chyba: neznámý typ uzlu %s\n"
 
 #: src/mediamarks.c:225
 #, c-format
-msgid "mediamarks: ERROR, root node must be GXINEMM\n"
-msgstr "mediamarks: CHYBA, kořenový uzel musí být GXINEMM\n"
+msgid "mediamarks: error: root node must be GXINEMM\n"
+msgstr "mediamarks: chyba: kořenový uzel musí být GXINEMM\n"
 
 #: src/mediamarks.c:284
 #, c-format
@@ -854,8 +854,7 @@
 
 #: src/menu.c:99
 msgid "Check engine output for further details."
-msgstr ""
-"Další detaily získáte zkontrolováním výstupu enginu."
+msgstr "Další detaily získáte zkontrolováním výstupu enginu."
 
 #. Standard callback (invokes Javascript)
 #: src/menu.c:230
@@ -863,6 +862,7 @@
 msgid "menu function %s"
 msgstr "funkce menu %s"
 
+#. Menu entry text
 #: src/menu.c:334
 msgid "_File"
 msgstr "_Soubor"
@@ -1063,6 +1063,7 @@
 msgid "_200%"
 msgstr "_200%"
 
+#. Aspect ratio menu text
 #: src/menu.c:422 src/menu.c:434
 msgid "_Auto"
 msgstr "_Auto"
@@ -1083,6 +1084,7 @@
 msgid "_2:1"
 msgstr "_2:1"
 
+#. Subtitles menu text
 #: src/menu.c:429 src/menu.c:433 src/wizards.c:214
 msgid "_None"
 msgstr "_Žádný"
@@ -1190,8 +1192,7 @@
 
 #: src/player.c:86 src/player.c:93 src/player.c:98 src/player.c:103
 msgid "The xine engine failed to start."
-msgstr ""
-"Selhalo spuštění enginu xine."
+msgstr "Selhalo spuštění enginu xine."
 
 #: src/player.c:87
 msgid ""
@@ -1205,8 +1206,7 @@
 
 #: src/player.c:94
 msgid "No demuxer found - stream format not recognised."
-msgstr ""
-"Nenalezen žádný demultiplexor - formát dat nebyl rozpoznán."
+msgstr "Nenalezen žádný demultiplexor - formát dat nebyl rozpoznán."
 
 #: src/player.c:99
 msgid "The MRL is malformed."
@@ -1244,6 +1244,11 @@
 msgid "audio driver %s failed\n"
 msgstr "ovladač zvuku %s selhal\n"
 
+#. Text is help for the commands. Format is:
+#. *   To the left of the semicolon, a comma-separated list of
+#. *     VARIABLE[=TYPE] or METHOD([PARAMETER TYPE,...])
+#. *   To the right, descriptive text
+#.
 #: src/player.c:1070
 msgid "v=int, min, max; playback speed"
 msgstr "v=int, min, max; rychlost přehrávání"
@@ -1266,7 +1271,8 @@
 
 #: src/player.c:1078
 msgid "v=bool, toggle(): auto-resize video on frame shape change"
-msgstr "v=bool, toggle(): automatické přizpůsobení velikosti videa podle snímku"
+msgstr ""
+"v=bool, toggle(): automatické přizpůsobení velikosti videa podle snímku"
 
 #: src/player.c:1079
 msgid "v=bool, toggle(): double size of low-resolution video"
@@ -1292,6 +1298,7 @@
 msgstr ""
 "v=bool, toggle(): dodatečné zpracování videa; set_chain(string): řetěz modulů"
 
+#. help text describes function parameters
 #: src/player.c:1104
 msgid "[mrl] [, pos, time]"
 msgstr "[MRL] [, pozice, čas]"
@@ -1305,7 +1312,8 @@
 msgstr "[bool]"
 
 #: src/player.c:1115
-msgid "[file name]"
+#, fuzzy
+msgid "[file name [, scale, blend]]"
 msgstr "[jméno souboru]"
 
 #: src/player.c:1162
@@ -1336,8 +1344,7 @@
 
 #: src/playlist.c:303 src/playlist.c:312 src/playlist.c:332 src/playlist.c:382
 msgid "Loading of playlist file failed."
-msgstr ""
-"Načítání playlistu selhalo."
+msgstr "Načítání playlistu selhalo."
 
 #: src/playlist.c:304
 #, c-format
@@ -1351,8 +1358,7 @@
 #: src/playlist.c:313
 #, c-format
 msgid "'%s' is not a valid XML/ASX file"
-msgstr ""
-"'%s' není platný soubor XML/ASX"
+msgstr "'%s' není platný soubor XML/ASX"
 
 #: src/playlist.c:333
 #, c-format
@@ -1543,6 +1549,7 @@
 msgstr "Přehrávač médií, GTK front end nad xine-lib"
 
 #. roughly formatted for a typical variable-width font
+#. Translators: rewrap this as required
 #: src/script_engine.c:276
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
@@ -1558,8 +1565,8 @@
 "\n"
 "You should have received a copy of the GNU General Public\n"
 "Licence along with this program; if not, write to the Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
+"Boston, MA  02110-1301  USA\n"
 msgstr ""
 "Tento program je svobodný software; můžete ho dále šířit nebo také\n"
 "měnit za podmínek GNU General Public Licence,\n"
@@ -1573,9 +1580,8 @@
 "Licence.\n"
 "\n"
 "S tímto programem byste měli obdržet kopii GNU General Public\n"
-"Licence; pokud ne, napište do Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Licence; pokud ne, napište do Free Software Foundation, Inc.,\n"
+"51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
 #: src/script_engine.c:323
 msgid "JS callback"
@@ -1747,6 +1753,7 @@
 msgid "_Default"
 msgstr "_Výchozí"
 
+#. Snapshot processing options. I *think* that "Hyper" is trilinear
 #: src/snapshot.c:132
 msgid "Nearest"
 msgstr "Nejbližší"
@@ -1985,7 +1992,8 @@
 
 #: src/ui.c:794
 msgid "v=bool, toggle(): full-screen toolbar visibility"
-msgstr "v=bool, toggle(): viditelnost nástrojové lišty v celoobrazovkovém režimu"
+msgstr ""
+"v=bool, toggle(): viditelnost nástrojové lišty v celoobrazovkovém režimu"
 
 #: src/ui.c:795
 msgid "v=bool, toggle(): windowed-mode toolbar visibility"
@@ -1993,7 +2001,8 @@
 
 #: src/ui.c:799
 msgid "v=bool, toggle(): full-screen toolbar position"
-msgstr "v=bool, toggle(): viditelnost nástrojové lišty v celoobrazovkovém režimu"
+msgstr ""
+"v=bool, toggle(): viditelnost nástrojové lišty v celoobrazovkovém režimu"
 
 #: src/ui.c:803
 msgid "v=bool, toggle(): windowed-mode toolbar attachment"

Index: de.po
===================================================================
RCS file: /cvsroot/xine/gnome-xine/po/de.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- de.po	19 Oct 2005 08:17:12 -0000	1.32
+++ de.po	19 Oct 2005 19:19:56 -0000	1.33
@@ -186,8 +186,8 @@
 
 #: src/gtkvideo.c:555
 #, c-format
-msgid "gtkxine: video driver %s failed.\n"
-msgstr "gtkxine: Videotreiber %s konnte nicht geladen werden.\n"
+msgid "gtkvideo: video driver %s failed.\n"
+msgstr "gtkvideo: Videotreiber %s konnte nicht geladen werden.\n"
 
 #: src/gtkvideo.c:866
 #, c-format
@@ -563,21 +563,21 @@
 
 #: src/key_events.c:618
 #, c-format
-msgid "key_events: error, %s is not a valid gxine keybindings file\n"
+msgid "key_events: error: %s is not a valid gxine keybindings file\n"
 msgstr ""
-"Tastenbelegung: Fehler, %s ist keine Datei mit gültiger gxine-"
+"Tastenbelegung: Fehler: %s ist keine Datei mit gültiger gxine-"
 "Tastenbelegung\n"
 
 #: src/key_events.c:623
 #, c-format
 msgid ""
-"key_events: error, cannot load keybindings file %s (xml parsing failed)\n"
+"key_events: error: cannot load keybindings file %s (xml parsing failed)\n"
 msgstr ""
-"Tastenbelegung: Fehler, %s ist keine gültige XML-Datei mit Tastenbelegungen\n"
+"Tastenbelegung: Fehler: %s ist keine gültige XML-Datei mit Tastenbelegungen\n"
 
 #: src/key_events.c:631
 #, c-format
-msgid "key_events: error, cannot open keybindings file %s\n"
+msgid "key_events: error: cannot open keybindings file %s\n"
 msgstr "Tastenbelegung: Datei %s konnte nicht geöffnet werden\n"
 
 #: src/key_events.c:661
@@ -766,13 +766,13 @@
 
 #: src/mediamarks.c:215
 #, c-format
-msgid "mediamarks: error, unknown node type %s\n"
-msgstr "Medienmarken: Fehler, unbekannter Eintragstyp %s\n"
+msgid "mediamarks: error: unknown node type %s\n"
+msgstr "Medienmarken: Fehler: unbekannter Eintragstyp %s\n"
 
 #: src/mediamarks.c:225
 #, c-format
-msgid "mediamarks: ERROR, root node must be GXINEMM\n"
-msgstr "Medienmarken: Fehler, Wurzelknoten muß GXINEMM sein\n"
+msgid "mediamarks: error: root node must be GXINEMM\n"
+msgstr "Medienmarken: Fehler: Wurzelknoten muß GXINEMM sein\n"
 
 #: src/mediamarks.c:284
 #, c-format
@@ -864,7 +864,8 @@
 msgid "menu function %s"
 msgstr "Menüfunktion %s"
 
-#: src/menu.c:334
+#. Menu entry text
+#: src/menu.c:328
 msgid "_File"
 msgstr "_Datei"
 
@@ -1064,7 +1065,8 @@
 msgid "_200%"
 msgstr "_200%"
 
-#: src/menu.c:422 src/menu.c:434
+#. Aspect ratio menu text
+#: src/menu.c:416 src/menu.c:428
 msgid "_Auto"
 msgstr "_Audio"
 
@@ -1084,7 +1086,8 @@
 msgid "_2:1"
 msgstr "_2:1"
 
-#: src/menu.c:429 src/menu.c:433 src/wizards.c:217
+#. Subtitles menu text
+#: src/menu.c:423 src/menu.c:427 src/wizards.c:214
 msgid "_None"
 msgstr "_Keins"
 
@@ -1243,7 +1246,12 @@
 msgid "audio driver %s failed\n"
 msgstr "Audiotreiber %s schlug fehl\n"
 
-#: src/player.c:1074
+#. Text is help for the commands. Format is:
+#. *   To the left of the semicolon, a comma-separated list of
+#. *     VARIABLE[=TYPE] or METHOD([PARAMETER TYPE,...])
+#. *   To the right, descriptive text
+#.
+#: src/player.c:1065
 msgid "v=int, min, max; playback speed"
 msgstr "v=int, min, max; Wiedergabegeschwindigkeit"
 
@@ -1290,7 +1298,8 @@
 "v=bool, toggle(): video post-processing; set_chain(string): plugin chain"
 msgstr "v=bool, toggle(): Videonachbearbeitung; set_chain(string): Pluginkette"
 
-#: src/player.c:1108
+#. help text describes function parameters
+#: src/player.c:1099
 msgid "[mrl] [, pos, time]"
 msgstr "[mrl] [, Pos, Zeit]"
 
@@ -1542,7 +1551,8 @@
 msgstr "Ein GTK Bedienoberfläche für die xine-lib Medienwiedergabe"
 
 #. roughly formatted for a typical variable-width font
-#: src/script_engine.c:284
+#. Translators: rewrap this as required
+#: src/script_engine.c:276
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public Licence\n"
@@ -1557,8 +1567,8 @@
 "\n"
 "You should have received a copy of the GNU General Public\n"
 "Licence along with this program; if not, write to the Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
+"Boston, MA  02110-1301  USA\n"
 msgstr ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public Licence\n"
@@ -1573,8 +1583,8 @@
 "\n"
 "You should have received a copy of the GNU General Public\n"
 "Licence along with this program; if not, write to the Free\n"
-"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA  02111-1307  USA\n"
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
+"Boston, MA  02110-1301  USA\n"
 
 #: src/script_engine.c:331
 msgid "JS callback"
@@ -1746,6 +1756,7 @@
 msgid "_Default"
 msgstr "Standard"
 
+#. Snapshot processing options. I *think* that "Hyper" is trilinear
 #: src/snapshot.c:132
 msgid "Nearest"
 msgstr "Nahestes"

[xine-cvs] CVS: gnome-xine/src gtkvideo.c,1.92,1.93 key_events.c,1.87,1.88 mediamarks.c,1.61,1.62 menu.c,1.65,1.66 player.c,1.53,1.54 script_engine.c,1.60,1.61 snapshot.c,1.16,1.17

[Darren Salt <dsalt@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv436/src

Modified Files:
	gtkvideo.c key_events.c mediamarks.c menu.c player.c 
	script_engine.c snapshot.c 
Log Message:
Minor tweaks: s/: error,/: error:/ and update of the FSF address.

Index: gtkvideo.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gtkvideo.c	14 Oct 2005 18:04:22 -0000	1.92
+++ gtkvideo.c	19 Oct 2005 19:17:57 -0000	1.93
@@ -552,7 +552,7 @@
     if (video_port)
       return video_port;
     else
-      fprintf (stderr, _("gtkxine: video driver %s failed.\n"),
+      fprintf (stderr, _("gtkvideo: video driver %s failed.\n"),
 	       video_driver_id); /* => auto-detect */
   }
 

Index: key_events.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/key_events.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- key_events.c	13 Oct 2005 23:58:53 -0000	1.87
+++ key_events.c	19 Oct 2005 19:17:57 -0000	1.88
@@ -316,7 +316,7 @@
     l += strlen (text_mod4);
 
   if (kb->keyval == GDK_VoidSymbol)
-    key = _("undef");
+    key = _("undef"); /* undefined */
   else if (!(key = gdk_keyval_name (kb->keyval)))
     key = _("unknown");
 
@@ -615,12 +615,12 @@
 	  if (!strcasecmp (node->name, "KEYBINDING"))
 	    xml2kb (node->child, version);
       } else {
-	fprintf (stderr, _("key_events: error, %s is not a valid gxine keybindings file\n"),
+	fprintf (stderr, _("key_events: error: %s is not a valid gxine keybindings file\n"),
 		 fname);
 	load_default_kb();
       }
     } else {
-      fprintf (stderr, _("key_events: error, cannot load keybindings file %s (xml parsing failed)\n"),
+      fprintf (stderr, _("key_events: error: cannot load keybindings file %s (xml parsing failed)\n"),
 	       fname);
       load_default_kb();
     }
@@ -628,7 +628,7 @@
     free (kbfile);
   } else {
     if (errno != ENOENT)
-      fprintf (stderr, _("key_events: error, cannot open keybindings file %s\n"),
+      fprintf (stderr, _("key_events: error: cannot open keybindings file %s\n"),
 	       fname);
     load_default_kb();
   }

Index: mediamarks.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/mediamarks.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mediamarks.c	5 Oct 2005 21:01:24 -0000	1.61
+++ mediamarks.c	19 Oct 2005 19:17:57 -0000	1.62
@@ -212,7 +212,7 @@
 			  play_item->mrl, 2, play_item, -1);
 
     } else {
-      fprintf (stderr, _("mediamarks: error, unknown node type %s\n"), node->name);
+      fprintf (stderr, _("mediamarks: error: unknown node type %s\n"), node->name);
     }
 }
 
@@ -222,7 +222,7 @@
 
     get_items (node->child, 0, NULL);
   } else {
-    fprintf (stderr, _("mediamarks: ERROR, root node must be GXINEMM\n"));
+    fprintf (stderr, _("mediamarks: error: root node must be GXINEMM\n"));
   }
 }
 

Index: menu.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- menu.c	14 Oct 2005 17:54:42 -0000	1.65
+++ menu.c	19 Oct 2005 19:17:57 -0000	1.66
@@ -331,6 +331,7 @@
 #define CB(name, stock, label, key) \
   { #name, (stock), (label), (key), NULL, G_CALLBACK(js_##name##_cb) }
 static const GtkActionEntry main_actions[] = {
+  /* Menu entry text */
   { "FileMenu",		NULL,			N_("_File") },
   CB(Open,		GTK_STOCK_OPEN,		N_("_Open..."),			"<control>O"),
   CB(MRL,		GTK_STOCK_OPEN,		N_("Open _MRL..."),		"<control>M"),
@@ -419,6 +420,7 @@
   { "WindowDynamic",	NULL, "",		NULL, NULL, -1 },
 },
 aspect_actions[] = {
+  /* Aspect ratio menu text */
   { "AspectAuto",	NULL, N_("_Auto"),	NULL, NULL, XINE_VO_ASPECT_AUTO },
   { "AspectSquare",	NULL, N_("_Square"),	NULL, NULL, XINE_VO_ASPECT_SQUARE },
   { "Aspect4_3",	NULL, N_("_4:3"),	NULL, NULL, XINE_VO_ASPECT_4_3 },
@@ -430,6 +432,7 @@
 },
 subtitle_actions[] = {
   { "SubtitlesOther",	NULL, "",		NULL, NULL, -3 },
+  /* Subtitles menu text */
   { "SubtitlesNone",	NULL, N_("_None"),	NULL, NULL, -2 },
   { "SubtitlesAuto",	NULL, N_("_Auto"),	NULL, NULL, -1 },
   { "Subtitles0",	NULL, N_("Channel _0"),	NULL, NULL, 0 },

Index: player.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/player.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- player.c	17 Oct 2005 18:14:22 -0000	1.53
+++ player.c	19 Oct 2005 19:17:57 -0000	1.54
@@ -1071,6 +1071,11 @@
 
   {
     static const ui_property_t int_props[] = {
+      /* Text is help for the commands. Format is:
+       *   To the left of the semicolon, a comma-separated list of
+       *     VARIABLE[=TYPE] or METHOD([PARAMETER TYPE,...])
+       *   To the right, descriptive text
+       */
       { "av_speed", N_("v=int, min, max; playback speed"), XINE_PARAM_SPEED, NULL, NULL, XINE_SPEED_PAUSE, XINE_SPEED_FAST_4 },
       { "vo_aspect", N_("v=int; aspect ratio"), XINE_PARAM_VO_ASPECT_RATIO, NULL, set_aspect, 0, XINE_VO_ASPECT_NUM_RATIOS - 1, TRUE },
       { "vo_subtitle", N_("v=int, min, max; subtitle channel"), XINE_PARAM_SPU_CHANNEL, NULL, set_subtitles, -2, GXINE_MAX_SPU_CHANNEL },
@@ -1105,6 +1110,7 @@
   {
     static const se_f_def_t defs[] = {
       { "play", controls_play, 0, 0,
+	/* help text describes function parameters */
 	SE_GROUP_ENGINE, N_("[mrl] [, pos, time]"),
 	N_("time in milliseconds") },
       { "get_time", get_time, 0, 0,

Index: script_engine.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/script_engine.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- script_engine.c	22 Sep 2005 18:20:52 -0000	1.60
+++ script_engine.c	19 Oct 2005 19:17:57 -0000	1.61
@@ -281,6 +281,7 @@
 	"copyright", _("© 2002-2005 the xine project team"),
 	"comments", _("A GTK media player front end for xine-lib"),
 	"license", /* roughly formatted for a typical variable-width font */
+	  /* Translators: rewrap this as required */
           _("This program is free software; you can redistribute it and/or\n"
 	    "modify it under the terms of the GNU General Public Licence\n"
 	    "as published by the Free Software Foundation; either version\n"
@@ -294,8 +295,8 @@
 	    "\n"
 	    "You should have received a copy of the GNU General Public\n"
 	    "Licence along with this program; if not, write to the Free\n"
-	    "Software Foundation, Inc., 59 Temple Place, Suite 330,\n"
-	    "Boston, MA  02111-1307  USA\n"),
+	    "Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n"
+	    "Boston, MA  02110-1301  USA\n"),
 	"website", "http://xinehq.de/";,
 	"authors", authors,
 	"documenters", documenters,

Index: snapshot.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/snapshot.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- snapshot.c	5 Oct 2005 21:01:25 -0000	1.16
+++ snapshot.c	19 Oct 2005 19:17:57 -0000	1.17
@@ -129,6 +129,7 @@
 }
 
 static const char *const blends[] = {
+  /* Snapshot processing options. I *think* that "Hyper" is trilinear */
   N_("Nearest"), N_("Tiles"), N_("Bilinear"), N_("Hyper"), NULL
 };
 

[xine-cvs] CVS: gnome-xine/po de.po,1.31,1.32

[Philipp Hahn <pmhahn@us...>]

Update of /cvsroot/xine/gnome-xine/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3756

Modified Files:
	de.po 
Log Message:
Update

Index: de.po
===================================================================
RCS file: /cvsroot/xine/gnome-xine/po/de.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- de.po	14 Oct 2005 20:13:07 -0000	1.31
+++ de.po	19 Oct 2005 08:17:12 -0000	1.32
@@ -8,8 +8,8 @@
 "Project-Id-Version: gxine 0.4.999\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?";
 "group_id=9655&atid=109655\n"
-"POT-Creation-Date: 2005-09-12 22:42+0100\n"
-"PO-Revision-Date: 2005-09-15 10:38+0200\n"
+"POT-Creation-Date: 2005-10-15 17:11+0100\n"
+"PO-Revision-Date: 2005-10-19 10:15+0200\n"
 "Last-Translator: Philipp Matthias Hahn <pmhahn@...>\n"
 "Language-Team: German <de@...>\n"
 "MIME-Version: 1.0\n"
@@ -162,39 +162,39 @@
[...1446 lines suppressed...]
 msgstr "Es gab einige Probleme bei der Registrierung."
 
-#: src/wizards.c:293
+#: src/wizards.c:296
 msgid "Keep track of whether user has seen wizards yet"
 msgstr "Vermerkt, ob der Benutzer den Assistenten bereits gesehen hat"
 
 #. set up dialog which all wizards will use
-#: src/wizards.c:319
+#: src/wizards.c:322
 msgid "gxine setup wizards"
 msgstr "gxine Konfigurationsassistent"
 
-#: src/wizards.c:361
+#: src/wizards.c:364
 msgid "Setup completed."
 msgstr "Konfiguration abgeschlossen."
+
+#~ msgid "[file name]"
+#~ msgstr "[Dateiname]"