[Xfce4-commits] midori:master l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/master to a9b771ab5c6fa155b45d65c876d8c6273c12348d (commit) from 02d095cae0971d32c0cfcd1c7f32166db846bcda (commit) commit a9b771ab5c6fa155b45d65c876d8c6273c12348d Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Mar 12 10:28:28 2011 +0100 l10n: Updated Indonesian (id) translation to 100% New status: 672 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 644 +++-- 1 files changed, 327 insertions(+), 317 deletions(-) diff --git a/po/id.po b/po/id.po index cfcbc62..72a9250 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: midori\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-05 11:16+\n -PO-Revision-Date: 2011-03-05 20:16+0700\n +POT-Creation-Date: 2011-03-12 05:17+\n +PO-Revision-Date: 2011-03-12 16:27+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian translation-team...@lists.sourceforge.net\n MIME-Version: 1.0\n @@ -20,8 +20,8 @@ msgstr msgid Lightweight web browser msgstr Peramban web ringan -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1337 ../midori/main.c:1737 -#: ../midori/main.c:1748 ../midori/main.c:1764 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1337 ../midori/main.c:1866 +#: ../midori/main.c:1877 ../midori/main.c:1893 #: ../midori/midori-websettings.c:311 msgid Midori msgstr Midori @@ -124,7 +124,7 @@ msgstr Atur ulang _sesi terakhir msgid Disable all _extensions msgstr Nonaktifkan semua _ekstensi -#: ../midori/main.c:1215 ../midori/main.c:2033 +#: ../midori/main.c:1215 ../midori/main.c:2162 #, c-format msgid The session couldn't be loaded: %s\n msgstr Sesi tak dapat dimuat: %s\n @@ -142,127 +142,127 @@ msgstr Galat tak diketahui terjadi. msgid Snapshot saved to: %s\n msgstr Cuplikan layar disimpan ke: %s\n -#: ../midori/main.c:1626 +#: ../midori/main.c:1754 msgid Run ADDRESS as a web application msgstr Jalankan ALAMAT sebagai sebuah aplikasi web -#: ../midori/main.c:1626 +#: ../midori/main.c:1754 msgid ADDRESS msgstr ALAMAT -#: ../midori/main.c:1629 +#: ../midori/main.c:1757 msgid Use FOLDER as configuration folder msgstr Gunakan FOLDER sebagai folder konfigurasi -#: ../midori/main.c:1629 +#: ../midori/main.c:1757 msgid FOLDER msgstr FOLDER -#: ../midori/main.c:1632 +#: ../midori/main.c:1760 msgid Show a diagnostic dialog msgstr Tampilkan dialog diagnosis -#: ../midori/main.c:1634 +#: ../midori/main.c:1762 msgid Run the specified filename as javascript msgstr Jalankan nama berkas yang ditentukan sebagai javascript -#: ../midori/main.c:1637 +#: ../midori/main.c:1765 msgid Take a snapshot of the specified URI msgstr Ambil cuplikan layar dari URI yang ditentukan -#: ../midori/main.c:1640 +#: ../midori/main.c:1768 msgid Execute the specified command msgstr Eksekusi perintah yang ditentukan -#: ../midori/main.c:1642 +#: ../midori/main.c:1770 msgid List available commands to execute with -e/ --execute msgstr Senarai perintah tersedia yang dijalankan dengan -e/ --execute -#: ../midori/main.c:1644 +#: ../midori/main.c:1772 msgid Display program version msgstr Tampilkan versi program -#: ../midori/main.c:1646 +#: ../midori/main.c:1774 msgid Addresses msgstr Alamat -#: ../midori/main.c:1648 +#: ../midori/main.c:1776 msgid Block URIs according to regular expression PATTERN msgstr Blok URI berdasarkan POLA ekspresi reguler -#: ../midori/main.c:1648 +#: ../midori/main.c:1776 msgid PATTERN msgstr POLA #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1652 +#: ../midori/main.c:1780 msgid Reset Midori after SECONDS seconds of inactivity msgstr Atur ulang Midori setelah DETIK detik tidak aktif -#: ../midori/main.c:1652 +#: ../midori/main.c:1780 msgid SECONDS msgstr DETIK -#: ../midori/main.c:1734 +#: ../midori/main.c:1863 msgid [Addresses] msgstr [Alamat] -#: ../midori/main.c:1746 +#: ../midori/main.c:1875 msgid Midori (Private Browsing) msgstr Midori (Meramban Privat) -#: ../midori/main.c:1765 +#: ../midori/main.c:1894 msgid Please report comments, suggestions and bugs to: msgstr Silakan laporkan komentar, saran dan kutu ke: -#: ../midori/main.c:1767 +#: ../midori/main.c:1896 msgid Check for new versions at: msgstr Cek versi baru di: -#: ../midori/main.c:1831 +#: ../midori/main.c:1960 msgid Website icons msgstr Ikon situs web -#: ../midori/main.c:1833 +#: ../midori/main.c:1962 msgid Cookies msgstr Kuki -#: ../midori/main.c:1836 +#: ../midori/main.c:1965 msgid 'Flash' Cookies msgstr Kuki 'Flash' -#: ../midori/main.c:1840 +#: ../midori/main.c:1969 msgid HTML5 _Databases msgstr Basis _Data HTML5 -#: ../midori/main.c:1914 +#: ../midori/main.c:2043 msgid The specified configuration folder is invalid. msgstr Folder konfigurasi yang ditentukan tidak
[Xfce4-commits] xfce4-mailwatch-plugin:master l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/master to 6141606a91307cdf69d873b8330de006b58c83b3 (commit) from 176fa4b8c03ce5b57857a399ba0d01a07d13bf88 (commit) commit 6141606a91307cdf69d873b8330de006b58c83b3 Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Mar 12 10:35:15 2011 +0100 l10n: Updated Indonesian (id) translation to 100% New status: 110 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 142 +- 1 files changed, 39 insertions(+), 103 deletions(-) diff --git a/po/id.po b/po/id.po index fbae969..22ffb3b 100644 --- a/po/id.po +++ b/po/id.po @@ -2,12 +2,12 @@ # Copyright (C) 2005-2006 Brian Tarricone, Pasi Orovuo. # This file is distributed under the same license as the xfce4-mailwatch-plugin package. # Andhika Padmawan andhika.padma...@gmail.com, 2008. -# +# msgid msgstr Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-07-15 22:43-0700\n +POT-Creation-Date: 2011-03-12 05:06+\n PO-Revision-Date: 2008-09-03 21:57+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian i...@li.org\n @@ -25,23 +25,13 @@ msgstr Jabat tangan TLS gagal: %s #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255 #, c-format -msgid -Received HTTP response code %d. The most likely reason for this is that -your GMail username or password is incorrect. -msgstr -Menerima kode balasan HTTP %d. Alasan yang paling memungkinkan untuk ini -adalah nama pengguna atau sandi lewat GMail anda salah. +msgid Received HTTP response code %d. The most likely reason for this is that your GMail username or password is incorrect. +msgstr Menerima kode balasan HTTP %d. Alasan yang paling memungkinkan untuk ini adalah nama pengguna atau sandi lewat GMail anda salah. #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261 #, c-format -msgid -Received HTTP response code %d, which should be 200. There may be a problem -with GMail's servers, or they have incompatibly changed their authentication -method or location of the new messages feed. -msgstr -Menerima kode balasan HTTP %d, dari yang seharusnya 200. Mungkin ada masalah -dengan server GMail, atau mereka telah mengganti metode otentikasi mereka -atau lokasi umpan pesan baru sehingga tidak cocok. +msgid Received HTTP response code %d, which should be 200. There may be a problem with GMail's servers, or they have incompatibly changed their authentication method or location of the new messages feed. +msgstr Menerima kode balasan HTTP %d, dari yang seharusnya 200. Mungkin ada masalah dengan server GMail, atau mereka telah mengganti metode otentikasi mereka atau lokasi umpan pesan baru sehingga tidak cocok. #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:735 @@ -73,7 +63,7 @@ msgstr Cek _pesan baru tiap #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821 #: ../libmailwatch-core/mailwatch-mailbox-maildir.c:374 -#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:411 +#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:412 #: ../libmailwatch-core/mailwatch-mailbox-mh.c:605 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929 msgid minute(s). @@ -84,19 +74,12 @@ msgid Remote GMail Mailbox msgstr Kotak Surat Jarak Jauh GMail #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669 -msgid -The GMail plugin can connect to Google's mail service and securely retrieve -the number of new messages. -msgstr -Plugin GMail dapat menghubungi layanan surat Google dan menerima sejumlah -pesan baru dengan aman. +msgid The GMail plugin can connect to Google's mail service and securely retrieve the number of new messages. +msgstr Plugin GMail dapat menghubungi layanan surat Google dan menerima sejumlah pesan baru dengan aman. #: ../libmailwatch-core/mailwatch-mailbox-imap.c:286 -msgid -Secure IMAP is not available, and the IMAP server does not support plaintext -logins. -msgstr -IMAP aman tak tersedia, dan server IMAP tidak mendukung log masuk teks biasa. +msgid Secure IMAP is not available, and the IMAP server does not support plaintext logins. +msgstr IMAP aman tak tersedia, dan server IMAP tidak mendukung log masuk teks biasa. #: ../libmailwatch-core/mailwatch-mailbox-imap.c:337 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:370 @@ -127,14 +110,8 @@ msgid No server or username is set. msgstr Tak ada server atau nama pengguna yang diatur. #: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398 -msgid -The folder list cannot be retrieved until a server, username, and probably -password are set. Also be sure to check any security settings in the -Advanced dialog. -msgstr -Senarai folder tak dapat diterima hingga server, nama pengguna, dan mungkin -sandi lewat diatur. Pastikan juga
[Xfce4-commits] assembly:master Creating branch master
Updating branch refs/heads/master as new branch to 361e21bb41e6215767d476044cd194467a7c983a (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/master for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] assembly:master Initial import.
Updating branch refs/heads/master to 361e21bb41e6215767d476044cd194467a7c983a (commit) from 361e21bb41e6215767d476044cd194467a7c983a^1 () ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] cafe:master Rename to cafe (this is where people meet, right?).
Updating branch refs/heads/master to d513424ef05113e7cbaabc40057030bab5e3a2ba (commit) from 361e21bb41e6215767d476044cd194467a7c983a (commit) commit d513424ef05113e7cbaabc40057030bab5e3a2ba Author: Jannis Pohlmann jan...@xfce.org Date: Sat Mar 12 15:06:18 2011 +0100 Rename to cafe (this is where people meet, right?). .gitignore |2 ++ Rakefile | 13 ++--- config.ru | 16 lib/cafe.rb| 19 +++ lib/controllers/members.rb | 15 +++ module.xml |4 ++-- update-installation.sh |8 +++- 7 files changed, 67 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..c74ce46 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.gemspec +pkg diff --git a/Rakefile b/Rakefile index 5ecf440..b0d7a9a 100755 --- a/Rakefile +++ b/Rakefile @@ -5,18 +5,17 @@ begin require 'jeweler' Jeweler::Tasks.new do |gem| -gem.name = 'assembly' +gem.name = 'cafe' gem.summary = %Q{Web application used to managing the Xfce Foundation} gem.email= 'jan...@xfce.org' -gem.homepage = 'http://git.xfce.org/jannis/assembly' +gem.homepage = 'http://git.xfce.org/jannis/cafe' gem.authors = ['Jannis Pohlmann'] gem.files= FileList['[A-Z]*', '{examples,lib}/**/*'] -gem.add_dependency('pony', '0.3') -gem.add_dependency('sinatra', '0.9.2') -gem.add_dependency('warden', '0.2.3') -gem.add_dependency('haml', '2.2.1') -gem.add_dependency('ratom', '0.6.2') +gem.add_dependency('pony', '= 0.3') +gem.add_dependency('sinatra', '= 0.9.2') +gem.add_dependency('warden', '= 0.2.3') +gem.add_dependency('haml', '= 2.2.1') end rescue LoadError puts 'Jeweler not available. Install it with gem install jeweler' diff --git a/config.ru b/config.ru new file mode 100644 index 000..5994d96 --- /dev/null +++ b/config.ru @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'sinatra' +require 'cafe' + +disable :run +enable :static +enable :session +enable :methodoverride +enable :reload +set :environment, :development + +use Rack::ShowExceptions + +run Cafe::Application diff --git a/lib/cafe.rb b/lib/cafe.rb new file mode 100644 index 000..aaae3aa --- /dev/null +++ b/lib/cafe.rb @@ -0,0 +1,19 @@ +require 'rubygems' + +# determine the location of this very ruby script +directory = File.expand_path(File.dirname(__FILE__)) + +# load models +require File.join(directory, 'models', 'member') + +# load helpers + +# load controllers +require File.join(directory, 'controllers', 'members') + +# load middleware + +module Cafe + class Application Sinatra::Base + end +end diff --git a/lib/controllers/members.rb b/lib/controllers/members.rb new file mode 100644 index 000..869158d --- /dev/null +++ b/lib/controllers/members.rb @@ -0,0 +1,15 @@ +module Cafe + module Controllers +module Members + + def self.registered(app) + +app.get '/members/:name' do + 'Hello World' +end + + end + +end + end +end diff --git a/lib/models/member.rb b/lib/models/member.rb new file mode 100644 index 000..e69de29 diff --git a/module.xml b/module.xml index 3cc1e59..b1fdb6b 100644 --- a/module.xml +++ b/module.xml @@ -5,9 +5,9 @@ xmlns:gnome=http://api.gnome.org/doap-extensions#; xmlns=http://usefulinc.com/ns/doap#; - name xml:lang=enassembly/name + name xml:lang=encafe/name shortdesc xml:lang=enWeb application used to manage the Xfce Foundation/shortdesc - homepage rdf:resource=http://git.xfce.org/foundation/assembly/ + homepage rdf:resource=http://git.xfce.org/foundation/cafe/ maintainer foaf:Person diff --git a/update-installation.sh b/update-installation.sh index d053fb8..a11be9f 100755 --- a/update-installation.sh +++ b/update-installation.sh @@ -1,3 +1,9 @@ #!/bin/sh -rake build su -c 'gem install pkg/assembly-0.1.0.gem' +HOSTNAME=`hostname` + +if [[ $HOSTNAME -eq orion ]]; then + rake gemspec rake build sudo gem install pkg/cafe-0.1.0.gem +else + rake gemspec rake build su -c 'gem install pkg/cafe-0.1.0.gem' +fi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master Only build the docs folder if --enable-gtk-doc is passed
Updating branch refs/heads/master to b77d5cedf3b051a755660f21e2fec859a635e770 (commit) from 3ab6f8e284868c943e5e4ecc499a2f86dac05d25 (commit) commit b77d5cedf3b051a755660f21e2fec859a635e770 Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 10:32:12 2011 -0500 Only build the docs folder if --enable-gtk-doc is passed Makefile.am |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 19cfd0a..95246e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = src docs +SUBDIRS = src + +if ENABLE_GTK_DOC +SUBDIRS += docs +endif distclean-local: rm -rf *.spec *.cache *~ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master Fix some issues that would cause configure issues with python 3
Updating branch refs/heads/master to 3ab6f8e284868c943e5e4ecc499a2f86dac05d25 (commit) from f468bb851fff4daee52c6adbe175c809958fd687 (commit) commit 3ab6f8e284868c943e5e4ecc499a2f86dac05d25 Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 10:31:39 2011 -0500 Fix some issues that would cause configure issues with python 3 m4/python.m4 | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 index d193284..18685f1 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -1,7 +1,7 @@ ## this one is commonly used with AM_PATH_PYTHONDIR ... dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN(AM_CHECK_PYMOD, +AC_DEFUN(AM_CHECK_PYMOD, [AC_REQUIRE([AM_PATH_PYTHON]) py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) @@ -43,8 +43,8 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c import sys; print sys.prefix` -py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix` +py_prefix=`$PYTHON -c import sys; print(sys.prefix)` +py_exec_prefix=`$PYTHON -c import sys; print(sys.exec_prefix)` PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION} if test $py_prefix != $py_exec_prefix; then PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} @@ -112,14 +112,14 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS], [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) AC_MSG_CHECKING(for libraries required to embed python) dnl deduce PYTHON_LIBS -py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix` +py_exec_prefix=`$PYTHON -c import sys; print(sys.exec_prefix)` AC_MULTILIB(yes) -if test x$PYTHON_LIBS == x; then +if test x$PYTHON_LIBS = x; then PYTHON_LIBS=-L${py_prefix}/lib${libdirsuffix} -lpython${PYTHON_VERSION} fi -if test x$PYTHON_LIB_LOC == x; then +if test x$PYTHON_LIB_LOC = x; then PYTHON_LIB_LOC=${py_prefix}/lib${libdirsuffix} fi AC_SUBST(PYTHON_LIBS) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master We must refer to the overview example in order for it to get properly built
Updating branch refs/heads/master to e72abc48093bcbae4807846ff5c89db0ba4dbe88 (commit) from b77d5cedf3b051a755660f21e2fec859a635e770 (commit) commit e72abc48093bcbae4807846ff5c89db0ba4dbe88 Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 10:42:09 2011 -0500 We must refer to the overview example in order for it to get properly built docs/reference/thunarx-python-overview.xml |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/reference/thunarx-python-overview.xml b/docs/reference/thunarx-python-overview.xml index 5182f6d..f174b0b 100644 --- a/docs/reference/thunarx-python-overview.xml +++ b/docs/reference/thunarx-python-overview.xml @@ -28,5 +28,7 @@ such as Fedora, put Thunarx-Python extensions in $PREFIX/lib64/thunarx-1/python (or thunarx-1). /para /note +xi:include href=thunarx-python-overview-example.xml/ + /chapter ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master Add support for importing pygtk as a PyCapsule. Some distributions with python 2.7+ will require this
Updating branch refs/heads/master to d458474c1ab9da75e2bdb9029fbb7c5456714a8d (commit) from e72abc48093bcbae4807846ff5c89db0ba4dbe88 (commit) commit d458474c1ab9da75e2bdb9029fbb7c5456714a8d Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 10:43:02 2011 -0500 Add support for importing pygtk as a PyCapsule. Some distributions with python 2.7+ will require this src/thunarx-python.c | 32 +--- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/thunarx-python.c b/src/thunarx-python.c index e9b35a2..3133511 100644 --- a/src/thunarx-python.c +++ b/src/thunarx-python.c @@ -82,20 +82,30 @@ thunarx_python_init_pygtk(void) PyObject *pygtk = PyImport_ImportModule(gtk._gtk); if (pygtk != NULL) { - PyObject *module_dict = PyModule_GetDict(pygtk); - PyObject *cobject = PyDict_GetItemString(module_dict, _PyGtk_API); - if (PyCObject_Check(cobject)) +#ifdef Py_CAPSULE_H + void *capsule = PyCapsule_Import(gtk._gtk._PyGtk_API, 0); + if (capsule) { - _PyGtk_API = (struct _PyGtk_FunctionStruct*) - PyCObject_AsVoidPtr(cobject); + _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; } - else +#endif + if (!_PyGtk_API) { -PyErr_SetString(PyExc_RuntimeError, -could not find _PyGtk_API object); - PyErr_Print(); - return FALSE; -} + PyObject *module_dict = PyModule_GetDict(pygtk); + PyObject *cobject = PyDict_GetItemString(module_dict, _PyGtk_API); + if (PyCObject_Check(cobject)) + { + _PyGtk_API = (struct _PyGtk_FunctionStruct*) + PyCObject_AsVoidPtr(cobject); + } + else + { + PyErr_SetString(PyExc_RuntimeError, + could not find _PyGtk_API object); + PyErr_Print(); + return FALSE; + } + } } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master Point the ChangeLog to the new git repository at git.xfce.org
Updating branch refs/heads/master to 165fd427335c8835efeb9c01cb1bf71eb3891bf6 (commit) from d458474c1ab9da75e2bdb9029fbb7c5456714a8d (commit) commit 165fd427335c8835efeb9c01cb1bf71eb3891bf6 Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 10:49:19 2011 -0500 Point the ChangeLog to the new git repository at git.xfce.org ChangeLog |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e66db29..b3079fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,2 +1,2 @@ For a list of changes go to: -http://github.com/adamplumb/thunarx-python/commits/master +http://git.xfce.org/bindings/thunarx-python/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python:master Release 0.2.3
Updating branch refs/heads/master to 3ea8c96e11bc9b6f2b0237adc3d5f39205d114c5 (commit) from 165fd427335c8835efeb9c01cb1bf71eb3891bf6 (commit) commit 3ea8c96e11bc9b6f2b0237adc3d5f39205d114c5 Author: Adam Plumb adampl...@gmail.com Date: Sat Mar 12 11:01:12 2011 -0500 Release 0.2.3 NEWS|8 configure.ac.in |2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 70f1e38..8787dd9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +0.2.3: +- Fix the python macros to work with python3 +- Fix the main Makefile.am to only build the docs folder if +--gtk-docs-enable is set +- The overview docs now properly includes the example script. This fixes an +install bug +- Add support for importing the pygtk module as a PyCapsule + 0.2.2: - Add gtk-doc documentation - Fixed dependency information in the README file diff --git a/configure.ac.in b/configure.ac.in index d87a857..6d2a0ca 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ dnl *** Version information *** dnl *** m4_define([txp_version_major], [0]) m4_define([txp_version_minor], [2]) -m4_define([txp_version_micro], [2]) +m4_define([txp_version_micro], [3]) m4_define([txp_version_tag], []) m4_define([txp_version_build], []) m4_define([txp_version], [txp_version_major().txp_version_minor().txp_version_micro()ifelse(txp_version_tag(), [], [], [txp_version_tag()-txp_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunarx-python|thunarx-python-0.2.3 Creating annotated tag thunarx-python-0.2.3
Updating annotated tag refs/tags/thunarx-python-0.2.3 as new annotated tag to 55ee47a87fec76c14ce3ea6d3cd8cd717de70341 (tag) succeeds thunarx-python-0-2-2-5-g165fd42 tagged by Adam Plumb adampl...@gmail.com on 2011-03-12 16:01 + Adam Plumb (1): Release 0.2.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Check if _midori_web_view_load_icon actually has a URI
Updating branch refs/heads/master to 1bedc8a76cb95f6f37dc606a101136e127a25225 (commit) from 9ca127102025df8f4096d820d1e6a9b25fc83f07 (commit) commit 1bedc8a76cb95f6f37dc606a101136e127a25225 Author: Christian Dywan christ...@twotoasts.de Date: Sat Mar 12 21:07:37 2011 +0100 Check if _midori_web_view_load_icon actually has a URI A blank page wouldn't have one. midori/midori-view.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index b252282..0e7558e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -866,7 +866,7 @@ _midori_web_view_load_icon (MidoriView* view) icon_uri = g_strdup (view-icon_uri); if ((icon_uri g_str_has_prefix (icon_uri, http)) -|| g_str_has_prefix (view-uri, http)) +|| (view-uri g_str_has_prefix (view-uri, http))) { if (!icon_uri) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Implement MD5 and SHA1 Link Fingerprint support
Updating branch refs/heads/master to 9ca127102025df8f4096d820d1e6a9b25fc83f07 (commit) from a9b771ab5c6fa155b45d65c876d8c6273c12348d (commit) commit 9ca127102025df8f4096d820d1e6a9b25fc83f07 Author: Christian Dywan christ...@twotoasts.de Date: Sat Mar 12 21:02:48 2011 +0100 Implement MD5 and SHA1 Link Fingerprint support If a URL has an embedded link fingerprint the checksum and algorithm is shown in the download prompt. After a file has been saved to disk a warning icon will be shown if the checksum doesn't match and clicking the icon will explain that the file is erroneous and not open it. See http://mdhashtool.mozdev.org/lfinfo.html midori/midori-view.c | 51 +-- toolbars/midori-transferbar.c | 66 - 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 665823d..b252282 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2857,6 +2857,13 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, GtkWidget* dialog; gchar* content_type; gchar* description; +gchar* file_type; +#if WEBKIT_CHECK_VERSION (1, 1, 14) +WebKitWebDataSource* datasource; +WebKitNetworkRequest* original_request; +#endif +const gchar* original_uri; +gchar** fingerprint; #if GTK_CHECK_VERSION (2, 14, 0) GIcon* icon; GtkWidget* image; @@ -2916,12 +2923,38 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, #endif g_free (content_type); if (g_strrstr (description, mime_type)) -gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), -_(File Type: '%s'), mime_type); +file_type = g_strdup_printf (_(File Type: '%s'), mime_type); else - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _(File Type: %s ('%s')), description, mime_type); +file_type = g_strdup_printf (_(File Type: %s ('%s')), description, mime_type); g_free (description); + +/* Link Fingerprint */ +#if WEBKIT_CHECK_VERSION (1, 1, 14) +/* We look at the original URI because redirection would lose the fragment */ +datasource = webkit_web_frame_get_provisional_data_source (web_frame); +original_request = webkit_web_data_source_get_initial_request (datasource); +original_uri = webkit_network_request_get_uri (original_request); +#else +original_uri = webkit_network_request_get_uri (request); +#endif +fingerprint = g_strsplit (original_uri, #!md5!, 2); +if (fingerprint fingerprint[0] fingerprint[1]) +gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +%s\n%s %s, file_type, _(MD5-Checksum:), fingerprint[1]); +else +{ +g_strfreev (fingerprint); +fingerprint = g_strsplit (original_uri, #!sha1!, 2); +if (fingerprint fingerprint[0] fingerprint[1]) +gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +%s\n%s %s, file_type, _(SHA1-Checksum:), fingerprint[1]); +else +gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +%s, file_type); +} +g_strfreev (fingerprint); +g_free (file_type); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); /* i18n: A file open dialog title, ie. Open http://fila.com/manual.tgz; */ title = g_strdup_printf (_(Open %s), @@ -2989,6 +3022,16 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, MidoriView* view) { gboolean handled; +#if WEBKIT_CHECK_VERSION (1, 1, 14) +/* Propagate original URI to make it available when the download finishes */ +WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); +WebKitWebDataSource* datasource = webkit_web_frame_get_provisional_data_source (web_frame); +WebKitNetworkRequest* original_request = webkit_web_data_source_get_initial_request (datasource); +const gchar* original_uri = webkit_network_request_get_uri (original_request); +WebKitNetworkRequest* request = webkit_download_get_network_request (download); +g_object_set_data_full (G_OBJECT (request), midori-original-uri, +g_strdup (original_uri), g_free); +#endif g_object_set_data (G_OBJECT (download), open-download, g_object_get_data (G_OBJECT (view), open-download)); g_object_set_data (G_OBJECT (download), save-as-download, diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c index 0a8fec4..6b1de4c 100644 --- a/toolbars/midori-transferbar.c +++ b/toolbars/midori-transferbar.c @@ -137,6 +137,11 @@ midori_transferbar_download_notify_status_cb (WebKitDownload* download, case
[Xfce4-commits] cafe:master Work on authentication, sqlite database integration.
Updating branch refs/heads/master to 2a3473aaad641542a5b075b2bff83a5a0b977067 (commit) from d513424ef05113e7cbaabc40057030bab5e3a2ba (commit) commit 2a3473aaad641542a5b075b2bff83a5a0b977067 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Mar 12 21:12:15 2011 +0100 Work on authentication, sqlite database integration. config.ru | 16 - examples/xfce-foundation/config.ru | 32 + lib/cafe.rb| 40 +++- lib/controllers/authentication.rb | 23 +++ lib/helpers/authentication.rb | 98 lib/helpers/general.rb | 56 lib/models/member.rb | 27 lib/views/authentication_login.erb |9 +++ lib/views/foot.erb |3 + lib/views/head.erb | 15 + lib/views/index.erb|2 + lib/views/stylesheet.sass | 123 12 files changed, 427 insertions(+), 17 deletions(-) diff --git a/config.ru b/config.ru deleted file mode 100644 index 5994d96..000 --- a/config.ru +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env ruby - -require 'rubygems' -require 'sinatra' -require 'cafe' - -disable :run -enable :static -enable :session -enable :methodoverride -enable :reload -set :environment, :development - -use Rack::ShowExceptions - -run Cafe::Application diff --git a/examples/xfce-foundation/config.ru b/examples/xfce-foundation/config.ru new file mode 100644 index 000..6aa5c73 --- /dev/null +++ b/examples/xfce-foundation/config.ru @@ -0,0 +1,32 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'sinatra' +require 'dm-core' + +disable :run +enable :static +enable :session +enable :methodoverride +enable :reload +set :environment, :development + +use Rack::ShowExceptions + +DataMapper::Logger.new($stdout, :debug) +DataMapper.setup(:default, sqlite:///home/jannis/xfce/git/foundation/cafe/examples/xfce-foundation/xfce-foundation.db) + +require '../../lib/cafe' + +# create dummy users +admin = Cafe::Models::Member.first_or_create( + :username = 'jannis', + :password = 'test', + :firstname = 'Jannis', + :lastname = 'Pohlmann', + :address = 'Foo 123, 23123 Lübeck', + :member_since = '2011-02-06' +) +admin.save + +run Cafe::Application diff --git a/lib/cafe.rb b/lib/cafe.rb index aaae3aa..05eb913 100644 --- a/lib/cafe.rb +++ b/lib/cafe.rb @@ -1,4 +1,7 @@ -require 'rubygems' +require 'dm-core' +require 'dm-migrations' +require 'sinatra' +require 'sass' # determine the location of this very ruby script directory = File.expand_path(File.dirname(__FILE__)) @@ -6,14 +9,49 @@ directory = File.expand_path(File.dirname(__FILE__)) # load models require File.join(directory, 'models', 'member') +# finalize models and set up the database +DataMapper.finalize +DataMapper.auto_upgrade! + # load helpers +require File.join(directory, 'helpers', 'general') +require File.join(directory, 'helpers', 'authentication') # load controllers require File.join(directory, 'controllers', 'members') +require File.join(directory, 'controllers', 'authentication') # load middleware module Cafe class Application Sinatra::Base + +include Cafe::Models + +register Cafe::Helpers::General +register Cafe::Helpers::Authentication + +register Cafe::Controllers::Members +register Cafe::Controllers::Authentication + +authentication_initialize + +get '/stylesheet.css' do + content_type 'text/css', :charset = 'utf-8' + + directory = File.join(File.expand_path(File.dirname(__FILE__)), 'views') + + template = File.read(File.join(directory, 'stylesheet.sass')) + engine = Sass::Engine.new(template) + engine.render +end + +get '/' do + if authenticated? +view :index + else +redirect '/login' + end +end end end diff --git a/lib/controllers/authentication.rb b/lib/controllers/authentication.rb new file mode 100644 index 000..16f3db2 --- /dev/null +++ b/lib/controllers/authentication.rb @@ -0,0 +1,23 @@ +require 'warden' + +module Cafe + module Controllers +module Authentication + def self.registered(app) +app.get '/login/?' do + view :authentication_login +end + +app.post '/login/?' do + login + redirect '/' +end + +app.get '/logout/?' do + logout + redirect '/' +end + end +end + end +end diff --git a/lib/helpers/authentication.rb b/lib/helpers/authentication.rb new file mode 100644 index 000..3281d7d --- /dev/null +++ b/lib/helpers/authentication.rb @@ -0,0 +1,98 @@ +require 'warden' + +module Cafe + module Helpers +module Authentication + def self.registered(app) +app.helpers Helpers + +# enable session +app.set :session, true + +# set auth paths +app.set :auth_failure_path, '/'
[Xfce4-commits] xfce4-settings:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to ad8bdf8d16e53dfa4edb100b22d23e1f4b5695ba (commit) from c6b12d0e9f1362d12ad3b4a65b43499b0d61a766 (commit) commit ad8bdf8d16e53dfa4edb100b22d23e1f4b5695ba Author: Cristian Marchi cri.pe...@gmail.com Date: Sat Mar 12 21:26:37 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 269 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 326 - 1 files changed, 86 insertions(+), 240 deletions(-) diff --git a/po/it.po b/po/it.po index 72f75e1..e04b7bc 100644 --- a/po/it.po +++ b/po/it.po @@ -3,20 +3,19 @@ # This file is distributed under the same license as the xfce4-settings package. # Automatically generated, 2009. # Cristian Marchi cri.pe...@gmail.com, 2009 -# +# msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-28 17:23+0100\n +POT-Creation-Date: 2011-03-12 17:12+\n PO-Revision-Date: 2011-02-26 11:48+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n -Language-Team: Italian Translation Team xfce-it-translators@googlegroups. -com\n -Language: \n +Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=2; plural=(n != 1);\n # GLOSSARIO @@ -73,12 +72,8 @@ msgstr Disabilita i tasti appiccicosi se vengono premuti _due tasti # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 -msgid -If enabled, the session manager will start the required applications for -screen readers and magnifiers -msgstr -Se abilitata, il gestore della sessione avvierà le applicazioni necessarie -per la lettura dello schermo e per l'ingrandimento +msgid If enabled, the session manager will start the required applications for screen readers and magnifiers +msgstr Se abilitata, il gestore della sessione avvierà le applicazioni necessarie per la lettura dello schermo e per l'ingrandimento #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid K_eystroke delay: @@ -119,12 +114,8 @@ msgstr Il tempo, in millisecondi, richiesto tra due digitazioni # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid -The amount of time, in milliseconds, that must elapse before a keystroke -will be accepted -msgstr -Il tempo, in millisecondi, che deve trascorrere prima che una digitazione -venga accettata +msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted +msgstr Il tempo, in millisecondi, che deve trascorrere prima che una digitazione venga accettata #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 msgid The maximum pointer speed after acceleration @@ -132,9 +123,7 @@ msgstr La massima velocità del puntatore dopo l'accelerazione #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 msgid The ramp used to reach maximum pointer speed -msgstr -L'esponente utilizzato per il raggiungimento della massima velocità del -puntatore +msgstr L'esponente utilizzato per il raggiungimento della massima velocità del puntatore # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 @@ -143,12 +132,8 @@ msgstr Il tempo, in millisecondi, tra movimenti ripetuti # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 -msgid -The time, in milliseconds, between the initial key press and first repeated -motion event -msgstr -Il tempo, in millisecondi, tra la pressione del tasto iniziale e il primo -movimento ripetuto +msgid The time, in milliseconds, between the initial key press and first repeated motion event +msgstr Il tempo, in millisecondi, tra la pressione del tasto iniziale e il primo movimento ripetuto # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25 @@ -157,22 +142,13 @@ msgstr Il tempo, in millisecondi, prima di raggiungere la velocità massima # tooltip #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26 -msgid -To help prevent accidental keystrokes, slow keys requires that a key is held -for a certain minimum amount of time before the keystroke will be accepted -msgstr -Per prevenire le battiture accidentali, i tasti lenti richiedono che un -tasto rimanga premuto per un certo intervallo di tempo minimo prima che -l'immissione venga accettata +msgid To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted +msgstr Per prevenire le battiture accidentali, i tasti lenti richiedono che un tasto rimanga premuto per un certo intervallo di tempo minimo prima che l'immissione venga accettata # tooltip #:
[Xfce4-commits] postler:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 86b873ef034494da8acd2eae55071f1f8ae6e242 (commit) from efcd9ca3174614e1de2e62d76b915c45c0199e08 (commit) commit 86b873ef034494da8acd2eae55071f1f8ae6e242 Author: Cristian Marchi cri.pe...@gmail.com Date: Sat Mar 12 21:41:21 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 264 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 589 ++ 1 files changed, 323 insertions(+), 266 deletions(-) diff --git a/po/it.po b/po/it.po index e20c6d9..299dc57 100644 --- a/po/it.po +++ b/po/it.po @@ -2,22 +2,22 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# +# msgid msgstr Project-Id-Version: Postler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-26 11:17+\n +POT-Creation-Date: 2011-03-12 17:18+\n PO-Revision-Date: 2011-02-26 13:39+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -X-Poedit-Country: ITALY\n Language: Italian\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Italian\n +X-Poedit-Country: ITALY\n #: ../data/postler.desktop.in.h:1 msgid Lean mail interface @@ -27,14 +27,12 @@ msgstr Un'agile interfaccia per le mail msgid Mail reader msgstr Lettore di mail -#: ../data/postler.desktop.in.h:3 -#: ../postler/postler-reader.vala:42 +#: ../data/postler.desktop.in.h:3 ../postler/postler-reader.vala:42 msgid Postler msgstr Postler -#: ../postler/postler-accounts.vala:70 -#: ../postler/postler-accounts.vala:197 -#: ../postler/postler-service.vala:213 +#: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:202 +#: ../postler/postler-folders.vala:490 ../postler/postler-service.vala:220 msgid Inbox msgstr In arrivo @@ -63,176 +61,201 @@ msgstr Archivio msgid Junk msgstr Indesiderata -#: ../postler/postler-accounts.vala:168 +#: ../postler/postler-accounts.vala:173 msgid Failed to find a root certificate file. msgstr Impossibile trovare il file del certificato di root. -#: ../postler/postler-accounts.vala:202 +#: ../postler/postler-accounts.vala:207 msgid Config folder couldn't be created. msgstr La cartella di configurazione non può essere creata. -#: ../postler/postler-accounts.vala:325 +#: ../postler/postler-accounts.vala:332 #, c-format msgid Failed to remove \%s\ msgstr Impossibile rimuovere %s -#: ../postler/postler-accounts.vala:400 +#: ../postler/postler-accounts.vala:409 #, c-format msgid Invalid type \%s\ msgstr Tipo \%s\ non valido #. i18n: File was found but can't contains invalid values -#: ../postler/postler-accounts.vala:404 +#: ../postler/postler-accounts.vala:413 #, c-format msgid Failed to parse account in \%s\: %s msgstr Impossibile analizzare l'account in \%s\: %s -#: ../postler/postler-accounts.vala:441 +#: ../postler/postler-accounts.vala:450 msgid Cache folder couldn't be created. msgstr La cartella della cache non può essere creata. -#: ../postler/postler-accounts.vala:451 +#: ../postler/postler-accounts.vala:460 msgid This type can't receive mail. msgstr Questo tipo non può ricevere mail -#: ../postler/postler-accounts.vala:468 +#: ../postler/postler-accounts.vala:477 msgid No SSL certificates available msgstr Nessun certificato SSL disponibile -#: ../postler/postler-accounts.vala:473 +#: ../postler/postler-accounts.vala:482 msgid Invalid address msgstr Indirizzo non valido -#: ../postler/postler-accounts.vala:483 -#: ../postler/postler-accounts.vala:485 +#: ../postler/postler-accounts.vala:492 ../postler/postler-accounts.vala:494 msgid Hostname is missing msgstr Manca il nome host -#: ../postler/postler-accounts.vala:487 +#: ../postler/postler-accounts.vala:496 msgid Username is missing msgstr Manca il nome utente -#: ../postler/postler-accounts.vala:489 +#: ../postler/postler-accounts.vala:498 msgid Password is missing msgstr Manca la apssword -#: ../postler/postler-accounts.vala:588 -#: ../postler/postler-accounts.vala:606 -#: ../postler/postler-accounts.vala:626 +#: ../postler/postler-accounts.vala:602 ../postler/postler-accounts.vala:620 +#: ../postler/postler-accounts.vala:640 #, c-format msgid Account \%s\ can't receive mail. msgstr L'account \%s\ non può ricevere mail -#: ../postler/postler-accounts.vala:609 -#: ../postler/postler-accounts.vala:629 +#: ../postler/postler-accounts.vala:623 ../postler/postler-accounts.vala:643 msgid Mail folder couldn't be created. msgstr La cartella delle mail non può essere creata. -#: ../postler/postler-accountsetup.vala:61 +#: ../postler/postler-accountsetup.vala:63 msgid _Header
[Xfce4-commits] midori:master Enforce private/ app windows to be in normal state
Updating branch refs/heads/master to d02b234626515e50c91c510e765037cdae30ca82 (commit) from 1bedc8a76cb95f6f37dc606a101136e127a25225 (commit) commit d02b234626515e50c91c510e765037cdae30ca82 Author: Christian Dywan christ...@twotoasts.de Date: Sat Mar 12 21:27:58 2011 +0100 Enforce private/ app windows to be in normal state midori/main.c |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/midori/main.c b/midori/main.c index a08a4c0..365bee6 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1999,7 +1999,12 @@ main (intargc, NULL); midori_browser_set_action_visible (browser, Menubar, FALSE); } -g_object_set (settings, show-panel, FALSE, NULL); +g_object_set (settings, show-panel, FALSE, + last-window-state, MIDORI_WINDOW_NORMAL, + #if WEBKIT_CHECK_VERSION (1, 1, 2) + enable-private-browsing, TRUE, + #endif + NULL); midori_browser_set_action_visible (browser, Tools, FALSE); midori_browser_set_action_visible (browser, Panel, FALSE); g_object_set (browser, settings, settings, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Always save settings when quitting the browser
Updating branch refs/heads/master to 3d15c22b0b62d4aa69c5fea433e70268e44df042 (commit) from d02b234626515e50c91c510e765037cdae30ca82 (commit) commit 3d15c22b0b62d4aa69c5fea433e70268e44df042 Author: Christian Dywan christ...@twotoasts.de Date: Sat Mar 12 22:10:35 2011 +0100 Always save settings when quitting the browser midori/main.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/midori/main.c b/midori/main.c index 365bee6..e4ca398 100644 --- a/midori/main.c +++ b/midori/main.c @@ -2347,6 +2347,8 @@ main (intargc, gtk_main (); settings = katze_object_get_object (app, settings); +settings_notify_cb (settings, NULL, app); + g_object_get (settings, maximum-history-age, max_history_age, NULL); midori_history_terminate (history, max_history_age); /* Removing KatzeHttpCookies makes it save outstanding changes */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Update translators, week 10.
Updating branch refs/heads/master to d64699be8189394fcb687289ee9251b49a667307 (commit) from 84faa646168dd1aad5c163f358f3ad64db6fe509 (commit) commit d64699be8189394fcb687289ee9251b49a667307 Author: Transifex norep...@xfce.org Date: Sun Mar 13 00:00:05 2011 +0100 Update translators, week 10. xfce4-about/translators.h |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index 60067f8..c7cbd27 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#define TRANSLATORS_H_STAMP 2011-03-06 00:00:09 +#define TRANSLATORS_H_STAMP 2011-03-13 00:00:05 #define ATSIGN @ #define DOTSIGN . @@ -147,6 +147,7 @@ static const TranslatorInfo xfce_translators_es[] = { Abel Martín, abel DOTSIGN martin DOTSIGN ruiz ATSIGN gmail DOTSIGN com, TRUE }, { Javier Sánchez Reinosa, donoban ATSIGN gmail DOTSIGN com, FALSE }, { Ignacio Velasco, elega ATSIGN elega DOTSIGN com DOTSIGN ar, FALSE }, + { Gonzalo Lagos, xalo DOTSIGN em ATSIGN gmail DOTSIGN com, FALSE }, { NULL, NULL } }; @@ -427,6 +428,7 @@ static const TranslatorInfo xfce_translators_tr[] = { Ozan Türkyılmaz, ozan DOTSIGN turkyilmaz ATSIGN gmail DOTSIGN com, FALSE }, { Özgür Kuru, ozgur ATSIGN ozgurkuru DOTSIGN net, FALSE }, { Samed Beyribey, beyribey ATSIGN gmail DOTSIGN com, FALSE }, + { Server Acim, serveracim ATSIGN gmail DOTSIGN com, FALSE }, { Utku Aydın, utkuaydin ATSIGN archlinux DOTSIGN org DOTSIGN tr, FALSE }, { NULL, NULL } }; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] cafe:master Allow general member information to be changed.
Updating branch refs/heads/master to ac13008b9fac334cddd47a95bca2b413b51ca396 (commit) from 02f3c9e8130180058284883c4ac75a58b84c06f9 (commit) commit ac13008b9fac334cddd47a95bca2b413b51ca396 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Mar 13 02:16:14 2011 +0100 Allow general member information to be changed. examples/xfce-foundation/config.ru | 24 lib/controllers/members.rb | 30 -- lib/views/member.erb | 17 ++--- lib/views/stylesheet.sass | 15 --- 4 files changed, 62 insertions(+), 24 deletions(-) diff --git a/examples/xfce-foundation/config.ru b/examples/xfce-foundation/config.ru index 54d165f..9fabfdb 100644 --- a/examples/xfce-foundation/config.ru +++ b/examples/xfce-foundation/config.ru @@ -20,22 +20,22 @@ require '../../lib/cafe' # create dummy users user = Cafe::Models::Member.first_or_create( - :fullname = 'Christoph Wickert', - :email = 'christoph.wick...@googlemail.com', - :password = 'test', - :address = 'Foo 123 -D12393 Wherever + { :email = 'christoph.wick...@googlemail.com' }, + { :fullname = 'Christoph Wickert', +:password = 'test', +:address = 'Foo 123 +D-12393 Wherever Germany', - :member_since = '2011-02-06' +:member_since = '2011-02-06' } ) user.save user = Cafe::Models::Member.first_or_create( - :fullname = 'Jannis Pohlmann', - :email = 'jan...@xfce.org', - :password = 'test', - :address = 'Foo 123 -23123 Lübeck', - :member_since = '2011-02-06' + { :email = 'jan...@xfce.org' }, + { :fullname = 'Jannis Pohlmann', +:password = 'test', +:address = 'Foo 123 +23123 Lübeck', +:member_since = '2011-02-06' } ) user.save diff --git a/lib/controllers/members.rb b/lib/controllers/members.rb index 2f1f8d3..c8f191c 100644 --- a/lib/controllers/members.rb +++ b/lib/controllers/members.rb @@ -11,13 +11,39 @@ module Cafe app.get '/member/:id' do authorization_required - @member = Member.first(params[:id]) + @member = Member.get(params[:id]) view :member end app.post '/member/:id/information' do authorization_required - @member = Member.first(params[:id]) + @member = Member.get(params[:id]) + + error_set(:fullname, 'No name specified') if params[:fullname].empty? + error_set(:email, 'No email address specified') if params[:email].empty? + error_set(:address, 'No address specified') if params[:address].empty? + error_set(:member_since, 'No membership start date specified') if params[:member_since].empty? + + unless params[:new_password_repeat].empty? +if params[:new_password] != params[:new_password_repeat] + error_set(:new_password, 'Passwords did not match') +end + end + + unless error_set? +@member.fullname = params[:fullname] +@member.email = params[:email] +@member.address = params[:address] +@member.member_since = params[:member_since] +unless params[:new_password_repeat].empty? + @member.password = params[:new_password] +end +@member.save + +redirect '/members' + end + + view :member end end diff --git a/lib/views/member.erb b/lib/views/member.erb index 5f54f8f..8f8fccc 100644 --- a/lib/views/member.erb +++ b/lib/views/member.erb @@ -5,31 +5,34 @@ p label for=fullnameFull name:/label input type=text id=fullname name=fullname value=%= @member.fullname %/ + % if error(:fullname) %span class=error%= error(:fullname) %/span% end % /p p label for=emailEmail address:/label input type=text id=email name=email value=%= @member.email %/ + % if error(:email) %span class=error%= error(:email) %/span% end % /p p - label for=emailEmail address:/label - input type=text id=email name=email value=%= @member.email %/ + label for=addressAddress:/label + textarea id=address name=address%= @member.address %/textarea /p +% if error(:address) %p class=errorspan class=placeholdernbsp;/span%= error(:address) %/p% end % p label for=new_passwordPassword:/label input type=password id=new_password name=new_password value=/ + % if error(:new_password) %span class=error%= error(:new_password) %/span% end % /p p label for=new_passwordPassword (confirmation):/label input type=password id=new_password_repeat name=new_password_repeat value=/ -/p -p - label for=addressAddress:/label - textarea id=address name=address style=height:10em;%= @member.address %/textarea + % unless params.has_key?(:new_password) % +span class=infoLeave empty for no password change/span + % end % /p p label
[Xfce4-commits] cafe:master Add an incomplete TODO list.
Updating branch refs/heads/master to 58f83bfabc983ff5bcbf852bc205b39fd4431ffa (commit) from ac13008b9fac334cddd47a95bca2b413b51ca396 (commit) commit 58f83bfabc983ff5bcbf852bc205b39fd4431ffa Author: Jannis Pohlmann jan...@xfce.org Date: Sun Mar 13 02:32:11 2011 +0100 Add an incomplete TODO list. examples/xfce-foundation/TODO | 50 + 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/examples/xfce-foundation/TODO b/examples/xfce-foundation/TODO new file mode 100644 index 000..d433668 --- /dev/null +++ b/examples/xfce-foundation/TODO @@ -0,0 +1,50 @@ +Cafe TODO += + + +Member Management +- + + * Allow member roles to be edited. + + * Allow membership status to be changed between active, inactive and +supporting membership. + + * Allow membership to be revoked (with the option to change opinion). +This feature needs to send mails to the board of directors whenever +the opinion is changed. We also need a check that rejects +membership termination during the last four weeks of the year. + + * Allow people to edit their own member information and membership +status (to the degree they are permitted by the statutes). + + +Meetings + + + * Allow meetings to be created by board members. Meetings may be +restricted to members with certain roles and membership states. +Meetings can be created, edited, opened and closed. + + * Allow members allowed to participate in a meeting to sign in to +an existing meeting. + + * Add management of items to be discussed at a meeting. Each meeting +has a deadline for item proposals. Members allowed by the statutes +to propose items may propose items before this deadline. + + * Add management of notes for each discussion item. + + * Add management of polls for each discussion item. Members allowed +to vote have one or more votes (depending on whether they were +assigned additional votes by non-participating members). Polls can +be created, opened, voted on and closed. Polls are multiple-choice +with only one choice possible per vote. + + * Add management of actions for each discussion item. Actions only +have a description and can be created, edited and removed. + + * Once a meeting is closed, allow for a summary to be created so +that we can post it on the wiki and on mailing lists. + +... to be continued ... ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 0d35f97d01b37b3fcec2fd5dcfcb32cd2fa055d6 (commit) from 3d15c22b0b62d4aa69c5fea433e70268e44df042 (commit) commit 0d35f97d01b37b3fcec2fd5dcfcb32cd2fa055d6 Author: Sergio Marques smarque...@gmail.com Date: Sun Mar 13 03:18:04 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 676 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 122 +++--- 1 files changed, 69 insertions(+), 53 deletions(-) diff --git a/po/pt.po b/po/pt.po index dd084c2..ee9c45b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: midori\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-09 17:16+\n +POT-Creation-Date: 2011-03-12 23:17+\n PO-Revision-Date: \n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: Portuguese\n @@ -119,7 +119,7 @@ msgstr Restaurar últi_ma sessão msgid Disable all _extensions msgstr Desativar todas as _extensões -#: ../midori/main.c:1215 ../midori/main.c:2162 +#: ../midori/main.c:1215 ../midori/main.c:2167 #, c-format msgid The session couldn't be loaded: %s\n msgstr A sessão não foi carregada: %s\n @@ -230,34 +230,34 @@ msgstr \Cookies Flash\ msgid HTML5 _Databases msgstr Bases de _dados HTML5 -#: ../midori/main.c:2043 +#: ../midori/main.c:2048 msgid The specified configuration folder is invalid. msgstr A pasta de configuração especificada é inválida. -#: ../midori/main.c:2091 +#: ../midori/main.c:2096 msgid An instance of Midori is already running but not responding.\n msgstr Já está ativa uma instância de Midori mas que não está a responder.\n -#: ../midori/main.c:2129 +#: ../midori/main.c:2134 #, c-format msgid Bookmarks couldn't be loaded: %s\n msgstr Os marcadores não foram carregados: %s\n -#: ../midori/main.c:2177 +#: ../midori/main.c:2182 #, c-format msgid The trash couldn't be loaded: %s\n msgstr O lixo não foi carregado: %s\n -#: ../midori/main.c:2190 +#: ../midori/main.c:2195 #, c-format msgid The history couldn't be loaded: %s\n msgstr O histórico não foi carregado: %s\n -#: ../midori/main.c:2212 +#: ../midori/main.c:2217 msgid The following errors occured: msgstr Ocorreram os seguintes erros: -#: ../midori/main.c:2228 +#: ../midori/main.c:2233 msgid _Ignore msgstr _Ignorar @@ -422,7 +422,7 @@ msgid Open in New _Tab msgstr Abrir em novo _separador #: ../midori/midori-browser.c:3931 ../midori/midori-view.c:2650 -#: ../midori/midori-view.c:4398 ../panels/midori-bookmarks.c:768 +#: ../midori/midori-view.c:4441 ../panels/midori-bookmarks.c:768 #: ../panels/midori-history.c:737 ../extensions/feed-panel/feed-panel.c:538 msgid Open in New _Window msgstr Abrir em nova _janela @@ -1087,11 +1087,11 @@ msgstr Falha ao executar o relatório da base de dados:\n msgid Paste and p_roceed msgstr Cola_r e prosseguir -#: ../midori/midori-locationaction.c:1822 +#: ../midori/midori-locationaction.c:1825 msgid Not verified msgstr Não verificada -#: ../midori/midori-locationaction.c:1833 +#: ../midori/midori-locationaction.c:1840 msgid Verified and encrypted connection msgstr Ligação verificada e encriptada @@ -1684,8 +1684,8 @@ msgstr %s pretende saber a sua localização. #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1411 ../midori/midori-view.c:4833 -#: ../midori/midori-view.c:4837 +#: ../midori/midori-view.c:1411 ../midori/midori-view.c:4876 +#: ../midori/midori-view.c:4880 #, c-format msgid Error - %s msgstr Erro - %s @@ -1779,134 +1779,142 @@ msgstr _Pesquisar na web msgid Open Address in New _Tab msgstr Abrir endereço em novo _separador -#: ../midori/midori-view.c:2900 +#: ../midori/midori-view.c:2907 msgid Open or download file msgstr Abrir ou transferir ficheiro -#: ../midori/midori-view.c:2920 +#: ../midori/midori-view.c:2926 #, c-format msgid File Type: '%s' msgstr Tipo de ficheiro: '%s' -#: ../midori/midori-view.c:2923 +#: ../midori/midori-view.c:2928 #, c-format msgid File Type: %s ('%s') msgstr Tipo de ficheiro: %s ('%s') +#: ../midori/midori-view.c:2943 +msgid MD5-Checksum: +msgstr Código MD5: + +#: ../midori/midori-view.c:2950 +msgid SHA1-Checksum: +msgstr Código SHA1: + #. i18n: A file open dialog title, ie. Open http://fila.com/manual.tgz; -#: ../midori/midori-view.c:2927 +#: ../midori/midori-view.c:2960 #, c-format msgid Open %s msgstr Abrir %s -#: ../midori/midori-view.c:3493 +#: ../midori/midori-view.c:3536 #, c-format msgid Inspect page - %s msgstr Inspecionar página - %s -#: ../midori/midori-view.c:3822 +#: ../midori/midori-view.c:3865 msgid Speed dial msgstr Ligação rápida -#: ../midori/midori-view.c:3823 +#: ../midori/midori-view.c:3866
[Xfce4-commits] xfdesktop:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to aca74ad3440ebe8626829bb8fbde956143920019 (commit) from 1ff37ee95a1b8a443461546cdc3bce3e07a0103c (commit) commit aca74ad3440ebe8626829bb8fbde956143920019 Author: 微 尘 yjwork.x...@gmail.com Date: Sun Mar 13 06:20:35 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 306 --- 1 files changed, 124 insertions(+), 182 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 05e1110..373cfd5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,14 +11,14 @@ msgid msgstr Project-Id-Version: xfdesktop 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:44+0100\n +POT-Creation-Date: 2011-03-13 05:13+\n PO-Revision-Date: 2010-11-27 22:17+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese xfce-i...@xfce.org\n -Language: zh\n MIME-Version: 1.1\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: zh\n #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 #, c-format @@ -26,7 +26,7 @@ msgid Backdrop list file is not valid msgstr 背景列表文件名无效 #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid %s\n @@ -35,127 +35,126 @@ msgstr %s\n i尺寸: %dx%d/i -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid Home msgstr Home -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid Filesystem msgstr 文件系统 -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid Trash msgstr 回收站 -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid Removable Devices msgstr 可移动设备 -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid Cannot create backdrop list \%s\ msgstr 无法创建背景列表 \%s\ -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid Backdrop List Error msgstr 背景列表错误 -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid Create/Load Backdrop List msgstr 创建/加载背景列表 -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format -msgid -File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? +msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? msgstr “%s”是无效背景列表文件,要覆盖吗? -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid Invalid List File msgstr 无效列表文件 -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid Overwriting the file will cause its contents to be lost. msgstr 覆盖后以前文件的内容将丢失。 -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid Replace msgstr 替换 -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid Failed to write backdrop list to \%s\ msgstr 无法将背景列表写入 \%s\。 -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid Add Image File(s) msgstr 添加图像文件(s) -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid Image files msgstr 图像文件 -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid All files msgstr 所有文件 -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid Screen %d, Monitor %d (%s) msgstr 屏幕 %d,显示器 %d (%s) -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid Screen %d, Monitor %d msgstr 屏幕 %d,显示器 %d -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid Screen %d msgstr 屏幕 %d -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid Monitor %d (%s) msgstr 显示器 %d (%s) -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid Monitor %d msgstr 显示器 %d -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid Settings manager socket msgstr 设置管理器套接字 -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid SOCKET ID msgstr 套接字 ID -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid Version information msgstr 版本信息 -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid Type '%s --help' for usage. msgstr '%s --help' 可列出使用方法。 -#: ../settings/main.c:1510 +#: ../settings/main.c:1533 msgid The Xfce development team. All rights reserved. msgstr Xfce 开发团队,版权所有。 -#: ../settings/main.c:1511 +#: ../settings/main.c:1534 #, c-format msgid Please report bugs to %s. msgstr 请向 %s 报告程序错误。 -#: ../settings/main.c:1518 +#: ../settings/main.c:1541 msgid Desktop Settings msgstr 桌面设置 -#: ../settings/main.c:1520 +#: ../settings/main.c:1543 msgid Unable to contact settings server msgstr 无法连到设置服务器 @@ -265,8 +264,7 @@ msgid Specifies the \right\ or \bottom\ color of the gradient msgstr 指定渐变区右边或下边的颜色
[Xfce4-commits] xfce4-panel:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 3f0e31544377e31b0cee78e24e3a139711b7eda2 (commit) from 431d5269c43a052ca5eb2e9a3a0fb934b36a5a71 (commit) commit 3f0e31544377e31b0cee78e24e3a139711b7eda2 Author: 微 尘 yjwork.x...@gmail.com Date: Sun Mar 13 06:37:12 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 345 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 224 ++ 1 files changed, 85 insertions(+), 139 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 863e872..3e47acd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,18 +13,17 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:01+0100\n +POT-Creation-Date: 2011-03-13 05:11+\n PO-Revision-Date: 2010-11-27 21:07+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Simplified Chinese xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../panel-desktop-handler.desktop.in.h:1 -msgid -Add a new launcher to the panel based on the information of this desktop file +msgid Add a new launcher to the panel based on the information of this desktop file msgstr 基于此 desktop 文件中的信息在面板上添加一个新的启动器 #: ../panel-desktop-handler.desktop.in.h:2 @@ -36,7 +35,7 @@ msgid Customize the panel msgstr 定制面板 #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2263 #: ../migrate/main.c:84 msgid Panel msgstr 面板 @@ -46,9 +45,7 @@ msgid _Read Online msgstr 在线阅读(_R) #: ../common/panel-utils.c:156 -msgid -You can read the user manual online. This manual may however not exactly -match your panel version. +msgid You can read the user manual online. This manual may however not exactly match your panel version. msgstr 你可以在线阅读用户手册。但本手册未必完全适合您当前面板的版本。 #: ../common/panel-utils.c:158 @@ -82,17 +79,17 @@ msgid Pane_l msgstr 面板(_L) #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2275 msgid Add _New Items... msgstr 添加新项目(_N)... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2286 msgid Panel Pr_eferences... msgstr 面板属性(_E)... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2302 msgid Log _Out msgstr 登出(_O) @@ -192,48 +189,39 @@ msgid Failed to send D-Bus message msgstr 发送 D-Bus 信息失败 #: ../panel/main.c:405 -msgid -Do you want to start the panel? If you do, make sure you save the session on -logout, so the panel is automatically started the next time you login. -msgstr -您是否想启动面板程序?如果是的话,请在注销时确认您保存了当前的会话状态,如此 -面板程序将会在您下次登录时自动启动。 +msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. +msgstr 您是否想启动面板程序?如果是的话,请在注销时确认您保存了当前的会话状态,如此面板程序将会在您下次登录时自动启动。 #: ../panel/main.c:408 ../panel/main.c:422 #, c-format msgid No running instance of %s was found msgstr 没有 %s 的运行实例被发现 -#: ../panel/panel-application.c:196 +#: ../panel/panel-application.c:195 msgid Failed to launch the migration application msgstr 无法启动迁移程序 -#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 -msgid -You have started X without session manager. Clicking Quit will close the X -server. +#: ../panel/panel-application.c:1451 ../plugins/actions/actions.c:421 +msgid You have started X without session manager. Clicking Quit will close the X server. msgstr 您没有使用任何的会话管理器来启动 X。点击退出将会关闭 X 服务器。 -#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1452 ../plugins/actions/actions.c:422 msgid Are you sure you want to quit the panel? msgstr 你确认要退出面板程序吗? -#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1460 ../plugins/actions/actions.c:430 #, c-format msgid Failed to execute command \%s\ msgstr 无法执行命令 \%s\ -#: ../panel/panel-dbus-client.c:209 -msgid -Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]. +#: ../panel/panel-dbus-client.c:208 +msgid Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]. msgstr 指定的插件事件语法不正确。请使用 插件名:事件名[:类型:值]。 -#: ../panel/panel-dbus-client.c:242 +#: ../panel/panel-dbus-client.c:241 #, c-format -msgid -Invalid hint type \%s\. Valid types are bool, double, int, string and uint. -msgstr -\%s\ 不是一个有效类型。有效的类型包括 bool、double、int、string 和 uint。
[Xfce4-commits] thunar-volman:master l10n: Updated Chinese (China) (zh_CN) translation to 80%
Updating branch refs/heads/master to 8b03198f5823704501510862ee9ed0fa8aef4f94 (commit) from 96bd412f31f75af722679c06e07551a9102f0df4 (commit) commit 8b03198f5823704501510862ee9ed0fa8aef4f94 Author: 微 尘 yjwork.x...@gmail.com Date: Sun Mar 13 07:21:45 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 80% New status: 93 messages complete with 9 fuzzies and 14 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 105 --- 1 files changed, 43 insertions(+), 62 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c18ccb5..c014bc0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,24 +3,23 @@ # This file is distributed under the same license as the thunar-volman package. # Jiahua Huang jhuangjia...@gmail.com, 2009. # Hunt Xu hun...@live.cn, 2009. -# +# msgid msgstr Project-Id-Version: thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:51+0100\n +POT-Creation-Date: 2010-11-07 14:39+0100\n PO-Revision-Date: 2009-06-16 13:00+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../thunar-volman/main.c:59 -#, fuzzy msgid The syfs path of the newly added device -msgstr 新插入的 HAL 设备 UDI +msgstr 新添加的设备的 sysf 路径 #: ../thunar-volman/main.c:60 #: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 @@ -33,28 +32,28 @@ msgid Print version information and exit msgstr 打印版本信息并退出 #. setup application name -#: ../thunar-volman/main.c:93 +#: ../thunar-volman/main.c:96 msgid Thunar Volume Manager msgstr Thunar 卷管理器 -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:135 msgid All rights reserved. -msgstr +msgstr 保留所有权利。 -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:136 #, c-format msgid Please report bugs to %s. msgstr 请报告 bug 至 %s。 -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:190 #, c-format msgid There is no device with the sysfs path \%s\ -msgstr +msgstr 没有 sysfs 路径为 \%s\ 的设备 -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:202 +#, c-format msgid Must specify the sysfs path of new devices with --device-added -msgstr 必须使用 --device-added 来指定新的 HAL 设备 UDI +msgstr 必须使用 --device-added 来指定新设备的 sysfs 路径 #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -62,9 +61,8 @@ msgid Photos and Music msgstr 照片和音乐 #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid Photos were found on your portable music player -msgstr 在您的音乐播放器里找到相片。 +msgstr 在您的便携式音乐播放器里找到相片 #: ../thunar-volman/tvm-block-device.c:206 msgid Would you like to import the photos or manage the music? @@ -95,14 +93,11 @@ msgid Photo Import msgstr 照片导入 #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid A photo card has been detected -msgstr 检测到照片存储卡。 +msgstr 检测到照片存储卡 #: ../thunar-volman/tvm-block-device.c:275 -msgid -There are photos on the card. Would you like to add these photos to your -album? +msgid There are photos on the card. Would you like to add these photos to your album? msgstr 存储卡中有照片。是否添加到相册? #. prompt the user to execute the file @@ -148,56 +143,54 @@ msgstr 打开(_O) #: ../thunar-volman/tvm-block-device.c:619 msgid CD mounted -msgstr +msgstr CD 已挂载 #: ../thunar-volman/tvm-block-device.c:619 msgid DVD mounted -msgstr +msgstr DVD 已挂载 #: ../thunar-volman/tvm-block-device.c:621 msgid The CD was mounted automatically -msgstr +msgstr 该 CD 已自动挂载 #: ../thunar-volman/tvm-block-device.c:622 msgid The DVD was mounted automatically -msgstr +msgstr 该 DVD 已自动挂载 #: ../thunar-volman/tvm-block-device.c:632 msgid Volume mounted -msgstr +msgstr 卷已挂载 #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid The volume \%s\ was mounted automatically -msgstr +msgstr \%s\ 卷已被自动挂载 #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid The inserted volume was mounted automatically -msgstr +msgstr 插入卷已自动挂载 #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid Unable to locate mount point -msgstr +msgstr 无法定位挂载点 #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid Unable to mount the device -msgstr +msgstr 无法挂载该设备 #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid Could not detect the volume corresponding to the device -msgstr +msgstr 无法检测到该卷所对应的设备 #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid Audio/Data CD msgstr 音乐/数据 CD #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid The CD in the drive contains both music and files msgstr 驱动器中的 CD 同时包含音乐和文件。 @@ -216,38 +209,34 @@ msgstr 播放 CD(_P) #: ../thunar-volman/tvm-block-device.c:919 #, c-format msgid Unknown block device type -msgstr +msgstr 未知的块设备类型 #:
[Xfce4-commits] thunar-volman:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 323c34372700bffbd8e6c660b6be7ebd0e078385 (commit) from 8b03198f5823704501510862ee9ed0fa8aef4f94 (commit) commit 323c34372700bffbd8e6c660b6be7ebd0e078385 Author: 微 尘 yjwork.x...@gmail.com Date: Sun Mar 13 07:35:29 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 116 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 51 +-- 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c014bc0..376e05d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -241,38 +241,37 @@ msgstr 检测到平板 #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid A graphics tablet was detected -msgstr +msgstr 检测到一块绘图板 #: ../thunar-volman/tvm-input-device.c:110 msgid input-mouse -msgstr +msgstr 鼠标输入 #: ../thunar-volman/tvm-input-device.c:111 msgid Mouse detected -msgstr +msgstr 检测到鼠标 #: ../thunar-volman/tvm-input-device.c:112 msgid A mouse was detected -msgstr +msgstr 检测到一个鼠标 #: ../thunar-volman/tvm-input-device.c:141 #, c-format msgid Unsupported input device type -msgstr +msgstr 不支持的输入设备类型 #: ../thunar-volman/tvm-run.c:171 #, c-format msgid Autoburning of blank CDs and DVDs is disabled -msgstr +msgstr 自动刻录空白 CD 和 DVD 的功能被禁用 #: ../thunar-volman/tvm-run.c:189 msgid Blank DVD inserted -msgstr +msgstr 空白 DVD 被插入 #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid You have inserted a blank DVD. -msgstr 您插入了一张空白光盘。 +msgstr 您插入了一张空白 DVD。 #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid What would you like to do? @@ -280,65 +279,59 @@ msgstr 接下来您要做什么? #: ../thunar-volman/tvm-run.c:193 msgid Burn _DVD -msgstr +msgstr 刻录 DVD (_D) #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid Blank CD inserted -msgstr 空白 CD 与 DVD +msgstr 空白 CD 被插入 #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid You have inserted a blank CD. -msgstr 您插入了一张空白光盘。 +msgstr 您插入了一张空白 CD。 #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid Burn _Data CD -msgstr 制作数据 CD(_D) +msgstr 刻录数据 CD(_D) #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid Burn _Audio CD -msgstr 制作音乐 CD(_A) +msgstr 刻录音乐 CD(_A) #: ../thunar-volman/tvm-run.c:229 #, c-format msgid The burn command may not be empty -msgstr +msgstr 刻录指令不能为空 #: ../thunar-volman/tvm-run.c:268 #, c-format msgid The CD player command is undefined -msgstr +msgstr CD 播放命令未指定 #: ../thunar-volman/tvm-usb-device.c:62 msgid Camera detected -msgstr +msgstr 检测到相机 #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid A photo camera was detected -msgstr 检测到照片存储卡。 +msgstr 检测到一台照相机 #: ../thunar-volman/tvm-usb-device.c:71 msgid Printer detected -msgstr +msgstr 检测到打印机 #: ../thunar-volman/tvm-usb-device.c:72 msgid A USB printer was detected -msgstr +msgstr 检测到一台 USB 打印机 #: ../thunar-volman/tvm-usb-device.c:100 #, c-format msgid Unsupported USB device type -msgstr +msgstr 不支持的 USB 设备类型 #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid Thunar Volume Manager Settings -msgstr Thunar 卷管理器 +msgstr Thunar 卷管理设置 #: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 @@ -522,7 +515,6 @@ msgid Keyboards msgstr 键盘 #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid Automatically run a program when an USB _keyboard is connected msgstr USB 键盘连接后自动运行程序(_K) @@ -531,7 +523,6 @@ msgid Mice msgstr 鼠标 #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid Automatically run a program when an USB _mouse is connected msgstr USB 鼠标连接后自动运行程序(_M) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 4ffd7417645bef38fd6792c1f83ade1b8f20dff3 (commit) from 323c34372700bffbd8e6c660b6be7ebd0e078385 (commit) commit 4ffd7417645bef38fd6792c1f83ade1b8f20dff3 Author: 微 尘 yjwork.x...@gmail.com Date: Sun Mar 13 07:50:16 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 116 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 45 - 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 376e05d..5a91638 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the thunar-volman package. # Jiahua Huang jhuangjia...@gmail.com, 2009. # Hunt Xu hun...@live.cn, 2009. -# +# msgid msgstr Project-Id-Version: thunar-volman\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2010-11-07 14:39+0100\n -PO-Revision-Date: 2009-06-16 13:00+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +PO-Revision-Date: 2011-03-13 14:50+0800\n +Last-Translator: 微尘 sque...@189.cn\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -73,7 +73,8 @@ msgstr 您是想要导入相片还是管理音乐? #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 +#: ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid Ig_nore msgstr 忽略(_N) @@ -231,12 +232,12 @@ msgstr 已检测一组键盘。 #: ../thunar-volman/tvm-input-device.c:86 #: ../thunar-volman/tvm-input-device.c:100 msgid input-tablet -msgstr 平板输入 +msgstr 写字板输入 #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid Tablet detected -msgstr 检测到平板 +msgstr 检测到写字板 #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 @@ -273,7 +274,8 @@ msgstr 空白 DVD 被插入 msgid You have inserted a blank DVD. msgstr 您插入了一张空白 DVD。 -#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 +#: ../thunar-volman/tvm-run.c:202 msgid What would you like to do? msgstr 接下来您要做什么? @@ -367,7 +369,7 @@ msgid Shell Scripts msgstr Shell 脚本 #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid Storage msgstr 存储设备 @@ -413,7 +415,7 @@ msgid Command for A_udio CDs: msgstr 刻录音乐 CD 的程序(_U): #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid Multimedia msgstr 多媒体 @@ -458,7 +460,7 @@ msgid Play _music files when connected msgstr 连接后播放音乐(_M) #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid Cameras msgstr 相机 @@ -472,7 +474,7 @@ msgid Import digital photographs when connected msgstr 连接后导入照片 #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid PDAs msgstr PDA @@ -494,7 +496,7 @@ msgid Sync Pocket P_C devices when connected msgstr 连接时同步 Pocket PC 设备(_C) #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid Printers @@ -505,7 +507,7 @@ msgid Automatically run a program when a _printer is connected msgstr 打印机连接后自动运行程序(_P) #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid Input Devices msgstr 输入设备 @@ -544,51 +546,36 @@ msgstr 打开文件浏览器失败 #~ msgid Failed to open display #~ msgstr 打开显示失败 - #~ msgid The Thunar development team. All rights reserved. #~ msgstr Thunar 开发团队。版权所有。 - #~ msgid Written by Benedikt Meurer be...@xfce.org. #~ msgstr 作者: Benedikt Meurer be...@xfce.org。 - #~ msgid The specified UDI \%s\ is not a valid HAL device UDI #~ msgstr 指定的 UDI \%s\ 并非有效的 HAL 设备 UDI - #~ msgid Encrypted volume #~ msgstr 加密卷 - #~ msgid span weight=\bold\ size=\larger\Mounting encrypted volume.../span #~ msgstr span weight=\bold\ size=\larger\正在挂载加密卷.../span - #~ msgid Setting up the crypto layer... #~ msgstr 正在设置加密层... - #~ msgid You are not privileged to setup the crypto layer #~ msgstr 您没有权限设置加密层 - #~ msgid Wrong password #~ msgstr 密码错误 - #~ msgid span weight=\bold\ size=\larger\Wrong password./span #~ msgstr span weight=\bold\ size=\larger\密码错误。/span - #~ msgid span weight=\bold\ size=\larger\This volume is encrypted./span #~ msgstr span weight=\bold\ size=\larger\此卷已被加密。/span - #~ msgid Please enter your password to decrypt and mount the volume. #~ msgstr 请输入密码并挂载卷 - #~ msgid _Mount #~ msgstr 挂载(_M) - #~ msgid Failed to setup the encrypted volume #~ msgstr 设置加密卷失败 - #~ msgid Choose Disc Type #~ msgstr 选择光盘类型 - #~ msgid Make _DVD #~ msgstr 制作 DVD(_D) - #~ msgid Removable Media #~ msgstr 可移动介质 +