[telegnome: 2/2] Merge with master
- From: Colin Watson <cjwatson src gnome org>
- To: svn-commits-list gnome org
- Subject: [telegnome: 2/2] Merge with master
- Date: Tue, 28 Apr 2009 18:42:17 -0400 (EDT)
commit 6f237b5846a3519a0098f2a6605644f8c655d7f5
Merge: 67c1766... ba07c93...
Author: Colin Watson <cjwatson debian org>
Date: Tue Apr 28 23:41:36 2009 +0100
Merge with master
.gitignore | 4 +
ChangeLog | 22 +++++++
Makefile.am | 11 +++-
configure.ac | 1 +
po/.gitignore | 2 +
po/LINGUAS | 11 +++-
po/POTFILES.in | 3 +-
po/az.po | 81 +++++++++++++-----------
po/fr.po | 80 +++++++++++++-----------
po/it.po | 81 +++++++++++++-----------
po/nl.po | 81 +++++++++++++-----------
po/pl.po | 81 +++++++++++++-----------
po/pt_BR.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++
po/ru.po | 82 ++++++++++++++-----------
po/sv.po | 27 ++++++---
po/zh_CN.po | 81 +++++++++++++-----------
telegnome.desktop | 13 ----
telegnome.desktop.in | 9 +++
18 files changed, 563 insertions(+), 277 deletions(-)
diff --cc po/az.po
index 6e9b4fd,aa9366e..d12f7bf
--- a/po/az.po
+++ b/po/az.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome 0.0.10\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2001-11-25 21:39GMT+0200\n"
"Last-Translator: Vasif Ä°smayıloÄ?lu MD <azerb_linux hotmail com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz azerimail net>\n"
diff --cc po/fr.po
index a8a87e7,7d8dc56..3636396
--- a/po/fr.po
+++ b/po/fr.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome 0.0.10\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2002-01-01 23:33+0100\n"
"Last-Translator: fred <fred pipo com>\n"
"Language-Team: GNOME French Team <gnomefr traduc org>\n"
diff --cc po/it.po
index ed5c663,58d5b20..c08ec65
--- a/po/it.po
+++ b/po/it.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2000-04-13 20:21+02:00\n"
"Last-Translator: Christopher R. Gabriel <cgabriel pluto linux it>\n"
"Language-Team: Italiano <it li org>\n"
diff --cc po/nl.po
index ace0d75,6b3bd54..ea570af
--- a/po/nl.po
+++ b/po/nl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome 0.0.10\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2000-04-12 19:30+0200\n"
"Last-Translator: Unknown :-(\n"
"Language-Team: Dutch\n"
diff --cc po/pl.po
index 050d310,48694e0..929b6b8
--- a/po/pl.po
+++ b/po/pl.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2008-05-08 22:00+0200\n"
"Last-Translator: Piotr DrÄ?g <piotrdrag gmail com>\n"
"Language-Team: Polish <pl li org>\n"
diff --cc po/pt_BR.po
index 0000000,0207a5c..a6c29db
mode 000000,100644..100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -1,0 -1,170 +1,170 @@@
+ # French translation of telegnome.
+ # Copyright (C) 2002 Free Software Foundation, Inc.
+ # fred <fred pipo com>, 2002.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: telegnome 0.1.0\n"
+ "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
+ "PO-Revision-Date: 2009-04-28 21:51+0100\n"
+ "Last-Translator: Jorge Godoy <docsbr gnome org>\n"
+ "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+ #. the app
+ #: ../src/gui.c:71
+ msgid "TeleGNOME: Teletext for GNOME"
+ msgstr ""
+
+ #: ../src/gui.c:263
+ msgid "Page:"
+ msgstr ""
+
+ #: ../src/gui.c:268
+ msgid "Page number"
+ msgstr ""
+
+ #: ../src/gui.c:276
+ msgid "Go To Page"
+ msgstr ""
+
+ #: ../src/gui.c:282
+ msgid "Get Previous Page"
+ msgstr ""
+
+ #: ../src/gui.c:288
+ msgid "Get Next Page"
+ msgstr ""
+
+ #: ../src/gui.c:294
+ msgid "Go to the home page"
+ msgstr ""
+
+ #: ../src/gui.c:304
+ msgid "Toggles auto-paging"
+ msgstr ""
+
+ #: ../src/gui.c:387 ../src/prefs.c:96
+ msgid "Channels"
+ msgstr ""
+
+ #: ../src/gui.c:400
+ #, c-format
+ msgid "TeleGNOME: %s (%s)"
+ msgstr ""
+
+ #: ../src/gui.c:551
+ msgid "Teletext for GNOME"
+ msgstr ""
+
+ #: ../src/gui.c:552
+ msgid "GNU General Public License, version 2 or later"
+ msgstr ""
+
+ #: ../src/gui.c:555
+ msgid "translator-credits"
+ msgstr ""
+
+ #: ../src/gui.c:616
+ msgid "Error in page entry"
+ msgstr ""
+
+ #: ../src/prefs.c:91
+ msgid "TeleGNOME: Preferences"
+ msgstr ""
+
+ #: ../src/prefs.c:101
+ msgid "Misc"
+ msgstr ""
+
+ #: ../src/prefs.c:163
+ msgid "Paging interval"
+ msgstr ""
+
+ #: ../src/prefs.c:164
+ msgid "Specifies the interval for the auto-pager, in milliseconds."
+ msgstr ""
+
+ #: ../src/prefs.c:174
+ msgid "Proxy server"
+ msgstr ""
+
+ #: ../src/prefs.c:183
+ msgid "Miscelaneous"
+ msgstr ""
+
+ #: ../src/prefs.c:198 ../src/prefs.c:318
+ msgid "Country"
+ msgstr ""
+
+ #: ../src/prefs.c:198 ../src/prefs.c:286
+ msgid "Name"
+ msgstr ""
+
+ #. move up button
+ #: ../src/prefs.c:226
+ msgid "Move up"
+ msgstr ""
+
+ #. move down button
+ #: ../src/prefs.c:231
+ msgid "Move down"
+ msgstr ""
+
+ #. add button
+ #: ../src/prefs.c:236
+ msgid "Add..."
+ msgstr ""
+
+ #. delete button
+ #: ../src/prefs.c:242
+ msgid "Delete"
+ msgstr ""
+
+ #. edit buton
+ #: ../src/prefs.c:248
+ msgid "Edit"
+ msgstr ""
+
+ #: ../src/prefs.c:276
+ msgid "New/Edit Channel"
+ msgstr ""
+
+ #: ../src/prefs.c:294
+ msgid "Description"
+ msgstr ""
+
+ #: ../src/prefs.c:302
+ msgid "Page url"
+ msgstr ""
+
+ #: ../src/prefs.c:310
+ msgid "Subpage url"
+ msgstr ""
+
+ #: ../src/prefs.c:326
+ msgid "Channel Information"
+ msgstr ""
+
+ #: ../src/view.c:115
+ msgid "Web server error: Wrong page number?"
+ msgstr ""
+
+ #: ../src/view.c:134
+ msgid "Error making HTTP connection"
+ msgstr ""
+
+ #: ../src/view.c:137
+ msgid "Internal error in HTTP query code"
+ msgstr ""
+
+ #: ../telegnome.desktop.in.h:1
+ msgid "TeleGNOME"
+ msgstr ""
+
+ #: ../telegnome.desktop.in.h:2
+ msgid "Viewer for Teletext pages"
+ msgstr "Visualizador para pág. Teletekst"
diff --cc po/ru.po
index 0a79a56,74ba620..7e863da
--- a/po/ru.po
+++ b/po/ru.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
msgstr ""
"Project-Id-Version: TeleGnome\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2000-04-11 15:18+04:00\n"
"Last-Translator: Valek Filippov <frob df ru>\n"
"Language-Team: Russian <ru li org>\n"
diff --cc po/sv.po
index 7eaf392,5ea7db9..17f982f
--- a/po/sv.po
+++ b/po/sv.po
@@@ -10,12 -9,12 +10,12 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-04-28 22:53+0200\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
-"PO-Revision-Date: 2001-12-02 12:57+0100\n"
-"Last-Translator: Christian Rose <menthos menthos com>\n"
-"Language-Team: Swedish <sv li org>\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
+"PO-Revision-Date: 2009-04-28 22:55+0100\n"
+"Last-Translator: Daniel Nylander <po danielnylander se>\n"
+"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. the app
@@@ -49,10 -48,9 +49,9 @@@ msgstr "GÃ¥ till hemsidan
#: ../src/gui.c:304
msgid "Toggles auto-paging"
-msgstr "Växlar automatiskt sidbyte"
+msgstr "Växlar automatiskt sidbyte"
- #: ../src/gui.c:387
- #: ../src/prefs.c:96
+ #: ../src/gui.c:387 ../src/prefs.c:96
msgid "Channels"
msgstr "Kanaler"
@@@ -172,24 -163,38 +169,38 @@@ msgstr "Fel vid HTTP-anslutning
#: ../src/view.c:137
msgid "Internal error in HTTP query code"
-msgstr "Internt fel i HTTP-kökoden"
+msgstr "Internt fel i HTTP-kökoden"
+ #: ../telegnome.desktop.in.h:1
+ #, fuzzy
+ msgid "TeleGNOME"
+ msgstr "TeleGNOME: %s (%s)"
+
+ #: ../telegnome.desktop.in.h:2
+ msgid "Viewer for Teletext pages"
+ msgstr ""
+
#~ msgid ""
#~ "Teletext for GNOME\n"
#~ "Released under the terms of the GPL"
#~ msgstr ""
-#~ "Texttv för GNOME\n"
-#~ "Släppt under villkoren i GPL"
+#~ "Texttv för GNOME\n"
+#~ "Släppt under villkoren i GPL"
+
#~ msgid "Dirk-Jan C. Binnema <djcb dds nl>"
#~ msgstr "Dirk-Jan C. Binnema <djcb dds nl>"
+
#~ msgid "Arjan Scherpenisse <acscherp wins uva nl>"
#~ msgstr "Arjan Scherpenisse <acscherp wins uva nl>"
+
#~ msgid "(c) 1999, 2000 Dirk-Jan C. Binnema, Arjan Scherpenisse"
-#~ msgstr "© 1999, 2000 Dirk-Jan C. Binnema, Arjan Scherpenisse"
+#~ msgstr "© 1999, 2000 Dirk-Jan C. Binnema, Arjan Scherpenisse"
+
#~ msgid "No connection"
#~ msgstr "Ingen anslutning"
+
#~ msgid "Error using temporary file"
-#~ msgstr "Fel vid användning av temporär fil"
+#~ msgstr "Fel vid användning av temporär fil"
+
#~ msgid "Error setting permissions on temporary file"
-#~ msgstr "Fel vid inställning av rättigheter på temporär fil"
+#~ msgstr "Fel vid inställning av rättigheter på temporär fil"
-
diff --cc po/zh_CN.po
index c02af3c,bd8f052..3316cb8
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: telegnome\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-04-27 20:19+0100\n"
-"POT-Creation-Date: 2009-04-28 21:47+0100\n"
++"POT-Creation-Date: 2009-04-28 23:40+0100\n"
"PO-Revision-Date: 2002-08-06 00:58+0800\n"
"Last-Translator: Wen ShaoHua <nadwsh sbell com cn>\n"
"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]