diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | NEWS | 50 | ||||
| -rw-r--r-- | README.win32 | 8 | ||||
| -rw-r--r-- | build/Makefile-newvs.am | 45 | ||||
| -rw-r--r-- | build/Makefile.msvcproj | 114 | ||||
| -rw-r--r-- | build/win32/Makefile.am | 12 | ||||
| -rw-r--r-- | build/win32/vs10/glib.vcxproj.filtersin | 122 | ||||
| -rw-r--r-- | build/win32/vs10/glib.vcxprojin | 675 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | docs/reference/gio/glib-compile-resources.xml | 9 | ||||
| -rw-r--r-- | gio-2.0.pc.in | 2 | ||||
| -rw-r--r-- | gio/Makefile.am | 12 | ||||
| -rw-r--r-- | gio/gaction.c | 8 | ||||
| -rw-r--r-- | gio/gactiongroup.c | 10 | ||||
| -rw-r--r-- | gio/gappinfo.c | 18 | ||||
| -rw-r--r-- | gio/gapplication.c | 16 | ||||
| -rw-r--r-- | gio/gapplicationcommandline.c | 2 | ||||
| -rw-r--r-- | gio/gasyncinitable.c | 2 | ||||
| -rw-r--r-- | gio/gbufferedinputstream.c | 6 | ||||
| -rw-r--r-- | gio/gcancellable.c | 12 | ||||
| -rw-r--r-- | gio/gcontenttype.c | 8 | ||||
| -rw-r--r-- | gio/gconverterinputstream.c | 12 | ||||
| -rw-r--r-- | gio/gconverteroutputstream.c | 8 | ||||
| -rw-r--r-- | gio/gdatagrambased.c | 2 | ||||
| -rw-r--r-- | gio/gdatainputstream.c | 28 | ||||
| -rw-r--r-- | gio/gdataoutputstream.c | 16 | ||||
| -rw-r--r-- | gio/gdbusaddress.c | 10 | ||||
| -rw-r--r-- | gio/gdbusauth.c | 24 | ||||
| -rw-r--r-- | gio/gdbusauthobserver.c | 4 | ||||
| -rw-r--r-- | gio/gdbusconnection.c | 118 | ||||
| -rw-r--r-- | gio/gdbusconnection.h | 2 | ||||
| -rw-r--r-- | gio/gdbuserror.c | 4 | ||||
| -rw-r--r-- | gio/gdbusinterface.c | 2 | ||||
| -rw-r--r-- | gio/gdbusintrospection.c | 2 | ||||
| -rw-r--r-- | gio/gdbusmessage.c | 11 | ||||
| -rw-r--r-- | gio/gdbusmethodinvocation.c | 44 | ||||
| -rw-r--r-- | gio/gdbusnameowning.c | 24 | ||||
| -rw-r--r-- | gio/gdbusnamewatching.c | 20 | ||||
| -rw-r--r-- | gio/gdbusobjectmanagerclient.c | 26 | ||||
| -rw-r--r-- | gio/gdbusobjectmanagerserver.c | 2 | ||||
| -rw-r--r-- | gio/gdbusprivate.c | 6 | ||||
| -rw-r--r-- | gio/gdbusproxy.c | 56 | ||||
| -rw-r--r-- | gio/gdbusserver.c | 4 | ||||
| -rw-r--r-- | gio/gdesktopappinfo.c | 27 | ||||
| -rw-r--r-- | gio/gdrive.c | 26 | ||||
| -rw-r--r-- | gio/gdtlsclientconnection.c | 2 | ||||
| -rw-r--r-- | gio/gdtlsconnection.c | 6 | ||||
| -rw-r--r-- | gio/gdtlsserverconnection.c | 2 | ||||
| -rw-r--r-- | gio/gemblemedicon.c | 2 | ||||
| -rw-r--r-- | gio/gfdonotificationbackend.c | 2 | ||||
| -rw-r--r-- | gio/gfile.c | 227 | ||||
| -rw-r--r-- | gio/gfileenumerator.c | 14 | ||||
| -rw-r--r-- | gio/gfileinfo.c | 2 | ||||
| -rw-r--r-- | gio/gfileinputstream.c | 4 | ||||
| -rw-r--r-- | gio/gfileiostream.c | 4 | ||||
| -rw-r--r-- | gio/gfilemonitor.c | 2 | ||||
| -rw-r--r-- | gio/ghttpproxy.c | 17 | ||||
| -rw-r--r-- | gio/gicon.c | 4 | ||||
| -rw-r--r-- | gio/ginitable.c | 2 | ||||
| -rw-r--r-- | gio/ginputstream.c | 20 | ||||
| -rw-r--r-- | gio/gioerror.c | 1 | ||||
| -rw-r--r-- | gio/giomodule.c | 6 | ||||
| -rw-r--r-- | gio/gioscheduler.c | 6 | ||||
| -rw-r--r-- | gio/giostream.c | 6 | ||||
| -rw-r--r-- | gio/giotypes.h | 6 | ||||
| -rw-r--r-- | gio/gkeyfilesettingsbackend.c | 2 | ||||
| -rw-r--r-- | gio/glib-compile-resources.c | 83 | ||||
| -rw-r--r-- | gio/gloadableicon.c | 4 | ||||
| -rw-r--r-- | gio/gmemoryinputstream.c | 4 | ||||
| -rw-r--r-- | gio/gmemoryoutputstream.c | 6 | ||||
| -rw-r--r-- | gio/gmenu.c | 54 | ||||
| -rw-r--r-- | gio/gmenumodel.c | 10 | ||||
| -rw-r--r-- | gio/gmount.c | 30 | ||||
| -rw-r--r-- | gio/gnetworkmonitor.c | 4 | ||||
| -rw-r--r-- | gio/gnotification.c | 16 | ||||
| -rw-r--r-- | gio/goutputstream.c | 28 | ||||
| -rw-r--r-- | gio/gpermission.c | 8 | ||||
| -rw-r--r-- | gio/gpollableinputstream.c | 4 | ||||
| -rw-r--r-- | gio/gpollableoutputstream.c | 4 | ||||
| -rw-r--r-- | gio/gpollableutils.c | 10 | ||||
| -rw-r--r-- | gio/gproxy.c | 4 | ||||
| -rw-r--r-- | gio/gproxyaddress.c | 4 | ||||
| -rw-r--r-- | gio/gproxyresolver.c | 4 | ||||
| -rw-r--r-- | gio/gremoteactiongroup.c | 2 | ||||
| -rw-r--r-- | gio/gresolver.c | 37 | ||||
| -rw-r--r-- | gio/gresource.c | 8 | ||||
| -rw-r--r-- | gio/gseekable.c | 4 | ||||
| -rw-r--r-- | gio/gsettings.c | 12 | ||||
| -rw-r--r-- | gio/gsettingsbackend.c | 4 | ||||
| -rw-r--r-- | gio/gsettingsschema.c | 2 | ||||
| -rw-r--r-- | gio/gsimpleaction.c | 10 | ||||
| -rw-r--r-- | gio/gsimpleasyncresult.c | 22 | ||||
| -rw-r--r-- | gio/gsimpleproxyresolver.c | 4 | ||||
| -rw-r--r-- | gio/gsocket.c | 167 | ||||
| -rw-r--r-- | gio/gsocketaddressenumerator.c | 4 | ||||
| -rw-r--r-- | gio/gsocketclient.c | 20 | ||||
| -rw-r--r-- | gio/gsocketconnection.c | 4 | ||||
| -rw-r--r-- | gio/gsocketlistener.c | 26 | ||||
| -rw-r--r-- | gio/gsocketservice.c | 2 | ||||
| -rw-r--r-- | gio/gsubprocess.c | 14 | ||||
| -rw-r--r-- | gio/gsubprocesslauncher.c | 11 | ||||
| -rw-r--r-- | gio/gtask.c | 57 | ||||
| -rw-r--r-- | gio/gtestdbus.c | 2 | ||||
| -rw-r--r-- | gio/gtlscertificate.c | 4 | ||||
| -rw-r--r-- | gio/gtlsclientconnection.c | 2 | ||||
| -rw-r--r-- | gio/gtlsconnection.c | 6 | ||||
| -rw-r--r-- | gio/gtlsdatabase.c | 46 | ||||
| -rw-r--r-- | gio/gtlsinteraction.c | 8 | ||||
| -rw-r--r-- | gio/gtlspassword.c | 4 | ||||
| -rw-r--r-- | gio/gtlsserverconnection.c | 2 | ||||
| -rw-r--r-- | gio/gunixconnection.c | 16 | ||||
| -rw-r--r-- | gio/gunixfdlist.c | 4 | ||||
| -rw-r--r-- | gio/gunixfdmessage.c | 2 | ||||
| -rw-r--r-- | gio/gunixmounts.c | 15 | ||||
| -rw-r--r-- | gio/gunixsocketaddress.c | 4 | ||||
| -rw-r--r-- | gio/gvdb/gvdb-builder.c | 3 | ||||
| -rw-r--r-- | gio/gvolume.c | 16 | ||||
| -rw-r--r-- | gio/gwin32registrykey.c | 8 | ||||
| -rw-r--r-- | gio/gzlibcompressor.c | 2 | ||||
| -rw-r--r-- | gio/inotify/inotify-helper.c | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-helper.h | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-kernel.c | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-kernel.h | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-missing.c | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-missing.h | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-path.c | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-path.h | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-sub.c | 15 | ||||
| -rw-r--r-- | gio/inotify/inotify-sub.h | 15 | ||||
| -rw-r--r-- | gio/org.freedesktop.portal.Documents.xml | 6 | ||||
| -rw-r--r-- | gio/org.freedesktop.portal.NetworkMonitor.xml | 6 | ||||
| -rw-r--r-- | gio/org.freedesktop.portal.ProxyResolver.xml | 6 | ||||
| -rw-r--r-- | gio/tests/Makefile.am | 9 | ||||
| -rw-r--r-- | gio/tests/file.c | 2 | ||||
| -rw-r--r-- | gio/tests/gdbus-serialization.c | 2 | ||||
| -rw-r--r-- | gio/tests/test-pipe-unix.c | 8 | ||||
| -rw-r--r-- | gio/win32/winhttp.h | 5 | ||||
| -rw-r--r-- | glib-gettextize.in | 2 | ||||
| -rw-r--r-- | glib.supp | 493 | ||||
| -rw-r--r-- | glib/Makefile.am | 4 | ||||
| -rw-r--r-- | glib/docs.c | 18 | ||||
| -rw-r--r-- | glib/garray.c | 15 | ||||
| -rw-r--r-- | glib/gatomic.c | 10 | ||||
| -rw-r--r-- | glib/gatomic.h | 8 | ||||
| -rw-r--r-- | glib/gbookmarkfile.c | 41 | ||||
| -rw-r--r-- | glib/gbookmarkfile.h | 5 | ||||
| -rw-r--r-- | glib/gcharset.h | 15 | ||||
| -rw-r--r-- | glib/gconvert.c | 5 | ||||
| -rw-r--r-- | glib/gdataset.c | 20 | ||||
| -rw-r--r-- | glib/gdatetime.c | 12 | ||||
| -rw-r--r-- | glib/gdatetime.h | 6 | ||||
| -rw-r--r-- | glib/genviron.c | 6 | ||||
| -rw-r--r-- | glib/gerror.c | 2 | ||||
| -rw-r--r-- | glib/gerror.h | 15 | ||||
| -rw-r--r-- | glib/gfileutils.c | 21 | ||||
| -rw-r--r-- | glib/gfileutils.h | 15 | ||||
| -rw-r--r-- | glib/ggettext.c | 10 | ||||
| -rw-r--r-- | glib/ghash.c | 6 | ||||
| -rw-r--r-- | glib/ghostutils.c | 7 | ||||
| -rw-r--r-- | glib/giochannel.c | 12 | ||||
| -rw-r--r-- | glib/gkeyfile.c | 43 | ||||
| -rw-r--r-- | glib/gkeyfile.h | 15 | ||||
| -rw-r--r-- | glib/glib-init.c | 32 | ||||
| -rw-r--r-- | glib/glib-mirroring-tab/gen-mirroring-tab.c | 4 | ||||
| -rw-r--r-- | glib/glib-mirroring-tab/packtab.c | 6 | ||||
| -rw-r--r-- | glib/glib-mirroring-tab/packtab.h | 6 | ||||
| -rw-r--r-- | glib/glib.stp.in | 4 | ||||
| -rw-r--r-- | glib/gmain.c | 36 | ||||
| -rw-r--r-- | glib/gmain.h | 8 | ||||
| -rw-r--r-- | glib/gmarkup.c | 19 | ||||
| -rw-r--r-- | glib/gmarkup.h | 15 | ||||
| -rw-r--r-- | glib/gmem.c | 10 | ||||
| -rw-r--r-- | glib/gmessages.c | 257 | ||||
| -rw-r--r-- | glib/goption.c | 39 | ||||
| -rw-r--r-- | glib/gpattern.c | 2 | ||||
| -rw-r--r-- | glib/gquark.c | 10 | ||||
| -rw-r--r-- | glib/gregex.c | 38 | ||||
| -rw-r--r-- | glib/gregex.h | 5 | ||||
| -rw-r--r-- | glib/gsequence.c | 2 | ||||
| -rw-r--r-- | glib/gshell.c | 16 | ||||
| -rw-r--r-- | glib/gshell.h | 16 | ||||
| -rw-r--r-- | glib/gspawn-win32-helper.c | 32 | ||||
| -rw-r--r-- | glib/gspawn-win32.c | 16 | ||||
| -rw-r--r-- | glib/gspawn.c | 56 | ||||
| -rw-r--r-- | glib/gspawn.h | 16 | ||||
| -rw-r--r-- | glib/gstdio.c | 17 | ||||
| -rw-r--r-- | glib/gstdio.h | 15 | ||||
| -rw-r--r-- | glib/gstrfuncs.c | 10 | ||||
| -rw-r--r-- | glib/gtestutils.c | 13 | ||||
| -rw-r--r-- | glib/gtestutils.h | 2 | ||||
| -rw-r--r-- | glib/gthread.c | 4 | ||||
| -rw-r--r-- | glib/gthreadprivate.h | 15 | ||||
| -rw-r--r-- | glib/gtimezone.c | 2 | ||||
| -rw-r--r-- | glib/gtranslit.c | 2 | ||||
| -rw-r--r-- | glib/gunibreak.c | 15 | ||||
| -rw-r--r-- | glib/gunicode.h | 15 | ||||
| -rw-r--r-- | glib/gunicollate.c | 15 | ||||
| -rw-r--r-- | glib/gunidecomp.c | 17 | ||||
| -rw-r--r-- | glib/guniprop.c | 5 | ||||
| -rw-r--r-- | glib/gurifuncs.c | 10 | ||||
| -rw-r--r-- | glib/gutf8.c | 2 | ||||
| -rw-r--r-- | glib/gvariant-parser.c | 13 | ||||
| -rw-r--r-- | glib/gvariant-serialiser.c | 2 | ||||
| -rw-r--r-- | glib/gvariant.c | 58 | ||||
| -rw-r--r-- | glib/gvarianttype.c | 6 | ||||
| -rw-r--r-- | glib/gvarianttypeinfo.c | 8 | ||||
| -rw-r--r-- | glib/gwin32.c | 10 | ||||
| -rw-r--r-- | glib/tests/642026.c | 1 | ||||
| -rw-r--r-- | glib/tests/gdatetime.c | 5 | ||||
| -rw-r--r-- | gmodule/gmodule.c | 4 | ||||
| -rw-r--r-- | gobject/Makefile.am | 4 | ||||
| -rw-r--r-- | gobject/gbinding.c | 4 | ||||
| -rw-r--r-- | gobject/gboxed.c | 8 | ||||
| -rw-r--r-- | gobject/gclosure.c | 6 | ||||
| -rw-r--r-- | gobject/gclosure.h | 10 | ||||
| -rwxr-xr-x | gobject/glib-mkenums.in | 2 | ||||
| -rw-r--r-- | gobject/gmarshal.c | 88 | ||||
| -rw-r--r-- | gobject/gobject.c | 34 | ||||
| -rw-r--r-- | gobject/gobject.stp.in | 36 | ||||
| -rw-r--r-- | gobject/gparam.c | 8 | ||||
| -rw-r--r-- | gobject/gparamspecs.c | 2 | ||||
| -rw-r--r-- | gobject/gsignal.c | 30 | ||||
| -rw-r--r-- | gobject/gsignal.h | 6 | ||||
| -rw-r--r-- | gobject/gtype.c | 9 | ||||
| -rw-r--r-- | gobject/gtype.h | 21 | ||||
| -rw-r--r-- | gobject/gvalue.c | 2 | ||||
| -rw-r--r-- | gobject/gvaluearray.c | 6 | ||||
| -rw-r--r-- | gobject/gvaluetypes.c | 10 | ||||
| -rw-r--r-- | po/Makefile.in.in | 2 | ||||
| -rw-r--r-- | po/cs.po | 848 | ||||
| -rw-r--r-- | po/de.po | 636 | ||||
| -rw-r--r-- | po/es.po | 899 | ||||
| -rw-r--r-- | po/gl.po | 725 | ||||
| -rw-r--r-- | po/he.po | 1124 | ||||
| -rw-r--r-- | po/kk.po | 792 | ||||
| -rw-r--r-- | po/lt.po | 549 | ||||
| -rw-r--r-- | po/pt_BR.po | 1355 | ||||
| -rw-r--r-- | po/sv.po | 655 | ||||
| -rw-r--r-- | tests/datetime.c | 6 | ||||
| -rw-r--r-- | tests/refcount/signals.c | 6 | ||||
| -rw-r--r-- | tests/type-test.c | 6 | ||||
| -rw-r--r-- | win32/Makefile-newvs.am | 46 | ||||
| -rw-r--r-- | win32/Makefile.am | 6 | ||||
| -rw-r--r-- | win32/Makefile.msvcproj | 153 | ||||
| -rw-r--r-- | win32/detectenv-msvc.mak (renamed from build/win32/detectenv-msvc.mak) | 0 | ||||
| -rw-r--r-- | win32/glibpc.py (renamed from build/win32/glibpc.py) | 3 | ||||
| -rw-r--r-- | win32/pc_base.py (renamed from build/win32/pc_base.py) | 2 | ||||
| -rw-r--r-- | win32/replace.py (renamed from build/win32/replace.py) | 0 | ||||
| -rw-r--r-- | win32/setup.py (renamed from build/win32/setup.py) | 110 | ||||
| -rw-r--r-- | win32/vs10/.gitignore (renamed from build/win32/vs10/.gitignore) | 0 | ||||
| -rw-r--r-- | win32/vs10/Makefile.am (renamed from build/win32/vs10/Makefile.am) | 10 | ||||
| -rw-r--r-- | win32/vs10/README.txt (renamed from build/win32/vs10/README.txt) | 0 | ||||
| -rw-r--r-- | win32/vs10/gdbus.vcxproj (renamed from build/win32/vs10/gdbus.vcxproj) | 12 | ||||
| -rw-r--r-- | win32/vs10/gdbus.vcxproj.filters (renamed from build/win32/vs10/gdbus.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gio-querymodules.vcxproj (renamed from build/win32/vs10/gio-querymodules.vcxproj) | 12 | ||||
| -rw-r--r-- | win32/vs10/gio-querymodules.vcxproj.filters (renamed from build/win32/vs10/gio-querymodules.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gio-tool.vcxproj.filtersin (renamed from build/win32/vs10/gio-tool.vcxproj.filtersin) | 0 | ||||
| -rw-r--r-- | win32/vs10/gio-tool.vcxprojin (renamed from build/win32/vs10/gio-tool.vcxprojin) | 8 | ||||
| -rw-r--r-- | win32/vs10/gio.vcxproj.filtersin (renamed from build/win32/vs10/gio.vcxproj.filtersin) | 4 | ||||
| -rw-r--r-- | win32/vs10/gio.vcxprojin (renamed from build/win32/vs10/gio.vcxprojin) | 30 | ||||
| -rw-r--r-- | win32/vs10/glib-build-defines.props (renamed from build/win32/vs10/glib-build-defines.props) | 2 | ||||
| -rw-r--r-- | win32/vs10/glib-compile-resources.vcxproj.filtersin (renamed from build/win32/vs10/glib-compile-resources.vcxproj.filtersin) | 0 | ||||
| -rw-r--r-- | win32/vs10/glib-compile-resources.vcxprojin (renamed from build/win32/vs10/glib-compile-resources.vcxprojin) | 8 | ||||
| -rw-r--r-- | win32/vs10/glib-compile-schemas.vcxproj.filtersin (renamed from build/win32/vs10/glib-compile-schemas.vcxproj.filtersin) | 0 | ||||
| -rw-r--r-- | win32/vs10/glib-compile-schemas.vcxprojin (renamed from build/win32/vs10/glib-compile-schemas.vcxprojin) | 8 | ||||
| -rw-r--r-- | win32/vs10/glib-gen-srcs.props (renamed from build/win32/vs10/glib-gen-srcs.props) | 10 | ||||
| -rw-r--r-- | win32/vs10/glib-genmarshal.vcxproj (renamed from build/win32/vs10/glib-genmarshal.vcxproj) | 4 | ||||
| -rw-r--r-- | win32/vs10/glib-genmarshal.vcxproj.filters (renamed from build/win32/vs10/glib-genmarshal.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/glib-install.propsin (renamed from build/win32/vs10/glib-install.propsin) | 24 | ||||
| -rw-r--r-- | win32/vs10/glib-install.vcxproj (renamed from build/win32/vs10/glib-install.vcxproj) | 58 | ||||
| -rw-r--r-- | win32/vs10/glib-install.vcxproj.filters (renamed from build/win32/vs10/glib-install.vcxproj.filters) | 2 | ||||
| -rw-r--r-- | win32/vs10/glib-version-paths.props.in (renamed from build/win32/vs10/glib-version-paths.props.in) | 4 | ||||
| -rw-r--r-- | win32/vs10/glib.sln (renamed from build/win32/vs10/glib.sln) | 0 | ||||
| -rw-r--r-- | win32/vs10/glib.vcxproj.filtersin | 66 | ||||
| -rw-r--r-- | win32/vs10/glib.vcxprojin | 533 | ||||
| -rw-r--r-- | win32/vs10/gmodule.vcxproj (renamed from build/win32/vs10/gmodule.vcxproj) | 32 | ||||
| -rw-r--r-- | win32/vs10/gmodule.vcxproj.filters (renamed from build/win32/vs10/gmodule.vcxproj.filters) | 8 | ||||
| -rw-r--r-- | win32/vs10/gobject.vcxproj.filtersin (renamed from build/win32/vs10/gobject.vcxproj.filtersin) | 4 | ||||
| -rw-r--r-- | win32/vs10/gobject.vcxprojin (renamed from build/win32/vs10/gobject.vcxprojin) | 28 | ||||
| -rw-r--r-- | win32/vs10/gresource.vcxproj (renamed from build/win32/vs10/gresource.vcxproj) | 12 | ||||
| -rw-r--r-- | win32/vs10/gresource.vcxproj.filters (renamed from build/win32/vs10/gresource.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gsettings.vcxproj (renamed from build/win32/vs10/gsettings.vcxproj) | 12 | ||||
| -rw-r--r-- | win32/vs10/gsettings.vcxproj.filters (renamed from build/win32/vs10/gsettings.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gspawn-win32-helper-console.vcxproj (renamed from build/win32/vs10/gspawn-win32-helper-console.vcxproj) | 4 | ||||
| -rw-r--r-- | win32/vs10/gspawn-win32-helper-console.vcxproj.filters (renamed from build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gspawn-win32-helper.vcxproj (renamed from build/win32/vs10/gspawn-win32-helper.vcxproj) | 4 | ||||
| -rw-r--r-- | win32/vs10/gspawn-win32-helper.vcxproj.filters (renamed from build/win32/vs10/gspawn-win32-helper.vcxproj.filters) | 4 | ||||
| -rw-r--r-- | win32/vs10/gthread.vcxproj (renamed from build/win32/vs10/gthread.vcxproj) | 6 | ||||
| -rw-r--r-- | win32/vs10/gthread.vcxproj.filters (renamed from build/win32/vs10/gthread.vcxproj.filters) | 10 | ||||
| -rw-r--r-- | win32/vs11/.gitignore (renamed from build/win32/vs11/.gitignore) | 0 | ||||
| -rw-r--r-- | win32/vs11/Makefile.am (renamed from build/win32/vs11/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs12/.gitignore (renamed from build/win32/vs12/.gitignore) | 0 | ||||
| -rw-r--r-- | win32/vs12/Makefile.am (renamed from build/win32/vs12/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs14/Makefile.am (renamed from build/win32/vs14/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs9/.gitignore (renamed from build/win32/vs9/.gitignore) | 0 | ||||
| -rw-r--r-- | win32/vs9/Makefile.am (renamed from build/win32/vs9/Makefile.am) | 4 | ||||
| -rw-r--r-- | win32/vs9/README.txt (renamed from build/win32/vs9/README.txt) | 0 | ||||
| -rw-r--r-- | win32/vs9/gdbus.vcproj (renamed from build/win32/vs9/gdbus.vcproj) | 10 | ||||
| -rw-r--r-- | win32/vs9/gio-querymodules.vcproj (renamed from build/win32/vs9/gio-querymodules.vcproj) | 10 | ||||
| -rw-r--r-- | win32/vs9/gio-tool.vcprojin (renamed from build/win32/vs9/gio-tool.vcprojin) | 8 | ||||
| -rw-r--r-- | win32/vs9/gio.vcprojin (renamed from build/win32/vs9/gio.vcprojin) | 20 | ||||
| -rw-r--r-- | win32/vs9/glib-build-defines.vsprops (renamed from build/win32/vs9/glib-build-defines.vsprops) | 2 | ||||
| -rw-r--r-- | win32/vs9/glib-compile-resources.vcprojin (renamed from build/win32/vs9/glib-compile-resources.vcprojin) | 8 | ||||
| -rw-r--r-- | win32/vs9/glib-compile-schemas.vcprojin (renamed from build/win32/vs9/glib-compile-schemas.vcprojin) | 8 | ||||
| -rw-r--r-- | win32/vs9/glib-gen-srcs.vsprops (renamed from build/win32/vs9/glib-gen-srcs.vsprops) | 10 | ||||
| -rw-r--r-- | win32/vs9/glib-genmarshal.vcproj (renamed from build/win32/vs9/glib-genmarshal.vcproj) | 2 | ||||
| -rw-r--r-- | win32/vs9/glib-install.vcproj (renamed from build/win32/vs9/glib-install.vcproj) | 0 | ||||
| -rw-r--r-- | win32/vs9/glib-install.vspropsin (renamed from build/win32/vs9/glib-install.vspropsin) | 24 | ||||
| -rw-r--r-- | win32/vs9/glib-version-paths.vsprops.in (renamed from build/win32/vs9/glib-version-paths.vsprops.in) | 2 | ||||
| -rw-r--r-- | win32/vs9/glib.sln (renamed from build/win32/vs9/glib.sln) | 0 | ||||
| -rw-r--r-- | win32/vs9/glib.vcprojin (renamed from build/win32/vs9/glib.vcprojin) | 94 | ||||
| -rw-r--r-- | win32/vs9/gmodule.vcproj (renamed from build/win32/vs9/gmodule.vcproj) | 14 | ||||
| -rw-r--r-- | win32/vs9/gobject.vcprojin (renamed from build/win32/vs9/gobject.vcprojin) | 12 | ||||
| -rw-r--r-- | win32/vs9/gresource.vcproj (renamed from build/win32/vs9/gresource.vcproj) | 10 | ||||
| -rw-r--r-- | win32/vs9/gsettings.vcproj (renamed from build/win32/vs9/gsettings.vcproj) | 10 | ||||
| -rw-r--r-- | win32/vs9/gspawn-win32-helper-console.vcproj (renamed from build/win32/vs9/gspawn-win32-helper-console.vcproj) | 2 | ||||
| -rw-r--r-- | win32/vs9/gspawn-win32-helper.vcproj (renamed from build/win32/vs9/gspawn-win32-helper.vcproj) | 2 | ||||
| -rw-r--r-- | win32/vs9/gthread.vcproj (renamed from build/win32/vs9/gthread.vcproj) | 4 |
318 files changed, 7722 insertions, 6410 deletions
diff --git a/Makefile.am b/Makefile.am index a1c9c33a0..008ad5826 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/glib.mk ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests -DIST_SUBDIRS = $(SUBDIRS) build +DIST_SUBDIRS = $(SUBDIRS) build win32 bin_SCRIPTS = glib-gettextize @@ -103,6 +103,10 @@ endif $(pkgconfig_DATA): config.status +# Install Valgrind suppression file +valgrinddir = $(datadir)/glib-2.0/valgrind +dist_valgrind_DATA = glib.supp + # build documentation when doing distcheck DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode @@ -1,3 +1,53 @@ +Overview of changes in GLib 2.51.1 +================================== + +* glib-compile-resources grew a --generate-phony-targets flag + +* GLib now installs a valgrind suppressions file for GLib and GIO + +* Bugs fixed: + 666114 should have infrastructure to run its tests under valgrind + 729730 GDBusMessage: Fix segfault if DEBUG_SERIALIZER is enabled + 730932 statically assert that reasonable assumptions about enums are true + 735731 gobject: Document behaviour of GType checking macros on NULL + 736810 gdbus: Fix leak in g_dbus_message_print() + 762283 GSocket – Fix race conditions on Win32 if multiple threads are waiting on cond... + 767609 Test suite problems + 767952 g_dbus_method_invocation_return_*, g_dbus_method_invocation_take_error: They d... + 769672 Assert threads for testcase 642026 are sucessfully created + 769745 gtask: Add guards for public functions + 770175 Add command line argument to mkenums and genmarshal to write output to a file + 770646 glib: Namespace global tapset variables by soname + 772160 Add g_unix_mount_for() support + 772989 Totem allows invalid urls that might cause segfault that's irrecoverable + 773823 gio: Bump copy buffer size to 256k by default + 774086 fix g_main_context_check declaration + 774368 Dependency file output of resource scanner breaks Ninja + 774421 Two minor patches + 774520 GSocket allocates and processes control messages even if not requested + 775309 Crash in gdbusauth + 775468 Improve log write supports color method on windows + 775510 testing with -fsanitize=undefined reports various undefined behaviour + 775517 Password input is echoed in the terminal + 775621 gmessages: Fix compilation on Android + 775765 FDO notification withdrawal backend sends wrong ID to the server + 775913 subprocesslauncher: potential infinite loop in verify_disposition() + 776198 Stray semicolon after g_variant_print() function in gvariant.c + 776586 License headers cleanup + 777077 Use of memory after it is freed + +* Translation updates: + Brazilian Portuguese + Czech + Galician + German + Hebrew + Kazakh + Lithuanian + Spanish + Swedish + + Overview of changes in GLib 2.51.0 ================================== diff --git a/README.win32 b/README.win32 index 6e2d9daaa..fa6a3a016 100644 --- a/README.win32 +++ b/README.win32 @@ -191,15 +191,15 @@ information. Note that you will need a libintl implementation, zlib, and libFFI.
If you are building from a GIT checkout, you will first need to use some
-Unix-like environment or run build/win32/setup.py,
+Unix-like environment or run win32/setup.py,
which will expand the VS 2008/2010 project files, the DLL resouce files and
-other miscellanious files required for the build. Run build/win32/setup.py
+other miscellanious files required for the build. Run win32/setup.py
as follows:
-$python build/win32/setup.py --perl path_to_your_perl.exe
+$python win32/setup.py --perl path_to_your_perl.exe
for more usage on this script, run
-$python build/win32/setup.py -h/--help
+$python win32/setup.py -h/--help
Building with MSVC and NMAKE
============================
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index b5e321607..000000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,45 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 - -%.sln: - sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: - sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj deleted file mode 100644 index f127eea51..000000000 --- a/build/Makefile.msvcproj +++ /dev/null @@ -1,114 +0,0 @@ -# Author: Fan, Chun-wei -# Common Autotools file used to generate Visual Studio 2008+ -# Projects from their templates - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# * Input variables: -# -# MSVCPROJS - List of Projects that should be generated -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# include $(top_srcdir)/build/Makefile.msvcproj -# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) -# YourProject_FILES = $(libyourlib_1_0_SOURCES) -# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# YourProject_HEADERS_DIR = $(libyourlibincludedir) -# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) -# YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none> -# -# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/build/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/build/win32/vs9/YourProject.headers - - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) -_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_proj_path=$(subst /,\\,$(_proj_path_raw)) -_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) -_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) - -_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) -_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) -_proj_filters=$($(_proj_name)_EXCLUDES) - -_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) -_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) -_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) - -_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) -_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) - -# -# Creates Visual Studio 2008/2010 projects from items passed in from autotools files -# $(1) - Base Name of the MSVC project files (outputs) -# - -define msvcproj-builder - -$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters - - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' <File RelativePath="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \ - echo ' <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \ - echo ' <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \ - ;; \ - esac; \ - done - - - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - $(RM) $(1).sourcefiles - $(RM) $(1).vs10.sourcefiles - $(RM) $(1).vs10.sourcefiles.filters - -$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers - -$(top_builddir)/build/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'
' >>$(top_builddir)/build/win32/vs9/$(1).headers && \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index 5c2dac8ed..2f701b063 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -1,14 +1,6 @@ SUBDIRS = \ - dirent \ - vs9 \ - vs10 \ - vs11 \ - vs12 \ - vs14 + dirent EXTRA_DIST = \ - glibpc.py \ make.msc \ - module.defs \ - pc_base.py \ - replace.py + module.defs diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin deleted file mode 100644 index 853efb602..000000000 --- a/build/win32/vs10/glib.vcxproj.filtersin +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Source Files\libcharset"> - <UniqueIdentifier>{bb961775-fd45-4205-b1fd-901c3c8fd64c}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\gnulib"> - <UniqueIdentifier>{f630c518-4c58-4dfa-ab43-5fa0b0eb10f1}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\pcre"> - <UniqueIdentifier>{9fef0e23-cf71-48aa-979b-7eb84df56143}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> -#include "glib.vs10.sourcefiles.filters" - <ClCompile Include="..\..\..\glib\giowin32.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gspawn-win32.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gthread-win32.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gwin32.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\libcharset\localcharset.c"> - <Filter>Source Files\libcharset</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\asnprintf.c"> - <Filter>Source Files\gnulib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\printf-args.c"> - <Filter>Source Files\gnulib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\printf-parse.c"> - <Filter>Source Files\gnulib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\printf.c"> - <Filter>Source Files\gnulib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\vasnprintf.c"> - <Filter>Source Files\gnulib</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_byte_order.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_chartables.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_compile.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_config.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_dfa_exec.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_exec.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_fullinfo.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_get.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_globals.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_jit_compile.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_newline.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_ord2utf8.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_string_utils.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_study.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_tables.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_version.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c"> - <Filter>Source Files\pcre</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> - <CustomBuild Include="..\..\..\glib\glibconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\glib\glib.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin deleted file mode 100644 index a7a9372dc..000000000 --- a/build/win32/vs10/glib.vcxprojin +++ /dev/null @@ -1,675 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug_BundledPCRE|Win32"> - <Configuration>Debug_BundledPCRE</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug_BundledPCRE|x64"> - <Configuration>Debug_BundledPCRE</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release_BundledPCRE|Win32"> - <Configuration>Release_BundledPCRE</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release_BundledPCRE|x64"> - <Configuration>Release_BundledPCRE</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{12BCA020-EABF-429E-876A-A476BC9C10C0}</ProjectGuid> - <RootNamespace>glib</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v100</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">true</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Debug\$(Platform)\bin\</OutDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">true</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Debug\$(Platform)\bin\</OutDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">false</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Release\$(Platform)\bin\</OutDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">false</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Release\$(Platform)\bin\</OutDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'"> - <ClCompile> - <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX86</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'"> - <ClCompile> - <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAs>CompileAsC</CompileAs> - </ClCompile> - <Link> - <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <DataExecutionPrevention> - </DataExecutionPrevention> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemGroup> -#include "glib.vs10.sourcefiles" - <ClCompile Include="..\..\..\glib\giowin32.c" /> - <ClCompile Include="..\..\..\glib\gspawn-win32.c" /> - <ClCompile Include="..\..\..\glib\gthread-win32.c" /> - <ClCompile Include="..\..\..\glib\gwin32.c" /> - <ClCompile Include="..\..\..\glib\libcharset\localcharset.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <ClCompile Include="..\..\..\glib\gnulib\asnprintf.c" /> - <ClCompile Include="..\..\..\glib\gnulib\printf-args.c" /> - <ClCompile Include="..\..\..\glib\gnulib\printf-parse.c" /> - <ClCompile Include="..\..\..\glib\gnulib\printf.c" /> - <ClCompile Include="..\..\..\glib\gnulib\vasnprintf.c" /> - <ClCompile Include="..\..\..\glib\pcre\pcre_byte_order.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_chartables.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_compile.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_config.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_dfa_exec.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_exec.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_fullinfo.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_get.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_globals.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_jit_compile.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_newline.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_ord2utf8.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_string_utils.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_study.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_tables.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_version.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c"> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - </ItemGroup> - <ItemGroup> - <CustomBuild Include="..\..\..\config.h.win32"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from config.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs> - </CustomBuild> - <CustomBuild Include="..\..\..\glib\glibconfig.h.win32"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying glibconfig.h from glibconfig.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGLibConfigH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\glib\glib.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/configure.ac b/configure.ac index 737e5e395..5607a6323 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ m4_define(glib_configure_ac) m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [51]) -m4_define([glib_micro_version], [0]) +m4_define([glib_micro_version], [1]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) @@ -712,6 +712,7 @@ AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h]) AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h]) AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h]) AC_CHECK_HEADERS([linux/magic.h]) +AC_CHECK_HEADERS([termios.h]) # Some versions of MSC lack these AC_CHECK_HEADERS([dirent.h sys/time.h]) @@ -3433,13 +3434,14 @@ Makefile build/Makefile build/win32/Makefile build/win32/dirent/Makefile -build/win32/vs9/Makefile -build/win32/vs9/glib-version-paths.vsprops -build/win32/vs10/Makefile -build/win32/vs10/glib-version-paths.props -build/win32/vs11/Makefile -build/win32/vs12/Makefile -build/win32/vs14/Makefile +win32/Makefile +win32/vs9/Makefile +win32/vs9/glib-version-paths.vsprops +win32/vs10/Makefile +win32/vs10/glib-version-paths.props +win32/vs11/Makefile +win32/vs12/Makefile +win32/vs14/Makefile glib/Makefile glib/libcharset/Makefile glib/gnulib/Makefile diff --git a/docs/reference/gio/glib-compile-resources.xml b/docs/reference/gio/glib-compile-resources.xml index f5a1e6257..1ab0a4469 100644 --- a/docs/reference/gio/glib-compile-resources.xml +++ b/docs/reference/gio/glib-compile-resources.xml @@ -181,6 +181,15 @@ as a side-effect of generating sources. </para></listitem> </varlistentry> +<varlistentry> +<term><option>--generate-phony-targets</option></term> +<listitem><para> +When creating a dependency file with <option>--dependency-file</option> +include phony targets in the same style as gcc -MP. This would typically +be used with <literal>make</literal>. +</para></listitem> +</varlistentry> + </variablelist> </refsect1> diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in index 899af0c98..7574eb700 100644 --- a/gio-2.0.pc.in +++ b/gio-2.0.pc.in @@ -14,5 +14,5 @@ Version: @VERSION@ Requires: glib-2.0 gobject-2.0 Requires.private: gmodule-no-export-2.0 Libs: -L${libdir} -lgio-2.0 -Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ +Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@ Cflags: diff --git a/gio/Makefile.am b/gio/Makefile.am index cbeeaa13c..1ca27fcb7 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -947,15 +947,15 @@ glib_compile_schemas_EXCLUDES = dummy gio_tool_FILES = $(gio_SOURCES) gio_tool_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ $(BUILT_EXTRA_DIST) \ - $(top_builddir)/build/win32/vs9/gio.vcproj \ - $(top_builddir)/build/win32/vs9/gio.headers \ - $(top_builddir)/build/win32/vs9/glib-compile-schemas.vcproj \ - $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj \ - $(top_builddir)/build/win32/vs9/gio-tool.vcproj + $(top_builddir)/win32/vs9/gio.vcproj \ + $(top_builddir)/win32/vs9/gio.headers \ + $(top_builddir)/win32/vs9/glib-compile-schemas.vcproj \ + $(top_builddir)/win32/vs9/glib-compile-resources.vcproj \ + $(top_builddir)/win32/vs9/gio-tool.vcproj files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/gio/gaction.c b/gio/gaction.c index 2075bb068..bc2c934a9 100644 --- a/gio/gaction.c +++ b/gio/gaction.c @@ -269,7 +269,7 @@ g_action_get_name (GAction *action) * In the case that this function returns %NULL, you must not give any * #GVariant, but %NULL instead. * - * Returns: (allow-none): the parameter type + * Returns: (nullable): the parameter type * * Since: 2.28 **/ @@ -299,7 +299,7 @@ g_action_get_parameter_type (GAction *action) * then this function will return %NULL. In that case, g_action_get_state() * will return %NULL and you must not call g_action_change_state(). * - * Returns: (allow-none): the state type, if the action is stateful + * Returns: (nullable): the state type, if the action is stateful * * Since: 2.28 **/ @@ -373,7 +373,7 @@ g_action_get_enabled (GAction *action) /** * g_action_activate: * @action: a #GAction - * @parameter: (allow-none): the parameter to the activation + * @parameter: (nullable): the parameter to the activation * * Activates the action. * @@ -542,7 +542,7 @@ bad_fmt: /** * g_action_print_detailed_name: * @action_name: a valid action name - * @target_value: (allow-none): a #GVariant target value, or %NULL + * @target_value: (nullable): a #GVariant target value, or %NULL * * Formats a detailed action name from @action_name and @target_value. * diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c index 425a20a03..eef46b4e8 100644 --- a/gio/gactiongroup.c +++ b/gio/gactiongroup.c @@ -573,7 +573,7 @@ g_action_group_change_action_state (GActionGroup *action_group, * g_action_group_activate_action: * @action_group: a #GActionGroup * @action_name: the name of the action to activate - * @parameter: (allow-none): parameters to the activation + * @parameter: (nullable): parameters to the activation * * Activate the named action within @action_group. * @@ -705,10 +705,10 @@ g_action_group_action_state_changed (GActionGroup *action_group, * @action_group: a #GActionGroup * @action_name: the name of an action in the group * @enabled: (out): if the action is presently enabled - * @parameter_type: (out) (allow-none): the parameter type, or %NULL if none needed - * @state_type: (out) (allow-none): the state type, or %NULL if stateless - * @state_hint: (out) (allow-none): the state hint, or %NULL if none - * @state: (out) (allow-none): the current state, or %NULL if stateless + * @parameter_type: (out) (optional): the parameter type, or %NULL if none needed + * @state_type: (out) (optional): the state type, or %NULL if stateless + * @state_hint: (out) (optional): the state hint, or %NULL if none + * @state: (out) (optional): the current state, or %NULL if stateless * * Queries all aspects of the named action within an @action_group. * diff --git a/gio/gappinfo.c b/gio/gappinfo.c index 99cb7b62b..5c4baa22f 100644 --- a/gio/gappinfo.c +++ b/gio/gappinfo.c @@ -528,8 +528,8 @@ g_app_info_get_icon (GAppInfo *appinfo) /** * g_app_info_launch: * @appinfo: a #GAppInfo - * @files: (allow-none) (element-type GFile): a #GList of #GFile objects - * @launch_context: (allow-none): a #GAppLaunchContext or %NULL + * @files: (nullable) (element-type GFile): a #GList of #GFile objects + * @launch_context: (nullable): a #GAppLaunchContext or %NULL * @error: a #GError * * Launches the application. Passes @files to the launched application @@ -623,8 +623,8 @@ g_app_info_supports_files (GAppInfo *appinfo) /** * g_app_info_launch_uris: * @appinfo: a #GAppInfo - * @uris: (allow-none) (element-type utf8): a #GList containing URIs to launch. - * @launch_context: (allow-none): a #GAppLaunchContext or %NULL + * @uris: (nullable) (element-type utf8): a #GList containing URIs to launch. + * @launch_context: (nullable): a #GAppLaunchContext or %NULL * @error: a #GError * * Launches the application. This passes the @uris to the launched application @@ -877,7 +877,7 @@ launch_default_for_uri (const char *uri, /** * g_app_info_launch_default_for_uri: * @uri: the uri to show - * @launch_context: (allow-none): an optional #GAppLaunchContext + * @launch_context: (nullable): an optional #GAppLaunchContext * @error: (nullable): return location for an error, or %NULL * * Utility function that launches the default application @@ -903,10 +903,10 @@ g_app_info_launch_default_for_uri (const char *uri, /** * g_app_info_launch_default_for_uri_async: * @uri: the uri to show - * @context: (allow-none): an optional #GAppLaunchContext - * cancellable: (allow-none): a #GCancellable - * @callback: (allow-none): a #GASyncReadyCallback to call when the request is done - * @user_data: (allow-none): data to pass to @callback + * @context: (nullable): an optional #GAppLaunchContext + * cancellable: (nullable): a #GCancellable + * @callback: (nullable): a #GASyncReadyCallback to call when the request is done + * @user_data: (nullable): data to pass to @callback * * Async version of g_app_info_launch_default_for_uri(). * diff --git a/gio/gapplication.c b/gio/gapplication.c index 0ffbc6627..e068aef06 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -88,7 +88,7 @@ * * If used, the expected form of an application identifier is very close * to that of of a - * [DBus bus name](http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-interface). + * [D-Bus bus name](http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-interface). * Examples include: "com.example.MyApp", "org.example.internal-apps.Calculator". * For details on valid application identifiers, see g_application_id_is_valid(). * @@ -1145,7 +1145,7 @@ g_application_set_property (GObject *object, /** * g_application_set_action_group: * @application: a #GApplication - * @action_group: (allow-none): a #GActionGroup, or %NULL + * @action_group: (nullable): a #GActionGroup, or %NULL * * This used to be how actions were associated with a #GApplication. * Now there is #GActionMap for that. @@ -1606,7 +1606,7 @@ g_application_id_is_valid (const gchar *application_id) /* Public Constructor {{{1 */ /** * g_application_new: - * @application_id: (allow-none): the application id + * @application_id: (nullable): the application id * @flags: the application flags * * Creates a new #GApplication instance. @@ -1653,7 +1653,7 @@ g_application_get_application_id (GApplication *application) /** * g_application_set_application_id: * @application: a #GApplication - * @application_id: (allow-none): the identifier for @application + * @application_id: (nullable): the identifier for @application * * Sets the unique identifier for @application. * @@ -1979,7 +1979,7 @@ g_application_get_dbus_object_path (GApplication *application) /** * g_application_register: * @application: a #GApplication - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a NULL #GError, or %NULL * * Attempts registration of the application. @@ -2198,7 +2198,7 @@ g_application_open (GApplication *application, * g_application_run: * @application: a #GApplication * @argc: the argc from main() (or 0 if @argv is %NULL) - * @argv: (array length=argc) (allow-none): the argv from main(), or %NULL + * @argv: (array length=argc) (nullable): the argv from main(), or %NULL * * Runs the application. * @@ -2577,7 +2577,7 @@ g_application_get_default (void) /** * g_application_set_default: - * @application: (allow-none): the application to set as default, or %NULL + * @application: (nullable): the application to set as default, or %NULL * * Sets or unsets the default application for the process, as returned * by g_application_get_default(). @@ -2705,7 +2705,7 @@ g_application_get_is_busy (GApplication *application) /** * g_application_send_notification: * @application: a #GApplication - * @id: (allow-none): id of the notification, or %NULL + * @id: (nullable): id of the notification, or %NULL * @notification: the #GNotification to send * * Sends a notification on behalf of @application to the desktop shell. diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c index c042da04e..f2fe02537 100644 --- a/gio/gapplicationcommandline.c +++ b/gio/gapplicationcommandline.c @@ -449,7 +449,7 @@ g_application_command_line_class_init (GApplicationCommandLineClass *class) /** * g_application_command_line_get_arguments: * @cmdline: a #GApplicationCommandLine - * @argc: (out) (allow-none): the length of the arguments array, or %NULL + * @argc: (out) (optional): the length of the arguments array, or %NULL * * Gets the list of arguments that was passed on the command line. * diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c index db93201bc..827bffcf7 100644 --- a/gio/gasyncinitable.c +++ b/gio/gasyncinitable.c @@ -311,7 +311,7 @@ g_async_initable_real_init_finish (GAsyncInitable *initable, * @callback: a #GAsyncReadyCallback to call when the initialization is * finished * @user_data: the data to pass to callback function - * @first_property_name: (allow-none): the name of the first property, or %NULL if no + * @first_property_name: (nullable): the name of the first property, or %NULL if no * properties * @...: the value of the first property, followed by other property * value pairs, and ended by %NULL. diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index 4a79660de..5aaf72802 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -369,7 +369,7 @@ g_buffered_input_stream_new_sized (GInputStream *base_stream, * g_buffered_input_stream_fill: * @stream: a #GBufferedInputStream * @count: the number of bytes that will be read from the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer. @@ -455,7 +455,7 @@ async_fill_callback_wrapper (GObject *source_object, * @stream: a #GBufferedInputStream * @count: the number of bytes that will be read from the stream * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object + * @cancellable: (nullable): optional #GCancellable object * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): a #gpointer * @@ -941,7 +941,7 @@ g_buffered_input_stream_truncate (GSeekable *seekable, /** * g_buffered_input_stream_read_byte: * @stream: a #GBufferedInputStream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: location to store the error occurring, or %NULL to ignore * * Tries to read a single byte from the stream or the buffer. Will block diff --git a/gio/gcancellable.c b/gio/gcancellable.c index 42785b260..2d098367f 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -282,7 +282,7 @@ g_cancellable_reset (GCancellable *cancellable) /** * g_cancellable_is_cancelled: - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * * Checks if a cancellable job has been cancelled. * @@ -297,7 +297,7 @@ g_cancellable_is_cancelled (GCancellable *cancellable) /** * g_cancellable_set_error_if_cancelled: - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: #GError to append error state to * * If the @cancellable is cancelled, sets the error to notify @@ -361,7 +361,7 @@ g_cancellable_get_fd (GCancellable *cancellable) /** * g_cancellable_make_pollfd: - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @pollfd: a pointer to a #GPollFD * * Creates a #GPollFD corresponding to @cancellable; this can be passed @@ -524,7 +524,7 @@ g_cancellable_cancel (GCancellable *cancellable) * @cancellable: A #GCancellable. * @callback: The #GCallback to connect. * @data: Data to pass to @callback. - * @data_destroy_func: (allow-none): Free function for @data or %NULL. + * @data_destroy_func: (nullable): Free function for @data or %NULL. * * Convenience function to connect to the #GCancellable::cancelled * signal. Also handles the race condition that may happen @@ -593,7 +593,7 @@ g_cancellable_connect (GCancellable *cancellable, /** * g_cancellable_disconnect: - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @handler_id: Handler id of the handler to be disconnected, or %0. * * Disconnects a handler from a cancellable instance similar to @@ -714,7 +714,7 @@ static GSourceFuncs cancellable_source_funcs = /** * g_cancellable_source_new: (skip) - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * * Creates a source that triggers if @cancellable is cancelled and * calls its callback of type #GCancellableSourceFunc. This is diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index 9586c31d9..76a5b137b 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -486,7 +486,7 @@ g_content_type_get_symbolic_icon (const gchar *type) * [shared-mime-info](http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec) * specification for more on the generic icon name. * - * Returns: (allow-none): the registered generic icon name for the given @type, + * Returns: (nullable): the registered generic icon name for the given @type, * or %NULL if unknown. Free with g_free() * * Since: 2.34 @@ -591,10 +591,10 @@ g_content_type_from_mime_type (const gchar *mime_type) /** * g_content_type_guess: - * @filename: (allow-none): a string, or %NULL - * @data: (allow-none) (array length=data_size): a stream of data, or %NULL + * @filename: (nullable): a string, or %NULL + * @data: (nullable) (array length=data_size): a stream of data, or %NULL * @data_size: the size of @data - * @result_uncertain: (allow-none) (out): return location for the certainty + * @result_uncertain: (out) (optional): return location for the certainty * of the result, or %NULL * * Guesses the content type based on example data. If the function is diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c index d23b8f269..5fb26cbaf 100644 --- a/gio/gconverterinputstream.c +++ b/gio/gconverterinputstream.c @@ -262,7 +262,9 @@ buffer_read (Buffer *buffer, char *dest, gsize count) { - memcpy (dest, buffer->data + buffer->start, count); + if (count != 0) + memcpy (dest, buffer->data + buffer->start, count); + buffer_consumed (buffer, count); } @@ -293,9 +295,11 @@ grow_buffer (Buffer *buffer) data = g_malloc (size); in_buffer = buffer_data_size (buffer); - memcpy (data, - buffer->data + buffer->start, - in_buffer); + if (in_buffer != 0) + memcpy (data, + buffer->data + buffer->start, + in_buffer); + g_free (buffer->data); buffer->data = data; buffer->end -= buffer->start; diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c index 46616b1a4..eef277eda 100644 --- a/gio/gconverteroutputstream.c +++ b/gio/gconverteroutputstream.c @@ -300,9 +300,11 @@ grow_buffer (Buffer *buffer) data = g_malloc (size); in_buffer = buffer_data_size (buffer); - memcpy (data, - buffer->data + buffer->start, - in_buffer); + if (in_buffer != 0) + memcpy (data, + buffer->data + buffer->start, + in_buffer); + g_free (buffer->data); buffer->data = data; buffer->end -= buffer->start; diff --git a/gio/gdatagrambased.c b/gio/gdatagrambased.c index afb37e3b8..af3eb63f7 100644 --- a/gio/gdatagrambased.c +++ b/gio/gdatagrambased.c @@ -102,7 +102,7 @@ g_datagram_based_default_init (GDatagramBasedInterface *iface) * @flags: an int containing #GSocketMsgFlags flags for the overall operation * @timeout: the maximum time (in microseconds) to wait, 0 to not block, or -1 * to block indefinitely - * @cancellable: (allow-none): a %GCancellable + * @cancellable: (nullable): a %GCancellable * @error: return location for a #GError * * Receive one or more data messages from @datagram_based in one go. diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index 9a7e722be..4c50f357b 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -318,7 +318,7 @@ read_data (GDataInputStream *stream, /** * g_data_input_stream_read_byte: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads an unsigned 8-bit/1-byte value from @stream. @@ -345,7 +345,7 @@ g_data_input_stream_read_byte (GDataInputStream *stream, /** * g_data_input_stream_read_int16: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a 16-bit/2-byte value from @stream. @@ -389,7 +389,7 @@ g_data_input_stream_read_int16 (GDataInputStream *stream, /** * g_data_input_stream_read_uint16: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads an unsigned 16-bit/2-byte value from @stream. @@ -433,7 +433,7 @@ g_data_input_stream_read_uint16 (GDataInputStream *stream, /** * g_data_input_stream_read_int32: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a signed 32-bit/4-byte value from @stream. @@ -481,7 +481,7 @@ g_data_input_stream_read_int32 (GDataInputStream *stream, /** * g_data_input_stream_read_uint32: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads an unsigned 32-bit/4-byte value from @stream. @@ -529,7 +529,7 @@ g_data_input_stream_read_uint32 (GDataInputStream *stream, /** * g_data_input_stream_read_int64: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a 64-bit/8-byte value from @stream. @@ -577,7 +577,7 @@ g_data_input_stream_read_int64 (GDataInputStream *stream, /** * g_data_input_stream_read_uint64: * @stream: a given #GDataInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads an unsigned 64-bit/8-byte value from @stream. @@ -724,7 +724,7 @@ scan_for_newline (GDataInputStream *stream, * g_data_input_stream_read_line: * @stream: a given #GDataInputStream. * @length: (out): a #gsize to get the length of the data read in. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a line from the data input stream. Note that no encoding @@ -810,7 +810,7 @@ g_data_input_stream_read_line (GDataInputStream *stream, * g_data_input_stream_read_line_utf8: * @stream: a given #GDataInputStream. * @length: (out): a #gsize to get the length of the data read in. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a UTF-8 encoded line from the data input stream. @@ -896,7 +896,7 @@ scan_for_chars (GDataInputStream *stream, * @stream: a given #GDataInputStream. * @stop_chars: characters to terminate the read. * @length: (out): a #gsize to get the length of the data read in. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * * Reads a string from the data input stream, up to the first @@ -1117,7 +1117,7 @@ g_data_input_stream_read_finish (GDataInputStream *stream, * g_data_input_stream_read_line_async: * @stream: a given #GDataInputStream. * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied. * @user_data: (closure): the data to pass to callback function. * @@ -1149,7 +1149,7 @@ g_data_input_stream_read_line_async (GDataInputStream *stream, * @stream: a given #GDataInputStream. * @stop_chars: characters to terminate the read. * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied. * @user_data: (closure): the data to pass to callback function. * @@ -1296,7 +1296,7 @@ g_data_input_stream_read_until_finish (GDataInputStream *stream, * @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is * nul-terminated * @length: (out): a #gsize to get the length of the data read in - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: #GError for error reporting * * Reads a string from the data input stream, up to the first @@ -1388,7 +1388,7 @@ g_data_input_stream_read_upto (GDataInputStream *stream, * @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is * nul-terminated * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gdataoutputstream.c b/gio/gdataoutputstream.c index ea7deb139..960c8da9d 100644 --- a/gio/gdataoutputstream.c +++ b/gio/gdataoutputstream.c @@ -232,7 +232,7 @@ g_data_output_stream_get_byte_order (GDataOutputStream *stream) * g_data_output_stream_put_byte: * @stream: a #GDataOutputStream. * @data: a #guchar. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts a byte into the output stream. @@ -259,7 +259,7 @@ g_data_output_stream_put_byte (GDataOutputStream *stream, * g_data_output_stream_put_int16: * @stream: a #GDataOutputStream. * @data: a #gint16. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts a signed 16-bit integer into the output stream. @@ -299,7 +299,7 @@ g_data_output_stream_put_int16 (GDataOutputStream *stream, * g_data_output_stream_put_uint16: * @stream: a #GDataOutputStream. * @data: a #guint16. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts an unsigned 16-bit integer into the output stream. @@ -339,7 +339,7 @@ g_data_output_stream_put_uint16 (GDataOutputStream *stream, * g_data_output_stream_put_int32: * @stream: a #GDataOutputStream. * @data: a #gint32. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts a signed 32-bit integer into the output stream. @@ -379,7 +379,7 @@ g_data_output_stream_put_int32 (GDataOutputStream *stream, * g_data_output_stream_put_uint32: * @stream: a #GDataOutputStream. * @data: a #guint32. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts an unsigned 32-bit integer into the stream. @@ -419,7 +419,7 @@ g_data_output_stream_put_uint32 (GDataOutputStream *stream, * g_data_output_stream_put_int64: * @stream: a #GDataOutputStream. * @data: a #gint64. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts a signed 64-bit integer into the stream. @@ -459,7 +459,7 @@ g_data_output_stream_put_int64 (GDataOutputStream *stream, * g_data_output_stream_put_uint64: * @stream: a #GDataOutputStream. * @data: a #guint64. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts an unsigned 64-bit integer into the stream. @@ -499,7 +499,7 @@ g_data_output_stream_put_uint64 (GDataOutputStream *stream, * g_data_output_stream_put_string: * @stream: a #GDataOutputStream. * @str: a string. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Puts a string into the output stream. diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c index 23f18c9f1..26fbec4c5 100644 --- a/gio/gdbusaddress.c +++ b/gio/gdbusaddress.c @@ -833,7 +833,7 @@ get_stream_thread_func (GTask *task, /** * g_dbus_address_get_stream: * @address: A valid D-Bus address. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @callback: A #GAsyncReadyCallback to call when the request is satisfied. * @user_data: Data to pass to @callback. * @@ -912,7 +912,7 @@ g_dbus_address_get_stream_finish (GAsyncResult *res, * g_dbus_address_get_stream_sync: * @address: A valid D-Bus address. * @out_guid: (optional) (out): %NULL or return location to store the GUID extracted from @address, if any. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Synchronously connects to an endpoint specified by @address and @@ -1356,6 +1356,7 @@ open_console_window (void) atexit (wait_console_window); } } + static void idle_timeout_cb (GDBusDaemon *daemon, gpointer user_data) { @@ -1404,12 +1405,13 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow if (daemon == NULL) { g_printerr ("Can't init bus: %s\n", error->message); + g_error_free (error); return; } g_signal_connect (daemon, "idle-timeout", G_CALLBACK (idle_timeout_cb), loop); - if ( publish_session_bus (_g_dbus_daemon_get_address (daemon))) + if (publish_session_bus (_g_dbus_daemon_get_address (daemon))) { g_main_loop_run (loop); @@ -1540,7 +1542,7 @@ get_session_address_platform_specific (GError **error) /** * g_dbus_address_get_for_bus_sync: * @bus_type: a #GBusType - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously looks up the D-Bus address for the well-known message diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c index 4036d778a..a870e86e0 100644 --- a/gio/gdbusauth.c +++ b/gio/gdbusauth.c @@ -1207,19 +1207,25 @@ _g_dbus_auth_run_server (GDBusAuth *auth, { gchar *data; gsize data_len; - gchar *encoded_data; + data = _g_dbus_auth_mechanism_server_data_send (mech, &data_len); - encoded_data = hexencode (data); - s = g_strdup_printf ("DATA %s\r\n", encoded_data); - g_free (encoded_data); - g_free (data); - debug_print ("SERVER: writing '%s'", s); - if (!g_data_output_stream_put_string (dos, s, cancellable, error)) + if (data != NULL) { + gchar *encoded_data; + + encoded_data = hexencode (data); + s = g_strdup_printf ("DATA %s\r\n", encoded_data); + g_free (encoded_data); + g_free (data); + + debug_print ("SERVER: writing '%s'", s); + if (!g_data_output_stream_put_string (dos, s, cancellable, error)) + { + g_free (s); + goto out; + } g_free (s); - goto out; } - g_free (s); } goto change_state; break; diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c index ffa3c64d6..3ae434f72 100644 --- a/gio/gdbusauthobserver.c +++ b/gio/gdbusauthobserver.c @@ -156,7 +156,7 @@ g_dbus_auth_observer_class_init (GDBusAuthObserverClass *klass) * GDBusAuthObserver::authorize-authenticated-peer: * @observer: The #GDBusAuthObserver emitting the signal. * @stream: A #GIOStream for the #GDBusConnection. - * @credentials: (allow-none): Credentials received from the peer or %NULL. + * @credentials: (nullable): Credentials received from the peer or %NULL. * * Emitted to check if a peer that is successfully authenticated * is authorized. @@ -228,7 +228,7 @@ g_dbus_auth_observer_new (void) * g_dbus_auth_observer_authorize_authenticated_peer: * @observer: A #GDBusAuthObserver. * @stream: A #GIOStream for the #GDBusConnection. - * @credentials: (allow-none): Credentials received from the peer or %NULL. + * @credentials: (nullable): Credentials received from the peer or %NULL. * * Emits the #GDBusAuthObserver::authorize-authenticated-peer signal on @observer. * diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 8977c671a..8400a6403 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -251,8 +251,8 @@ call_destroy_notify_data_free (CallDestroyNotifyData *data) /* * call_destroy_notify: <internal> - * @context: (allow-none): A #GMainContext or %NULL. - * @callback: (allow-none): A #GDestroyNotify or %NULL. + * @context: (nullable): A #GMainContext or %NULL. + * @callback: (nullable): A #GDestroyNotify or %NULL. * @user_data: Data to pass to @callback. * * Schedules @callback to run in @context. @@ -1026,7 +1026,7 @@ g_dbus_connection_class_init (GDBusConnectionClass *klass) * @connection: the #GDBusConnection emitting the signal * @remote_peer_vanished: %TRUE if @connection is closed because the * remote peer closed its end of the connection - * @error: (allow-none): a #GError with more details about the event or %NULL + * @error: (nullable): a #GError with more details about the event or %NULL * * Emitted when the connection is closed. * @@ -1217,8 +1217,8 @@ flush_in_thread_func (GTask *task, /** * g_dbus_connection_flush: * @connection: a #GDBusConnection - * @cancellable: (allow-none): a #GCancellable or %NULL - * @callback: (allow-none): a #GAsyncReadyCallback to call when the + * @cancellable: (nullable): a #GCancellable or %NULL + * @callback: (nullable): a #GAsyncReadyCallback to call when the * request is satisfied or %NULL if you don't care about the result * @user_data: The data to pass to @callback * @@ -1283,7 +1283,7 @@ g_dbus_connection_flush_finish (GDBusConnection *connection, /** * g_dbus_connection_flush_sync: * @connection: a #GDBusConnection - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously flushes @connection. The calling thread is blocked @@ -1398,8 +1398,8 @@ schedule_closed_unlocked (GDBusConnection *connection, /** * g_dbus_connection_close: * @connection: a #GDBusConnection - * @cancellable: (allow-none): a #GCancellable or %NULL - * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is + * @cancellable: (nullable): a #GCancellable or %NULL + * @callback: (nullable): a #GAsyncReadyCallback to call when the request is * satisfied or %NULL if you don't care about the result * @user_data: The data to pass to @callback * @@ -1497,7 +1497,7 @@ sync_close_cb (GObject *source_object, /** * g_dbus_connection_close_sync: * @connection: a #GDBusConnection - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously closees @connection. The calling thread is blocked @@ -1684,7 +1684,7 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection, * @connection: a #GDBusConnection * @message: a #GDBusMessage * @flags: flags affecting how the message is sent - * @out_serial: (out) (allow-none): return location for serial number assigned + * @out_serial: (out) (optional): return location for serial number assigned * to @message when sending it or %NULL * @error: Return location for error or %NULL * @@ -1952,10 +1952,10 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect * @flags: flags affecting how the message is sent * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @out_serial: (out) (allow-none): return location for serial number assigned + * @out_serial: (out) (optional): return location for serial number assigned * to @message when sending it or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL - * @callback: (allow-none): a #GAsyncReadyCallback to call when the request + * @cancellable: (nullable): a #GCancellable or %NULL + * @callback: (nullable): a #GAsyncReadyCallback to call when the request * is satisfied or %NULL if you don't care about the result * @user_data: The data to pass to @callback * @@ -2077,9 +2077,9 @@ send_message_with_reply_sync_cb (GDBusConnection *connection, * @flags: flags affecting how the message is sent. * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @out_serial: (out) (allow-none): return location for serial number + * @out_serial: (out) (optional): return location for serial number * assigned to @message when sending it or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously sends @message to the peer represented by @connection @@ -2649,10 +2649,10 @@ async_initable_iface_init (GAsyncInitableIface *async_initable_iface) /** * g_dbus_connection_new: * @stream: a #GIOStream - * @guid: (allow-none): the GUID to use if a authenticating as a server or %NULL + * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL * @flags: flags describing how to make the connection - * @observer: (allow-none): a #GDBusAuthObserver or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @observer: (nullable): a #GDBusAuthObserver or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: the data to pass to @callback * @@ -2739,10 +2739,10 @@ g_dbus_connection_new_finish (GAsyncResult *res, /** * g_dbus_connection_new_sync: * @stream: a #GIOStream - * @guid: (allow-none): the GUID to use if a authenticating as a server or %NULL + * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL * @flags: flags describing how to make the connection - * @observer: (allow-none): a #GDBusAuthObserver or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @observer: (nullable): a #GDBusAuthObserver or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously sets up a D-Bus connection for exchanging D-Bus messages @@ -2791,8 +2791,8 @@ g_dbus_connection_new_sync (GIOStream *stream, * g_dbus_connection_new_for_address: * @address: a D-Bus address * @flags: flags describing how to make the connection - * @observer: (allow-none): a #GDBusAuthObserver or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @observer: (nullable): a #GDBusAuthObserver or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: the data to pass to @callback * @@ -2878,8 +2878,8 @@ g_dbus_connection_new_for_address_finish (GAsyncResult *res, * g_dbus_connection_new_for_address_sync: * @address: a D-Bus address * @flags: flags describing how to make the connection - * @observer: (allow-none): a #GDBusAuthObserver or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @observer: (nullable): a #GDBusAuthObserver or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously connects and sets up a D-Bus client connection for @@ -3360,21 +3360,21 @@ is_signal_data_for_name_lost_or_acquired (SignalData *signal_data) /** * g_dbus_connection_signal_subscribe: * @connection: a #GDBusConnection - * @sender: (allow-none): sender name to match on (unique or well-known name) + * @sender: (nullable): sender name to match on (unique or well-known name) * or %NULL to listen from all senders - * @interface_name: (allow-none): D-Bus interface name to match on or %NULL to + * @interface_name: (nullable): D-Bus interface name to match on or %NULL to * match on all interfaces - * @member: (allow-none): D-Bus signal name to match on or %NULL to match on + * @member: (nullable): D-Bus signal name to match on or %NULL to match on * all signals - * @object_path: (allow-none): object path to match on or %NULL to match on + * @object_path: (nullable): object path to match on or %NULL to match on * all object paths - * @arg0: (allow-none): contents of first string argument to match on or %NULL + * @arg0: (nullable): contents of first string argument to match on or %NULL * to match on all kinds of arguments * @flags: #GDBusSignalFlags describing how arg0 is used in subscribing to the * signal * @callback: callback to invoke when there is a signal matching the requested data * @user_data: user data to pass to @callback - * @user_data_free_func: (allow-none): function to free @user_data with when + * @user_data_free_func: (nullable): function to free @user_data with when * subscription is removed or %NULL * * Subscribes to signals on @connection and invokes @callback with a whenever @@ -5057,8 +5057,8 @@ obj_message_func (GDBusConnection *connection, * @connection: a #GDBusConnection * @object_path: the object path to register at * @interface_info: introspection data for the interface - * @vtable: (allow-none): a #GDBusInterfaceVTable to call into or %NULL - * @user_data: (allow-none): data to pass to functions in @vtable + * @vtable: (nullable): a #GDBusInterfaceVTable to call into or %NULL + * @user_data: (nullable): data to pass to functions in @vtable * @user_data_free_func: function to call when the object path is unregistered * @error: return location for error or %NULL * @@ -5488,12 +5488,12 @@ g_dbus_connection_register_object_with_closures (GDBusConnection *connection /** * g_dbus_connection_emit_signal: * @connection: a #GDBusConnection - * @destination_bus_name: (allow-none): the unique bus name for the destination + * @destination_bus_name: (nullable): the unique bus name for the destination * for the signal or %NULL to emit to all listeners * @object_path: path of remote object * @interface_name: D-Bus interface to emit a signal on * @signal_name: the name of the signal to emit - * @parameters: (allow-none): a #GVariant tuple with parameters for the signal + * @parameters: (nullable): a #GVariant tuple with parameters for the signal * or %NULL if not passing parameters * @error: Return location for error or %NULL * @@ -5986,19 +5986,19 @@ g_dbus_connection_call_sync_internal (GDBusConnection *connection, /** * g_dbus_connection_call: * @connection: a #GDBusConnection - * @bus_name: (allow-none): a unique or well-known bus name or %NULL if + * @bus_name: (nullable): a unique or well-known bus name or %NULL if * @connection is not a message bus connection * @object_path: path of remote object * @interface_name: D-Bus interface to invoke method on * @method_name: the name of the method to invoke - * @parameters: (allow-none): a #GVariant tuple with parameters for the method + * @parameters: (nullable): a #GVariant tuple with parameters for the method * or %NULL if not passing parameters - * @reply_type: (allow-none): the expected type of the reply, or %NULL + * @reply_type: (nullable): the expected type of the reply, or %NULL * @flags: flags from the #GDBusCallFlags enumeration * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @cancellable: (allow-none): a #GCancellable or %NULL - * @callback: (allow-none): a #GAsyncReadyCallback to call when the request + * @cancellable: (nullable): a #GCancellable or %NULL + * @callback: (nullable): a #GAsyncReadyCallback to call when the request * is satisfied or %NULL if you don't care about the result of the * method invocation * @user_data: the data to pass to @callback @@ -6090,18 +6090,18 @@ g_dbus_connection_call_finish (GDBusConnection *connection, /** * g_dbus_connection_call_sync: * @connection: a #GDBusConnection - * @bus_name: (allow-none): a unique or well-known bus name or %NULL if + * @bus_name: (nullable): a unique or well-known bus name or %NULL if * @connection is not a message bus connection * @object_path: path of remote object * @interface_name: D-Bus interface to invoke method on * @method_name: the name of the method to invoke - * @parameters: (allow-none): a #GVariant tuple with parameters for the method + * @parameters: (nullable): a #GVariant tuple with parameters for the method * or %NULL if not passing parameters - * @reply_type: (allow-none): the expected type of the reply, or %NULL + * @reply_type: (nullable): the expected type of the reply, or %NULL * @flags: flags from the #GDBusCallFlags enumeration * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously invokes the @method_name method on the @@ -6169,20 +6169,20 @@ g_dbus_connection_call_sync (GDBusConnection *connection, /** * g_dbus_connection_call_with_unix_fd_list: * @connection: a #GDBusConnection - * @bus_name: (allow-none): a unique or well-known bus name or %NULL if + * @bus_name: (nullable): a unique or well-known bus name or %NULL if * @connection is not a message bus connection * @object_path: path of remote object * @interface_name: D-Bus interface to invoke method on * @method_name: the name of the method to invoke - * @parameters: (allow-none): a #GVariant tuple with parameters for the method + * @parameters: (nullable): a #GVariant tuple with parameters for the method * or %NULL if not passing parameters - * @reply_type: (allow-none): the expected type of the reply, or %NULL + * @reply_type: (nullable): the expected type of the reply, or %NULL * @flags: flags from the #GDBusCallFlags enumeration * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @fd_list: (allow-none): a #GUnixFDList or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL - * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is + * @fd_list: (nullable): a #GUnixFDList or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL + * @callback: (nullable): a #GAsyncReadyCallback to call when the request is * satisfied or %NULL if you don't * care about the result of the * method invocation * @user_data: The data to pass to @callback. @@ -6214,7 +6214,7 @@ g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection, /** * g_dbus_connection_call_with_unix_fd_list_finish: * @connection: a #GDBusConnection - * @out_fd_list: (out) (allow-none): return location for a #GUnixFDList or %NULL + * @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL * @res: a #GAsyncResult obtained from the #GAsyncReadyCallback passed to * g_dbus_connection_call_with_unix_fd_list() * @error: return location for error or %NULL @@ -6238,20 +6238,20 @@ g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection, /** * g_dbus_connection_call_with_unix_fd_list_sync: * @connection: a #GDBusConnection - * @bus_name: (allow-none): a unique or well-known bus name or %NULL + * @bus_name: (nullable): a unique or well-known bus name or %NULL * if @connection is not a message bus connection * @object_path: path of remote object * @interface_name: D-Bus interface to invoke method on * @method_name: the name of the method to invoke - * @parameters: (allow-none): a #GVariant tuple with parameters for + * @parameters: (nullable): a #GVariant tuple with parameters for * the method or %NULL if not passing parameters - * @reply_type: (allow-none): the expected type of the reply, or %NULL + * @reply_type: (nullable): the expected type of the reply, or %NULL * @flags: flags from the #GDBusCallFlags enumeration * @timeout_msec: the timeout in milliseconds, -1 to use the default * timeout or %G_MAXINT for no timeout - * @fd_list: (allow-none): a #GUnixFDList or %NULL - * @out_fd_list: (out) (allow-none): return location for a #GUnixFDList or %NULL - * @cancellable: (allow-none): a #GCancellable or %NULL + * @fd_list: (nullable): a #GUnixFDList or %NULL + * @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Like g_dbus_connection_call_sync() but also takes and returns #GUnixFDList objects. @@ -7218,7 +7218,7 @@ _g_bus_get_singleton_if_exists (GBusType bus_type) /** * g_bus_get_sync: * @bus_type: a #GBusType - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @error: return location for error or %NULL * * Synchronously connects to the message bus specified by @bus_type. @@ -7292,7 +7292,7 @@ bus_get_async_initable_cb (GObject *source_object, /** * g_bus_get: * @bus_type: a #GBusType - * @cancellable: (allow-none): a #GCancellable or %NULL + * @cancellable: (nullable): a #GCancellable or %NULL * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: the data to pass to @callback * diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h index abc87779e..0e61885b8 100644 --- a/gio/gdbusconnection.h +++ b/gio/gdbusconnection.h @@ -652,7 +652,7 @@ void g_dbus_connection_signal_unsubscribe (GDBusConnection * check this ahead of time using g_dbus_message_to_blob() passing a * #GDBusCapabilityFlags value obtained from @connection. * - * Returns: (transfer full) (allow-none): A #GDBusMessage that will be freed with + * Returns: (transfer full) (nullable): A #GDBusMessage that will be freed with * g_object_unref() or %NULL to drop the message. Passive filter * functions can simply return the passed @message object. * diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c index 8dd4b7181..dd7ab21e5 100644 --- a/gio/gdbuserror.c +++ b/gio/gdbuserror.c @@ -659,7 +659,7 @@ g_dbus_error_new_for_dbus_error (const gchar *dbus_error_name, * @error: A pointer to a #GError or %NULL. * @dbus_error_name: D-Bus error name. * @dbus_error_message: D-Bus error message. - * @format: (allow-none): printf()-style format to prepend to @dbus_error_message or %NULL. + * @format: (nullable): printf()-style format to prepend to @dbus_error_message or %NULL. * @...: Arguments for @format. * * Does nothing if @error is %NULL. Otherwise sets *@error to @@ -704,7 +704,7 @@ g_dbus_error_set_dbus_error (GError **error, * @error: A pointer to a #GError or %NULL. * @dbus_error_name: D-Bus error name. * @dbus_error_message: D-Bus error message. - * @format: (allow-none): printf()-style format to prepend to @dbus_error_message or %NULL. + * @format: (nullable): printf()-style format to prepend to @dbus_error_message or %NULL. * @var_args: Arguments for @format. * * Like g_dbus_error_set_dbus_error() but intended for language bindings. diff --git a/gio/gdbusinterface.c b/gio/gdbusinterface.c index 4f1ce3f4a..65eb4e002 100644 --- a/gio/gdbusinterface.c +++ b/gio/gdbusinterface.c @@ -119,7 +119,7 @@ g_dbus_interface_dup_object (GDBusInterface *interface_) /** * g_dbus_interface_set_object: * @interface_: An exported D-Bus interface. - * @object: (allow-none): A #GDBusObject or %NULL. + * @object: (nullable): A #GDBusObject or %NULL. * * Sets the #GDBusObject for @interface_ to @object. * diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c index 6d3ff93ea..bb510909a 100644 --- a/gio/gdbusintrospection.c +++ b/gio/gdbusintrospection.c @@ -1838,7 +1838,7 @@ g_dbus_node_info_new_for_xml (const gchar *xml_data, /** * g_dbus_annotation_info_lookup: - * @annotations: (array zero-terminated=1) (allow-none): A %NULL-terminated array of annotations or %NULL. + * @annotations: (array zero-terminated=1) (nullable): A %NULL-terminated array of annotations or %NULL. * @name: The name of the annotation to look up. * * Looks up the value of an annotation. diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index 86bd5bf1e..94b75ff88 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -580,9 +580,9 @@ g_dbus_message_new (void) /** * g_dbus_message_new_method_call: - * @name: (allow-none): A valid D-Bus name or %NULL. + * @name: (nullable): A valid D-Bus name or %NULL. * @path: A valid object path. - * @interface_: (allow-none): A valid D-Bus interface name or %NULL. + * @interface_: (nullable): A valid D-Bus interface name or %NULL. * @method: A valid method name. * * Creates a new #GDBusMessage for a method call. @@ -999,7 +999,7 @@ g_dbus_message_get_header (GDBusMessage *message, * g_dbus_message_set_header: * @message: A #GDBusMessage. * @header_field: A 8-bit unsigned integer (typically a value from the #GDBusMessageHeaderField enumeration) - * @value: (allow-none): A #GVariant to set the header field or %NULL to clear the header field. + * @value: (nullable): A #GVariant to set the header field or %NULL to clear the header field. * * Sets a header field on @message. * @@ -1162,7 +1162,7 @@ g_dbus_message_get_unix_fd_list (GDBusMessage *message) /** * g_dbus_message_set_unix_fd_list: * @message: A #GDBusMessage. - * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @fd_list: (nullable): A #GUnixFDList or %NULL. * * Sets the UNIX file descriptors associated with @message. As a * side-effect the %G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS header @@ -1451,7 +1451,7 @@ parse_value_from_blob (GMemoryBuffer *buf, indent, "", just_align ? "Aligning" : "Reading", s, - (gint) g_seekable_tell (G_SEEKABLE (buf))); + (gint) buf->pos); g_free (s); } #endif /* DEBUG_SERIALIZER */ @@ -3444,6 +3444,7 @@ g_dbus_message_print (GDBusMessage *message, { g_string_append_printf (str, "%*s (none)\n", indent, ""); } + g_list_free (keys); g_string_append_printf (str, "%*sBody: ", indent, ""); if (message->body != NULL) { diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index fc8bee20c..d111394dc 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -325,12 +325,12 @@ g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation) /* < internal > * _g_dbus_method_invocation_new: - * @sender: (allow-none): The bus name that invoked the method or %NULL if @connection is not a bus connection. + * @sender: (nullable): The bus name that invoked the method or %NULL if @connection is not a bus connection. * @object_path: The object path the method was invoked on. * @interface_name: The name of the D-Bus interface the method was invoked on. * @method_name: The name of the method that was invoked. - * @method_info: (allow-none): Information about the method call or %NULL. - * @property_info: (allow-none): Information about the property or %NULL. + * @method_info: (nullable): Information about the method call or %NULL. + * @property_info: (nullable): Information about the property or %NULL. * @connection: The #GDBusConnection the method was invoked on. * @message: The D-Bus message as a #GDBusMessage. * @parameters: The parameters as a #GVariant tuple. @@ -529,14 +529,16 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio /** * g_dbus_method_invocation_return_value: * @invocation: (transfer full): A #GDBusMethodInvocation. - * @parameters: (allow-none): A #GVariant tuple with out parameters for the method or %NULL if not passing any parameters. + * @parameters: (nullable): A #GVariant tuple with out parameters for the method or %NULL if not passing any parameters. * * Finishes handling a D-Bus method call by returning @parameters. * If the @parameters GVariant is floating, it is consumed. * * It is an error if @parameters is not of the right format. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since 2.48, if the method call requested for a reply not to be sent * then this call will sink @parameters and free @invocation, but @@ -556,14 +558,16 @@ g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation, /** * g_dbus_method_invocation_return_value_with_unix_fd_list: * @invocation: (transfer full): A #GDBusMethodInvocation. - * @parameters: (allow-none): A #GVariant tuple with out parameters for the method or %NULL if not passing any parameters. - * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @parameters: (nullable): A #GVariant tuple with out parameters for the method or %NULL if not passing any parameters. + * @fd_list: (nullable): A #GUnixFDList or %NULL. * * Like g_dbus_method_invocation_return_value() but also takes a #GUnixFDList. * * This method is only available on UNIX. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.30 */ @@ -599,7 +603,9 @@ g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation * * always register errors with g_dbus_error_register_error() * or use g_dbus_method_invocation_return_dbus_error(). * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since 2.48, if the method call requested for a reply not to be sent * then this call will free @invocation but otherwise do nothing (as per @@ -639,7 +645,9 @@ g_dbus_method_invocation_return_error (GDBusMethodInvocation *invocation, * Like g_dbus_method_invocation_return_error() but intended for * language bindings. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.26 */ @@ -672,7 +680,9 @@ g_dbus_method_invocation_return_error_valist (GDBusMethodInvocation *invocation, * * Like g_dbus_method_invocation_return_error() but without printf()-style formatting. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.26 */ @@ -700,7 +710,9 @@ g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation * Like g_dbus_method_invocation_return_error() but takes a #GError * instead of the error domain, error code and message. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.26 */ @@ -729,7 +741,9 @@ g_dbus_method_invocation_return_gerror (GDBusMethodInvocation *invocation, * Like g_dbus_method_invocation_return_gerror() but takes ownership * of @error so the caller does not need to free it. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.30 */ @@ -751,7 +765,9 @@ g_dbus_method_invocation_take_error (GDBusMethodInvocation *invocation, * * Finishes handling a D-Bus method call by returning an error. * - * This method will free @invocation, you cannot use it afterwards. + * This method will take ownership of @invocation. See + * #GDBusInterfaceVTable for more information about the ownership of + * @invocation. * * Since: 2.26 */ diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c index 00b2dfd7d..c95e43490 100644 --- a/gio/gdbusnameowning.c +++ b/gio/gdbusnameowning.c @@ -495,10 +495,10 @@ connection_get_cb (GObject *source_object, * @connection: a #GDBusConnection * @name: the well-known name to own * @flags: a set of flags from the #GBusNameOwnerFlags enumeration - * @name_acquired_handler: (allow-none): handler to invoke when @name is acquired or %NULL - * @name_lost_handler: (allow-none): handler to invoke when @name is lost or %NULL + * @name_acquired_handler: (nullable): handler to invoke when @name is acquired or %NULL + * @name_lost_handler: (nullable): handler to invoke when @name is lost or %NULL * @user_data: user data to pass to handlers - * @user_data_free_func: (allow-none): function for freeing @user_data or %NULL + * @user_data_free_func: (nullable): function for freeing @user_data or %NULL * * Like g_bus_own_name() but takes a #GDBusConnection instead of a * #GBusType. @@ -557,11 +557,11 @@ g_bus_own_name_on_connection (GDBusConnection *connection, * @bus_type: the type of bus to own a name on * @name: the well-known name to own * @flags: a set of flags from the #GBusNameOwnerFlags enumeration - * @bus_acquired_handler: (allow-none): handler to invoke when connected to the bus of type @bus_type or %NULL - * @name_acquired_handler: (allow-none): handler to invoke when @name is acquired or %NULL - * @name_lost_handler: (allow-none): handler to invoke when @name is lost or %NULL + * @bus_acquired_handler: (nullable): handler to invoke when connected to the bus of type @bus_type or %NULL + * @name_acquired_handler: (nullable): handler to invoke when @name is acquired or %NULL + * @name_lost_handler: (nullable): handler to invoke when @name is lost or %NULL * @user_data: user data to pass to handlers - * @user_data_free_func: (allow-none): function for freeing @user_data or %NULL + * @user_data_free_func: (nullable): function for freeing @user_data or %NULL * * Starts acquiring @name on the bus specified by @bus_type and calls * @name_acquired_handler and @name_lost_handler when the name is @@ -788,11 +788,11 @@ bus_own_name_free_func (gpointer user_data) * @bus_type: the type of bus to own a name on * @name: the well-known name to own * @flags: a set of flags from the #GBusNameOwnerFlags enumeration - * @bus_acquired_closure: (allow-none): #GClosure to invoke when connected to + * @bus_acquired_closure: (nullable): #GClosure to invoke when connected to * the bus of type @bus_type or %NULL - * @name_acquired_closure: (allow-none): #GClosure to invoke when @name is + * @name_acquired_closure: (nullable): #GClosure to invoke when @name is * acquired or %NULL - * @name_lost_closure: (allow-none): #GClosure to invoke when @name is lost or + * @name_lost_closure: (nullable): #GClosure to invoke when @name is lost or * %NULL * * Version of g_bus_own_name() using closures instead of callbacks for @@ -828,9 +828,9 @@ g_bus_own_name_with_closures (GBusType bus_type, * @connection: a #GDBusConnection * @name: the well-known name to own * @flags: a set of flags from the #GBusNameOwnerFlags enumeration - * @name_acquired_closure: (allow-none): #GClosure to invoke when @name is + * @name_acquired_closure: (nullable): #GClosure to invoke when @name is * acquired or %NULL - * @name_lost_closure: (allow-none): #GClosure to invoke when @name is lost + * @name_lost_closure: (nullable): #GClosure to invoke when @name is lost * or %NULL * * Version of g_bus_own_name_on_connection() using closures instead of diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c index 07713db0b..01ab4ce24 100644 --- a/gio/gdbusnamewatching.c +++ b/gio/gdbusnamewatching.c @@ -505,10 +505,10 @@ connection_get_cb (GObject *source_object, * @bus_type: The type of bus to watch a name on. * @name: The name (well-known or unique) to watch. * @flags: Flags from the #GBusNameWatcherFlags enumeration. - * @name_appeared_handler: (allow-none): Handler to invoke when @name is known to exist or %NULL. - * @name_vanished_handler: (allow-none): Handler to invoke when @name is known to not exist or %NULL. + * @name_appeared_handler: (nullable): Handler to invoke when @name is known to exist or %NULL. + * @name_vanished_handler: (nullable): Handler to invoke when @name is known to not exist or %NULL. * @user_data: User data to pass to handlers. - * @user_data_free_func: (allow-none): Function for freeing @user_data or %NULL. + * @user_data_free_func: (nullable): Function for freeing @user_data or %NULL. * * Starts watching @name on the bus specified by @bus_type and calls * @name_appeared_handler and @name_vanished_handler when the name is @@ -594,10 +594,10 @@ g_bus_watch_name (GBusType bus_type, * @connection: A #GDBusConnection. * @name: The name (well-known or unique) to watch. * @flags: Flags from the #GBusNameWatcherFlags enumeration. - * @name_appeared_handler: (allow-none): Handler to invoke when @name is known to exist or %NULL. - * @name_vanished_handler: (allow-none): Handler to invoke when @name is known to not exist or %NULL. + * @name_appeared_handler: (nullable): Handler to invoke when @name is known to exist or %NULL. + * @name_vanished_handler: (nullable): Handler to invoke when @name is known to not exist or %NULL. * @user_data: User data to pass to handlers. - * @user_data_free_func: (allow-none): Function for freeing @user_data or %NULL. + * @user_data_free_func: (nullable): Function for freeing @user_data or %NULL. * * Like g_bus_watch_name() but takes a #GDBusConnection instead of a * #GBusType. @@ -744,9 +744,9 @@ bus_watch_name_free_func (gpointer user_data) * @bus_type: The type of bus to watch a name on. * @name: The name (well-known or unique) to watch. * @flags: Flags from the #GBusNameWatcherFlags enumeration. - * @name_appeared_closure: (allow-none): #GClosure to invoke when @name is known + * @name_appeared_closure: (nullable): #GClosure to invoke when @name is known * to exist or %NULL. - * @name_vanished_closure: (allow-none): #GClosure to invoke when @name is known + * @name_vanished_closure: (nullable): #GClosure to invoke when @name is known * to not exist or %NULL. * * Version of g_bus_watch_name() using closures instead of callbacks for @@ -778,9 +778,9 @@ g_bus_watch_name_with_closures (GBusType bus_type, * @connection: A #GDBusConnection. * @name: The name (well-known or unique) to watch. * @flags: Flags from the #GBusNameWatcherFlags enumeration. - * @name_appeared_closure: (allow-none): #GClosure to invoke when @name is known + * @name_appeared_closure: (nullable): #GClosure to invoke when @name is known * to exist or %NULL. - * @name_vanished_closure: (allow-none): #GClosure to invoke when @name is known + * @name_vanished_closure: (nullable): #GClosure to invoke when @name is known * to not exist or %NULL. * * Version of g_bus_watch_name_on_connection() using closures instead of callbacks for diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index 29bb1dbd0..a94d2f35a 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -581,12 +581,12 @@ g_dbus_object_manager_client_init (GDBusObjectManagerClient *manager) * g_dbus_object_manager_client_new_sync: * @connection: A #GDBusConnection. * @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration. - * @name: (allow-none): The owner of the control object (unique or well-known name), or %NULL when not using a message bus connection. + * @name: (nullable): The owner of the control object (unique or well-known name), or %NULL when not using a message bus connection. * @object_path: The object path of the control object. - * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. + * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. * @get_proxy_type_user_data: User data to pass to @get_proxy_type_func. - * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL + * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL * @error: Return location for error or %NULL. * * Creates a new #GDBusObjectManagerClient object. @@ -643,10 +643,10 @@ g_dbus_object_manager_client_new_sync (GDBusConnection *connection * @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration. * @name: The owner of the control object (unique or well-known name). * @object_path: The object path of the control object. - * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. + * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. * @get_proxy_type_user_data: User data to pass to @get_proxy_type_func. - * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL + * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL * @callback: A #GAsyncReadyCallback to call when the request is satisfied. * @user_data: The data to pass to @callback. * @@ -735,10 +735,10 @@ g_dbus_object_manager_client_new_finish (GAsyncResult *res, * @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration. * @name: The owner of the control object (unique or well-known name). * @object_path: The object path of the control object. - * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. + * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. * @get_proxy_type_user_data: User data to pass to @get_proxy_type_func. - * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL + * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL * @error: Return location for error or %NULL. * * Like g_dbus_object_manager_client_new_sync() but takes a #GBusType instead @@ -795,10 +795,10 @@ g_dbus_object_manager_client_new_for_bus_sync (GBusType bu * @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration. * @name: The owner of the control object (unique or well-known name). * @object_path: The object path of the control object. - * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. + * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. * @get_proxy_type_user_data: User data to pass to @get_proxy_type_func. - * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL + * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL * @callback: A #GAsyncReadyCallback to call when the request is satisfied. * @user_data: The data to pass to @callback. * diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index 6aefb587e..31bfa8599 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -274,7 +274,7 @@ g_dbus_object_manager_server_new (const gchar *object_path) /** * g_dbus_object_manager_server_set_connection: * @manager: A #GDBusObjectManagerServer. - * @connection: (allow-none): A #GDBusConnection or %NULL. + * @connection: (nullable): A #GDBusConnection or %NULL. * * Exports all objects managed by @manager on @connection. If * @connection is %NULL, stops exporting objects. diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index 840a5542c..c7b126ead 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -1521,9 +1521,9 @@ continue_writing_in_idle_cb (gpointer user_data) } /* - * @write_data: (transfer full) (allow-none): - * @flush_data: (transfer full) (allow-none): - * @close_data: (transfer full) (allow-none): + * @write_data: (transfer full) (nullable): + * @flush_data: (transfer full) (nullable): + * @close_data: (transfer full) (nullable): * * Can be called from any thread * diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c index d98ffecd4..8676600c7 100644 --- a/gio/gdbusproxy.c +++ b/gio/gdbusproxy.c @@ -605,7 +605,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass) /** * GDBusProxy::g-signal: * @proxy: The #GDBusProxy emitting the signal. - * @sender_name: (allow-none): The sender of the signal or %NULL if the connection is not a bus connection. + * @sender_name: (nullable): The sender of the signal or %NULL if the connection is not a bus connection. * @signal_name: The name of the signal. * @parameters: A #GVariant tuple with parameters for the signal. * @@ -772,7 +772,7 @@ g_dbus_proxy_get_cached_property (GDBusProxy *proxy, * g_dbus_proxy_set_cached_property: * @proxy: A #GDBusProxy * @property_name: Property name. - * @value: (allow-none): Value for the property or %NULL to remove it from the cache. + * @value: (nullable): Value for the property or %NULL to remove it from the cache. * * If @value is not %NULL, sets the cached value for the property with * name @property_name to the value in @value. @@ -1976,11 +1976,11 @@ initable_iface_init (GInitableIface *initable_iface) * g_dbus_proxy_new: * @connection: A #GDBusConnection. * @flags: Flags used when constructing the proxy. - * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. + * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. * @object_path: An object path. * @interface_name: A D-Bus interface name. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @callback: Callback function to invoke when the proxy is ready. * @user_data: User data to pass to @callback. * @@ -2076,12 +2076,12 @@ g_dbus_proxy_new_finish (GAsyncResult *res, * g_dbus_proxy_new_sync: * @connection: A #GDBusConnection. * @flags: Flags used when constructing the proxy. - * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. + * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. * @object_path: An object path. * @interface_name: A D-Bus interface name. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: (allow-none): Return location for error or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. + * @error: (nullable): Return location for error or %NULL. * * Creates a proxy for accessing @interface_name on the remote object * at @object_path owned by @name at @connection and synchronously @@ -2146,11 +2146,11 @@ g_dbus_proxy_new_sync (GDBusConnection *connection, * g_dbus_proxy_new_for_bus: * @bus_type: A #GBusType. * @flags: Flags used when constructing the proxy. - * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. + * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or %NULL. * @name: A bus name (well-known or unique). * @object_path: An object path. * @interface_name: A D-Bus interface name. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @callback: Callback function to invoke when the proxy is ready. * @user_data: User data to pass to @callback. * @@ -2211,12 +2211,12 @@ g_dbus_proxy_new_for_bus_finish (GAsyncResult *res, * g_dbus_proxy_new_for_bus_sync: * @bus_type: A #GBusType. * @flags: Flags used when constructing the proxy. - * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface + * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface * that @proxy conforms to or %NULL. * @name: A bus name (well-known or unique). * @object_path: An object path. * @interface_name: A D-Bus interface name. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Like g_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. @@ -2466,7 +2466,7 @@ g_dbus_proxy_get_interface_info (GDBusProxy *proxy) /** * g_dbus_proxy_set_interface_info: * @proxy: A #GDBusProxy - * @info: (allow-none): Minimum interface this proxy conforms to or %NULL to unset. + * @info: (nullable): Minimum interface this proxy conforms to or %NULL to unset. * * Ensure that interactions with @proxy conform to the given * interface. See the #GDBusProxy:g-interface-info property for more @@ -2897,12 +2897,12 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy, * g_dbus_proxy_call: * @proxy: A #GDBusProxy. * @method_name: Name of method to invoke. - * @parameters: (allow-none): A #GVariant tuple with parameters for the signal or %NULL if not passing parameters. + * @parameters: (nullable): A #GVariant tuple with parameters for the signal or %NULL if not passing parameters. * @flags: Flags from the #GDBusCallFlags enumeration. * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning * "infinite") or -1 to use the proxy default timeout. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't + * @cancellable: (nullable): A #GCancellable or %NULL. + * @callback: (nullable): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't * care about the result of the method invocation. * @user_data: The data to pass to @callback. * @@ -2989,12 +2989,12 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy, * g_dbus_proxy_call_sync: * @proxy: A #GDBusProxy. * @method_name: Name of method to invoke. - * @parameters: (allow-none): A #GVariant tuple with parameters for the signal + * @parameters: (nullable): A #GVariant tuple with parameters for the signal * or %NULL if not passing parameters. * @flags: Flags from the #GDBusCallFlags enumeration. * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning * "infinite") or -1 to use the proxy default timeout. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Synchronously invokes the @method_name method on @proxy. @@ -3057,13 +3057,13 @@ g_dbus_proxy_call_sync (GDBusProxy *proxy, * g_dbus_proxy_call_with_unix_fd_list: * @proxy: A #GDBusProxy. * @method_name: Name of method to invoke. - * @parameters: (allow-none): A #GVariant tuple with parameters for the signal or %NULL if not passing parameters. + * @parameters: (nullable): A #GVariant tuple with parameters for the signal or %NULL if not passing parameters. * @flags: Flags from the #GDBusCallFlags enumeration. * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning * "infinite") or -1 to use the proxy default timeout. - * @fd_list: (allow-none): A #GUnixFDList or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't + * @fd_list: (nullable): A #GUnixFDList or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. + * @callback: (nullable): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't * care about the result of the method invocation. * @user_data: The data to pass to @callback. * @@ -3090,7 +3090,7 @@ g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy, /** * g_dbus_proxy_call_with_unix_fd_list_finish: * @proxy: A #GDBusProxy. - * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL. + * @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL. * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to g_dbus_proxy_call_with_unix_fd_list(). * @error: Return location for error or %NULL. * @@ -3114,14 +3114,14 @@ g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy, * g_dbus_proxy_call_with_unix_fd_list_sync: * @proxy: A #GDBusProxy. * @method_name: Name of method to invoke. - * @parameters: (allow-none): A #GVariant tuple with parameters for the signal + * @parameters: (nullable): A #GVariant tuple with parameters for the signal * or %NULL if not passing parameters. * @flags: Flags from the #GDBusCallFlags enumeration. * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning * "infinite") or -1 to use the proxy default timeout. - * @fd_list: (allow-none): A #GUnixFDList or %NULL. - * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @fd_list: (nullable): A #GUnixFDList or %NULL. + * @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Like g_dbus_proxy_call_sync() but also takes and returns #GUnixFDList objects. diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index d23711fa9..6a84e7523 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -448,8 +448,8 @@ on_run (GSocketService *service, * @address: A D-Bus address. * @flags: Flags from the #GDBusServerFlags enumeration. * @guid: A D-Bus GUID. - * @observer: (allow-none): A #GDBusAuthObserver or %NULL. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @observer: (nullable): A #GDBusAuthObserver or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for server or %NULL. * * Creates a new D-Bus server that listens on the first address in diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index fe9d71a0c..81dff27c9 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -506,7 +506,8 @@ add_token_result (const gchar *app_name, static void merge_token_results (gboolean first) { - qsort (static_token_results, static_token_results_size, sizeof (struct search_result), compare_results); + if (static_token_results_size != 0) + qsort (static_token_results, static_token_results_size, sizeof (struct search_result), compare_results); /* If this is the first token then we are basically merging a list with * itself -- we only perform de-duplication. @@ -606,7 +607,8 @@ reset_total_search_results (void) static void sort_total_search_results (void) { - qsort (static_total_results, static_total_results_size, sizeof (struct search_result), compare_categories); + if (static_total_results_size != 0) + qsort (static_total_results, static_total_results_size, sizeof (struct search_result), compare_categories); } static void @@ -620,9 +622,10 @@ merge_directory_results (void) static_total_results = g_renew (struct search_result, static_total_results, static_total_results_allocated); } - memcpy (static_total_results + static_total_results_size, - static_search_results, - static_search_results_size * sizeof (struct search_result)); + if (static_total_results + static_total_results_size != 0) + memcpy (static_total_results + static_total_results_size, + static_search_results, + static_search_results_size * sizeof (struct search_result)); static_total_results_size += static_search_results_size; @@ -2971,13 +2974,13 @@ g_desktop_app_info_launch (GAppInfo *appinfo, * g_desktop_app_info_launch_uris_as_manager: * @appinfo: a #GDesktopAppInfo * @uris: (element-type utf8): List of URIs - * @launch_context: (allow-none): a #GAppLaunchContext + * @launch_context: (nullable): a #GAppLaunchContext * @spawn_flags: #GSpawnFlags, used for each process - * @user_setup: (scope call) (allow-none): a #GSpawnChildSetupFunc, used once + * @user_setup: (scope call) (nullable): a #GSpawnChildSetupFunc, used once * for each process. - * @user_setup_data: (closure user_setup) (allow-none): User data for @user_setup - * @pid_callback: (scope call) (allow-none): Callback for child processes - * @pid_callback_data: (closure pid_callback) (allow-none): User data for @callback + * @user_setup_data: (closure user_setup) (nullable): User data for @user_setup + * @pid_callback: (scope call) (nullable): Callback for child processes + * @pid_callback_data: (closure pid_callback) (nullable): User data for @callback * @error: return location for a #GError, or %NULL * * This function performs the equivalent of g_app_info_launch_uris(), @@ -3677,7 +3680,7 @@ g_desktop_app_info_delete (GAppInfo *appinfo) /** * g_app_info_create_from_commandline: * @commandline: the commandline to use - * @application_name: (allow-none): the application name, or %NULL to use @commandline + * @application_name: (nullable): the application name, or %NULL to use @commandline * @flags: flags that can specify details of the created #GAppInfo * @error: a #GError location to store the error occurring, %NULL to ignore. * @@ -4508,7 +4511,7 @@ g_desktop_app_info_get_action_name (GDesktopAppInfo *info, * @info: a #GDesktopAppInfo * @action_name: the name of the action as from * g_desktop_app_info_list_actions() - * @launch_context: (allow-none): a #GAppLaunchContext + * @launch_context: (nullable): a #GAppLaunchContext * * Activates the named application action. * diff --git a/gio/gdrive.c b/gio/gdrive.c index f69bc6176..9720bf426 100644 --- a/gio/gdrive.c +++ b/gio/gdrive.c @@ -384,8 +384,8 @@ g_drive_can_poll_for_media (GDrive *drive) * g_drive_eject: * @drive: a #GDrive. * @flags: flags affecting the unmount if required for eject - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data to pass to @callback * * Asynchronously ejects a drive. @@ -458,10 +458,10 @@ g_drive_eject_finish (GDrive *drive, * g_drive_eject_with_operation: * @drive: a #GDrive. * @flags: flags affecting the unmount if required for eject - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Ejects a drive. This is an asynchronous operation, and is @@ -541,8 +541,8 @@ g_drive_eject_with_operation_finish (GDrive *drive, /** * g_drive_poll_for_media: * @drive: a #GDrive. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data to pass to @callback * * Asynchronously polls @drive to see if media has been inserted or removed. @@ -740,10 +740,10 @@ g_drive_can_start_degraded (GDrive *drive) * g_drive_start: * @drive: a #GDrive. * @flags: flags affecting the start operation. - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data to pass to @callback * * Asynchronously starts a drive. @@ -842,10 +842,10 @@ g_drive_can_stop (GDrive *drive) * g_drive_stop: * @drive: a #GDrive. * @flags: flags affecting the unmount if required for stopping. - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data to pass to @callback * * Asynchronously stops a drive. diff --git a/gio/gdtlsclientconnection.c b/gio/gdtlsclientconnection.c index 70d9a515d..5e992d25d 100644 --- a/gio/gdtlsclientconnection.c +++ b/gio/gdtlsclientconnection.c @@ -128,7 +128,7 @@ g_dtls_client_connection_default_init (GDtlsClientConnectionInterface *iface) /** * g_dtls_client_connection_new: * @base_socket: the #GDatagramBased to wrap - * @server_identity: (allow-none): the expected identity of the server + * @server_identity: (nullable): the expected identity of the server * @error: #GError for error reporting, or %NULL to ignore. * * Creates a new #GDtlsClientConnection wrapping @base_socket which is diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c index cfa282680..ef9127c8a 100644 --- a/gio/gdtlsconnection.c +++ b/gio/gdtlsconnection.c @@ -405,7 +405,7 @@ g_dtls_connection_get_certificate (GDtlsConnection *conn) /** * g_dtls_connection_set_interaction: * @conn: a connection - * @interaction: (allow-none): an interaction object, or %NULL + * @interaction: (nullable): an interaction object, or %NULL * * Set the object that will be used to interact with the user. It will be used * for things like prompting the user for passwords. @@ -636,7 +636,7 @@ g_dtls_connection_get_rehandshake_mode (GDtlsConnection *conn) /** * g_dtls_connection_handshake: * @conn: a #GDtlsConnection - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a #GError, or %NULL * * Attempts a TLS handshake on @conn. @@ -681,7 +681,7 @@ g_dtls_connection_handshake (GDtlsConnection *conn, * g_dtls_connection_handshake_async: * @conn: a #GDtlsConnection * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the handshake is complete * @user_data: the data to pass to the callback function * diff --git a/gio/gdtlsserverconnection.c b/gio/gdtlsserverconnection.c index dd736f83a..93ee7d701 100644 --- a/gio/gdtlsserverconnection.c +++ b/gio/gdtlsserverconnection.c @@ -67,7 +67,7 @@ g_dtls_server_connection_default_init (GDtlsServerConnectionInterface *iface) /** * g_dtls_server_connection_new: * @base_socket: the #GDatagramBased to wrap - * @certificate: (allow-none): the default server certificate, or %NULL + * @certificate: (nullable): the default server certificate, or %NULL * @error: #GError for error reporting, or %NULL to ignore * * Creates a new #GDtlsServerConnection wrapping @base_socket. diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c index 95bc72e66..cb9087a2b 100644 --- a/gio/gemblemedicon.c +++ b/gio/gemblemedicon.c @@ -143,7 +143,7 @@ g_emblemed_icon_init (GEmblemedIcon *emblemed) /** * g_emblemed_icon_new: * @icon: a #GIcon - * @emblem: (allow-none): a #GEmblem, or %NULL + * @emblem: (nullable): a #GEmblem, or %NULL * * Creates a new emblemed icon for @icon with the emblem @emblem. * diff --git a/gio/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c index 7b980278a..9a39d75bf 100644 --- a/gio/gfdonotificationbackend.c +++ b/gio/gfdonotificationbackend.c @@ -424,7 +424,7 @@ g_fdo_notification_backend_withdraw_notification (GNotificationBackend *backend, "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", "CloseNotification", - g_variant_new ("(u)", n->id), NULL, + g_variant_new ("(u)", n->notify_id), NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL); } diff --git a/gio/gfile.c b/gio/gfile.c index 0e9b608a4..af0587bc7 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -708,7 +708,7 @@ g_file_get_parent (GFile *file) /** * g_file_has_parent: * @file: input #GFile - * @parent: (allow-none): the parent to check for, or %NULL + * @parent: (nullable): the parent to check for, or %NULL * * Checks if @file has a parent, and optionally, if it is @parent. * @@ -915,7 +915,7 @@ g_file_resolve_relative_path (GFile *file, * @file: input #GFile * @attributes: an attribute query string * @flags: a set of #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: #GError for error reporting * @@ -980,7 +980,7 @@ g_file_enumerate_children (GFile *file, * @attributes: an attribute query string * @flags: a set of #GFileQueryInfoFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call when the * request is satisfied @@ -1053,7 +1053,7 @@ g_file_enumerate_children_finish (GFile *file, /** * g_file_query_exists: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * * Utility function to check if a particular file exists. This is @@ -1105,7 +1105,7 @@ g_file_query_exists (GFile *file, * g_file_query_file_type: * @file: input #GFile * @flags: a set of #GFileQueryInfoFlags passed to g_file_query_info() - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * * Utility function to inspect the #GFileType of a file. This is @@ -1146,7 +1146,7 @@ g_file_query_file_type (GFile *file, * @file: input #GFile * @attributes: an attribute query string * @flags: a set of #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError * @@ -1217,7 +1217,7 @@ g_file_query_info (GFile *file, * @attributes: an attribute query string * @flags: a set of #GFileQueryInfoFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call when the * request is satisfied @@ -1290,7 +1290,7 @@ g_file_query_info_finish (GFile *file, * g_file_query_filesystem_info: * @file: input #GFile * @attributes: an attribute query string - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError * @@ -1354,7 +1354,7 @@ g_file_query_filesystem_info (GFile *file, * @file: input #GFile * @attributes: an attribute query string * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -1426,7 +1426,7 @@ g_file_query_filesystem_info_finish (GFile *file, /** * g_file_find_enclosing_mount: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError * @@ -1476,7 +1476,7 @@ g_file_find_enclosing_mount (GFile *file, * g_file_find_enclosing_mount_async: * @file: a #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -1543,7 +1543,7 @@ g_file_find_enclosing_mount_finish (GFile *file, /** * g_file_read: * @file: #GFile to read - * @cancellable: (allow-none): a #GCancellable + * @cancellable: (nullable): a #GCancellable * @error: a #GError, or %NULL * * Opens a file for reading. The result is a #GFileInputStream that @@ -1591,7 +1591,7 @@ g_file_read (GFile *file, * g_file_append_to: * @file: input #GFile * @flags: a set of #GFileCreateFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -1646,7 +1646,7 @@ g_file_append_to (GFile *file, * g_file_create: * @file: input #GFile * @flags: a set of #GFileCreateFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -1703,11 +1703,11 @@ g_file_create (GFile *file, /** * g_file_replace: * @file: input #GFile - * @etag: (allow-none): an optional [entity tag][gfile-etag] + * @etag: (nullable): an optional [entity tag][gfile-etag] * for the current #GFile, or #NULL to ignore * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -1791,7 +1791,7 @@ g_file_replace (GFile *file, /** * g_file_open_readwrite: * @file: #GFile to open - * @cancellable: (allow-none): a #GCancellable + * @cancellable: (nullable): a #GCancellable * @error: a #GError, or %NULL * * Opens an existing file for reading and writing. The result is @@ -1845,7 +1845,7 @@ g_file_open_readwrite (GFile *file, * g_file_create_readwrite: * @file: a #GFile * @flags: a set of #GFileCreateFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: return location for a #GError, or %NULL * @@ -1908,11 +1908,11 @@ g_file_create_readwrite (GFile *file, /** * g_file_replace_readwrite: * @file: a #GFile - * @etag: (allow-none): an optional [entity tag][gfile-etag] + * @etag: (nullable): an optional [entity tag][gfile-etag] * for the current #GFile, or #NULL to ignore * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: return location for a #GError, or %NULL * @@ -1964,7 +1964,7 @@ g_file_replace_readwrite (GFile *file, * g_file_read_async: * @file: input #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2032,7 +2032,7 @@ g_file_read_finish (GFile *file, * @file: input #GFile * @flags: a set of #GFileCreateFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2103,7 +2103,7 @@ g_file_append_to_finish (GFile *file, * @file: input #GFile * @flags: a set of #GFileCreateFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2172,12 +2172,12 @@ g_file_create_finish (GFile *file, /** * g_file_replace_async: * @file: input #GFile - * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile, + * @etag: (nullable): an [entity tag][gfile-etag] for the current #GFile, * or %NULL to ignore * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2251,7 +2251,7 @@ g_file_replace_finish (GFile *file, * g_file_open_readwrite_async * @file: input #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2323,7 +2323,7 @@ g_file_open_readwrite_finish (GFile *file, * @file: input #GFile * @flags: a set of #GFileCreateFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2396,12 +2396,12 @@ g_file_create_readwrite_finish (GFile *file, /** * g_file_replace_readwrite_async: * @file: input #GFile - * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile, + * @etag: (nullable): an [entity tag][gfile-etag] for the current #GFile, * or %NULL to ignore * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -2707,7 +2707,7 @@ build_attribute_list_for_copy (GFile *file, * @source: a #GFile with attributes * @destination: a #GFile to copy attributes to * @flags: a set of #GFileCopyFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, %NULL to ignore * @@ -2765,6 +2765,9 @@ g_file_copy_attributes (GFile *source, return res; } +/* 256k minus malloc overhead */ +#define STREAM_BUFFER_SIZE (1024*256 - 2 *sizeof(gpointer)) + static gboolean copy_stream_with_progress (GInputStream *in, GOutputStream *out, @@ -2776,7 +2779,7 @@ copy_stream_with_progress (GInputStream *in, { gssize n_read, n_written; goffset current_size; - char buffer[1024*64], *p; + char *buffer, *p; gboolean res; goffset total_size; GFileInfo *info; @@ -2813,11 +2816,12 @@ copy_stream_with_progress (GInputStream *in, if (total_size == -1) total_size = 0; + buffer = g_malloc0 (STREAM_BUFFER_SIZE); current_size = 0; res = TRUE; while (TRUE) { - n_read = g_input_stream_read (in, buffer, sizeof (buffer), cancellable, error); + n_read = g_input_stream_read (in, buffer, STREAM_BUFFER_SIZE, cancellable, error); if (n_read == -1) { res = FALSE; @@ -2849,6 +2853,7 @@ copy_stream_with_progress (GInputStream *in, if (progress_callback) progress_callback (current_size, total_size, progress_callback_data); } + g_free (buffer); /* Make sure we send full copied size */ if (progress_callback) @@ -3277,9 +3282,9 @@ file_copy_fallback (GFile *source, * @source: input #GFile * @destination: destination #GFile * @flags: set of #GFileCopyFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (allow-none) (scope call): function to callback with + * @progress_callback: (nullable) (scope call): function to callback with * progress information, or %NULL if progress information is not needed * @progress_callback_data: (closure): user data to pass to @progress_callback * @error: #GError to set on error, or %NULL @@ -3402,9 +3407,9 @@ g_file_copy (GFile *source, * @destination: destination #GFile * @flags: set of #GFileCopyFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (allow-none): function to callback with progress + * @progress_callback: (nullable): function to callback with progress * information, or %NULL if progress information is not needed * @progress_callback_data: (closure): user data to pass to @progress_callback * @callback: a #GAsyncReadyCallback to call when the request is satisfied @@ -3481,9 +3486,9 @@ g_file_copy_finish (GFile *file, * @source: #GFile pointing to the source location * @destination: #GFile pointing to the destination location * @flags: set of #GFileCopyFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (allow-none) (scope call): #GFileProgressCallback + * @progress_callback: (nullable) (scope call): #GFileProgressCallback * function for updates * @progress_callback_data: (closure): gpointer to user data for * the callback function @@ -3617,7 +3622,7 @@ g_file_move (GFile *source, /** * g_file_make_directory: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -3667,7 +3672,7 @@ g_file_make_directory (GFile *file, * g_file_make_directory_async: * @file: input #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: a #GAsyncReadyCallback to call * when the request is satisfied @@ -3727,7 +3732,7 @@ g_file_make_directory_finish (GFile *file, /** * g_file_make_directory_with_parents: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -3851,7 +3856,7 @@ g_file_make_directory_with_parents (GFile *file, * @file: a #GFile with the name of the symlink to create * @symlink_value: (type filename): a string with the path for the target * of the new symlink - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError * @@ -3902,7 +3907,7 @@ g_file_make_symbolic_link (GFile *file, /** * g_file_delete: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -3945,7 +3950,7 @@ g_file_delete (GFile *file, * g_file_delete_async: * @file: input #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: a #GAsyncReadyCallback to call * when the request is satisfied @@ -4009,7 +4014,7 @@ g_file_delete_finish (GFile *file, /** * g_file_trash: * @file: #GFile to send to trash - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4054,7 +4059,7 @@ g_file_trash (GFile *file, * g_file_trash_async: * @file: input #GFile * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: a #GAsyncReadyCallback to call * when the request is satisfied @@ -4115,7 +4120,7 @@ g_file_trash_finish (GFile *file, * g_file_set_display_name: * @file: input #GFile * @display_name: a string - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4172,7 +4177,7 @@ g_file_set_display_name (GFile *file, * @file: input #GFile * @display_name: a string * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback to call * when the request is satisfied @@ -4241,7 +4246,7 @@ g_file_set_display_name_finish (GFile *file, /** * g_file_query_settable_attributes: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4299,7 +4304,7 @@ g_file_query_settable_attributes (GFile *file, /** * g_file_query_writable_namespaces: * @file: input #GFile - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4361,10 +4366,10 @@ g_file_query_writable_namespaces (GFile *file, * @file: input #GFile * @attribute: a string containing the attribute's name * @type: The type of the attribute - * @value_p: (allow-none): a pointer to the value (or the pointer + * @value_p: (nullable): a pointer to the value (or the pointer * itself if the type is a pointer type) * @flags: a set of #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4414,7 +4419,7 @@ g_file_set_attribute (GFile *file, * @file: input #GFile * @info: a #GFileInfo * @flags: #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4506,7 +4511,7 @@ g_file_real_set_attributes_from_info (GFile *file, * @info: a #GFileInfo * @flags: a #GFileQueryInfoFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): a #gpointer @@ -4579,7 +4584,7 @@ g_file_set_attributes_finish (GFile *file, * @attribute: a string containing the attribute's name * @value: a string containing the attribute's value * @flags: #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4611,7 +4616,7 @@ g_file_set_attribute_string (GFile *file, * @attribute: a string containing the attribute's name * @value: a string containing the attribute's new value * @flags: a #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4645,7 +4650,7 @@ g_file_set_attribute_byte_string (GFile *file, * @attribute: a string containing the attribute's name * @value: a #guint32 containing the attribute's new value * @flags: a #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4678,7 +4683,7 @@ g_file_set_attribute_uint32 (GFile *file, * @attribute: a string containing the attribute's name * @value: a #gint32 containing the attribute's new value * @flags: a #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4711,7 +4716,7 @@ g_file_set_attribute_int32 (GFile *file, * @attribute: a string containing the attribute's name * @value: a #guint64 containing the attribute's new value * @flags: a #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4744,7 +4749,7 @@ g_file_set_attribute_uint64 (GFile *file, * @attribute: a string containing the attribute's name * @value: a #guint64 containing the attribute's new value * @flags: a #GFileQueryInfoFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -4774,11 +4779,11 @@ g_file_set_attribute_int64 (GFile *file, * g_file_mount_mountable: * @file: input #GFile * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation, + * @mount_operation: (nullable): a #GMountOperation, * or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call + * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: (closure): the data to pass to callback function * @@ -4862,9 +4867,9 @@ g_file_mount_mountable_finish (GFile *file, * g_file_unmount_mountable: * @file: input #GFile * @flags: flags affecting the operation - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call + * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: (closure): the data to pass to callback function * @@ -4949,11 +4954,11 @@ g_file_unmount_mountable_finish (GFile *file, * g_file_unmount_mountable_with_operation: * @file: input #GFile * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation, + * @mount_operation: (nullable): a #GMountOperation, * or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call + * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: (closure): the data to pass to callback function * @@ -5050,9 +5055,9 @@ g_file_unmount_mountable_with_operation_finish (GFile *file, * g_file_eject_mountable: * @file: input #GFile * @flags: flags affecting the operation - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call + * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: (closure): the data to pass to callback function * @@ -5134,11 +5139,11 @@ g_file_eject_mountable_finish (GFile *file, * g_file_eject_mountable_with_operation: * @file: input #GFile * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation, + * @mount_operation: (nullable): a #GMountOperation, * or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call + * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: (closure): the data to pass to callback function * @@ -5231,7 +5236,7 @@ g_file_eject_mountable_with_operation_finish (GFile *file, * g_file_monitor_directory: * @file: input #GFile * @flags: a set of #GFileMonitorFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -5284,7 +5289,7 @@ g_file_monitor_directory (GFile *file, * g_file_monitor_file: * @file: input #GFile * @flags: a set of #GFileMonitorFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -5339,7 +5344,7 @@ g_file_monitor_file (GFile *file, * g_file_monitor: * @file: input #GFile * @flags: a set of #GFileMonitorFlags - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore * @error: a #GError, or %NULL * @@ -6375,7 +6380,7 @@ g_file_new_for_uri (const char *uri) /** * g_file_new_tmp: - * @tmpl: (type filename) (allow-none): Template for the file + * @tmpl: (type filename) (nullable): Template for the file * name, as in g_file_open_tmp(), or %NULL for a default template * @iostream: (out): on return, a #GFileIOStream for the created file * @error: a #GError, or %NULL @@ -6563,11 +6568,11 @@ g_file_new_for_commandline_arg_and_cwd (const gchar *arg, * g_file_mount_enclosing_volume: * @location: input #GFile * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation + * @mount_operation: (nullable): a #GMountOperation * or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback to call + * @callback: (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: the data to pass to callback function * @@ -6721,9 +6726,9 @@ g_file_query_default_handler (GFile *file, * @file: input #GFile * @cancellable: optional #GCancellable object, %NULL to ignore * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file - * @length: (out) (allow-none): a location to place the length of the contents of the file, + * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, + * @etag_out: (out) (optional): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7007,9 +7012,9 @@ g_file_load_partial_contents_async (GFile *file, * @file: input #GFile * @res: a #GAsyncResult * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file - * @length: (out) (allow-none): a location to place the length of the contents of the file, + * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, + * @etag_out: (out) (optional): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7105,9 +7110,9 @@ g_file_load_contents_async (GFile *file, * @file: input #GFile * @res: a #GAsyncResult * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file - * @length: (out) (allow-none): a location to place the length of the contents of the file, + * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, + * @etag_out: (out) (optional): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7141,11 +7146,11 @@ g_file_load_contents_finish (GFile *file, * @file: input #GFile * @contents: (element-type guint8) (array length=length): a string containing the new contents for @file * @length: the length of @contents in bytes - * @etag: (allow-none): the old [entity-tag][gfile-etag] for the document, + * @etag: (nullable): the old [entity-tag][gfile-etag] for the document, * or %NULL * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags - * @new_etag: (allow-none) (out): a location to a new [entity tag][gfile-etag] + * @new_etag: (out) (optional): a location to a new [entity tag][gfile-etag] * for the document. This should be freed with g_free() when no longer * needed, or %NULL * @cancellable: optional #GCancellable object, %NULL to ignore @@ -7348,7 +7353,7 @@ replace_contents_open_callback (GObject *obj, * @file: input #GFile * @contents: (element-type guint8) (array length=length): string of contents to replace the file with * @length: the length of @contents in bytes - * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL + * @etag: (nullable): a new [entity tag][gfile-etag] for the @file, or %NULL * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags * @cancellable: optional #GCancellable object, %NULL to ignore @@ -7398,7 +7403,7 @@ g_file_replace_contents_async (GFile *file, * g_file_replace_contents_bytes_async: * @file: input #GFile * @contents: a #GBytes - * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL + * @etag: (nullable): a new [entity tag][gfile-etag] for the @file, or %NULL * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags * @cancellable: optional #GCancellable object, %NULL to ignore @@ -7453,7 +7458,7 @@ g_file_replace_contents_bytes_async (GFile *file, * g_file_replace_contents_finish: * @file: input #GFile * @res: a #GAsyncResult - * @new_etag: (out) (allow-none): a location of a new [entity tag][gfile-etag] + * @new_etag: (out) (optional): a location of a new [entity tag][gfile-etag] * for the document. This should be freed with g_free() when it is no * longer needed, or %NULL * @error: a #GError, or %NULL @@ -7651,13 +7656,13 @@ g_file_real_measure_disk_usage_finish (GFile *file, * g_file_measure_disk_usage: * @file: a #GFile * @flags: #GFileMeasureFlags - * @cancellable: (allow-none): optional #GCancellable - * @progress_callback: (allow-none): a #GFileMeasureProgressCallback + * @cancellable: (nullable): optional #GCancellable + * @progress_callback: (nullable): a #GFileMeasureProgressCallback * @progress_data: user_data for @progress_callback - * @disk_usage: (allow-none) (out): the number of bytes of disk space used - * @num_dirs: (allow-none) (out): the number of directories encountered - * @num_files: (allow-none) (out): the number of non-directories encountered - * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer + * @disk_usage: (out) (optional): the number of bytes of disk space used + * @num_dirs: (out) (optional): the number of directories encountered + * @num_files: (out) (optional): the number of non-directories encountered + * @error: (nullable): %NULL, or a pointer to a %NULL #GError pointer * * Recursively measures the disk usage of @file. * @@ -7709,10 +7714,10 @@ g_file_measure_disk_usage (GFile *file, * @file: a #GFile * @flags: #GFileMeasureFlags * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable - * @progress_callback: (allow-none): a #GFileMeasureProgressCallback + * @cancellable: (nullable): optional #GCancellable + * @progress_callback: (nullable): a #GFileMeasureProgressCallback * @progress_data: user_data for @progress_callback - * @callback: (allow-none): a #GAsyncReadyCallback to call when complete + * @callback: (nullable): a #GAsyncReadyCallback to call when complete * @user_data: the data to pass to callback function * * Recursively measures the disk usage of @file. @@ -7744,10 +7749,10 @@ g_file_measure_disk_usage_async (GFile *file, * g_file_measure_disk_usage_finish: * @file: a #GFile * @result: the #GAsyncResult passed to your #GAsyncReadyCallback - * @disk_usage: (allow-none) (out): the number of bytes of disk space used - * @num_dirs: (allow-none) (out): the number of directories encountered - * @num_files: (allow-none) (out): the number of non-directories encountered - * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer + * @disk_usage: (out) (optional): the number of bytes of disk space used + * @num_dirs: (out) (optional): the number of directories encountered + * @num_files: (out) (optional): the number of non-directories encountered + * @error: (nullable): %NULL, or a pointer to a %NULL #GError pointer * * Collects the results from an earlier call to * g_file_measure_disk_usage_async(). See g_file_measure_disk_usage() for @@ -7776,9 +7781,9 @@ g_file_measure_disk_usage_finish (GFile *file, * g_file_start_mountable: * @file: input #GFile * @flags: flags affecting the operation - * @start_operation: (allow-none): a #GMountOperation, or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL + * @start_operation: (nullable): a #GMountOperation, or %NULL to avoid user interaction + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore + * @callback: (nullable): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL * @user_data: the data to pass to callback function * * Starts a file of type #G_FILE_TYPE_MOUNTABLE. @@ -7865,11 +7870,11 @@ g_file_start_mountable_finish (GFile *file, * g_file_stop_mountable: * @file: input #GFile * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation, + * @mount_operation: (nullable): a #GMountOperation, * or %NULL to avoid user interaction. - * @cancellable: (allow-none): optional #GCancellable object, + * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback to call + * @callback: (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: the data to pass to callback function * @@ -7955,7 +7960,7 @@ g_file_stop_mountable_finish (GFile *file, * g_file_poll_mountable: * @file: input #GFile * @cancellable: optional #GCancellable object, %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback to call + * @callback: (nullable): a #GAsyncReadyCallback to call * when the request is satisfied, or %NULL * @user_data: the data to pass to callback function * diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index 3763cb639..e4905d7f8 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -176,7 +176,7 @@ g_file_enumerator_init (GFileEnumerator *enumerator) /** * g_file_enumerator_next_file: * @enumerator: a #GFileEnumerator. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Returns information for the next file in the enumerated object. @@ -245,7 +245,7 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator, /** * g_file_enumerator_close: * @enumerator: a #GFileEnumerator. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Releases all resources used by this enumerator, making the @@ -310,8 +310,8 @@ next_async_callback_wrapper (GObject *source_object, * g_file_enumerator_next_files_async: * @enumerator: a #GFileEnumerator. * @num_files: the number of file info objects to request - * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @io_priority: the [I/O priority][io-priority] of the request + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -437,7 +437,7 @@ close_async_callback_wrapper (GObject *source_object, * g_file_enumerator_close_async: * @enumerator: a #GFileEnumerator. * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -576,8 +576,8 @@ g_file_enumerator_set_pending (GFileEnumerator *enumerator, /** * g_file_enumerator_iterate: * @direnum: an open #GFileEnumerator - * @out_info: (out) (transfer none) (allow-none): Output location for the next #GFileInfo, or %NULL - * @out_child: (out) (transfer none) (allow-none): Output location for the next #GFile, or %NULL + * @out_info: (out) (transfer none) (optional): Output location for the next #GFileInfo, or %NULL + * @out_child: (out) (transfer none) (optional): Output location for the next #GFile, or %NULL * @cancellable: a #GCancellable * @error: a #GError * diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index 49e0606e7..5577ce151 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -2663,7 +2663,7 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher) /** * g_file_attribute_matcher_to_string: - * @matcher: (allow-none): a #GFileAttributeMatcher. + * @matcher: (nullable): a #GFileAttributeMatcher. * * Prints what the matcher is matching against. The format will be * equal to the format passed to g_file_attribute_matcher_new(). diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c index bdfb7794c..2dcd0ac74 100644 --- a/gio/gfileinputstream.c +++ b/gio/gfileinputstream.c @@ -107,7 +107,7 @@ g_file_input_stream_init (GFileInputStream *stream) * g_file_input_stream_query_info: * @stream: a #GFileInputStream. * @attributes: a file attribute query string. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @@ -174,7 +174,7 @@ async_ready_callback_wrapper (GObject *source_object, * @stream: a #GFileInputStream. * @attributes: a file attribute query string. * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c index 8a0ec1536..30e90673c 100644 --- a/gio/gfileiostream.c +++ b/gio/gfileiostream.c @@ -112,7 +112,7 @@ g_file_io_stream_init (GFileIOStream *stream) * g_file_io_stream_query_info: * @stream: a #GFileIOStream. * @attributes: a file attribute query string. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError, %NULL to ignore. * * Queries a file io stream for the given @attributes. @@ -192,7 +192,7 @@ async_ready_callback_wrapper (GObject *source_object, * @stream: a #GFileIOStream. * @attributes: a file attribute query string. * @io_priority: the [I/O priority][gio-GIOScheduler] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c index 66808d9d6..c52aa7f81 100644 --- a/gio/gfilemonitor.c +++ b/gio/gfilemonitor.c @@ -144,7 +144,7 @@ g_file_monitor_class_init (GFileMonitorClass *klass) * GFileMonitor::changed: * @monitor: a #GFileMonitor. * @file: a #GFile. - * @other_file: (allow-none): a #GFile or #NULL. + * @other_file: (nullable): a #GFile or #NULL. * @event_type: a #GFileMonitorEvent. * * Emitted when @file has been changed. diff --git a/gio/ghttpproxy.c b/gio/ghttpproxy.c index 18ceb8b19..173960db2 100644 --- a/gio/ghttpproxy.c +++ b/gio/ghttpproxy.c @@ -69,8 +69,9 @@ g_http_proxy_init (GHttpProxy *proxy) } static gchar * -create_request (GProxyAddress *proxy_address, - gboolean *has_cred) +create_request (GProxyAddress *proxy_address, + gboolean *has_cred, + GError **error) { const gchar *hostname; gint port; @@ -83,13 +84,19 @@ create_request (GProxyAddress *proxy_address, *has_cred = FALSE; hostname = g_proxy_address_get_destination_hostname (proxy_address); + ascii_hostname = g_hostname_to_ascii (hostname); + if (!ascii_hostname) + { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Invalid hostname")); + return NULL; + } port = g_proxy_address_get_destination_port (proxy_address); username = g_proxy_address_get_username (proxy_address); password = g_proxy_address_get_password (proxy_address); request = g_string_new (NULL); - ascii_hostname = g_hostname_to_ascii (hostname); g_string_append_printf (request, "CONNECT %s:%i HTTP/1.0\r\n" "Host: %s:%i\r\n" @@ -214,7 +221,9 @@ g_http_proxy_connect (GProxy *proxy, in = g_io_stream_get_input_stream (io_stream); out = g_io_stream_get_output_stream (io_stream); - buffer = create_request (proxy_address, &has_cred); + buffer = create_request (proxy_address, &has_cred, error); + if (!buffer) + goto error; if (!g_output_stream_write_all (out, buffer, strlen (buffer), NULL, cancellable, error)) goto error; diff --git a/gio/gicon.c b/gio/gicon.c index a252c408e..03c8c018e 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -105,8 +105,8 @@ g_icon_hash (gconstpointer icon) /** * g_icon_equal: - * @icon1: (allow-none): pointer to the first #GIcon. - * @icon2: (allow-none): pointer to the second #GIcon. + * @icon1: (nullable): pointer to the first #GIcon. + * @icon2: (nullable): pointer to the second #GIcon. * * Checks if two icons are equal. * diff --git a/gio/ginitable.c b/gio/ginitable.c index 23d6069f3..92cf3ff01 100644 --- a/gio/ginitable.c +++ b/gio/ginitable.c @@ -118,7 +118,7 @@ g_initable_init (GInitable *initable, * @cancellable: optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occurring, or %NULL to * ignore. - * @first_property_name: (allow-none): the name of the first property, or %NULL if no + * @first_property_name: (nullable): the name of the first property, or %NULL if no * properties * @...: the value if the first property, followed by and other property * value pairs, and ended by %NULL. diff --git a/gio/ginputstream.c b/gio/ginputstream.c index 9406bbb08..299b4415b 100644 --- a/gio/ginputstream.c +++ b/gio/ginputstream.c @@ -130,7 +130,7 @@ g_input_stream_init (GInputStream *stream) * @buffer: (array length=count) (element-type guint8): a buffer to * read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer starting at @@ -212,7 +212,7 @@ g_input_stream_read (GInputStream *stream, * read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream * @bytes_read: (out): location to store the number of bytes that was read from the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer starting at @@ -279,7 +279,7 @@ g_input_stream_read_all (GInputStream *stream, * @stream: a #GInputStream. * @count: maximum number of bytes that will be read from the stream. Common * values include 4096 and 8192. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Like g_input_stream_read(), this tries to read @count bytes from @@ -339,7 +339,7 @@ g_input_stream_read_bytes (GInputStream *stream, * g_input_stream_skip: * @stream: a #GInputStream. * @count: the number of bytes that will be skipped from the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to skip @count bytes from the stream. Will block during the operation. @@ -455,7 +455,7 @@ g_input_stream_real_skip (GInputStream *stream, /** * g_input_stream_close: * @stream: A #GInputStream. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. @@ -555,7 +555,7 @@ async_ready_close_callback_wrapper (GObject *source_object, * @count: the number of bytes that will be read from the stream * @io_priority: the [I/O priority][io-priority] * of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -746,7 +746,7 @@ read_all_async_thread (GTask *task, * read data into (which should be at least count bytes long) * @count: the number of bytes that will be read from the stream * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -881,7 +881,7 @@ read_bytes_callback (GObject *stream, * @stream: A #GInputStream. * @count: the number of bytes that will be read from the stream * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -959,7 +959,7 @@ g_input_stream_read_bytes_finish (GInputStream *stream, * @stream: A #GInputStream. * @count: the number of bytes that will be skipped from the stream * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -1070,7 +1070,7 @@ g_input_stream_skip_finish (GInputStream *stream, * g_input_stream_close_async: * @stream: A #GInputStream. * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gioerror.c b/gio/gioerror.c index c2efa2044..ed80c6ebc 100644 --- a/gio/gioerror.c +++ b/gio/gioerror.c @@ -325,6 +325,7 @@ g_io_error_from_win32_error (gint error_code) return G_IO_ERROR_NOT_SUPPORTED; case WSAECONNRESET: + case WSAESHUTDOWN: return G_IO_ERROR_CONNECTION_CLOSED; case WSAEHOSTUNREACH: diff --git a/gio/giomodule.c b/gio/giomodule.c index dcd523b48..29a9f09a9 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -664,7 +664,7 @@ try_class (GIOExtension *extension, /** * _g_io_module_get_default_type: * @extension_point: the name of an extension point - * @envvar: (allow-none): the name of an environment variable to + * @envvar: (nullable): the name of an environment variable to * override the default implementation. * @is_supported_offset: a vtable offset, or zero * @@ -785,9 +785,9 @@ try_implementation (GIOExtension *extension, /** * _g_io_module_get_default: * @extension_point: the name of an extension point - * @envvar: (allow-none): the name of an environment variable to + * @envvar: (nullable): the name of an environment variable to * override the default implementation. - * @verify_func: (allow-none): a function to call to verify that + * @verify_func: (nullable): a function to call to verify that * a given implementation is usable in the current environment. * * Retrieves the default object implementing @extension_point. diff --git a/gio/gioscheduler.c b/gio/gioscheduler.c index f1632af39..b8f87d549 100644 --- a/gio/gioscheduler.c +++ b/gio/gioscheduler.c @@ -94,7 +94,7 @@ io_job_thread (GTask *task, * g_io_scheduler_push_job: * @job_func: a #GIOSchedulerJobFunc. * @user_data: data to pass to @job_func - * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL + * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL * @io_priority: the [I/O priority][io-priority] * of the request. * @cancellable: optional #GCancellable object, %NULL to ignore. @@ -226,7 +226,7 @@ mainloop_proxy_free (MainLoopProxy *proxy) * @job: a #GIOSchedulerJob * @func: a #GSourceFunc callback that will be called in the original thread * @user_data: data to pass to @func - * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL + * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL * * Used from an I/O job to send a callback to be run in the thread * that the job was started from, waiting for the result (and thus @@ -281,7 +281,7 @@ g_io_scheduler_job_send_to_mainloop (GIOSchedulerJob *job, * @job: a #GIOSchedulerJob * @func: a #GSourceFunc callback that will be called in the original thread * @user_data: data to pass to @func - * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL + * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL * * Used from an I/O job to send a callback to be run asynchronously in * the thread that the job was started from. The callback will be run diff --git a/gio/giostream.c b/gio/giostream.c index c50a0eb59..423c1070c 100644 --- a/gio/giostream.c +++ b/gio/giostream.c @@ -355,7 +355,7 @@ g_io_stream_real_close (GIOStream *stream, /** * g_io_stream_close: * @stream: a #GIOStream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. This will also @@ -461,7 +461,7 @@ async_ready_close_callback_wrapper (GObject *source_object, * g_io_stream_close_async: * @stream: a #GIOStream * @io_priority: the io priority of the request - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -826,7 +826,7 @@ splice_cancelled_cb (GCancellable *cancellable, * @stream2: a #GIOStream. * @flags: a set of #GIOStreamSpliceFlags. * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * diff --git a/gio/giotypes.h b/gio/giotypes.h index 262e14d05..15bed4824 100644 --- a/gio/giotypes.h +++ b/gio/giotypes.h @@ -505,12 +505,12 @@ struct _GOutputVector { /** * GOutputMessage: - * @address: (allow-none): a #GSocketAddress, or %NULL + * @address: (nullable): a #GSocketAddress, or %NULL * @vectors: pointer to an array of output vectors * @num_vectors: the number of output vectors pointed to by @vectors. * @bytes_sent: initialize to 0. Will be set to the number of bytes * that have been sent - * @control_messages: (array length=num_control_messages) (allow-none): a pointer + * @control_messages: (array length=num_control_messages) (nullable): a pointer * to an array of #GSocketControlMessages, or %NULL. * @num_control_messages: number of elements in @control_messages. * @@ -602,7 +602,7 @@ typedef struct _GDBusObjectManagerServer GDBusObjectManagerServer; * GDBusProxyTypeFunc: * @manager: A #GDBusObjectManagerClient. * @object_path: The object path of the remote object. - * @interface_name: (allow-none): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested. + * @interface_name: (nullable): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested. * @user_data: User data. * * Function signature for a function used to determine the #GType to diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c index 8eb768152..9375955ad 100644 --- a/gio/gkeyfilesettingsbackend.c +++ b/gio/gkeyfilesettingsbackend.c @@ -571,7 +571,7 @@ dir_changed (GFileMonitor *monitor, * g_keyfile_settings_backend_new: * @filename: the filename of the keyfile * @root_path: the path under which all settings keys appear - * @root_group: (allow-none): the group name corresponding to + * @root_group: (nullable): the group name corresponding to * @root_path, or %NULL * * Creates a keyfile-backed #GSettingsBackend. diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index 3d13b124e..eddb97738 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -596,6 +596,48 @@ extension_in_set (const char *str, return rv; } +/* + * We must escape any characters that `make` finds significant. + * This is largely a duplicate of the logic in gcc's `mkdeps.c:munge()`. + */ +static char * +escape_makefile_string (const char *string) +{ + GString *str; + const char *p, *q; + + str = g_string_sized_new (strlen (string) + 1); + for (p = string; *p != '\0'; ++p) + { + switch (*p) + { + case ' ': + case '\t': + /* GNU make uses a weird quoting scheme for white space. + A space or tab preceded by 2N+1 backslashes represents + N backslashes followed by space; a space or tab + preceded by 2N backslashes represents N backslashes at + the end of a file name; and backslashes in other + contexts should not be doubled. */ + for (q = p - 1; string <= q && *q == '\\'; q--) + g_string_append_c (str, '\\'); + g_string_append_c (str, '\\'); + break; + + case '$': + g_string_append_c (str, '$'); + break; + + case '#': + g_string_append_c (str, '\\'); + break; + } + g_string_append_c (str, *p); + } + + return g_string_free (str, FALSE); +} + int main (int argc, char **argv) { @@ -612,6 +654,7 @@ main (int argc, char **argv) gboolean manual_register = FALSE; gboolean internal = FALSE; gboolean generate_dependencies = FALSE; + gboolean generate_phony_targets = FALSE; char *dependency_file = NULL; char *c_name = NULL; char *c_name_no_underscores; @@ -626,6 +669,7 @@ main (int argc, char **argv) { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate sourcecode used to link in the resource file into your code"), NULL }, { "generate-dependencies", 0, 0, G_OPTION_ARG_NONE, &generate_dependencies, N_("Generate dependency list"), NULL }, { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("name of the dependency file to generate"), N_("FILE") }, + { "generate-phony-targets", 0, 0, G_OPTION_ARG_NONE, &generate_phony_targets, N_("Include phony targets in the generated dependency file"), NULL }, { "manual-register", 0, 0, G_OPTION_ARG_NONE, &manual_register, N_("Don’t automatically create and register resource"), NULL }, { "internal", 0, 0, G_OPTION_ARG_NONE, &internal, N_("Don’t export functions; declare them G_GNUC_INTERNAL"), NULL }, { "c-name", 0, 0, G_OPTION_ARG_STRING, &c_name, N_("C identifier name used for the generated source code"), NULL }, @@ -736,7 +780,7 @@ main (int argc, char **argv) else if (extension_in_set (target, "h", "hh", "hpp", "hxx", "h++", NULL)) generate_header = TRUE; else if (extension_in_set (target, "gresource", NULL)) - ; + { } } files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)file_data_free); @@ -758,29 +802,48 @@ main (int argc, char **argv) GHashTableIter iter; gpointer key, data; FileData *file_data; + char *escaped; g_hash_table_iter_init (&iter, files); dep_string = g_string_new (NULL); - g_string_printf (dep_string, "%s:", srcfile); + escaped = escape_makefile_string (srcfile); + g_string_printf (dep_string, "%s:", escaped); + g_free (escaped); /* First rule: foo.xml: resource1 resource2.. */ while (g_hash_table_iter_next (&iter, &key, &data)) { file_data = data; if (!g_str_equal (file_data->filename, srcfile)) - g_string_append_printf (dep_string, " %s", file_data->filename); + { + escaped = escape_makefile_string (file_data->filename); + g_string_append_printf (dep_string, " %s", escaped); + g_free (escaped); + } } - g_string_append (dep_string, "\n\n"); + g_string_append (dep_string, "\n"); - /* One rule for every resource: resourceN: */ - g_hash_table_iter_init (&iter, files); - while (g_hash_table_iter_next (&iter, &key, &data)) + /* Optionally include phony targets as it silences `make` but + * isn't supported on `ninja` at the moment. See also: `gcc -MP` + */ + if (generate_phony_targets) { - file_data = data; - if (!g_str_equal (file_data->filename, srcfile)) - g_string_append_printf (dep_string, "%s:\n\n", file_data->filename); + g_string_append (dep_string, "\n"); + + /* One rule for every resource: resourceN: */ + g_hash_table_iter_init (&iter, files); + while (g_hash_table_iter_next (&iter, &key, &data)) + { + file_data = data; + if (!g_str_equal (file_data->filename, srcfile)) + { + escaped = escape_makefile_string (file_data->filename); + g_string_append_printf (dep_string, "%s:\n\n", escaped); + g_free (escaped); + } + } } if (g_str_equal (dependency_file, "-")) diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c index 6dba5feb1..eeccd8dd9 100644 --- a/gio/gloadableicon.c +++ b/gio/gloadableicon.c @@ -62,7 +62,7 @@ g_loadable_icon_default_init (GLoadableIconIface *iface) * @size: an integer. * @type: (out) (optional): a location to store the type of the loaded * icon, %NULL to ignore. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to + * @cancellable: (nullable): optional #GCancellable object, %NULL to * ignore. * @error: a #GError location to store the error occurring, or %NULL * to ignore. @@ -92,7 +92,7 @@ g_loadable_icon_load (GLoadableIcon *icon, * g_loadable_icon_load_async: * @icon: a #GLoadableIcon. * @size: an integer. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the * request is satisfied * @user_data: (closure): the data to pass to callback function diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c index b205119df..c77aeb7d8 100644 --- a/gio/gmemoryinputstream.c +++ b/gio/gmemoryinputstream.c @@ -186,7 +186,7 @@ g_memory_input_stream_new (void) * g_memory_input_stream_new_from_data: * @data: (array length=len) (element-type guint8) (transfer full): input data * @len: length of the data, may be -1 if @data is a nul-terminated string - * @destroy: (allow-none): function that is called to free @data, or %NULL + * @destroy: (nullable): function that is called to free @data, or %NULL * * Creates a new #GMemoryInputStream with data in memory of a given size. * @@ -236,7 +236,7 @@ g_memory_input_stream_new_from_bytes (GBytes *bytes) * @stream: a #GMemoryInputStream * @data: (array length=len) (element-type guint8) (transfer full): input data * @len: length of the data, may be -1 if @data is a nul-terminated string - * @destroy: (allow-none): function that is called to free @data, or %NULL + * @destroy: (nullable): function that is called to free @data, or %NULL * * Appends @data to data that can be read from the input stream */ diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c index 9f6e7668f..44720f14f 100644 --- a/gio/gmemoryoutputstream.c +++ b/gio/gmemoryoutputstream.c @@ -330,11 +330,11 @@ g_memory_output_stream_init (GMemoryOutputStream *stream) /** * g_memory_output_stream_new: (skip) - * @data: (allow-none): pointer to a chunk of memory to use, or %NULL + * @data: (nullable): pointer to a chunk of memory to use, or %NULL * @size: the size of @data - * @realloc_function: (allow-none): a function with realloc() semantics (like g_realloc()) + * @realloc_function: (nullable): a function with realloc() semantics (like g_realloc()) * to be called when @data needs to be grown, or %NULL - * @destroy_function: (allow-none): a function to be called on @data when the stream is + * @destroy_function: (nullable): a function to be called on @data when the stream is * finalized, or %NULL * * Creates a new #GMemoryOutputStream. diff --git a/gio/gmenu.c b/gio/gmenu.c index e90fb14b9..b1f99d4e6 100644 --- a/gio/gmenu.c +++ b/gio/gmenu.c @@ -253,8 +253,8 @@ g_menu_new (void) * g_menu_insert: * @menu: a #GMenu * @position: the position at which to insert the item - * @label: (allow-none): the section label, or %NULL - * @detailed_action: (allow-none): the detailed action string, or %NULL + * @label: (nullable): the section label, or %NULL + * @detailed_action: (nullable): the detailed action string, or %NULL * * Convenience function for inserting a normal menu item into @menu. * Combine g_menu_item_new() and g_menu_insert_item() for a more flexible @@ -278,8 +278,8 @@ g_menu_insert (GMenu *menu, /** * g_menu_prepend: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL - * @detailed_action: (allow-none): the detailed action string, or %NULL + * @label: (nullable): the section label, or %NULL + * @detailed_action: (nullable): the detailed action string, or %NULL * * Convenience function for prepending a normal menu item to the start * of @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more @@ -298,8 +298,8 @@ g_menu_prepend (GMenu *menu, /** * g_menu_append: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL - * @detailed_action: (allow-none): the detailed action string, or %NULL + * @label: (nullable): the section label, or %NULL + * @detailed_action: (nullable): the detailed action string, or %NULL * * Convenience function for appending a normal menu item to the end of * @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more @@ -319,7 +319,7 @@ g_menu_append (GMenu *menu, * g_menu_insert_section: * @menu: a #GMenu * @position: the position at which to insert the item - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @section: a #GMenuModel with the items of the section * * Convenience function for inserting a section menu item into @menu. @@ -345,7 +345,7 @@ g_menu_insert_section (GMenu *menu, /** * g_menu_prepend_section: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @section: a #GMenuModel with the items of the section * * Convenience function for prepending a section menu item to the start @@ -365,7 +365,7 @@ g_menu_prepend_section (GMenu *menu, /** * g_menu_append_section: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @section: a #GMenuModel with the items of the section * * Convenience function for appending a section menu item to the end of @@ -386,7 +386,7 @@ g_menu_append_section (GMenu *menu, * g_menu_insert_submenu: * @menu: a #GMenu * @position: the position at which to insert the item - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @submenu: a #GMenuModel with the items of the submenu * * Convenience function for inserting a submenu menu item into @menu. @@ -411,7 +411,7 @@ g_menu_insert_submenu (GMenu *menu, /** * g_menu_prepend_submenu: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @submenu: a #GMenuModel with the items of the submenu * * Convenience function for prepending a submenu menu item to the start @@ -431,7 +431,7 @@ g_menu_prepend_submenu (GMenu *menu, /** * g_menu_append_submenu: * @menu: a #GMenu - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @submenu: a #GMenuModel with the items of the submenu * * Convenience function for appending a submenu menu item to the end of @@ -643,7 +643,7 @@ valid_attribute_name (const gchar *name) * g_menu_item_set_attribute_value: * @menu_item: a #GMenuItem * @attribute: the attribute to set - * @value: (allow-none): a #GVariant to use as the value, or %NULL + * @value: (nullable): a #GVariant to use as the value, or %NULL * * Sets or unsets an attribute on @menu_item. * @@ -688,7 +688,7 @@ g_menu_item_set_attribute_value (GMenuItem *menu_item, * g_menu_item_set_attribute: * @menu_item: a #GMenuItem * @attribute: the attribute to set - * @format_string: (allow-none): a #GVariant format string, or %NULL + * @format_string: (nullable): a #GVariant format string, or %NULL * @...: positional parameters, as per @format_string * * Sets or unsets an attribute on @menu_item. @@ -737,7 +737,7 @@ g_menu_item_set_attribute (GMenuItem *menu_item, * g_menu_item_set_link: * @menu_item: a #GMenuItem * @link: type of link to establish or unset - * @model: (allow-none): the #GMenuModel to link to (or %NULL to unset) + * @model: (nullable): the #GMenuModel to link to (or %NULL to unset) * * Creates a link from @menu_item to @model if non-%NULL, or unsets it. * @@ -773,7 +773,7 @@ g_menu_item_set_link (GMenuItem *menu_item, * g_menu_item_get_attribute_value: * @menu_item: a #GMenuItem * @attribute: the attribute name to query - * @expected_type: (allow-none): the expected type of the attribute + * @expected_type: (nullable): the expected type of the attribute * * Queries the named @attribute on @menu_item. * @@ -890,7 +890,7 @@ g_menu_item_get_link (GMenuItem *menu_item, /** * g_menu_item_set_label: * @menu_item: a #GMenuItem - * @label: (allow-none): the label to set, or %NULL to unset + * @label: (nullable): the label to set, or %NULL to unset * * Sets or unsets the "label" attribute of @menu_item. * @@ -916,7 +916,7 @@ g_menu_item_set_label (GMenuItem *menu_item, /** * g_menu_item_set_submenu: * @menu_item: a #GMenuItem - * @submenu: (allow-none): a #GMenuModel, or %NULL + * @submenu: (nullable): a #GMenuModel, or %NULL * * Sets or unsets the "submenu" link of @menu_item to @submenu. * @@ -938,7 +938,7 @@ g_menu_item_set_submenu (GMenuItem *menu_item, /** * g_menu_item_set_section: * @menu_item: a #GMenuItem - * @section: (allow-none): a #GMenuModel, or %NULL + * @section: (nullable): a #GMenuModel, or %NULL * * Sets or unsets the "section" link of @menu_item to @section. * @@ -960,8 +960,8 @@ g_menu_item_set_section (GMenuItem *menu_item, /** * g_menu_item_set_action_and_target_value: * @menu_item: a #GMenuItem - * @action: (allow-none): the name of the action for this item - * @target_value: (allow-none): a #GVariant to use as the action target + * @action: (nullable): the name of the action for this item + * @target_value: (nullable): a #GVariant to use as the action target * * Sets or unsets the "action" and "target" attributes of @menu_item. * @@ -1026,8 +1026,8 @@ g_menu_item_set_action_and_target_value (GMenuItem *menu_item, /** * g_menu_item_set_action_and_target: * @menu_item: a #GMenuItem - * @action: (allow-none): the name of the action for this item - * @format_string: (allow-none): a GVariant format string + * @action: (nullable): the name of the action for this item + * @format_string: (nullable): a GVariant format string * @...: positional parameters, as per @format_string * * Sets or unsets the "action" and "target" attributes of @menu_item. @@ -1112,8 +1112,8 @@ g_menu_item_set_detailed_action (GMenuItem *menu_item, /** * g_menu_item_new: - * @label: (allow-none): the section label, or %NULL - * @detailed_action: (allow-none): the detailed action string, or %NULL + * @label: (nullable): the section label, or %NULL + * @detailed_action: (nullable): the detailed action string, or %NULL * * Creates a new #GMenuItem. * @@ -1147,7 +1147,7 @@ g_menu_item_new (const gchar *label, /** * g_menu_item_new_submenu: - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @submenu: a #GMenuModel with the items of the submenu * * Creates a new #GMenuItem representing a submenu. @@ -1177,7 +1177,7 @@ g_menu_item_new_submenu (const gchar *label, /** * g_menu_item_new_section: - * @label: (allow-none): the section label, or %NULL + * @label: (nullable): the section label, or %NULL * @section: a #GMenuModel with the items of the section * * Creates a new #GMenuItem representing a section. diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c index 4ffe21f65..318358fec 100644 --- a/gio/gmenumodel.c +++ b/gio/gmenumodel.c @@ -521,7 +521,7 @@ g_menu_model_iterate_item_attributes (GMenuModel *model, * @model: a #GMenuModel * @item_index: the index of the item * @attribute: the attribute to query - * @expected_type: (allow-none): the expected type of the attribute, or + * @expected_type: (nullable): the expected type of the attribute, or * %NULL * * Queries the item at position @item_index in @model for the attribute @@ -702,8 +702,8 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GMenuAttributeIter, g_menu_attribute_iter, /** * g_menu_attribute_iter_get_next: * @iter: a #GMenuAttributeIter - * @out_name: (out) (allow-none) (transfer none): the type of the attribute - * @value: (out) (allow-none) (transfer full): the attribute value + * @out_name: (out) (optional) (transfer none): the type of the attribute + * @value: (out) (optional) (transfer full): the attribute value * * This function combines g_menu_attribute_iter_next() with * g_menu_attribute_iter_get_name() and g_menu_attribute_iter_get_value(). @@ -858,8 +858,8 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GMenuLinkIter, g_menu_link_iter, G_TYPE_OBJ /** * g_menu_link_iter_get_next: * @iter: a #GMenuLinkIter - * @out_link: (out) (allow-none) (transfer none): the name of the link - * @value: (out) (allow-none) (transfer full): the linked #GMenuModel + * @out_link: (out) (optional) (transfer none): the name of the link + * @value: (out) (optional) (transfer full): the linked #GMenuModel * * This function combines g_menu_link_iter_next() with * g_menu_link_iter_get_name() and g_menu_link_iter_get_value(). diff --git a/gio/gmount.c b/gio/gmount.c index 175877599..d585663cf 100644 --- a/gio/gmount.c +++ b/gio/gmount.c @@ -359,8 +359,8 @@ g_mount_can_eject (GMount *mount) * g_mount_unmount: * @mount: a #GMount. * @flags: flags affecting the operation - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Unmounts a mount. This is an asynchronous operation, and is @@ -435,8 +435,8 @@ g_mount_unmount_finish (GMount *mount, * g_mount_eject: * @mount: a #GMount. * @flags: flags affecting the unmount if required for eject - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Ejects a mount. This is an asynchronous operation, and is @@ -510,10 +510,10 @@ g_mount_eject_finish (GMount *mount, * g_mount_unmount_with_operation: * @mount: a #GMount. * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Unmounts a mount. This is an asynchronous operation, and is @@ -595,10 +595,10 @@ g_mount_unmount_with_operation_finish (GMount *mount, * g_mount_eject_with_operation: * @mount: a #GMount. * @flags: flags affecting the unmount if required for eject - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Ejects a mount. This is an asynchronous operation, and is @@ -679,10 +679,10 @@ g_mount_eject_with_operation_finish (GMount *mount, * g_mount_remount: * @mount: a #GMount. * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid * user interaction. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Remounts a mount. This is an asynchronous operation, and is @@ -760,7 +760,7 @@ g_mount_remount_finish (GMount *mount, * @mount: a #GMount * @force_rescan: Whether to force a rescan of the content. * Otherwise a cached result will be used if available - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @callback: a #GAsyncReadyCallback * @user_data: user data passed to @callback * @@ -848,7 +848,7 @@ g_mount_guess_content_type_finish (GMount *mount, * @mount: a #GMount * @force_rescan: Whether to force a rescan of the content. * Otherwise a cached result will be used if available - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: a #GError location to store the error occurring, or %NULL to * ignore * diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c index 3362c7f4f..c59caee84 100644 --- a/gio/gnetworkmonitor.c +++ b/gio/gnetworkmonitor.c @@ -176,7 +176,7 @@ g_network_monitor_get_connectivity (GNetworkMonitor *monitor) * g_network_monitor_can_reach: * @monitor: a #GNetworkMonitor * @connectable: a #GSocketConnectable - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Attempts to determine whether or not the host pointed to by @@ -237,7 +237,7 @@ g_network_monitor_real_can_reach_async (GNetworkMonitor *monitor, * g_network_monitor_can_reach_async: * @monitor: a #GNetworkMonitor * @connectable: a #GSocketConnectable - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback to call when the * request is satisfied * @user_data: (closure): the data to pass to callback function diff --git a/gio/gnotification.c b/gio/gnotification.c index 2cf03cf04..bdf053243 100644 --- a/gio/gnotification.c +++ b/gio/gnotification.c @@ -214,7 +214,7 @@ g_notification_set_title (GNotification *notification, * * Gets the current body of @notification. * - * Returns: (allow-none): the body of @notification + * Returns: (nullable): the body of @notification * * Since: 2.40 */ @@ -229,7 +229,7 @@ g_notification_get_body (GNotification *notification) /** * g_notification_set_body: * @notification: a #GNotification - * @body: (allow-none): the new body for @notification, or %NULL + * @body: (nullable): the new body for @notification, or %NULL * * Sets the body of @notification to @body. * @@ -384,7 +384,7 @@ g_notification_add_button (GNotification *notification, * @notification: a #GNotification * @label: label of the button * @action: an action name - * @target_format: (allow-none): a #GVariant format string, or %NULL + * @target_format: (nullable): a #GVariant format string, or %NULL * @...: positional parameters, as determined by @target_format * * Adds a button to @notification that activates @action when clicked. @@ -422,7 +422,7 @@ g_notification_add_button_with_target (GNotification *notification, * @notification: a #GNotification * @label: label of the button * @action: an action name - * @target: (allow-none): a #GVariant to use as @action's parameter, or %NULL + * @target: (nullable): a #GVariant to use as @action's parameter, or %NULL * * Adds a button to @notification that activates @action when clicked. * @action must be an application-wide action (it must start with "app."). @@ -538,8 +538,8 @@ g_notification_get_button_with_action (GNotification *notification, /*< private > * g_notification_get_default_action: * @notification: a #GNotification - * @action: (allow-none): return location for the default action - * @target: (allow-none): return location for the target of the default action + * @action: (nullable): return location for the default action + * @target: (nullable): return location for the target of the default action * * Gets the action and target for the default action of @notification. * @@ -612,7 +612,7 @@ g_notification_set_default_action (GNotification *notification, * g_notification_set_default_action_and_target: (skip) * @notification: a #GNotification * @action: an action name - * @target_format: (allow-none): a #GVariant format string, or %NULL + * @target_format: (nullable): a #GVariant format string, or %NULL * @...: positional parameters, as determined by @target_format * * Sets the default action of @notification to @action. This action is @@ -652,7 +652,7 @@ g_notification_set_default_action_and_target (GNotification *notification, * g_notification_set_default_action_and_target_value: (rename-to g_notification_set_default_action_and_target) * @notification: a #GNotification * @action: an action name - * @target: (allow-none): a #GVariant to use as @action's parameter, or %NULL + * @target: (nullable): a #GVariant to use as @action's parameter, or %NULL * * Sets the default action of @notification to @action. This action is * activated when the notification is clicked on. It must be an diff --git a/gio/goutputstream.c b/gio/goutputstream.c index 8e8172fbc..3d4fa9851 100644 --- a/gio/goutputstream.c +++ b/gio/goutputstream.c @@ -153,7 +153,7 @@ g_output_stream_init (GOutputStream *stream) * @stream: a #GOutputStream. * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write. * @count: the number of bytes to write - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @error: location to store the error occurring, or %NULL to ignore * * Tries to write @count bytes from @buffer into the stream. Will block @@ -236,7 +236,7 @@ g_output_stream_write (GOutputStream *stream, * @count: the number of bytes to write * @bytes_written: (out): location to store the number of bytes that was * written to the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to write @count bytes from @buffer into the stream. Will block @@ -304,7 +304,7 @@ g_output_stream_write_all (GOutputStream *stream, * @stream: a #GOutputStream. * @bytes_written: (out): location to store the number of bytes that was * written to the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * @format: the format string. See the printf() documentation * @...: the parameters to insert into the format string @@ -350,7 +350,7 @@ g_output_stream_printf (GOutputStream *stream, * @stream: a #GOutputStream. * @bytes_written: (out): location to store the number of bytes that was * written to the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * @format: the format string. See the printf() documentation * @args: the parameters to insert into the format string @@ -401,7 +401,7 @@ g_output_stream_vprintf (GOutputStream *stream, * g_output_stream_write_bytes: * @stream: a #GOutputStream. * @bytes: the #GBytes to write - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @error: location to store the error occurring, or %NULL to ignore * * A wrapper function for g_output_stream_write() which takes a @@ -438,7 +438,7 @@ g_output_stream_write_bytes (GOutputStream *stream, /** * g_output_stream_flush: * @stream: a #GOutputStream. - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @error: location to store the error occurring, or %NULL to ignore * * Forces a write of all user-space buffered data for the given @@ -490,7 +490,7 @@ g_output_stream_flush (GOutputStream *stream, * @stream: a #GOutputStream. * @source: a #GInputStream. * @flags: a set of #GOutputStreamSpliceFlags. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @@ -670,7 +670,7 @@ g_output_stream_internal_close (GOutputStream *stream, /** * g_output_stream_close: * @stream: A #GOutputStream. - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. @@ -761,7 +761,7 @@ async_ready_write_callback_wrapper (GObject *source_object, * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write. * @count: the number of bytes to write * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -956,7 +956,7 @@ write_all_async_thread (GTask *task, * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write * @count: the number of bytes to write * @io_priority: the io priority of the request - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -1083,7 +1083,7 @@ write_bytes_callback (GObject *stream, * @stream: A #GOutputStream. * @bytes: The bytes to write * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -1184,7 +1184,7 @@ async_ready_splice_callback_wrapper (GObject *source_object, * @source: a #GInputStream. * @flags: a set of #GOutputStreamSpliceFlags. * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * @@ -1300,7 +1300,7 @@ async_ready_flush_callback_wrapper (GObject *source_object, * g_output_stream_flush_async: * @stream: a #GOutputStream. * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -1458,7 +1458,7 @@ real_close_async_cb (GObject *source_object, * g_output_stream_close_async: * @stream: A #GOutputStream. * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional cancellable object + * @cancellable: (nullable): optional cancellable object * @callback: (scope async): callback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gpermission.c b/gio/gpermission.c index 6f3f2c2d1..0c021daff 100644 --- a/gio/gpermission.c +++ b/gio/gpermission.c @@ -78,7 +78,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GPermission, g_permission, G_TYPE_OBJECT) /** * g_permission_acquire: * @permission: a #GPermission instance - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a %NULL #GError, or %NULL * * Attempts to acquire the permission represented by @permission. @@ -114,7 +114,7 @@ g_permission_acquire (GPermission *permission, /** * g_permission_acquire_async: * @permission: a #GPermission instance - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: the #GAsyncReadyCallback to call when done * @user_data: the user data to pass to @callback * @@ -165,7 +165,7 @@ g_permission_acquire_finish (GPermission *permission, /** * g_permission_release: * @permission: a #GPermission instance - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a %NULL #GError, or %NULL * * Attempts to release the permission represented by @permission. @@ -201,7 +201,7 @@ g_permission_release (GPermission *permission, /** * g_permission_release_async: * @permission: a #GPermission instance - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: the #GAsyncReadyCallback to call when done * @user_data: the user data to pass to @callback * diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c index 45947a440..2a43ea4cd 100644 --- a/gio/gpollableinputstream.c +++ b/gio/gpollableinputstream.c @@ -114,7 +114,7 @@ g_pollable_input_stream_is_readable (GPollableInputStream *stream) /** * g_pollable_input_stream_create_source: * @stream: a #GPollableInputStream. - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * * Creates a #GSource that triggers when @stream can be read, or * @cancellable is triggered or an error occurs. The callback on the @@ -162,7 +162,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream *stream, * @buffer: (array length=count) (element-type guint8): a buffer to * read data into (which should be at least @count bytes long). * @count: the number of bytes you want to read - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Attempts to read up to @count bytes from @stream into @buffer, as diff --git a/gio/gpollableoutputstream.c b/gio/gpollableoutputstream.c index c16b90aa5..24e159630 100644 --- a/gio/gpollableoutputstream.c +++ b/gio/gpollableoutputstream.c @@ -115,7 +115,7 @@ g_pollable_output_stream_is_writable (GPollableOutputStream *stream) /** * g_pollable_output_stream_create_source: * @stream: a #GPollableOutputStream. - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * * Creates a #GSource that triggers when @stream can be written, or * @cancellable is triggered or an error occurs. The callback on the @@ -163,7 +163,7 @@ g_pollable_output_stream_default_write_nonblocking (GPollableOutputStream *stre * @buffer: (array length=count) (element-type guint8): a buffer to write * data from * @count: the number of bytes you want to write - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Attempts to write up to @count bytes from @buffer to @stream, as diff --git a/gio/gpollableutils.c b/gio/gpollableutils.c index 58313a7fa..84e4ecd04 100644 --- a/gio/gpollableutils.c +++ b/gio/gpollableutils.c @@ -126,8 +126,8 @@ g_pollable_source_new (GObject *pollable_stream) * g_pollable_source_new_full: * @pollable_stream: (type GObject): the stream associated with the * new source - * @child_source: (allow-none): optional child source to attach - * @cancellable: (allow-none): optional #GCancellable to attach + * @child_source: (nullable): optional child source to attach + * @cancellable: (nullable): optional #GCancellable to attach * * Utility method for #GPollableInputStream and #GPollableOutputStream * implementations. Creates a new #GSource, as with @@ -173,7 +173,7 @@ g_pollable_source_new_full (gpointer pollable_stream, * read data into * @count: the number of bytes to read * @blocking: whether to do blocking I/O - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to read from @stream, as with g_input_stream_read() (if @@ -219,7 +219,7 @@ g_pollable_stream_read (GInputStream *stream, * containing the data to write. * @count: the number of bytes to write * @blocking: whether to do blocking I/O - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to write to @stream, as with g_output_stream_write() (if @@ -268,7 +268,7 @@ g_pollable_stream_write (GOutputStream *stream, * @blocking: whether to do blocking I/O * @bytes_written: (out): location to store the number of bytes that was * written to the stream - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore * * Tries to write @count bytes to @stream, as with diff --git a/gio/gproxy.c b/gio/gproxy.c index bf5b1e28d..9419d5709 100644 --- a/gio/gproxy.c +++ b/gio/gproxy.c @@ -84,7 +84,7 @@ g_proxy_get_default_for_protocol (const gchar *protocol) * @proxy: a #GProxy * @connection: a #GIOStream * @proxy_address: a #GProxyAddress - * @cancellable: (allow-none): a #GCancellable + * @cancellable: (nullable): a #GCancellable * @error: return #GError * * Given @connection to communicate with a proxy (eg, a @@ -123,7 +123,7 @@ g_proxy_connect (GProxy *proxy, * @proxy: a #GProxy * @connection: a #GIOStream * @proxy_address: a #GProxyAddress - * @cancellable: (allow-none): a #GCancellable + * @cancellable: (nullable): a #GCancellable * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): callback data * diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c index 0d263fbdd..9e3adc467 100644 --- a/gio/gproxyaddress.c +++ b/gio/gproxyaddress.c @@ -297,9 +297,9 @@ g_proxy_address_init (GProxyAddress *proxy) * @protocol: The proxy protocol to support, in lower case (e.g. socks, http). * @dest_hostname: The destination hostname the proxy should tunnel to. * @dest_port: The destination port to tunnel to. - * @username: (allow-none): The username to authenticate to the proxy server + * @username: (nullable): The username to authenticate to the proxy server * (or %NULL). - * @password: (allow-none): The password to authenticate to the proxy server + * @password: (nullable): The password to authenticate to the proxy server * (or %NULL). * * Creates a new #GProxyAddress for @inetaddr with @protocol that should diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c index d5b19fdfd..c9418ceab 100644 --- a/gio/gproxyresolver.c +++ b/gio/gproxyresolver.c @@ -105,7 +105,7 @@ g_proxy_resolver_is_supported (GProxyResolver *resolver) * g_proxy_resolver_lookup: * @resolver: a #GProxyResolver * @uri: a URI representing the destination to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Looks into the system proxy configuration to determine what proxy, @@ -150,7 +150,7 @@ g_proxy_resolver_lookup (GProxyResolver *resolver, * g_proxy_resolver_lookup_async: * @resolver: a #GProxyResolver * @uri: a URI representing the destination to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): callback to call after resolution completes * @user_data: (closure): data for @callback * diff --git a/gio/gremoteactiongroup.c b/gio/gremoteactiongroup.c index ad0655c22..451c3e97c 100644 --- a/gio/gremoteactiongroup.c +++ b/gio/gremoteactiongroup.c @@ -87,7 +87,7 @@ g_remote_action_group_default_init (GRemoteActionGroupInterface *iface) * g_remote_action_group_activate_action_full: * @remote: a #GDBusActionGroup * @action_name: the name of the action to activate - * @parameter: (allow-none): the optional parameter to the activation + * @parameter: (nullable): the optional parameter to the activation * @platform_data: the platform data to send * * Activates the remote action. diff --git a/gio/gresolver.c b/gio/gresolver.c index 9b931bb56..0ed7d8f01 100644 --- a/gio/gresolver.c +++ b/gio/gresolver.c @@ -29,6 +29,7 @@ #include "gtask.h" #include "gsrvtarget.h" #include "gthreadedresolver.h" +#include "gioerror.h" #ifdef G_OS_UNIX #include <sys/stat.h> @@ -350,7 +351,7 @@ handle_ip_address (const char *hostname, * g_resolver_lookup_by_name: * @resolver: a #GResolver * @hostname: the hostname to look up - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Synchronously resolves @hostname to determine its associated IP @@ -403,6 +404,13 @@ g_resolver_lookup_by_name (GResolver *resolver, if (g_hostname_is_non_ascii (hostname)) hostname = ascii_hostname = g_hostname_to_ascii (hostname); + if (!hostname) + { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Invalid hostname")); + return NULL; + } + g_resolver_maybe_reload (resolver); addrs = G_RESOLVER_GET_CLASS (resolver)-> lookup_by_name (resolver, hostname, cancellable, error); @@ -417,7 +425,7 @@ g_resolver_lookup_by_name (GResolver *resolver, * g_resolver_lookup_by_name_async: * @resolver: a #GResolver * @hostname: the hostname to look up the address of - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): callback to call after resolution completes * @user_data: (closure): data for @callback * @@ -460,6 +468,19 @@ g_resolver_lookup_by_name_async (GResolver *resolver, if (g_hostname_is_non_ascii (hostname)) hostname = ascii_hostname = g_hostname_to_ascii (hostname); + if (!hostname) + { + GTask *task; + + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Invalid hostname")); + task = g_task_new (resolver, cancellable, callback, user_data); + g_task_set_source_tag (task, g_resolver_lookup_by_name_async); + g_task_return_error (task, error); + g_object_unref (task); + return; + } + g_resolver_maybe_reload (resolver); G_RESOLVER_GET_CLASS (resolver)-> lookup_by_name_async (resolver, hostname, cancellable, callback, user_data); @@ -536,7 +557,7 @@ g_resolver_free_addresses (GList *addresses) * g_resolver_lookup_by_address: * @resolver: a #GResolver * @address: the address to reverse-resolve - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Synchronously reverse-resolves @address to determine its @@ -572,7 +593,7 @@ g_resolver_lookup_by_address (GResolver *resolver, * g_resolver_lookup_by_address_async: * @resolver: a #GResolver * @address: the address to reverse-resolve - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): callback to call after resolution completes * @user_data: (closure): data for @callback * @@ -651,7 +672,7 @@ g_resolver_get_service_rrname (const char *service, * @service: the service type to look up (eg, "ldap") * @protocol: the networking protocol to use for @service (eg, "tcp") * @domain: the DNS domain to look up the service in - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Synchronously performs a DNS SRV lookup for the given @service and @@ -715,7 +736,7 @@ g_resolver_lookup_service (GResolver *resolver, * @service: the service type to look up (eg, "ldap") * @protocol: the networking protocol to use for @service (eg, "tcp") * @domain: the DNS domain to look up the service in - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): callback to call after resolution completes * @user_data: (closure): data for @callback * @@ -811,7 +832,7 @@ g_resolver_free_targets (GList *targets) * @resolver: a #GResolver * @rrname: the DNS name to lookup the record for * @record_type: the type of DNS record to lookup - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: return location for a #GError, or %NULL * * Synchronously performs a DNS record lookup for the given @rrname and returns @@ -856,7 +877,7 @@ g_resolver_lookup_records (GResolver *resolver, * @resolver: a #GResolver * @rrname: the DNS name to lookup the record for * @record_type: the type of DNS record to lookup - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): callback to call after resolution completes * @user_data: (closure): data for @callback * diff --git a/gio/gresource.c b/gio/gresource.c index d613740d9..7805e3733 100644 --- a/gio/gresource.c +++ b/gio/gresource.c @@ -784,9 +784,9 @@ g_resource_lookup_data (GResource *resource, * @resource: A #GResource * @path: A pathname inside the resource * @lookup_flags: A #GResourceLookupFlags - * @size: (out) (allow-none): a location to place the length of the contents of the file, + * @size: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @flags: (out) (allow-none): a location to place the flags about the file, + * @flags: (out) (optional): a location to place the flags about the file, * or %NULL if the length is not needed * @error: return location for a #GError, or %NULL * @@ -1147,9 +1147,9 @@ g_resources_enumerate_children (const gchar *path, * g_resources_get_info: * @path: A pathname inside the resource * @lookup_flags: A #GResourceLookupFlags - * @size: (out) (allow-none): a location to place the length of the contents of the file, + * @size: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @flags: (out) (allow-none): a location to place the flags about the file, + * @flags: (out) (optional): a location to place the flags about the file, * or %NULL if the length is not needed * @error: return location for a #GError, or %NULL * diff --git a/gio/gseekable.c b/gio/gseekable.c index 3d8959193..c1f678970 100644 --- a/gio/gseekable.c +++ b/gio/gseekable.c @@ -98,7 +98,7 @@ g_seekable_can_seek (GSeekable *seekable) * @seekable: a #GSeekable. * @offset: a #goffset. * @type: a #GSeekType. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @@ -161,7 +161,7 @@ g_seekable_can_truncate (GSeekable *seekable) * g_seekable_truncate: * @seekable: a #GSeekable. * @offset: a #goffset. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occurring, or %NULL to * ignore. * diff --git a/gio/gsettings.c b/gio/gsettings.c index ea1b88cc4..2b974e90c 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -744,7 +744,7 @@ g_settings_class_init (GSettingsClass *class) /** * GSettings::change-event: * @settings: the object on which the signal was emitted - * @keys: (array length=n_keys) (element-type GQuark) (allow-none): + * @keys: (array length=n_keys) (element-type GQuark) (nullable): * an array of #GQuarks for the changed keys, or %NULL * @n_keys: the length of the @keys array, or 0 * @@ -1084,8 +1084,8 @@ g_settings_new_with_backend_and_path (const gchar *schema_id, /** * g_settings_new_full: * @schema: a #GSettingsSchema - * @backend: (allow-none): a #GSettingsBackend - * @path: (allow-none): the path to use + * @backend: (nullable): a #GSettingsBackend + * @path: (nullable): the path to use * * Creates a new #GSettings object with a given schema, backend and * path. @@ -1238,7 +1238,7 @@ g_settings_get_value (GSettings *settings, * It is a programmer error to give a @key that isn't contained in the * schema for @settings. * - * Returns: (allow-none) (transfer full): the user's value, if set + * Returns: (nullable) (transfer full): the user's value, if set * * Since: 2.40 **/ @@ -1286,7 +1286,7 @@ g_settings_get_user_value (GSettings *settings, * It is a programmer error to give a @key that isn't contained in the * schema for @settings. * - * Returns: (allow-none) (transfer full): the default value + * Returns: (nullable) (transfer full): the default value * * Since: 2.40 **/ @@ -2194,7 +2194,7 @@ g_settings_get_strv (GSettings *settings, * g_settings_set_strv: * @settings: a #GSettings object * @key: the name of the key to set - * @value: (allow-none) (array zero-terminated=1): the value to set it to, or %NULL + * @value: (nullable) (array zero-terminated=1): the value to set it to, or %NULL * * Sets @key in @settings to @value. * diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c index f211e2cbf..62d75e28c 100644 --- a/gio/gsettingsbackend.c +++ b/gio/gsettingsbackend.c @@ -173,7 +173,7 @@ g_settings_backend_watch_weak_notify (gpointer data, * g_settings_backend_watch: * @backend: a #GSettingsBackend * @target: the GObject (typically GSettings instance) to call back to - * @context: (allow-none): a #GMainContext, or %NULL + * @context: (nullable): a #GMainContext, or %NULL * ...: callbacks... * * Registers a new watch on a #GSettingsBackend. @@ -586,7 +586,7 @@ g_settings_backend_flatten_one (gpointer key, * @path: (out): the location to save the path * @keys: (out) (transfer container) (array zero-terminated=1): the * location to save the relative keys - * @values: (out) (allow-none) (transfer container) (array zero-terminated=1): + * @values: (out) (optional) (transfer container) (array zero-terminated=1): * the location to save the values, or %NULL * * Calculate the longest common prefix of all keys in a tree and write diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c index ee31f818b..15941f778 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c @@ -247,7 +247,7 @@ g_settings_schema_source_unref (GSettingsSchemaSource *source) /** * g_settings_schema_source_new_from_directory: * @directory: (type filename): the filename of a directory - * @parent: (allow-none): a #GSettingsSchemaSource, or %NULL + * @parent: (nullable): a #GSettingsSchemaSource, or %NULL * @trusted: %TRUE, if the directory is trusted * @error: a pointer to a #GError pointer set to %NULL, or %NULL * diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c index 2c0bc85a4..ccc8f30e1 100644 --- a/gio/gsimpleaction.c +++ b/gio/gsimpleaction.c @@ -371,7 +371,7 @@ g_simple_action_class_init (GSimpleActionClass *class) /** * GSimpleAction::activate: * @simple: the #GSimpleAction - * @parameter: (allow-none): the parameter to the activation + * @parameter: (nullable): the parameter to the activation * * Indicates that the action was just activated. * @@ -400,7 +400,7 @@ g_simple_action_class_init (GSimpleActionClass *class) /** * GSimpleAction::change-state: * @simple: the #GSimpleAction - * @value: (allow-none): the requested value for the state + * @value: (nullable): the requested value for the state * * Indicates that the action just received a request to change its * state. @@ -563,7 +563,7 @@ g_simple_action_set_enabled (GSimpleAction *simple, /** * g_simple_action_set_state_hint: * @simple: a #GSimpleAction - * @state_hint: (allow-none): a #GVariant representing the state hint + * @state_hint: (nullable): a #GVariant representing the state hint * * Sets the state hint for the action. * @@ -591,7 +591,7 @@ g_simple_action_set_state_hint (GSimpleAction *simple, /** * g_simple_action_new: * @name: the name of the action - * @parameter_type: (allow-none): the type of parameter to the activate function + * @parameter_type: (nullable): the type of parameter to the activate function * * Creates a new action. * @@ -616,7 +616,7 @@ g_simple_action_new (const gchar *name, /** * g_simple_action_new_stateful: * @name: the name of the action - * @parameter_type: (allow-none): the type of the parameter to the activate function + * @parameter_type: (nullable): the type of the parameter to the activate function * @state: the initial state of the action * * Creates a new stateful action. diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c index fdd83fcb7..ff2177ee6 100644 --- a/gio/gsimpleasyncresult.c +++ b/gio/gsimpleasyncresult.c @@ -290,7 +290,7 @@ g_simple_async_result_init (GSimpleAsyncResult *simple) /** * g_simple_async_result_new: - * @source_object: (allow-none): a #GObject, or %NULL. + * @source_object: (nullable): a #GObject, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * @source_tag: the asynchronous function. @@ -334,7 +334,7 @@ g_simple_async_result_new (GObject *source_object, /** * g_simple_async_result_new_from_error: - * @source_object: (allow-none): a #GObject, or %NULL. + * @source_object: (nullable): a #GObject, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * @error: a #GError @@ -365,7 +365,7 @@ g_simple_async_result_new_from_error (GObject *source_object, /** * g_simple_async_result_new_take_error: (skip) - * @source_object: (allow-none): a #GObject, or %NULL + * @source_object: (nullable): a #GObject, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data passed to @callback * @error: a #GError @@ -399,7 +399,7 @@ g_simple_async_result_new_take_error (GObject *source_object, /** * g_simple_async_result_new_error: - * @source_object: (allow-none): a #GObject, or %NULL. + * @source_object: (nullable): a #GObject, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * @domain: a #GQuark. @@ -915,7 +915,7 @@ run_in_thread (GIOSchedulerJob *job, * @simple: a #GSimpleAsyncResult. * @func: a #GSimpleAsyncThreadFunc. * @io_priority: the io priority of the request. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * * Runs the asynchronous job in a separate thread and then calls * g_simple_async_result_complete_in_idle() on @simple to return @@ -951,8 +951,8 @@ g_simple_async_result_run_in_thread (GSimpleAsyncResult *simple, /** * g_simple_async_result_is_valid: * @result: the #GAsyncResult passed to the _finish function. - * @source: (allow-none): the #GObject passed to the _finish function. - * @source_tag: (allow-none): the asynchronous function. + * @source: (nullable): the #GObject passed to the _finish function. + * @source_tag: (nullable): the asynchronous function. * * Ensures that the data passed to the _finish function of an async * operation is consistent. Three checks are performed. @@ -1003,7 +1003,7 @@ g_simple_async_result_is_valid (GAsyncResult *result, /** * g_simple_async_report_error_in_idle: (skip) - * @object: (allow-none): a #GObject, or %NULL. + * @object: (nullable): a #GObject, or %NULL. * @callback: a #GAsyncReadyCallback. * @user_data: user data passed to @callback. * @domain: a #GQuark containing the error domain (usually #G_IO_ERROR). @@ -1046,7 +1046,7 @@ g_simple_async_report_error_in_idle (GObject *object, /** * g_simple_async_report_gerror_in_idle: - * @object: (allow-none): a #GObject, or %NULL + * @object: (nullable): a #GObject, or %NULL * @callback: (scope async): a #GAsyncReadyCallback. * @user_data: (closure): user data passed to @callback. * @error: the #GError to report @@ -1078,7 +1078,7 @@ g_simple_async_report_gerror_in_idle (GObject *object, /** * g_simple_async_report_take_gerror_in_idle: (skip) - * @object: (allow-none): a #GObject, or %NULL + * @object: (nullable): a #GObject, or %NULL * @callback: a #GAsyncReadyCallback. * @user_data: user data passed to @callback. * @error: the #GError to report @@ -1113,7 +1113,7 @@ g_simple_async_report_take_gerror_in_idle (GObject *object, /** * g_simple_async_result_set_check_cancellable: * @simple: a #GSimpleAsyncResult - * @check_cancellable: (allow-none): a #GCancellable to check, or %NULL to unset + * @check_cancellable: (nullable): a #GCancellable to check, or %NULL to unset * * Sets a #GCancellable to check before dispatching results. * diff --git a/gio/gsimpleproxyresolver.c b/gio/gsimpleproxyresolver.c index ea952802f..a4b9abdcf 100644 --- a/gio/gsimpleproxyresolver.c +++ b/gio/gsimpleproxyresolver.c @@ -484,9 +484,9 @@ g_simple_proxy_resolver_iface_init (GProxyResolverInterface *iface) /** * g_simple_proxy_resolver_new: - * @default_proxy: (allow-none): the default proxy to use, eg + * @default_proxy: (nullable): the default proxy to use, eg * "socks://192.168.1.1" - * @ignore_hosts: (allow-none): an optional list of hosts/IP addresses + * @ignore_hosts: (nullable): an optional list of hosts/IP addresses * to not use a proxy for. * * Creates a new #GSimpleProxyResolver. See diff --git a/gio/gsocket.c b/gio/gsocket.c index cb7c81b34..c7555ba47 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -249,11 +249,14 @@ struct _GSocketPrivate guint connect_pending : 1; #ifdef G_OS_WIN32 WSAEVENT event; + gboolean waiting; + DWORD waiting_result; int current_events; int current_errors; int selected_events; GList *requested_conditions; /* list of requested GIOCondition * */ GMutex win32_source_lock; + GCond win32_source_cond; #endif struct { @@ -333,8 +336,10 @@ socket_strerror (int err) static void _win32_unset_event_mask (GSocket *socket, int mask) { + g_mutex_lock (&socket->priv->win32_source_lock); socket->priv->current_events &= ~mask; socket->priv->current_errors &= ~mask; + g_mutex_unlock (&socket->priv->win32_source_lock); } #else #define win32_unset_event_mask(_socket, _mask) @@ -831,6 +836,7 @@ g_socket_finalize (GObject *object) g_assert (socket->priv->requested_conditions == NULL); g_mutex_clear (&socket->priv->win32_source_lock); + g_cond_clear (&socket->priv->win32_source_cond); #endif for (i = 0; i < RECV_ADDR_CACHE_SIZE; i++) @@ -1058,6 +1064,7 @@ g_socket_init (GSocket *socket) #ifdef G_OS_WIN32 socket->priv->event = WSA_INVALID_EVENT; g_mutex_init (&socket->priv->win32_source_lock); + g_cond_init (&socket->priv->win32_source_cond); #endif } @@ -2295,7 +2302,7 @@ g_socket_multicast_group_operation (GSocket *socket, * g_socket_join_multicast_group: * @socket: a #GSocket. * @group: a #GInetAddress specifying the group address to join. - * @iface: (allow-none): Name of the interface to use, or %NULL + * @iface: (nullable): Name of the interface to use, or %NULL * @source_specific: %TRUE if source-specific multicast should be used * @error: #GError for error reporting, or %NULL to ignore. * @@ -2329,7 +2336,7 @@ g_socket_join_multicast_group (GSocket *socket, * g_socket_leave_multicast_group: * @socket: a #GSocket. * @group: a #GInetAddress specifying the group address to leave. - * @iface: (allow-none): Interface used + * @iface: (nullable): Interface used * @source_specific: %TRUE if source-specific multicast was used * @error: #GError for error reporting, or %NULL to ignore. * @@ -2404,7 +2411,7 @@ g_socket_speaks_ipv4 (GSocket *socket) /** * g_socket_accept: * @socket: a #GSocket. - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Accept incoming connections on a connection-based socket. This removes @@ -2441,6 +2448,8 @@ g_socket_accept (GSocket *socket, while (TRUE) { + win32_unset_event_mask (socket, FD_ACCEPT); + if ((ret = accept (socket->priv->fd, NULL, 0)) < 0) { int errsv = get_socket_errno (); @@ -2455,8 +2464,6 @@ g_socket_accept (GSocket *socket, errsv == EAGAIN) #endif { - win32_unset_event_mask (socket, FD_ACCEPT); - if (socket->priv->blocking) { if (!g_socket_condition_wait (socket, @@ -2473,8 +2480,6 @@ g_socket_accept (GSocket *socket, break; } - win32_unset_event_mask (socket, FD_ACCEPT); - #ifdef G_OS_WIN32 { /* The socket inherits the accepting sockets event mask and even object, @@ -2517,7 +2522,7 @@ g_socket_accept (GSocket *socket, * g_socket_connect: * @socket: a #GSocket. * @address: a #GSocketAddress specifying the remote address. - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Connect the socket to the specified remote address. @@ -2563,6 +2568,8 @@ g_socket_connect (GSocket *socket, while (1) { + win32_unset_event_mask (socket, FD_CONNECT); + if (connect (socket->priv->fd, (struct sockaddr *) &buffer, g_socket_address_get_native_size (address)) < 0) { @@ -2577,8 +2584,6 @@ g_socket_connect (GSocket *socket, if (errsv == WSAEWOULDBLOCK) #endif { - win32_unset_event_mask (socket, FD_CONNECT); - if (socket->priv->blocking) { if (g_socket_condition_wait (socket, G_IO_OUT, cancellable, error)) @@ -2604,8 +2609,6 @@ g_socket_connect (GSocket *socket, break; } - win32_unset_event_mask (socket, FD_CONNECT); - socket->priv->connected_read = TRUE; socket->priv->connected_write = TRUE; @@ -2785,6 +2788,8 @@ g_socket_receive_with_timeout (GSocket *socket, while (1) { + win32_unset_event_mask (socket, FD_READ); + if ((ret = recv (socket->priv->fd, buffer, size, 0)) < 0) { int errsv = get_socket_errno (); @@ -2799,8 +2804,6 @@ g_socket_receive_with_timeout (GSocket *socket, errsv == EAGAIN) #endif { - win32_unset_event_mask (socket, FD_READ); - if (timeout != 0) { if (!block_on_timeout (socket, G_IO_IN, timeout, start_time, @@ -2811,14 +2814,10 @@ g_socket_receive_with_timeout (GSocket *socket, } } - win32_unset_event_mask (socket, FD_READ); - socket_set_error_lazy (error, errsv, _("Error receiving data: %s")); return -1; } - win32_unset_event_mask (socket, FD_READ); - break; } @@ -2831,7 +2830,7 @@ g_socket_receive_with_timeout (GSocket *socket, * @buffer: (array length=size) (element-type guint8): a buffer to * read data into (which should be at least @size bytes long). * @size: the number of bytes you want to read from the socket - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Receive data (up to @size bytes) from a socket. This is mainly used by @@ -2882,7 +2881,7 @@ g_socket_receive (GSocket *socket, * read data into (which should be at least @size bytes long). * @size: the number of bytes you want to read from the socket * @blocking: whether to do blocking or non-blocking I/O - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * This behaves exactly the same as g_socket_receive(), except that @@ -2909,12 +2908,12 @@ g_socket_receive_with_blocking (GSocket *socket, /** * g_socket_receive_from: * @socket: a #GSocket - * @address: (out) (allow-none): a pointer to a #GSocketAddress + * @address: (out) (optional): a pointer to a #GSocketAddress * pointer, or %NULL * @buffer: (array length=size) (element-type guint8): a buffer to * read data into (which should be at least @size bytes long). * @size: the number of bytes you want to read from the socket - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Receive data (up to @size bytes) from a socket. @@ -2984,6 +2983,8 @@ g_socket_send_with_timeout (GSocket *socket, while (1) { + win32_unset_event_mask (socket, FD_WRITE); + if ((ret = send (socket->priv->fd, buffer, size, G_SOCKET_DEFAULT_SEND_FLAGS)) < 0) { int errsv = get_socket_errno (); @@ -2998,8 +2999,6 @@ g_socket_send_with_timeout (GSocket *socket, errsv == EAGAIN) #endif { - win32_unset_event_mask (socket, FD_WRITE); - if (timeout != 0) { if (!block_on_timeout (socket, G_IO_OUT, timeout, start_time, @@ -3025,7 +3024,7 @@ g_socket_send_with_timeout (GSocket *socket, * @buffer: (array length=size) (element-type guint8): the buffer * containing the data to send. * @size: the number of bytes to send - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Tries to send @size bytes from @buffer on the socket. This is @@ -3067,7 +3066,7 @@ g_socket_send (GSocket *socket, * containing the data to send. * @size: the number of bytes to send * @blocking: whether to do blocking or non-blocking I/O - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * This behaves exactly the same as g_socket_send(), except that @@ -3094,11 +3093,11 @@ g_socket_send_with_blocking (GSocket *socket, /** * g_socket_send_to: * @socket: a #GSocket - * @address: (allow-none): a #GSocketAddress, or %NULL + * @address: (nullable): a #GSocketAddress, or %NULL * @buffer: (array length=size) (element-type guint8): the buffer * containing the data to send. * @size: the number of bytes to send - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Tries to send @size bytes from @buffer to @address. If @address is @@ -3414,7 +3413,7 @@ remove_condition_watch (GSocket *socket, } static GIOCondition -update_condition (GSocket *socket) +update_condition_unlocked (GSocket *socket) { WSANETWORKEVENTS events; GIOCondition condition; @@ -3481,6 +3480,16 @@ update_condition (GSocket *socket) return condition; } + +static GIOCondition +update_condition (GSocket *socket) +{ + GIOCondition res; + g_mutex_lock (&socket->priv->win32_source_lock); + res = update_condition_unlocked (socket); + g_mutex_unlock (&socket->priv->win32_source_lock); + return res; +} #endif typedef struct { @@ -3665,7 +3674,7 @@ socket_source_new (GSocket *socket, * g_socket_create_source: (skip) * @socket: a #GSocket * @condition: a #GIOCondition mask to monitor - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * * Creates a #GSource that can be attached to a %GMainContext to monitor * for the availability of the specified @condition on the socket. The #GSource @@ -3770,7 +3779,7 @@ g_socket_condition_check (GSocket *socket, * g_socket_condition_wait: * @socket: a #GSocket * @condition: a #GIOCondition mask to wait for - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a #GError pointer, or %NULL * * Waits for @condition to become true on @socket. When the condition @@ -3805,7 +3814,7 @@ g_socket_condition_wait (GSocket *socket, * @socket: a #GSocket * @condition: a #GIOCondition mask to wait for * @timeout: the maximum time (in microseconds) to wait, or -1 - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a #GError pointer, or %NULL * * Waits for up to @timeout microseconds for @condition to become true @@ -3876,11 +3885,44 @@ g_socket_condition_timed_wait (GSocket *socket, if (timeout == -1) timeout = WSA_INFINITE; - current_condition = update_condition (socket); + g_mutex_lock (&socket->priv->win32_source_lock); + current_condition = update_condition_unlocked (socket); while ((condition & current_condition) == 0) { - res = WSAWaitForMultipleEvents (num_events, events, - FALSE, timeout, FALSE); + if (!socket->priv->waiting) + { + socket->priv->waiting = TRUE; + socket->priv->waiting_result = 0; + g_mutex_unlock (&socket->priv->win32_source_lock); + + res = WSAWaitForMultipleEvents (num_events, events, FALSE, timeout, FALSE); + + g_mutex_lock (&socket->priv->win32_source_lock); + socket->priv->waiting = FALSE; + socket->priv->waiting_result = res; + g_cond_broadcast (&socket->priv->win32_source_cond); + } + else + { + if (timeout != WSA_INFINITE) + { + if (!g_cond_wait_until (&socket->priv->win32_source_cond, &socket->priv->win32_source_lock, timeout)) + { + res = WSA_WAIT_TIMEOUT; + break; + } + else + { + res = socket->priv->waiting_result; + } + } + else + { + g_cond_wait (&socket->priv->win32_source_cond, &socket->priv->win32_source_lock); + res = socket->priv->waiting_result; + } + } + if (res == WSA_WAIT_FAILED) { int errsv = get_socket_errno (); @@ -3901,7 +3943,7 @@ g_socket_condition_timed_wait (GSocket *socket, if (g_cancellable_set_error_if_cancelled (cancellable, error)) break; - current_condition = update_condition (socket); + current_condition = update_condition_unlocked (socket); if (timeout != WSA_INFINITE) { @@ -3910,6 +3952,7 @@ g_socket_condition_timed_wait (GSocket *socket, timeout = 0; } } + g_mutex_unlock (&socket->priv->win32_source_lock); remove_condition_watch (socket, &condition); if (num_events > 1) g_cancellable_release_fd (cancellable); @@ -4099,8 +4142,16 @@ G_STMT_START { \ } \ \ /* control */ \ - _msg->msg_controllen = 2048; \ - _msg->msg_control = g_alloca (_msg->msg_controllen); \ + if (_message->control_messages == NULL) \ + { \ + _msg->msg_controllen = 0; \ + _msg->msg_control = NULL; \ + } \ + else \ + { \ + _msg->msg_controllen = 2048; \ + _msg->msg_control = g_alloca (_msg->msg_controllen); \ + } \ \ /* flags */ \ _msg->msg_flags = _message->flags; \ @@ -4125,6 +4176,7 @@ input_message_from_msghdr (const struct msghdr *msg, if (msg->msg_controllen >= sizeof (struct cmsghdr)) { + g_assert (message->control_messages != NULL); for (cmsg = CMSG_FIRSTHDR (msg); cmsg != NULL; cmsg = CMSG_NXTHDR ((struct msghdr *) msg, cmsg)) @@ -4140,19 +4192,9 @@ input_message_from_msghdr (const struct msghdr *msg, deserialization code, so just continue */ continue; - if (message->control_messages == NULL) - { - /* we have to do it this way if the user ignores the - * messages so that we will close any received fds. - */ - g_object_unref (control_message); - } - else - { - if (my_messages == NULL) - my_messages = g_ptr_array_new (); - g_ptr_array_add (my_messages, control_message); - } + if (my_messages == NULL) + my_messages = g_ptr_array_new (); + g_ptr_array_add (my_messages, control_message); } } @@ -4185,14 +4227,14 @@ input_message_from_msghdr (const struct msghdr *msg, /** * g_socket_send_message: * @socket: a #GSocket - * @address: (allow-none): a #GSocketAddress, or %NULL + * @address: (nullable): a #GSocketAddress, or %NULL * @vectors: (array length=num_vectors): an array of #GOutputVector structs * @num_vectors: the number of elements in @vectors, or -1 - * @messages: (array length=num_messages) (allow-none): a pointer to an + * @messages: (array length=num_messages) (nullable): a pointer to an * array of #GSocketControlMessages, or %NULL. * @num_messages: number of elements in @messages, or -1. * @flags: an int containing #GSocketMsgFlags flags - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Send data to @address on @socket. For sending multiple messages see @@ -4406,6 +4448,8 @@ g_socket_send_message_with_timeout (GSocket *socket, while (1) { + win32_unset_event_mask (socket, FD_WRITE); + if (address) result = WSASendTo (socket->priv->fd, bufs, num_vectors, @@ -4427,8 +4471,6 @@ g_socket_send_message_with_timeout (GSocket *socket, if (errsv == WSAEWOULDBLOCK) { - win32_unset_event_mask (socket, FD_WRITE); - if (timeout != 0) { if (!block_on_timeout (socket, G_IO_OUT, timeout, @@ -4456,7 +4498,7 @@ g_socket_send_message_with_timeout (GSocket *socket, * @messages: (array length=num_messages): an array of #GOutputMessage structs * @num_messages: the number of elements in @messages * @flags: an int containing #GSocketMsgFlags flags - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Send multiple data messages from @socket in one go. This is the most @@ -4876,6 +4918,8 @@ g_socket_receive_message_with_timeout (GSocket *socket, /* do it */ while (1) { + win32_unset_event_mask (socket, FD_READ); + addrlen = sizeof addr; if (address) result = WSARecvFrom (socket->priv->fd, @@ -4897,8 +4941,6 @@ g_socket_receive_message_with_timeout (GSocket *socket, if (errsv == WSAEWOULDBLOCK) { - win32_unset_event_mask (socket, FD_READ); - if (timeout != 0) { if (!block_on_timeout (socket, G_IO_IN, timeout, @@ -4912,7 +4954,6 @@ g_socket_receive_message_with_timeout (GSocket *socket, socket_set_error_lazy (error, errsv, _("Error receiving message: %s")); return -1; } - win32_unset_event_mask (socket, FD_READ); break; } @@ -4942,7 +4983,7 @@ g_socket_receive_message_with_timeout (GSocket *socket, * @messages: (array length=num_messages): an array of #GInputMessage structs * @num_messages: the number of elements in @messages * @flags: an int containing #GSocketMsgFlags flags for the overall operation - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore * * Receive multiple data messages from @socket in one go. This is the most @@ -5219,11 +5260,11 @@ g_socket_receive_messages_with_timeout (GSocket *socket, /** * g_socket_receive_message: * @socket: a #GSocket - * @address: (out) (nullable): a pointer to a #GSocketAddress + * @address: (out) (optional): a pointer to a #GSocketAddress * pointer, or %NULL * @vectors: (array length=num_vectors): an array of #GInputVector structs * @num_vectors: the number of elements in @vectors, or -1 - * @messages: (array length=num_messages) (out) (nullable): a pointer which + * @messages: (array length=num_messages) (out) (optional): a pointer which * may be filled with an array of #GSocketControlMessages, or %NULL * @num_messages: (out): a pointer which will be filled with the number of * elements in @messages, or %NULL diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c index f703f5787..2b6935a8f 100644 --- a/gio/gsocketaddressenumerator.c +++ b/gio/gsocketaddressenumerator.c @@ -48,7 +48,7 @@ g_socket_address_enumerator_class_init (GSocketAddressEnumeratorClass *enumerato /** * g_socket_address_enumerator_next: * @enumerator: a #GSocketAddressEnumerator - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: a #GError. * * Retrieves the next #GSocketAddress from @enumerator. Note that this @@ -112,7 +112,7 @@ g_socket_address_enumerator_real_next_async (GSocketAddressEnumerator *enumerato /** * g_socket_address_enumerator_next_async: * @enumerator: a #GSocketAddressEnumerator - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request * is satisfied * @user_data: (closure): the data to pass to callback function diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c index 840051e14..94212bf1f 100644 --- a/gio/gsocketclient.c +++ b/gio/gsocketclient.c @@ -489,7 +489,7 @@ g_socket_client_get_local_address (GSocketClient *client) /** * g_socket_client_set_local_address: * @client: a #GSocketClient. - * @address: (allow-none): a #GSocketAddress, or %NULL + * @address: (nullable): a #GSocketAddress, or %NULL * * Sets the local address of the socket client. * The sockets created by this object will bound to the @@ -720,7 +720,7 @@ g_socket_client_get_proxy_resolver (GSocketClient *client) /** * g_socket_client_set_proxy_resolver: * @client: a #GSocketClient. - * @proxy_resolver: (allow-none): a #GProxyResolver, or %NULL for the + * @proxy_resolver: (nullable): a #GProxyResolver, or %NULL for the * default. * * Overrides the #GProxyResolver used by @client. You can call this if @@ -939,7 +939,7 @@ g_socket_client_emit_event (GSocketClient *client, * g_socket_client_connect: * @client: a #GSocketClient. * @connectable: a #GSocketConnectable specifying the remote address. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting, or %NULL to ignore. * * Tries to resolve the @connectable and make a network connection to it. @@ -1163,7 +1163,7 @@ g_socket_client_connect (GSocketClient *client, * @client: a #GSocketClient * @host_and_port: the name and optionally port of the host to connect to * @default_port: the default port to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a #GError, or %NULL * * This is a helper function for g_socket_client_connect(). @@ -1227,7 +1227,7 @@ g_socket_client_connect_to_host (GSocketClient *client, * @client: a #GSocketConnection * @domain: a domain name * @service: the name of the service to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a #GError, or %NULL * * Attempts to create a TCP connection to a service. @@ -1270,7 +1270,7 @@ g_socket_client_connect_to_service (GSocketClient *client, * @client: a #GSocketClient * @uri: A network URI * @default_port: the default port to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a pointer to a #GError, or %NULL * * This is a helper function for g_socket_client_connect(). @@ -1637,7 +1637,7 @@ g_socket_client_enumerator_callback (GObject *object, * g_socket_client_connect_async: * @client: a #GSocketClient * @connectable: a #GSocketConnectable specifying the remote address. - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * @@ -1690,7 +1690,7 @@ g_socket_client_connect_async (GSocketClient *client, * @client: a #GSocketClient * @host_and_port: the name and optionally the port of the host to connect to * @default_port: the default port to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * @@ -1736,7 +1736,7 @@ g_socket_client_connect_to_host_async (GSocketClient *client, * @client: a #GSocketClient * @domain: a domain name * @service: the name of the service to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * @@ -1767,7 +1767,7 @@ g_socket_client_connect_to_service_async (GSocketClient *client, * @client: a #GSocketClient * @uri: a network uri * @default_port: the default port to connect to - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c index a452bc34c..63d974dde 100644 --- a/gio/gsocketconnection.c +++ b/gio/gsocketconnection.c @@ -139,7 +139,7 @@ g_socket_connection_is_connected (GSocketConnection *connection) * g_socket_connection_connect: * @connection: a #GSocketConnection * @address: a #GSocketAddress specifying the remote address. - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Connect @connection to the specified remote address. @@ -169,7 +169,7 @@ static gboolean g_socket_connection_connect_callback (GSocket *socket, * g_socket_connection_connect_async: * @connection: a #GSocketConnection * @address: a #GSocketAddress specifying the remote address. - * @cancellable: (allow-none): a %GCancellable or %NULL + * @cancellable: (nullable): a %GCancellable or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c index cd4f78f62..fd1966848 100644 --- a/gio/gsocketlistener.c +++ b/gio/gsocketlistener.c @@ -226,7 +226,7 @@ check_listener (GSocketListener *listener, * g_socket_listener_add_socket: * @listener: a #GSocketListener * @socket: a listening #GSocket - * @source_object: (allow-none): Optional #GObject identifying this source + * @source_object: (nullable): Optional #GObject identifying this source * @error: #GError for error reporting, or %NULL to ignore. * * Adds @socket to the set of sockets that we try to accept @@ -285,8 +285,8 @@ g_socket_listener_add_socket (GSocketListener *listener, * @address: a #GSocketAddress * @type: a #GSocketType * @protocol: a #GSocketProtocol - * @source_object: (allow-none): Optional #GObject identifying this source - * @effective_address: (out) (allow-none): location to store the address that was bound to, or %NULL. + * @source_object: (nullable): Optional #GObject identifying this source + * @effective_address: (out) (optional): location to store the address that was bound to, or %NULL. * @error: #GError for error reporting, or %NULL to ignore. * * Creates a socket of type @type and protocol @protocol, binds @@ -392,7 +392,7 @@ g_socket_listener_add_address (GSocketListener *listener, * g_socket_listener_add_inet_port: * @listener: a #GSocketListener * @port: an IP port number (non-zero) - * @source_object: (allow-none): Optional #GObject identifying this source + * @source_object: (nullable): Optional #GObject identifying this source * @error: #GError for error reporting, or %NULL to ignore. * * Helper function for g_socket_listener_add_address() that @@ -639,8 +639,8 @@ accept_callback (GSocket *socket, /** * g_socket_listener_accept_socket: * @listener: a #GSocketListener - * @source_object: (out) (transfer none) (allow-none): location where #GObject pointer will be stored, or %NULL. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @source_object: (out) (transfer none) (optional): location where #GObject pointer will be stored, or %NULL. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting, or %NULL to ignore. * * Blocks waiting for a client to connect to any of the sockets added @@ -716,8 +716,8 @@ g_socket_listener_accept_socket (GSocketListener *listener, /** * g_socket_listener_accept: * @listener: a #GSocketListener - * @source_object: (out) (transfer none) (allow-none): location where #GObject pointer will be stored, or %NULL - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @source_object: (out) (transfer none) (optional): location where #GObject pointer will be stored, or %NULL + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting, or %NULL to ignore. * * Blocks waiting for a client to connect to any of the sockets added @@ -790,7 +790,7 @@ accept_ready (GSocket *accept_socket, /** * g_socket_listener_accept_socket_async: * @listener: a #GSocketListener - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * @@ -834,7 +834,7 @@ g_socket_listener_accept_socket_async (GSocketListener *listener, * g_socket_listener_accept_socket_finish: * @listener: a #GSocketListener * @result: a #GAsyncResult. - * @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source + * @source_object: (out) (transfer none) (optional): Optional #GObject identifying this source * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @@ -862,7 +862,7 @@ g_socket_listener_accept_socket_finish (GSocketListener *listener, /** * g_socket_listener_accept_async: * @listener: a #GSocketListener - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: (scope async): a #GAsyncReadyCallback * @user_data: (closure): user data for the callback * @@ -890,7 +890,7 @@ g_socket_listener_accept_async (GSocketListener *listener, * g_socket_listener_accept_finish: * @listener: a #GSocketListener * @result: a #GAsyncResult. - * @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source + * @source_object: (out) (transfer none) (optional): Optional #GObject identifying this source * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @@ -981,7 +981,7 @@ g_socket_listener_close (GSocketListener *listener) /** * g_socket_listener_add_any_inet_port: * @listener: a #GSocketListener - * @source_object: (allow-none): Optional #GObject identifying this source + * @source_object: (nullable): Optional #GObject identifying this source * @error: a #GError location to store the error occurring, or %NULL to * ignore. * diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c index b10491b08..57113a00f 100644 --- a/gio/gsocketservice.c +++ b/gio/gsocketservice.c @@ -327,7 +327,7 @@ g_socket_service_class_init (GSocketServiceClass *class) * GSocketService::incoming: * @service: the #GSocketService * @connection: a new #GSocketConnection object - * @source_object: (allow-none): the source_object passed to + * @source_object: (nullable): the source_object passed to * g_socket_listener_add_address() * * The ::incoming signal is emitted when a new incoming connection diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c index c791543af..5fd535575 100644 --- a/gio/gsubprocess.c +++ b/gio/gsubprocess.c @@ -648,7 +648,7 @@ g_subprocess_class_init (GSubprocessClass *class) /** * g_subprocess_new: (skip) * @flags: flags that define the behaviour of the subprocess - * @error: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * @argv0: first commandline argument to pass to the subprocess * @...: more commandline arguments, followed by %NULL * @@ -699,7 +699,7 @@ g_subprocess_new (GSubprocessFlags flags, * g_subprocess_newv: (rename-to g_subprocess_new) * @argv: (array zero-terminated=1) (element-type utf8): commandline arguments for the subprocess * @flags: flags that define the behaviour of the subprocess - * @error: (allow-none): return location for an error, or %NULL + * @error: (nullable): return location for an error, or %NULL * * Create a new process with the given flags and argument list. * @@ -1577,7 +1577,7 @@ g_subprocess_communicate_internal (GSubprocess *subprocess, /** * g_subprocess_communicate: * @subprocess: a #GSubprocess - * @stdin_buf: (allow-none): data to send to the stdin of the subprocess, or %NULL + * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL * @cancellable: a #GCancellable * @stdout_buf: (out): data read from the subprocess stdout * @stderr_buf: (out): data read from the subprocess stderr @@ -1658,8 +1658,8 @@ g_subprocess_communicate (GSubprocess *subprocess, /** * g_subprocess_communicate_async: * @subprocess: Self - * @stdin_buf: (allow-none): Input data, or %NULL - * @cancellable: (allow-none): Cancellable + * @stdin_buf: (nullable): Input data, or %NULL + * @cancellable: (nullable): Cancellable * @callback: Callback * @user_data: User data * @@ -1724,7 +1724,7 @@ g_subprocess_communicate_finish (GSubprocess *subprocess, /** * g_subprocess_communicate_utf8: * @subprocess: a #GSubprocess - * @stdin_buf: (allow-none): data to send to the stdin of the subprocess, or %NULL + * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL * @cancellable: a #GCancellable * @stdout_buf: (out): data read from the subprocess stdout * @stderr_buf: (out): data read from the subprocess stderr @@ -1769,7 +1769,7 @@ g_subprocess_communicate_utf8 (GSubprocess *subprocess, /** * g_subprocess_communicate_utf8_async: * @subprocess: Self - * @stdin_buf: (allow-none): Input data, or %NULL + * @stdin_buf: (nullable): Input data, or %NULL * @cancellable: Cancellable * @callback: Callback * @user_data: User data diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c index a7906d9d3..d43583af7 100644 --- a/gio/gsubprocesslauncher.c +++ b/gio/gsubprocesslauncher.c @@ -79,13 +79,16 @@ verify_disposition (const gchar *stream_name, if (n_bits) { GFlagsClass *class; - GFlagsValue *value; + guint i; class = g_type_class_peek (G_TYPE_SUBPROCESS_FLAGS); - while ((value = g_flags_get_first_value (class, filtered_flags))) + + for (i = 0; i < class->n_values; i++) { - g_string_append_printf (err, " %s", value->value_name); - filtered_flags &= value->value; + const GFlagsValue *value = &class->values[i]; + + if (filtered_flags & value->value) + g_string_append_printf (err, " %s", value->value_name); } g_type_class_unref (class); diff --git a/gio/gtask.c b/gio/gtask.c index 4af423764..5a2767473 100644 --- a/gio/gtask.c +++ b/gio/gtask.c @@ -654,9 +654,9 @@ g_task_finalize (GObject *object) /** * g_task_new: - * @source_object: (allow-none) (type GObject): the #GObject that owns + * @source_object: (nullable) (type GObject): the #GObject that owns * this task, or %NULL. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. * @@ -709,7 +709,7 @@ g_task_new (gpointer source_object, /** * g_task_report_error: - * @source_object: (allow-none) (type GObject): the #GObject that owns + * @source_object: (nullable) (type GObject): the #GObject that owns * this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. @@ -744,7 +744,7 @@ g_task_report_error (gpointer source_object, /** * g_task_report_new_error: - * @source_object: (allow-none) (type GObject): the #GObject that owns + * @source_object: (nullable) (type GObject): the #GObject that owns * this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. @@ -790,8 +790,8 @@ g_task_report_new_error (gpointer source_object, /** * g_task_set_task_data: * @task: the #GTask - * @task_data: (allow-none): task-specific data - * @task_data_destroy: (allow-none): #GDestroyNotify for @task_data + * @task_data: (nullable): task-specific data + * @task_data_destroy: (nullable): #GDestroyNotify for @task_data * * Sets @task's task data (freeing the existing task data, if any). * @@ -802,6 +802,8 @@ g_task_set_task_data (GTask *task, gpointer task_data, GDestroyNotify task_data_destroy) { + g_return_if_fail (G_IS_TASK (task)); + if (task->task_data_destroy) task->task_data_destroy (task->task_data); @@ -830,6 +832,8 @@ void g_task_set_priority (GTask *task, gint priority) { + g_return_if_fail (G_IS_TASK (task)); + task->priority = priority; TRACE (GIO_TASK_SET_PRIORITY (task, priority)); @@ -862,6 +866,7 @@ void g_task_set_check_cancellable (GTask *task, gboolean check_cancellable) { + g_return_if_fail (G_IS_TASK (task)); g_return_if_fail (check_cancellable || !task->return_on_cancel); task->check_cancellable = check_cancellable; @@ -914,6 +919,7 @@ gboolean g_task_set_return_on_cancel (GTask *task, gboolean return_on_cancel) { + g_return_val_if_fail (G_IS_TASK (task), FALSE); g_return_val_if_fail (task->check_cancellable || !return_on_cancel, FALSE); if (!G_TASK_IS_THREADED (task)) @@ -958,6 +964,8 @@ void g_task_set_source_tag (GTask *task, gpointer source_tag) { + g_return_if_fail (G_IS_TASK (task)); + task->source_tag = source_tag; TRACE (GIO_TASK_SET_SOURCE_TAG (task, source_tag)); @@ -977,6 +985,8 @@ g_task_set_source_tag (GTask *task, gpointer g_task_get_source_object (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + return task->source_object; } @@ -1004,6 +1014,8 @@ g_task_ref_source_object (GAsyncResult *res) gpointer g_task_get_task_data (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + return task->task_data; } @@ -1020,6 +1032,8 @@ g_task_get_task_data (GTask *task) gint g_task_get_priority (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), G_PRIORITY_DEFAULT); + return task->priority; } @@ -1042,6 +1056,8 @@ g_task_get_priority (GTask *task) GMainContext * g_task_get_context (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + return task->context; } @@ -1058,6 +1074,8 @@ g_task_get_context (GTask *task) GCancellable * g_task_get_cancellable (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + return task->cancellable; } @@ -1073,6 +1091,8 @@ g_task_get_cancellable (GTask *task) gboolean g_task_get_check_cancellable (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), FALSE); + return task->check_cancellable; } @@ -1088,6 +1108,8 @@ g_task_get_check_cancellable (GTask *task) gboolean g_task_get_return_on_cancel (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), FALSE); + return task->return_on_cancel; } @@ -1104,6 +1126,8 @@ g_task_get_return_on_cancel (GTask *task) gpointer g_task_get_source_tag (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + return task->source_tag; } @@ -1502,6 +1526,8 @@ g_task_attach_source (GTask *task, GSource *source, GSourceFunc callback) { + g_return_if_fail (G_IS_TASK (task)); + g_source_set_callback (source, callback, g_object_ref (task), g_object_unref); g_source_set_priority (source, task->priority); @@ -1536,9 +1562,9 @@ g_task_propagate_error (GTask *task, /** * g_task_return_pointer: * @task: a #GTask - * @result: (allow-none) (transfer full): the pointer result of a task + * @result: (nullable) (transfer full): the pointer result of a task * function - * @result_destroy: (allow-none): a #GDestroyNotify function. + * @result_destroy: (nullable): a #GDestroyNotify function. * * Sets @task's result to @result and completes the task. If @result * is not %NULL, then @result_destroy will be used to free @result if @@ -1566,6 +1592,7 @@ g_task_return_pointer (GTask *task, gpointer result, GDestroyNotify result_destroy) { + g_return_if_fail (G_IS_TASK (task)); g_return_if_fail (task->result_set == FALSE); task->result.pointer = result; @@ -1596,6 +1623,8 @@ gpointer g_task_propagate_pointer (GTask *task, GError **error) { + g_return_val_if_fail (G_IS_TASK (task), NULL); + if (g_task_propagate_error (task, error)) return NULL; @@ -1621,6 +1650,7 @@ void g_task_return_int (GTask *task, gssize result) { + g_return_if_fail (G_IS_TASK (task)); g_return_if_fail (task->result_set == FALSE); task->result.size = result; @@ -1649,6 +1679,8 @@ gssize g_task_propagate_int (GTask *task, GError **error) { + g_return_val_if_fail (G_IS_TASK (task), -1); + if (g_task_propagate_error (task, error)) return -1; @@ -1673,6 +1705,7 @@ void g_task_return_boolean (GTask *task, gboolean result) { + g_return_if_fail (G_IS_TASK (task)); g_return_if_fail (task->result_set == FALSE); task->result.boolean = result; @@ -1701,6 +1734,8 @@ gboolean g_task_propagate_boolean (GTask *task, GError **error) { + g_return_val_if_fail (G_IS_TASK (task), FALSE); + if (g_task_propagate_error (task, error)) return FALSE; @@ -1733,6 +1768,7 @@ void g_task_return_error (GTask *task, GError *error) { + g_return_if_fail (G_IS_TASK (task)); g_return_if_fail (task->result_set == FALSE); g_return_if_fail (error != NULL); @@ -1793,6 +1829,7 @@ g_task_return_error_if_cancelled (GTask *task) { GError *error = NULL; + g_return_val_if_fail (G_IS_TASK (task), FALSE); g_return_val_if_fail (task->result_set == FALSE, FALSE); if (g_cancellable_set_error_if_cancelled (task->cancellable, &error)) @@ -1823,6 +1860,8 @@ g_task_return_error_if_cancelled (GTask *task) gboolean g_task_had_error (GTask *task) { + g_return_val_if_fail (G_IS_TASK (task), FALSE); + if (task->error != NULL || task->had_error) return TRUE; @@ -1855,7 +1894,7 @@ g_task_get_completed (GTask *task) /** * g_task_is_valid: * @result: (type Gio.AsyncResult): A #GAsyncResult - * @source_object: (allow-none) (type GObject): the source object + * @source_object: (nullable) (type GObject): the source object * expected to be associated with the task * * Checks that @result is a #GTask, and that @source_object is its diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c index 588bcfae7..1d17cf452 100644 --- a/gio/gtestdbus.c +++ b/gio/gtestdbus.c @@ -715,7 +715,7 @@ g_test_dbus_get_flags (GTestDBus *self) * been called yet, %NULL is returned. This can be used with * g_dbus_connection_new_for_address(). * - * Returns: (allow-none): the address of the bus, or %NULL. + * Returns: (nullable): the address of the bus, or %NULL. */ const gchar * g_test_dbus_get_bus_address (GTestDBus *self) diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c index e75ea2adf..b30ed1fd2 100644 --- a/gio/gtlscertificate.c +++ b/gio/gtlscertificate.c @@ -678,8 +678,8 @@ g_tls_certificate_get_issuer (GTlsCertificate *cert) /** * g_tls_certificate_verify: * @cert: a #GTlsCertificate - * @identity: (allow-none): the expected peer identity - * @trusted_ca: (allow-none): the certificate of a trusted authority + * @identity: (nullable): the expected peer identity + * @trusted_ca: (nullable): the certificate of a trusted authority * * This verifies @cert and returns a set of #GTlsCertificateFlags * indicating any problems found with it. This can be used to verify a diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c index 99ff9a8e8..5f5619925 100644 --- a/gio/gtlsclientconnection.c +++ b/gio/gtlsclientconnection.c @@ -149,7 +149,7 @@ g_tls_client_connection_default_init (GTlsClientConnectionInterface *iface) /** * g_tls_client_connection_new: * @base_io_stream: the #GIOStream to wrap - * @server_identity: (allow-none): the expected identity of the server + * @server_identity: (nullable): the expected identity of the server * @error: #GError for error reporting, or %NULL to ignore. * * Creates a new #GTlsClientConnection wrapping @base_io_stream (which diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c index c1b644c55..11f10d2fb 100644 --- a/gio/gtlsconnection.c +++ b/gio/gtlsconnection.c @@ -501,7 +501,7 @@ g_tls_connection_get_certificate (GTlsConnection *conn) /** * g_tls_connection_set_interaction: * @conn: a connection - * @interaction: (allow-none): an interaction object, or %NULL + * @interaction: (nullable): an interaction object, or %NULL * * Set the object that will be used to interact with the user. It will be used * for things like prompting the user for passwords. @@ -735,7 +735,7 @@ g_tls_connection_get_rehandshake_mode (GTlsConnection *conn) /** * g_tls_connection_handshake: * @conn: a #GTlsConnection - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @error: a #GError, or %NULL * * Attempts a TLS handshake on @conn. @@ -779,7 +779,7 @@ g_tls_connection_handshake (GTlsConnection *conn, * g_tls_connection_handshake_async: * @conn: a #GTlsConnection * @io_priority: the [I/O priority][io-priority] of the request - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the handshake is complete * @user_data: the data to pass to the callback function * diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c index f139891cc..16d4a3720 100644 --- a/gio/gtlsdatabase.c +++ b/gio/gtlsdatabase.c @@ -449,11 +449,11 @@ g_tls_database_class_init (GTlsDatabaseClass *klass) * @self: a #GTlsDatabase * @chain: a #GTlsCertificate chain * @purpose: the purpose that this certificate chain will be used for. - * @identity: (allow-none): the expected peer identity - * @interaction: (allow-none): used to interact with the user if necessary + * @identity: (nullable): the expected peer identity + * @interaction: (nullable): used to interact with the user if necessary * @flags: additional verify flags - * @cancellable: (allow-none): a #GCancellable, or %NULL - * @error: (allow-none): a #GError, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL + * @error: (nullable): a #GError, or %NULL * * Verify's a certificate chain after looking up and adding any missing * certificates to the chain. @@ -525,10 +525,10 @@ g_tls_database_verify_chain (GTlsDatabase *self, * @self: a #GTlsDatabase * @chain: a #GTlsCertificate chain * @purpose: the purpose that this certificate chain will be used for. - * @identity: (allow-none): the expected peer identity - * @interaction: (allow-none): used to interact with the user if necessary + * @identity: (nullable): the expected peer identity + * @interaction: (nullable): used to interact with the user if necessary * @flags: additional verify flags - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the operation completes * @user_data: the data to pass to the callback function * @@ -631,10 +631,10 @@ g_tls_database_create_certificate_handle (GTlsDatabase *self, * g_tls_database_lookup_certificate_for_handle: * @self: a #GTlsDatabase * @handle: a certificate handle - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: Flags which affect the lookup. - * @cancellable: (allow-none): a #GCancellable, or %NULL - * @error: (allow-none): a #GError, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL + * @error: (nullable): a #GError, or %NULL * * Lookup a certificate by its handle. * @@ -649,7 +649,7 @@ g_tls_database_create_certificate_handle (GTlsDatabase *self, * This function can block, use g_tls_database_lookup_certificate_for_handle_async() to perform * the lookup operation asynchronously. * - * Returns: (transfer full) (allow-none): a newly allocated + * Returns: (transfer full) (nullable): a newly allocated * #GTlsCertificate, or %NULL. Use g_object_unref() to release the certificate. * * Since: 2.30 @@ -681,9 +681,9 @@ g_tls_database_lookup_certificate_for_handle (GTlsDatabase *self, * g_tls_database_lookup_certificate_for_handle_async: * @self: a #GTlsDatabase * @handle: a certificate handle - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: Flags which affect the lookup. - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the operation completes * @user_data: the data to pass to the callback function * @@ -750,10 +750,10 @@ g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase *se * g_tls_database_lookup_certificate_issuer: * @self: a #GTlsDatabase * @certificate: a #GTlsCertificate - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: flags which affect the lookup operation - * @cancellable: (allow-none): a #GCancellable, or %NULL - * @error: (allow-none): a #GError, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL + * @error: (nullable): a #GError, or %NULL * * Lookup the issuer of @certificate in the database. * @@ -795,9 +795,9 @@ g_tls_database_lookup_certificate_issuer (GTlsDatabase *self, * g_tls_database_lookup_certificate_issuer_async: * @self: a #GTlsDatabase * @certificate: a #GTlsCertificate - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: flags which affect the lookup operation - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the operation completes * @user_data: the data to pass to the callback function * @@ -862,10 +862,10 @@ g_tls_database_lookup_certificate_issuer_finish (GTlsDatabase *self, * g_tls_database_lookup_certificates_issued_by: * @self: a #GTlsDatabase * @issuer_raw_dn: a #GByteArray which holds the DER encoded issuer DN. - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: Flags which affect the lookup operation. - * @cancellable: (allow-none): a #GCancellable, or %NULL - * @error: (allow-none): a #GError, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL + * @error: (nullable): a #GError, or %NULL * * Lookup certificates issued by this issuer in the database. * @@ -903,9 +903,9 @@ g_tls_database_lookup_certificates_issued_by (GTlsDatabase *self, * g_tls_database_lookup_certificates_issued_by_async: * @self: a #GTlsDatabase * @issuer_raw_dn: a #GByteArray which holds the DER encoded issuer DN. - * @interaction: (allow-none): used to interact with the user if necessary + * @interaction: (nullable): used to interact with the user if necessary * @flags: Flags which affect the lookup operation. - * @cancellable: (allow-none): a #GCancellable, or %NULL + * @cancellable: (nullable): a #GCancellable, or %NULL * @callback: callback to call when the operation completes * @user_data: the data to pass to the callback function * diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c index 25382379e..75134a211 100644 --- a/gio/gtlsinteraction.c +++ b/gio/gtlsinteraction.c @@ -457,8 +457,8 @@ g_tls_interaction_ask_password (GTlsInteraction *interaction, * @interaction: a #GTlsInteraction object * @password: a #GTlsPassword object * @cancellable: an optional #GCancellable cancellation object - * @callback: (allow-none): will be called when the interaction completes - * @user_data: (allow-none): data to pass to the @callback + * @callback: (nullable): will be called when the interaction completes + * @user_data: (nullable): data to pass to the @callback * * Run asynchronous interaction to ask the user for a password. In general, * g_tls_interaction_invoke_ask_password() should be used instead of this @@ -754,8 +754,8 @@ g_tls_interaction_request_certificate (GTlsInteraction *interaction * @connection: a #GTlsConnection object * @flags: flags providing more information about the request * @cancellable: an optional #GCancellable cancellation object - * @callback: (allow-none): will be called when the interaction completes - * @user_data: (allow-none): data to pass to the @callback + * @callback: (nullable): will be called when the interaction completes + * @user_data: (nullable): data to pass to the @callback * * Run asynchronous interaction to ask the user for a certificate to use with * the connection. In general, g_tls_interaction_invoke_request_certificate() should diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c index 57e60ac75..a64faa464 100644 --- a/gio/gtlspassword.c +++ b/gio/gtlspassword.c @@ -241,7 +241,7 @@ g_tls_password_new (GTlsPasswordFlags flags, /** * g_tls_password_get_value: * @password: a #GTlsPassword object - * @length: (allow-none): location to place the length of the password. + * @length: (nullable): location to place the length of the password. * * Get the password value. If @length is not %NULL then it will be * filled in with the length of the password value. (Note that the @@ -295,7 +295,7 @@ g_tls_password_set_value (GTlsPassword *password, * @password: a #GTlsPassword object * @value: the value for the password * @length: the length of the password, or -1 - * @destroy: (allow-none): a function to use to free the password. + * @destroy: (nullable): a function to use to free the password. * * Provide the value for this password. * diff --git a/gio/gtlsserverconnection.c b/gio/gtlsserverconnection.c index 518af5557..d1e488b7e 100644 --- a/gio/gtlsserverconnection.c +++ b/gio/gtlsserverconnection.c @@ -65,7 +65,7 @@ g_tls_server_connection_default_init (GTlsServerConnectionInterface *iface) /** * g_tls_server_connection_new: * @base_io_stream: the #GIOStream to wrap - * @certificate: (allow-none): the default server certificate, or %NULL + * @certificate: (nullable): the default server certificate, or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Creates a new #GTlsServerConnection wrapping @base_io_stream (which diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c index f87be31ed..16245f182 100644 --- a/gio/gunixconnection.c +++ b/gio/gunixconnection.c @@ -65,8 +65,8 @@ G_DEFINE_TYPE_WITH_CODE (GUnixConnection, g_unix_connection, * g_unix_connection_send_fd: * @connection: a #GUnixConnection * @fd: a file descriptor - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: (allow-none): #GError for error reporting, or %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. + * @error: (nullable): #GError for error reporting, or %NULL to ignore. * * Passes a file descriptor to the receiving side of the * connection. The receiving end has to call g_unix_connection_receive_fd() @@ -119,8 +119,8 @@ g_unix_connection_send_fd (GUnixConnection *connection, /** * g_unix_connection_receive_fd: * @connection: a #GUnixConnection - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: (allow-none): #GError for error reporting, or %NULL to ignore + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore + * @error: (nullable): #GError for error reporting, or %NULL to ignore * * Receives a file descriptor from the sending end of the connection. * The sending end has to call g_unix_connection_send_fd() for this @@ -288,7 +288,7 @@ gboolean g_unix_connection_create_pair (GUnixCo /** * g_unix_connection_send_credentials: * @connection: A #GUnixConnection. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Passes the credentials of the current user the receiving side @@ -386,7 +386,7 @@ send_credentials_async_thread (GTask *task, /** * g_unix_connection_send_credentials_async: * @connection: A #GUnixConnection. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * @@ -439,7 +439,7 @@ g_unix_connection_send_credentials_finish (GUnixConnection *connection, /** * g_unix_connection_receive_credentials: * @connection: A #GUnixConnection. - * @cancellable: (allow-none): A #GCancellable or %NULL. + * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * * Receives credentials from the sending end of the connection. The @@ -647,7 +647,7 @@ receive_credentials_async_thread (GTask *task, /** * g_unix_connection_receive_credentials_async: * @connection: A #GUnixConnection. - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function * diff --git a/gio/gunixfdlist.c b/gio/gunixfdlist.c index de4e772ce..7c3fc6a97 100644 --- a/gio/gunixfdlist.c +++ b/gio/gunixfdlist.c @@ -200,7 +200,7 @@ g_unix_fd_list_new_from_array (const gint *fds, /** * g_unix_fd_list_steal_fds: * @list: a #GUnixFDList - * @length: (out) (allow-none): pointer to the length of the returned + * @length: (out) (optional): pointer to the length of the returned * array, or %NULL * * Returns the array of file descriptors that is contained in this @@ -256,7 +256,7 @@ g_unix_fd_list_steal_fds (GUnixFDList *list, /** * g_unix_fd_list_peek_fds: * @list: a #GUnixFDList - * @length: (out) (allow-none): pointer to the length of the returned + * @length: (out) (optional): pointer to the length of the returned * array, or %NULL * * Returns the array of file descriptors that is contained in this diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c index 523d7296b..f3b303cf0 100644 --- a/gio/gunixfdmessage.c +++ b/gio/gunixfdmessage.c @@ -261,7 +261,7 @@ g_unix_fd_message_new_with_fd_list (GUnixFDList *fd_list) /** * g_unix_fd_message_steal_fds: * @message: a #GUnixFDMessage - * @length: (out) (allow-none): pointer to the length of the returned + * @length: (out) (optional): pointer to the length of the returned * array, or %NULL * * Returns the array of file descriptors that is contained in this diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 52be25a34..0c73a5689 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1390,7 +1390,7 @@ get_mount_points_timestamp (void) /** * g_unix_mounts_get: (skip) - * @time_read: (out) (allow-none): guint64 to contain a timestamp, or %NULL + * @time_read: (out) (optional): guint64 to contain a timestamp, or %NULL * * Gets a #GList of #GUnixMountEntry containing the unix mounts. * If @time_read is set, it will be filled with the mount @@ -1412,7 +1412,7 @@ g_unix_mounts_get (guint64 *time_read) /** * g_unix_mount_at: (skip) * @mount_path: path for a possible unix mount. - * @time_read: (out) (allow-none): guint64 to contain a timestamp. + * @time_read: (out) (optional): guint64 to contain a timestamp. * * Gets a #GUnixMountEntry for a given mount path. If @time_read * is set, it will be filled with a unix timestamp for checking @@ -1447,7 +1447,7 @@ g_unix_mount_at (const char *mount_path, /** * g_unix_mount_for: (skip) * @file_path: file path on some unix mount. - * @time_read: (out) (allow-none): guint64 to contain a timestamp. + * @time_read: (out) (optional): guint64 to contain a timestamp. * * Gets a #GUnixMountEntry for a given file path. If @time_read * is set, it will be filled with a unix timestamp for checking @@ -1471,8 +1471,11 @@ g_unix_mount_for (const char *file_path, char *topdir; topdir = _g_local_file_find_topdir_for (file_path); - entry = g_unix_mount_at (topdir, time_read); - g_free (topdir); + if (topdir != NULL) + { + entry = g_unix_mount_at (topdir, time_read); + g_free (topdir); + } } return entry; @@ -1480,7 +1483,7 @@ g_unix_mount_for (const char *file_path, /** * g_unix_mount_points_get: (skip) - * @time_read: (out) (allow-none): guint64 to contain a timestamp. + * @time_read: (out) (optional): guint64 to contain a timestamp. * * Gets a #GList of #GUnixMountPoint containing the unix mount points. * If @time_read is set, it will be filled with the mount timestamp, diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c index f4fc07758..3b2a1c486 100644 --- a/gio/gunixsocketaddress.c +++ b/gio/gunixsocketaddress.c @@ -116,7 +116,9 @@ g_unix_socket_address_set_property (GObject *object, /* Clip to fit in UNIX_PATH_MAX with zero termination or first byte */ len = MIN (array->len, UNIX_PATH_MAX-1); - memcpy (address->priv->path, array->data, len); + if (len != 0) + memcpy (address->priv->path, array->data, len); + address->priv->path[len] = 0; /* Ensure null-terminated */ address->priv->path_len = len; } diff --git a/gio/gvdb/gvdb-builder.c b/gio/gvdb/gvdb-builder.c index 48fe3e41c..43ad06869 100644 --- a/gio/gvdb/gvdb-builder.c +++ b/gio/gvdb/gvdb-builder.c @@ -291,7 +291,8 @@ file_builder_add_string (FileBuilder *fb, chunk->offset = fb->offset; chunk->size = length; chunk->data = g_malloc (length); - memcpy (chunk->data, string, length); + if (length != 0) + memcpy (chunk->data, string, length); *start = guint32_to_le (fb->offset); *size = guint16_to_le (length); diff --git a/gio/gvolume.c b/gio/gvolume.c index 5626baa66..3f08ebc1d 100644 --- a/gio/gvolume.c +++ b/gio/gvolume.c @@ -330,9 +330,9 @@ g_volume_should_automount (GVolume *volume) * g_volume_mount: * @volume: a #GVolume * @flags: flags affecting the operation - * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL + * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid user interaction + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL * @user_data: user data that gets passed to @callback * * Mounts a volume. This is an asynchronous operation, and is @@ -406,8 +406,8 @@ g_volume_mount_finish (GVolume *volume, * g_volume_eject: * @volume: a #GVolume * @flags: flags affecting the unmount if required for eject - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL * @user_data: user data that gets passed to @callback * * Ejects a volume. This is an asynchronous operation, and is @@ -477,10 +477,10 @@ g_volume_eject_finish (GVolume *volume, * g_volume_eject_with_operation: * @volume: a #GVolume * @flags: flags affecting the unmount if required for eject - * @mount_operation: (allow-none): a #GMountOperation or %NULL to + * @mount_operation: (nullable): a #GMountOperation or %NULL to * avoid user interaction - * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL + * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore + * @callback: (nullable): a #GAsyncReadyCallback, or %NULL * @user_data: user data passed to @callback * * Ejects a volume. This is an asynchronous operation, and is diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c index 69cd9ed47..313980bc0 100644 --- a/gio/gwin32registrykey.c +++ b/gio/gwin32registrykey.c @@ -484,7 +484,7 @@ g_win32_registry_key_new (const gchar *path, /** * g_win32_registry_key_new_w: * @path: (in) (transfer none): absolute full name of a key to open (in UTF-16) - * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL * * Creates an object that represents a registry key specified by @path. * @path must start with one of the following pre-defined names: @@ -628,7 +628,7 @@ g_win32_registry_key_initable_init (GInitable *initable, * g_win32_registry_key_get_child: * @key: (in) (transfer none): a parent #GWin32RegistryKey * @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key - * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL * * Opens a @subkey of the @key. * @@ -662,7 +662,7 @@ g_win32_registry_key_get_child (GWin32RegistryKey *key, * g_win32_registry_key_get_child_w: * @key: (in) (transfer none): a parent #GWin32RegistryKey * @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key - * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL * * Opens a @subkey of the @key. * @@ -739,7 +739,7 @@ g_win32_registry_key_get_child_w (GWin32RegistryKey *key, * g_win32_registry_subkey_iter_init: * @iter: (in) (transfer none): a pointer to a #GWin32RegistrySubkeyIter * @key: (in) (transfer none): a #GWin32RegistryKey to iterate over - * @error: (inout) (nullable): a pointer to %NULL #GError, or %NULL + * @error: (inout) (optional): a pointer to %NULL #GError, or %NULL * * Initialises (without allocating) a #GWin32RegistrySubkeyIter. @iter may be * completely uninitialised prior to this call; its old value is diff --git a/gio/gzlibcompressor.c b/gio/gzlibcompressor.c index 68445d05a..5e89017ad 100644 --- a/gio/gzlibcompressor.c +++ b/gio/gzlibcompressor.c @@ -311,7 +311,7 @@ g_zlib_compressor_get_file_info (GZlibCompressor *compressor) /** * g_zlib_compressor_set_file_info: * @compressor: a #GZlibCompressor - * @file_info: (allow-none): a #GFileInfo + * @file_info: (nullable): a #GFileInfo * * Sets @file_info in @compressor. If non-%NULL, and @compressor's * #GZlibCompressor:format property is %G_ZLIB_COMPRESSOR_FORMAT_GZIP, diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c index 06f5fab91..13acd25ae 100644 --- a/gio/inotify/inotify-helper.c +++ b/gio/inotify/inotify-helper.c @@ -4,19 +4,18 @@ Copyright (C) 2007 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-helper.h b/gio/inotify/inotify-helper.h index 27bba7016..7e3ce1c31 100644 --- a/gio/inotify/inotify-helper.h +++ b/gio/inotify/inotify-helper.h @@ -2,19 +2,18 @@ Copyright (C) 2007 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <john@johnmccutchan.com> */ diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c index 89fb9ca3a..da177f30f 100644 --- a/gio/inotify/inotify-kernel.c +++ b/gio/inotify/inotify-kernel.c @@ -2,19 +2,18 @@ Copyright (C) 2005 John McCutchan Copyright © 2015 Canonical Limited - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: Ryan Lortie <desrt@desrt.ca> diff --git a/gio/inotify/inotify-kernel.h b/gio/inotify/inotify-kernel.h index 25ede291f..c3e78bf4b 100644 --- a/gio/inotify/inotify-kernel.h +++ b/gio/inotify/inotify-kernel.h @@ -1,19 +1,18 @@ /* Copyright (C) 2005 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors:. John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-missing.c b/gio/inotify/inotify-missing.c index aec3b9a10..cac9a14f3 100644 --- a/gio/inotify/inotify-missing.c +++ b/gio/inotify/inotify-missing.c @@ -4,19 +4,18 @@ Copyright (C) 2005 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-missing.h b/gio/inotify/inotify-missing.h index 58c0fb6fe..e47aad9df 100644 --- a/gio/inotify/inotify-missing.h +++ b/gio/inotify/inotify-missing.h @@ -2,19 +2,18 @@ Copyright (C) 2006 John McCutchan <john@johnmccutchan.com> - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <ttb@tentacle.dhs.org> */ diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c index bed3ab39c..b7e5135c6 100644 --- a/gio/inotify/inotify-path.c +++ b/gio/inotify/inotify-path.c @@ -5,19 +5,18 @@ Copyright (C) 2006 John McCutchan Copyright (C) 2009 Codethink Limited - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-path.h b/gio/inotify/inotify-path.h index 1793ff79b..91b891f55 100644 --- a/gio/inotify/inotify-path.h +++ b/gio/inotify/inotify-path.h @@ -1,19 +1,18 @@ /* Copyright (C) 2005 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors:. John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-sub.c b/gio/inotify/inotify-sub.c index 2036227dd..4220064d6 100644 --- a/gio/inotify/inotify-sub.c +++ b/gio/inotify/inotify-sub.c @@ -4,19 +4,18 @@ Copyright (C) 2006 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-sub.h b/gio/inotify/inotify-sub.h index ab24dd857..d1a913638 100644 --- a/gio/inotify/inotify-sub.h +++ b/gio/inotify/inotify-sub.h @@ -2,19 +2,18 @@ Copyright (C) 2006 John McCutchan - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - The Gnome Library is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Library General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <john@johnmccutchan.com> */ diff --git a/gio/org.freedesktop.portal.Documents.xml b/gio/org.freedesktop.portal.Documents.xml index c466c5272..92eabf907 100644 --- a/gio/org.freedesktop.portal.Documents.xml +++ b/gio/org.freedesktop.portal.Documents.xml @@ -15,10 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: Alexander Larsson <alexl@redhat.com> --> diff --git a/gio/org.freedesktop.portal.NetworkMonitor.xml b/gio/org.freedesktop.portal.NetworkMonitor.xml index 284b7bd3e..3022208b1 100644 --- a/gio/org.freedesktop.portal.NetworkMonitor.xml +++ b/gio/org.freedesktop.portal.NetworkMonitor.xml @@ -12,10 +12,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: Matthias Clasen <mclasen@redhat.com> --> diff --git a/gio/org.freedesktop.portal.ProxyResolver.xml b/gio/org.freedesktop.portal.ProxyResolver.xml index b274f00ee..0b98b805a 100644 --- a/gio/org.freedesktop.portal.ProxyResolver.xml +++ b/gio/org.freedesktop.portal.ProxyResolver.xml @@ -12,10 +12,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. Author: Matthias Clasen <mclasen@redhat.com> --> diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index 749267b65..321141da1 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -32,7 +32,6 @@ test_programs = \ credentials \ data-input-stream \ data-output-stream \ - defaultvalue \ fileattributematcher \ filter-streams \ giomodule \ @@ -245,7 +244,6 @@ if OS_UNIX test_programs += \ file \ gdbus-peer-object-manager \ - gdbus-unix-addresses \ live-g-file \ socket-address \ stream-rw_all \ @@ -383,7 +381,6 @@ uninstalled_test_extra_programs += gdbus-test-fixture gdbus_test_fixture_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) # This is peer to peer so it doesn't need a session bus (so we can run it normally) -test_programs += gdbus-peer gdbus_peer_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) # This test is currently unreliable @@ -398,6 +395,7 @@ gdbus_sessionbus_sources = gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h g test_programs += \ actions \ dbus-appinfo \ + defaultvalue \ gapplication \ gdbus-auth \ gdbus-bz627724 \ @@ -410,6 +408,7 @@ test_programs += \ gdbus-export \ gdbus-introspection \ gdbus-names \ + gdbus-peer \ gdbus-proxy \ gdbus-proxy-threads \ gdbus-proxy-well-known-name \ @@ -420,6 +419,10 @@ test_programs += \ gnotification \ $(NULL) +if OS_UNIX +test_programs += gdbus-unix-addresses +endif + gdbus_proxy_threads_CFLAGS = $(AM_CFLAGS) $(DBUS1_CFLAGS) actions_SOURCES = $(gdbus_sessionbus_sources) actions.c dbus_appinfo_SOURCES = $(gdbus_sessionbus_sources) dbus-appinfo.c diff --git a/gio/tests/file.c b/gio/tests/file.c index 04eaea9f8..779183791 100644 --- a/gio/tests/file.c +++ b/gio/tests/file.c @@ -498,7 +498,7 @@ static const gchar *replace_data = " * @file: input #GFile.\n" " * @contents: string of contents to replace the file with.\n" " * @length: the length of @contents in bytes.\n" - " * @etag: (allow-none): a new <link linkend=\"gfile-etag\">entity tag</link> for the @file, or %NULL\n" + " * @etag: (nullable): a new <link linkend=\"gfile-etag\">entity tag</link> for the @file, or %NULL\n" " * @make_backup: %TRUE if a backup should be created.\n" " * @flags: a set of #GFileCreateFlags.\n" " * @cancellable: optional #GCancellable object, %NULL to ignore.\n" diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c index a40518964..2002a9252 100644 --- a/gio/tests/gdbus-serialization.c +++ b/gio/tests/gdbus-serialization.c @@ -650,7 +650,7 @@ message_serialize_basic (void) 60000, -44, 100000, - -G_GINT64_CONSTANT(2)<<34, + -(G_GUINT64_CONSTANT(2)<<34), G_GUINT64_CONSTANT(0xffffffffffffffff), 42.5), "value 0: string: 'this is a string'\n" diff --git a/gio/tests/test-pipe-unix.c b/gio/tests/test-pipe-unix.c index 3d75964c3..b9fb38cbf 100644 --- a/gio/tests/test-pipe-unix.c +++ b/gio/tests/test-pipe-unix.c @@ -36,8 +36,8 @@ /** * test_pipe: - * @is: (out) (allow-none): used to return a #GInputStream - * @os: (out) (allow-none): used to return a #GOutputStream + * @is: (out) (optional): used to return a #GInputStream + * @os: (out) (optional): used to return a #GOutputStream * @error: used to raise an error * * Return a "pipe to self" connecting @is to @os. This can be used @@ -82,8 +82,8 @@ test_pipe (GInputStream **is, /** * test_bidi_pipe: - * @left: (out) (allow-none): used to return one #GIOStream - * @right: (out) (allow-none): used to return the other #GIOStream + * @left: (out) (optional): used to return one #GIOStream + * @right: (out) (optional): used to return the other #GIOStream * @error: used to raise an error * * Return two #GIOStream<!---->s connected to each other with pipes. diff --git a/gio/win32/winhttp.h b/gio/win32/winhttp.h index a8dd0c10f..2f0041a67 100644 --- a/gio/win32/winhttp.h +++ b/gio/win32/winhttp.h @@ -11,9 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __WINE_WINHTTP_H diff --git a/glib-gettextize.in b/glib-gettextize.in index 617d6bce4..b07078bc5 100644 --- a/glib-gettextize.in +++ b/glib-gettextize.in @@ -51,7 +51,7 @@ esac datarootdir=@datarootdir@ datadir=@datadir@ -gettext_dir=$prefix/share/glib-2.0/gettext +gettext_dir=$datadir/glib-2.0/gettext while test $# -gt 0; do case "$1" in diff --git a/glib.supp b/glib.supp new file mode 100644 index 000000000..ccfab67d6 --- /dev/null +++ b/glib.supp @@ -0,0 +1,493 @@ +# GLib Valgrind suppressions file +# +# This provides a list of suppressions for all of GLib (including GIO), for all +# Valgrind tools (memcheck, drd, helgrind, etc.) for the false positives and +# deliberate one-time leaks which GLib causes to be reported when running under +# Valgrind. +# +# When running an application which links to GLib under Valgrind, you can pass +# this suppression file to Valgrind using --suppressions=/path/to/glib-2.0.supp. +# +# http://valgrind.org/docs/manual/manual-core.html#manual-core.suppress +# +# Note that there is currently no way for Valgrind to load this automatically +# (https://bugs.kde.org/show_bug.cgi?id=160905), so the best GLib can currently +# do is to install this file as part of its development package. +# +# This file should be updated if GLib introduces a new deliberate one-time leak, +# or another false race positive in Valgrind: please file bugs at: +# +# https://bugzilla.gnome.org/enter_bug.cgi?product=glib + +{ + gnutls-init-calloc + Memcheck:Leak + fun:calloc + ... + fun:gtls_gnutls_init +} + +{ + gnutls-init-realloc + Memcheck:Leak + fun:realloc + ... + fun:gtls_gnutls_init +} + +{ + g-tls-backend-gnutls-init + Memcheck:Leak + fun:g_once_impl + fun:g_tls_backend_gnutls_init +} + +{ + p11-tokens-init + Memcheck:Leak + fun:calloc + ... + fun:create_tokens_inlock + fun:initialize_module_inlock_reentrant +} + +{ + gobject-init-malloc + Memcheck:Leak + fun:malloc + ... + fun:gobject_init_ctor +} + +{ + gobject-init-realloc + Memcheck:Leak + fun:realloc + ... + fun:gobject_init_ctor +} + +{ + gobject-init-calloc + Memcheck:Leak + fun:calloc + ... + fun:gobject_init_ctor +} + +{ + g-type-register-dynamic + Memcheck:Leak + fun:malloc + ... + fun:g_type_register_dynamic +} + +{ + g-type-register-static + Memcheck:Leak + fun:malloc + ... + fun:g_type_register_static +} + +{ + g-type-register-static-realloc + Memcheck:Leak + fun:realloc + ... + fun:g_type_register_static +} + +{ + g-type-register-static-calloc + Memcheck:Leak + fun:calloc + ... + fun:g_type_register_static +} + +{ + g-type-add-interface-dynamic + Memcheck:Leak + fun:malloc + ... + fun:g_type_add_interface_dynamic +} + +{ + g-type-add-interface-static + Memcheck:Leak + fun:malloc + ... + fun:g_type_add_interface_static +} + +{ + g-test-rand-init + Memcheck:Leak + fun:calloc + ... + fun:g_rand_new_with_seed_array + fun:test_run_seed + ... + fun:g_test_run +} + +{ + g-test-rand-init2 + Memcheck:Leak + fun:calloc + ... + fun:g_rand_new_with_seed_array + ... + fun:get_global_random + ... + fun:g_test_init +} + +{ + g-quark-table-new + Memcheck:Leak + fun:g_hash_table_new + ... + fun:quark_new +} + +{ + g-quark-table-resize + Memcheck:Leak + fun:g_hash_table_resize + ... + fun:quark_new +} + +{ + g-type-interface-init + Memcheck:Leak + fun:malloc + ... + fun:type_iface_vtable_base_init_Wm +} + +{ + g-type-class-init + Memcheck:Leak + fun:calloc + ... + fun:type_class_init_Wm +} + +{ + g-io-module-default-singleton-malloc + Memcheck:Leak + fun:malloc + ... + fun:g_type_create_instance + ... + fun:_g_io_module_get_default +} + +{ + g-io-module-default-singleton-module + Memcheck:Leak + fun:calloc + ... + fun:g_module_open + ... + fun:_g_io_module_get_default +} + +{ + g-get-language-names + Memcheck:Leak + fun:malloc + ... + fun:g_get_language_names +} + +{ + g-static-mutex + Memcheck:Leak + fun:malloc + ... + fun:g_static_mutex_get_mutex_impl +} + +{ + g-system-thread-init + Memcheck:Leak + fun:calloc + ... + fun:g_system_thread_new +} + +{ + g-io-module-default-proxy-resolver-gnome + Memcheck:Leak + fun:calloc + ... + fun:g_proxy_resolver_gnome_init + ... + fun:_g_io_module_get_default +} + +{ + g-private-get + drd:ConflictingAccess + fun:g_private_get +} +{ + g-private-get-helgrind + Helgrind:Race + fun:g_private_get +} + + +{ + g-private-set + drd:ConflictingAccess + fun:g_private_set +} +{ + g-private-set-helgrind + Helgrind:Race + fun:g_private_set +} + +{ + g-type-construct-free + drd:ConflictingAccess + fun:g_type_free_instance +} +{ + g-type-construct-free-helgrind + Helgrind:Race + fun:g_type_free_instance +} + +{ + g-variant-unref + drd:ConflictingAccess + fun:g_variant_unref +} +{ + g-variant-unref-helgrind + Helgrind:Race + fun:g_variant_unref +} + +{ + g-unix-signals-main + drd:ConflictingAccess + fun:_g_main_create_unix_signal_watch +} +{ + g-unix-signals-dispatch + drd:ConflictingAccess + ... + fun:dispatch_unix_signals* +} +{ + g-unix-signals-dispatch-helgrind + Helgrind:Race + ... + fun:dispatch_unix_signals* +} +{ + g-unix-signals-other + drd:ConflictingAccess + fun:g_unix_signal_watch* +} +{ + g-unix-signals-other-helgrind + Helgrind:Race + fun:g_unix_signal_watch* +} +{ + g-unix-signals-handler + drd:ConflictingAccess + fun:g_unix_signal_handler* +} +{ + g-unix-signals-handler-helgrind + Helgrind:Race + fun:g_unix_signal_handler* +} +{ + g-unix-signals-worker + drd:ConflictingAccess + fun:glib_worker_main +} +{ + g-unix-signals-worker-helgrind + Helgrind:Race + fun:glib_worker_main +} + +{ + g-wakeup-acknowledge + drd:ConflictingAccess + fun:read + fun:g_wakeup_acknowledge +} + +{ + g-type-fundamental + drd:ConflictingAccess + fun:g_type_fundamental +} +{ + g-type-fundamental-helgrind + Helgrind:Race + fun:g_type_fundamental +} +{ + g-type-class-peek-static + drd:ConflictingAccess + fun:g_type_class_peek_static +} +{ + g-type-class-peek-static-helgrind + Helgrind:Race + fun:g_type_class_peek_static +} +{ + g-type-is-a + drd:ConflictingAccess + ... + fun:g_type_is_a +} +{ + g-type-is-a-helgrind + Helgrind:Race + ... + fun:g_type_is_a +} + +{ + g-inet-address-get-type + drd:ConflictingAccess + fun:g_inet_address_get_type +} +{ + g-inet-address-get-type-helgrind + Helgrind:Race + fun:g_inet_address_get_type +} + +# From: https://github.com/fredericgermain/valgrind/blob/master/glibc-2.X-drd.supp +{ + drd-libc-stdio + drd:ConflictingAccess + obj:*/lib*/libc-* +} +{ + drd-libc-recv + drd:ConflictingAccess + fun:recv +} +{ + drd-libc-send + drd:ConflictingAccess + fun:send +} + +# GSources do an opportunistic ref count check +{ + g-source-set-ready-time + drd:ConflictingAccess + fun:g_source_set_ready_time +} +{ + g-source-set-ready-time-helgrind + Helgrind:Race + fun:g_source_set_ready_time +} + +{ + g-source-iter-next + Helgrind:Race + fun:g_source_iter_next + fun:g_main_context_* + fun:g_main_context_iterate +} + +{ + g-object-instance-private + drd:ConflictingAccess + fun:*_get_instance_private +} +{ + g-object-instance-private-helgrind + Helgrind:Race + fun:*_get_instance_private +} + +# GLib legitimately calls pthread_cond_signal without a mutex held +{ + g-task-thread-complete + drd:CondErr + ... + fun:g_cond_signal + fun:g_task_thread_complete +} +{ + g-task-thread-complete + Helgrind:Misc + ... + fun:g_cond_signal + fun:g_task_thread_complete +} + +# False positive, but I can't explain how (FIXME) +{ + g-task-cond + Helgrind:Misc + ... + fun:g_cond_clear + fun:g_task_finalize +} + +# Real race, but is_cancelled() is an opportunistic function anyway +{ + g-cancellable-is-cancelled + Helgrind:Race + fun:g_cancellable_is_cancelled +} + +# False positive +{ + g-main-context-cond + Helgrind:Misc + ... + fun:g_cond_clear + fun:g_main_context_unref +} + +# False positives +{ + g-source-unlocked + Helgrind:Race + fun:g_source_*_unlocked +} +{ + g-source-internal + Helgrind:Race + fun:g_source_*_internal +} + +# False positive +{ + g_object_real_dispose + Helgrind:Race + fun:g_object_real_dispose +} + +# False positive +{ + g_object_new_valist + Helgrind:Race + ... + fun:g_object_new_valist +} diff --git a/glib/Makefile.am b/glib/Makefile.am index 82a7d3a2a..2aeaddd1b 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -466,9 +466,9 @@ glib_HEADERS_DIR = $(glibsubincludedir) glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS) glib_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/glib.vcproj $(top_builddir)/build/win32/vs9/glib.headers +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/glib/docs.c b/glib/docs.c index 781869d72..5ac735448 100644 --- a/glib/docs.c +++ b/glib/docs.c @@ -2237,8 +2237,9 @@ /** * G_GNUC_PRINTF: * @format_idx: the index of the argument corresponding to the - * format string (The arguments are numbered from 1) - * @arg_idx: the index of the first of the format arguments + * format string (the arguments are numbered from 1) + * @arg_idx: the index of the first of the format arguments, or 0 if + * there are no format arguments * * Expands to the GNU C format function attribute if the compiler is gcc. * This is used for declaring functions which take a variable number of @@ -2248,7 +2249,9 @@ * Place the attribute after the function declaration, just before the * semicolon. * - * See the GNU C documentation for more details. + * See the + * [GNU C documentation](https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-Wformat-3288) + * for more details. * * |[<!-- language="C" --> * gint g_snprintf (gchar *string, @@ -2261,15 +2264,18 @@ /** * G_GNUC_SCANF: * @format_idx: the index of the argument corresponding to - * the format string (The arguments are numbered from 1) - * @arg_idx: the index of the first of the format arguments + * the format string (the arguments are numbered from 1) + * @arg_idx: the index of the first of the format arguments, or 0 if + * there are no format arguments * * Expands to the GNU C format function attribute if the compiler is gcc. * This is used for declaring functions which take a variable number of * arguments, with the same syntax as scanf(). It allows the compiler * to type-check the arguments passed to the function. * - * See the GNU C documentation for details. + * See the + * [GNU C documentation](https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-Wformat-3288) + * for details. */ /** diff --git a/glib/garray.c b/glib/garray.c index 727c1024d..ac7e58035 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -415,6 +415,9 @@ g_array_append_vals (GArray *farray, g_return_val_if_fail (array, NULL); + if (len == 0) + return farray; + g_array_maybe_expand (array, len); memcpy (g_array_elt_pos (array, array->len), data, @@ -468,6 +471,9 @@ g_array_prepend_vals (GArray *farray, g_return_val_if_fail (array, NULL); + if (len == 0) + return farray; + g_array_maybe_expand (array, len); memmove (g_array_elt_pos (array, len), g_array_elt_pos (array, 0), @@ -517,6 +523,9 @@ g_array_insert_vals (GArray *farray, g_return_val_if_fail (array, NULL); + if (len == 0) + return farray; + g_array_maybe_expand (array, len); memmove (g_array_elt_pos (array, len + index_), @@ -913,7 +922,7 @@ g_ptr_array_sized_new (guint reserved_size) /** * g_ptr_array_new_with_free_func: - * @element_free_func: (allow-none): A function to free elements with + * @element_free_func: (nullable): A function to free elements with * destroy @array or %NULL * * Creates a new #GPtrArray with a reference count of 1 and use @@ -939,7 +948,7 @@ g_ptr_array_new_with_free_func (GDestroyNotify element_free_func) /** * g_ptr_array_new_full: * @reserved_size: number of pointers preallocated - * @element_free_func: (allow-none): A function to free elements with + * @element_free_func: (nullable): A function to free elements with * destroy @array or %NULL * * Creates a new #GPtrArray with @reserved_size pointers preallocated @@ -969,7 +978,7 @@ g_ptr_array_new_full (guint reserved_size, /** * g_ptr_array_set_free_func: * @array: A #GPtrArray - * @element_free_func: (allow-none): A function to free elements with + * @element_free_func: (nullable): A function to free elements with * destroy @array or %NULL * * Sets a function for freeing each element when @array is destroyed diff --git a/glib/gatomic.c b/glib/gatomic.c index e70e8095b..e3e49fab4 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -95,6 +95,16 @@ */ #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + +#if defined(__ATOMIC_SEQ_CST) && !defined(__clang__) +/* The implementation used in this code path in gatomic.h assumes + * 4-byte int */ +G_STATIC_ASSERT (sizeof (gint) == 4); + +/* The implementations in gatomic.h assume 4- or 8-byte pointers */ +G_STATIC_ASSERT (sizeof (void *) == 4 || sizeof (void *) == 8); +#endif + /** * g_atomic_int_get: * @atomic: a pointer to a #gint or #guint diff --git a/glib/gatomic.h b/glib/gatomic.h index 9d04b1dfd..32d0d1e7e 100644 --- a/glib/gatomic.h +++ b/glib/gatomic.h @@ -87,6 +87,10 @@ G_END_DECLS /* We prefer the new C11-style atomic extension of GCC if available */ #if defined(__ATOMIC_SEQ_CST) && !defined(__clang__) +/* This assumes sizeof(int) is 4: gatomic.c statically + * asserts that (using G_STATIC_ASSERT at top-level in a header was + * problematic, see #730932) */ + #define g_atomic_int_get(atomic) \ (G_GNUC_EXTENSION ({ \ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ @@ -116,6 +120,10 @@ G_END_DECLS #else /* GLIB_SIZEOF_VOID_P == 8 */ +/* This assumes that if sizeof(void *) is not 8, then it is 4: + * gatomic.c statically asserts that (using G_STATIC_ASSERT + * at top-level in a header was problematic, see #730932) */ + #define g_atomic_pointer_get(atomic) \ (G_GNUC_EXTENSION ({ \ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index a1cd9b36d..6a05623ff 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -12,9 +12,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * You should have received a copy of the GNU Library General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -1767,7 +1766,7 @@ find_file_in_data_dirs (const gchar *file, * g_bookmark_file_load_from_data_dirs: * @bookmark: a #GBookmarkFile * @file: (type filename): a relative path to a filename to open and parse - * @full_path: (type filename) (allow-none): return location for a string + * @full_path: (type filename) (nullable): return location for a string * containing the full path of the file, or %NULL * @error: return location for a #GError, or %NULL * @@ -1848,7 +1847,7 @@ g_bookmark_file_load_from_data_dirs (GBookmarkFile *bookmark, /** * g_bookmark_file_to_data: * @bookmark: a #GBookmarkFile - * @length: (allow-none) (out): return location for the length of the returned string, or %NULL + * @length: (out) (optional): return location for the length of the returned string, or %NULL * @error: return location for a #GError, or %NULL * * This function outputs @bookmark as a string. @@ -2038,7 +2037,7 @@ g_bookmark_file_has_item (GBookmarkFile *bookmark, /** * g_bookmark_file_get_uris: * @bookmark: a #GBookmarkFile - * @length: (allow-none) (out): return location for the number of returned URIs, or %NULL + * @length: (out) (optional): return location for the number of returned URIs, or %NULL * * Returns all URIs of the bookmarks in the bookmark file @bookmark. * The array of returned URIs will be %NULL-terminated, so @length may @@ -2082,7 +2081,7 @@ g_bookmark_file_get_uris (GBookmarkFile *bookmark, /** * g_bookmark_file_set_title: * @bookmark: a #GBookmarkFile - * @uri: (allow-none): a valid URI or %NULL + * @uri: (nullable): a valid URI or %NULL * @title: a UTF-8 encoded string * * Sets @title as the title of the bookmark for @uri inside the @@ -2127,7 +2126,7 @@ g_bookmark_file_set_title (GBookmarkFile *bookmark, /** * g_bookmark_file_get_title: * @bookmark: a #GBookmarkFile - * @uri: (allow-none): a valid URI or %NULL + * @uri: (nullable): a valid URI or %NULL * @error: return location for a #GError, or %NULL * * Returns the title of the bookmark for @uri. @@ -2170,7 +2169,7 @@ g_bookmark_file_get_title (GBookmarkFile *bookmark, /** * g_bookmark_file_set_description: * @bookmark: a #GBookmarkFile - * @uri: (allow-none): a valid URI or %NULL + * @uri: (nullable): a valid URI or %NULL * @description: a string * * Sets @description as the description of the bookmark for @uri. @@ -2823,7 +2822,7 @@ g_bookmark_file_remove_group (GBookmarkFile *bookmark, * g_bookmark_file_set_groups: * @bookmark: a #GBookmarkFile * @uri: an item's URI - * @groups: (allow-none): an array of group names, or %NULL to remove all groups + * @groups: (nullable): an array of group names, or %NULL to remove all groups * @length: number of group name values in @groups * * Sets a list of group names for the item with URI @uri. Each previously @@ -2873,7 +2872,7 @@ g_bookmark_file_set_groups (GBookmarkFile *bookmark, * g_bookmark_file_get_groups: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @length: (allow-none) (out): return location for the length of the returned string, or %NULL + * @length: (out) (optional): return location for the length of the returned string, or %NULL * @error: return location for a #GError, or %NULL * * Retrieves the list of group names of the bookmark for @uri. @@ -2945,9 +2944,9 @@ g_bookmark_file_get_groups (GBookmarkFile *bookmark, * g_bookmark_file_add_application: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @name: (allow-none): the name of the application registering the bookmark + * @name: (nullable): the name of the application registering the bookmark * or %NULL - * @exec: (allow-none): command line to be used to launch the bookmark or %NULL + * @exec: (nullable): command line to be used to launch the bookmark or %NULL * * Adds the application with @name and @exec to the list of * applications that have registered a bookmark for @uri into @@ -3298,9 +3297,9 @@ expand_exec_line (const gchar *exec_fmt, * @bookmark: a #GBookmarkFile * @uri: a valid URI * @name: an application's name - * @exec: (allow-none) (out): return location for the command line of the application, or %NULL - * @count: (allow-none) (out): return location for the registration count, or %NULL - * @stamp: (allow-none) (out): return location for the last registration time, or %NULL + * @exec: (out) (optional): return location for the command line of the application, or %NULL + * @count: (out) (optional): return location for the registration count, or %NULL + * @stamp: (out) (optional): return location for the last registration time, or %NULL * @error: return location for a #GError, or %NULL * * Gets the registration informations of @app_name for the bookmark for @@ -3398,7 +3397,7 @@ g_bookmark_file_get_app_info (GBookmarkFile *bookmark, * g_bookmark_file_get_applications: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @length: (allow-none) (out): return location of the length of the returned list, or %NULL + * @length: (out) (optional): return location of the length of the returned list, or %NULL * @error: return location for a #GError, or %NULL * * Retrieves the names of the applications that have registered the @@ -3490,7 +3489,7 @@ g_bookmark_file_get_size (GBookmarkFile *bookmark) * g_bookmark_file_move_item: * @bookmark: a #GBookmarkFile * @old_uri: a valid URI - * @new_uri: (allow-none): a valid URI, or %NULL + * @new_uri: (nullable): a valid URI, or %NULL * @error: return location for a #GError or %NULL * * Changes the URI of a bookmark item from @old_uri to @new_uri. Any @@ -3556,7 +3555,7 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark, * g_bookmark_file_set_icon: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @href: (allow-none): the URI of the icon for the bookmark, or %NULL + * @href: (nullable): the URI of the icon for the bookmark, or %NULL * @mime_type: the MIME type of the icon for the bookmark * * Sets the icon for the bookmark for @uri. If @href is %NULL, unsets @@ -3605,8 +3604,8 @@ g_bookmark_file_set_icon (GBookmarkFile *bookmark, * g_bookmark_file_get_icon: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @href: (allow-none) (out): return location for the icon's location or %NULL - * @mime_type: (allow-none) (out): return location for the icon's MIME type or %NULL + * @href: (out) (optional): return location for the icon's location or %NULL + * @mime_type: (out) (optional): return location for the icon's MIME type or %NULL * @error: return location for a #GError or %NULL * * Gets the icon of the bookmark for @uri. diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h index 1f6532389..3f9b88a1d 100644 --- a/glib/gbookmarkfile.h +++ b/glib/gbookmarkfile.h @@ -12,9 +12,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * You should have received a copy of the GNU Library General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_BOOKMARK_FILE_H__ diff --git a/glib/gcharset.h b/glib/gcharset.h index e90a5f61b..dacc6ba9c 100644 --- a/glib/gcharset.h +++ b/glib/gcharset.h @@ -2,19 +2,18 @@ * * Copyright (C) 2011 Red Hat, Inc. * - * The GLib Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The GLib Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_CHARSET_H__ diff --git a/glib/gconvert.c b/glib/gconvert.c index 1de941edc..1e27f9255 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -1530,8 +1530,7 @@ hostname_validate (const char *hostname) /** * g_filename_from_uri: * @uri: a uri describing a filename (escaped, encoded in ASCII). - * @hostname: (out) (optional) (nullable): Location to store hostname for the - * URI. + * @hostname: (out) (optional): Location to store hostname for the URI. * If there is no hostname in the URI, %NULL will be * stored in this location. * @error: location to store the error occurring, or %NULL to ignore @@ -1692,7 +1691,7 @@ g_filename_from_uri (const gchar *uri, * @filename: (type filename): an absolute filename specified in the GLib file * name encoding, which is the on-disk file name bytes on Unix, and UTF-8 * on Windows - * @hostname: (allow-none): A UTF-8 encoded hostname, or %NULL for none. + * @hostname: (nullable): A UTF-8 encoded hostname, or %NULL for none. * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * diff --git a/glib/gdataset.c b/glib/gdataset.c index 4f00d990f..df75c81a1 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -588,7 +588,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location, * g_datalist_id_set_data_full: * @datalist: a datalist. * @key_id: the #GQuark to identify the data element. - * @data: (allow-none): the data element or %NULL to remove any previous element + * @data: (nullable): the data element or %NULL to remove any previous element * corresponding to @key_id. * @destroy_func: the function to call when the data element is * removed. This function will be called with the data @@ -605,7 +605,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location, * g_datalist_set_data_full: * @dl: a datalist. * @k: the string to identify the data element. - * @d: (allow-none): the data element, or %NULL to remove any previous element + * @d: (nullable): the data element, or %NULL to remove any previous element * corresponding to @k. * @f: the function to call when the data element is removed. This * function will be called with the data element and can be used to @@ -619,7 +619,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location, * g_datalist_id_set_data: * @dl: a datalist. * @q: the #GQuark to identify the data element. - * @d: (allow-none): the data element, or %NULL to remove any previous element + * @d: (nullable): the data element, or %NULL to remove any previous element * corresponding to @q. * * Sets the data corresponding to the given #GQuark id. Any previous @@ -630,7 +630,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location, * g_datalist_set_data: * @dl: a datalist. * @k: the string to identify the data element. - * @d: (allow-none): the data element, or %NULL to remove any previous element + * @d: (nullable): the data element, or %NULL to remove any previous element * corresponding to @k. * * Sets the data element corresponding to the given string identifier. @@ -815,8 +815,8 @@ g_datalist_id_get_data (GData **datalist, * g_datalist_id_dup_data: * @datalist: location of a datalist * @key_id: the #GQuark identifying a data element - * @dup_func: (allow-none): function to duplicate the old value - * @user_data: (allow-none): passed as user_data to @dup_func + * @dup_func: (nullable): function to duplicate the old value + * @user_data: (nullable): passed as user_data to @dup_func * * This is a variant of g_datalist_id_get_data() which * returns a 'duplicate' of the value. @dup_func defines the @@ -882,10 +882,10 @@ g_datalist_id_dup_data (GData **datalist, * g_datalist_id_replace_data: * @datalist: location of a datalist * @key_id: the #GQuark identifying a data element - * @oldval: (allow-none): the old value to compare against - * @newval: (allow-none): the new value to replace it with - * @destroy: (allow-none): destroy notify for the new value - * @old_destroy: (allow-none): destroy notify for the existing value + * @oldval: (nullable): the old value to compare against + * @newval: (nullable): the new value to replace it with + * @destroy: (nullable): destroy notify for the new value + * @old_destroy: (nullable): destroy notify for the existing value * * Compares the member that is associated with @key_id in * @datalist to @oldval, and if they are the same, replace diff --git a/glib/gdatetime.c b/glib/gdatetime.c index 8ff0223de..7e1da4d7d 100644 --- a/glib/gdatetime.c +++ b/glib/gdatetime.c @@ -15,10 +15,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * Authors: Christian Hergert <chris@dronelabs.com> * Thiago Santos <thiago.sousa.santos@collabora.co.uk> @@ -1458,9 +1456,9 @@ g_date_time_equal (gconstpointer dt1, /** * g_date_time_get_ymd: * @datetime: a #GDateTime. - * @year: (out) (allow-none): the return location for the gregorian year, or %NULL. - * @month: (out) (allow-none): the return location for the month of the year, or %NULL. - * @day: (out) (allow-none): the return location for the day of the month, or %NULL. + * @year: (out) (optional): the return location for the gregorian year, or %NULL. + * @month: (out) (optional): the return location for the month of the year, or %NULL. + * @day: (out) (optional): the return location for the day of the month, or %NULL. * * Retrieves the Gregorian day, month, and year of a given #GDateTime. * diff --git a/glib/gdatetime.h b/glib/gdatetime.h index 63942c8a2..927e29cfc 100644 --- a/glib/gdatetime.h +++ b/glib/gdatetime.h @@ -12,10 +12,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * Authors: Christian Hergert <chris@dronelabs.com> * Thiago Santos <thiago.sousa.santos@collabora.co.uk> diff --git a/glib/genviron.c b/glib/genviron.c index 8c64cdaf8..0dfcb5c79 100644 --- a/glib/genviron.c +++ b/glib/genviron.c @@ -67,7 +67,7 @@ g_environ_find (gchar **envp, /** * g_environ_getenv: - * @envp: (allow-none) (array zero-terminated=1) (transfer none): an environment + * @envp: (nullable) (array zero-terminated=1) (transfer none): an environment * list (eg, as returned from g_get_environ()), or %NULL * for an empty environment list * @variable: the environment variable to get @@ -99,7 +99,7 @@ g_environ_getenv (gchar **envp, /** * g_environ_setenv: - * @envp: (allow-none) (array zero-terminated=1) (transfer full): an + * @envp: (nullable) (array zero-terminated=1) (transfer full): an * environment list that can be freed using g_strfreev() (e.g., as * returned from g_get_environ()), or %NULL for an empty * environment list @@ -186,7 +186,7 @@ g_environ_unsetenv_internal (gchar **envp, /** * g_environ_unsetenv: - * @envp: (allow-none) (array zero-terminated=1) (transfer full): an environment + * @envp: (nullable) (array zero-terminated=1) (transfer full): an environment * list that can be freed using g_strfreev() (e.g., as returned from g_get_environ()), * or %NULL for an empty environment list * @variable: the environment variable to remove, must not contain '=' diff --git a/glib/gerror.c b/glib/gerror.c index 380382b33..625e67b02 100644 --- a/glib/gerror.c +++ b/glib/gerror.c @@ -694,7 +694,7 @@ g_error_add_prefix (gchar **string, /** * g_prefix_error: - * @err: (inout) (optional) (nullable): a return location for a #GError + * @err: (inout) (optional): a return location for a #GError * @format: printf()-style format string * @...: arguments to @format * diff --git a/glib/gerror.h b/glib/gerror.h index 574eaf5a1..34d7b0fea 100644 --- a/glib/gerror.h +++ b/glib/gerror.h @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_ERROR_H__ diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 99cc72bbc..2e9655f0f 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -953,7 +952,7 @@ get_contents_win32 (const gchar *filename, * @filename: (type filename): name of a file to read contents from, in the GLib file name encoding * @contents: (out) (array length=length) (element-type guint8): location to store an allocated string, use g_free() to free * the returned string - * @length: (allow-none): location to store length in bytes of the contents, or %NULL + * @length: (nullable): location to store length in bytes of the contents, or %NULL * @error: return location for a #GError, or %NULL * * Reads an entire file into allocated memory, with good error @@ -1551,7 +1550,7 @@ g_get_tmp_name (const gchar *tmpl, /** * g_file_open_tmp: - * @tmpl: (type filename) (allow-none): Template for file name, as in + * @tmpl: (type filename) (nullable): Template for file name, as in * g_mkstemp(), basename only, or %NULL for a default template * @name_used: (out) (type filename): location to store actual name used, * or %NULL @@ -1605,7 +1604,7 @@ g_file_open_tmp (const gchar *tmpl, /** * g_dir_make_tmp: - * @tmpl: (type filename) (allow-none): Template for directory name, + * @tmpl: (type filename) (nullable): Template for directory name, * as in g_mkdtemp(), basename only, or %NULL for a default template * @error: return location for a #GError * diff --git a/glib/gfileutils.h b/glib/gfileutils.h index c08ba0989..fce5c50a6 100644 --- a/glib/gfileutils.h +++ b/glib/gfileutils.h @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_FILEUTILS_H__ diff --git a/glib/ggettext.c b/glib/ggettext.c index bf74ccbf0..19f5f4178 100644 --- a/glib/ggettext.c +++ b/glib/ggettext.c @@ -184,7 +184,7 @@ g_strip_context (const gchar *msgid, /** * g_dpgettext: - * @domain: (allow-none): the translation domain to use, or %NULL to use + * @domain: (nullable): the translation domain to use, or %NULL to use * the domain set with textdomain() * @msgctxtid: a combined message context and message id, separated * by a \004 character @@ -248,7 +248,7 @@ g_dpgettext (const gchar *domain, */ /** * g_dpgettext2: - * @domain: (allow-none): the translation domain to use, or %NULL to use + * @domain: (nullable): the translation domain to use, or %NULL to use * the domain set with textdomain() * @context: the message context * @msgid: the message @@ -351,7 +351,7 @@ _g_dgettext_should_translate (void) /** * g_dgettext: - * @domain: (allow-none): the translation domain to use, or %NULL to use + * @domain: (nullable): the translation domain to use, or %NULL to use * the domain set with textdomain() * @msgid: message to translate * @@ -404,7 +404,7 @@ g_dgettext (const gchar *domain, /** * g_dcgettext: - * @domain: (allow-none): the translation domain to use, or %NULL to use + * @domain: (nullable): the translation domain to use, or %NULL to use * the domain set with textdomain() * @msgid: message to translate * @category: a locale category @@ -431,7 +431,7 @@ g_dcgettext (const gchar *domain, /** * g_dngettext: - * @domain: (allow-none): the translation domain to use, or %NULL to use + * @domain: (nullable): the translation domain to use, or %NULL to use * the domain set with textdomain() * @msgid: message to translate * @msgid_plural: plural form of the message diff --git a/glib/ghash.c b/glib/ghash.c index 3edba8772..198684ad5 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -768,7 +768,7 @@ g_hash_table_iter_init (GHashTableIter *iter, * g_hash_table_iter_next: * @iter: an initialized #GHashTableIter * @key: (out) (optional): a location to store the key - * @value: (out) (nullable) (optional): a location to store the value + * @value: (out) (optional): a location to store the value * * Advances @iter and retrieves the key and/or value that are now * pointed to as a result of this advancement. If %FALSE is returned, @@ -1155,8 +1155,8 @@ g_hash_table_lookup (GHashTable *hash_table, * g_hash_table_lookup_extended: * @hash_table: a #GHashTable * @lookup_key: the key to look up - * @orig_key: (out) (optional) (nullable): return location for the original key - * @value: (out) (optional) (nullable): return location for the value associated + * @orig_key: (out) (optional): return location for the original key + * @value: (out) (optional): return location for the value associated * with the key * * Looks up a key in the #GHashTable, returning the original key and the diff --git a/glib/ghostutils.c b/glib/ghostutils.c index 79e951446..4be59f7ee 100644 --- a/glib/ghostutils.c +++ b/glib/ghostutils.c @@ -785,7 +785,12 @@ g_hostname_is_ip_address (const gchar *hostname) else { for (end = p; g_ascii_isdigit (*end); end++) - octet = 10 * octet + (*end - '0'); + { + octet = 10 * octet + (*end - '0'); + + if (octet > 255) + break; + } } if (end == p || end > p + 3 || octet > 255) return FALSE; diff --git a/glib/giochannel.c b/glib/giochannel.c index 37110af3e..1a3c76b58 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -867,7 +867,7 @@ g_io_channel_get_buffer_size (GIOChannel *channel) /** * g_io_channel_set_line_term: * @channel: a #GIOChannel - * @line_term: (allow-none): The line termination string. Use %NULL for + * @line_term: (nullable): The line termination string. Use %NULL for * autodetect. Autodetection breaks on "\n", "\r\n", "\r", "\0", * and the Unicode paragraph separator. Autodetection should not be * used for anything other than file-based channels. @@ -1264,7 +1264,7 @@ g_io_channel_get_buffered (GIOChannel *channel) /** * g_io_channel_set_encoding: * @channel: a #GIOChannel - * @encoding: (allow-none): the encoding type + * @encoding: (nullable): the encoding type * @error: location to store an error of type #GConvertError * * Sets the encoding for the input/output of the channel. @@ -1626,8 +1626,8 @@ reencode: * line terminator. This data should be freed with g_free() * when no longer needed. This is a nul-terminated string. * If a @length of zero is returned, this will be %NULL instead. - * @length: (allow-none) (out): location to store length of the read data, or %NULL - * @terminator_pos: (allow-none) (out): location to store position of line terminator, or %NULL + * @length: (out) (optional): location to store length of the read data, or %NULL + * @terminator_pos: (out) (optional): location to store position of line terminator, or %NULL * @error: A location to return an error of type #GConvertError * or #GIOChannelError * @@ -1677,7 +1677,7 @@ g_io_channel_read_line (GIOChannel *channel, * @buffer: a #GString into which the line will be written. * If @buffer already contains data, the old data will * be overwritten. - * @terminator_pos: (allow-none): location to store position of line terminator, or %NULL + * @terminator_pos: (nullable): location to store position of line terminator, or %NULL * @error: a location to store an error of type #GConvertError * or #GIOChannelError * @@ -1972,7 +1972,7 @@ g_io_channel_read_to_end (GIOChannel *channel, * @count: (in): the size of the buffer. Note that the buffer may not be * complelely filled even if there is data in the buffer if the * remaining data is not a complete character. - * @bytes_read: (allow-none) (out): The number of bytes read. This may be + * @bytes_read: (out) (optional): The number of bytes read. This may be * zero even on success if count < 6 and the channel's encoding * is non-%NULL. This indicates that the next UTF-8 character is * too wide for the buffer. diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 70d8fda3e..87f2b9109 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -7,19 +7,18 @@ * Written by Ray Strode <rstrode@redhat.com> * Matthias Clasen <mclasen@redhat.com> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -961,7 +960,7 @@ g_key_file_load_from_bytes (GKeyFile *key_file, * @key_file: an empty #GKeyFile struct * @file: (type filename): a relative path to a filename to open and parse * @search_dirs: (array zero-terminated=1) (element-type filename): %NULL-terminated array of directories to search - * @full_path: (out) (type filename) (allow-none): return location for a string containing the full path + * @full_path: (out) (type filename) (optional): return location for a string containing the full path * of the file, or %NULL * @flags: flags from #GKeyFileFlags * @error: return location for a #GError, or %NULL @@ -1035,7 +1034,7 @@ g_key_file_load_from_dirs (GKeyFile *key_file, * g_key_file_load_from_data_dirs: * @key_file: an empty #GKeyFile struct * @file: (type filename): a relative path to a filename to open and parse - * @full_path: (out) (type filename) (allow-none): return location for a string containing the full path + * @full_path: (out) (type filename) (optional): return location for a string containing the full path * of the file, or %NULL * @flags: flags from #GKeyFileFlags * @error: return location for a #GError, or %NULL @@ -1472,7 +1471,7 @@ g_key_file_flush_parse_buffer (GKeyFile *key_file, /** * g_key_file_to_data: * @key_file: a #GKeyFile - * @length: (out) (allow-none): return location for the length of the + * @length: (out) (optional): return location for the length of the * returned string, or %NULL * @error: return location for a #GError, or %NULL * @@ -1542,7 +1541,7 @@ g_key_file_to_data (GKeyFile *key_file, * g_key_file_get_keys: * @key_file: a #GKeyFile * @group_name: a group name - * @length: (out) (allow-none): return location for the number of keys returned, or %NULL + * @length: (out) (optional): return location for the number of keys returned, or %NULL * @error: return location for a #GError, or %NULL * * Returns all keys for the group name @group_name. The array of @@ -1640,7 +1639,7 @@ g_key_file_get_start_group (GKeyFile *key_file) /** * g_key_file_get_groups: * @key_file: a #GKeyFile - * @length: (out) (allow-none): return location for the number of returned groups, or %NULL + * @length: (out) (optional): return location for the number of returned groups, or %NULL * * Returns all groups in the key file loaded with @key_file. * The array of returned groups will be %NULL-terminated, so @@ -1934,7 +1933,7 @@ g_key_file_set_string (GKeyFile *key_file, * @key_file: a #GKeyFile * @group_name: a group name * @key: a key - * @length: (out) (allow-none): return location for the number of returned strings, or %NULL + * @length: (out) (optional): return location for the number of returned strings, or %NULL * @error: return location for a #GError, or %NULL * * Returns the values associated with @key under @group_name. @@ -2110,7 +2109,7 @@ g_key_file_set_locale_string (GKeyFile *key_file, * @key_file: a #GKeyFile * @group_name: a group name * @key: a key - * @locale: (allow-none): a locale identifier or %NULL + * @locale: (nullable): a locale identifier or %NULL * @error: return location for a #GError, or %NULL * * Returns the value associated with @key under @group_name @@ -2197,8 +2196,8 @@ g_key_file_get_locale_string (GKeyFile *key_file, * @key_file: a #GKeyFile * @group_name: a group name * @key: a key - * @locale: (allow-none): a locale identifier or %NULL - * @length: (out) (allow-none): return location for the number of returned strings or %NULL + * @locale: (nullable): a locale identifier or %NULL + * @length: (out) (optional): return location for the number of returned strings or %NULL * @error: return location for a #GError or %NULL * * Returns the values associated with @key under @group_name @@ -3255,8 +3254,8 @@ g_key_file_set_top_comment (GKeyFile *key_file, /** * g_key_file_set_comment: * @key_file: a #GKeyFile - * @group_name: (allow-none): a group name, or %NULL - * @key: (allow-none): a key + * @group_name: (nullable): a group name, or %NULL + * @key: (nullable): a key * @comment: a comment * @error: return location for a #GError * @@ -3486,7 +3485,7 @@ g_key_file_get_top_comment (GKeyFile *key_file, /** * g_key_file_get_comment: * @key_file: a #GKeyFile - * @group_name: (allow-none): a group name, or %NULL + * @group_name: (nullable): a group name, or %NULL * @key: a key * @error: return location for a #GError * @@ -3520,8 +3519,8 @@ g_key_file_get_comment (GKeyFile *key_file, /** * g_key_file_remove_comment: * @key_file: a #GKeyFile - * @group_name: (allow-none): a group name, or %NULL - * @key: (allow-none): a key + * @group_name: (nullable): a group name, or %NULL + * @key: (nullable): a key * @error: return location for a #GError * * Removes a comment above @key from @group_name. diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index 2e1efa4f2..8e7bfb9dd 100644 --- a/glib/gkeyfile.h +++ b/glib/gkeyfile.h @@ -4,19 +4,18 @@ * * Ray Strode <halfline@hawaii.rr.com> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_KEY_FILE_H__ diff --git a/glib/glib-init.c b/glib/glib-init.c index 5a5c2156f..30a965405 100644 --- a/glib/glib-init.c +++ b/glib/glib-init.c @@ -45,6 +45,29 @@ G_STATIC_ASSERT (_g_alignof (gpointer) == _g_alignof (GFunc)); G_STATIC_ASSERT (sizeof (GFunc) == sizeof (GCompareDataFunc)); G_STATIC_ASSERT (_g_alignof (GFunc) == _g_alignof (GCompareDataFunc)); +/* We assume that "small" enums (those where all values fit in INT32_MIN + * to INT32_MAX) are exactly int-sized. In particular, we assume that if + * an enum has no members that exceed the range of char/short, the + * compiler will make it int-sized anyway, so adding a member later that + * *does* exceed the range of char/short is not an ABI break. */ +typedef enum { + TEST_CHAR_0 = 0 +} TestChar; +typedef enum { + TEST_SHORT_0 = 0, + TEST_SHORT_256 = 256 +} TestShort; +typedef enum { + TEST_INT32_MIN = G_MININT32, + TEST_INT32_MAX = G_MAXINT32 +} TestInt; +G_STATIC_ASSERT (sizeof (TestChar) == sizeof (int)); +G_STATIC_ASSERT (sizeof (TestShort) == sizeof (int)); +G_STATIC_ASSERT (sizeof (TestInt) == sizeof (int)); +G_STATIC_ASSERT (_g_alignof (TestChar) == _g_alignof (int)); +G_STATIC_ASSERT (_g_alignof (TestShort) == _g_alignof (int)); +G_STATIC_ASSERT (_g_alignof (TestInt) == _g_alignof (int)); + /** * g_mem_gc_friendly: * @@ -78,9 +101,16 @@ debug_key_matches (const gchar *key, return *key == '\0'; } +/* The GVariant documentation indirectly says that int is at least 32 bits + * (by saying that b, y, n, q, i, u, h are promoted to int). On any + * reasonable platform, int is in fact *exactly* 32 bits long, because + * otherwise, {signed char, short, int} wouldn't be sufficient to provide + * {int8_t, int16_t, int32_t}. */ +G_STATIC_ASSERT (sizeof (int) == sizeof (gint32)); + /** * g_parse_debug_string: - * @string: (allow-none): a list of debug options separated by colons, spaces, or + * @string: (nullable): a list of debug options separated by colons, spaces, or * commas, or %NULL. * @keys: (array length=nkeys): pointer to an array of #GDebugKey which associate * strings with bit flags. diff --git a/glib/glib-mirroring-tab/gen-mirroring-tab.c b/glib/glib-mirroring-tab/gen-mirroring-tab.c index 6731ecdef..19efbecf3 100644 --- a/glib/glib-mirroring-tab/gen-mirroring-tab.c +++ b/glib/glib-mirroring-tab/gen-mirroring-tab.c @@ -24,9 +24,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with this library, in a file named COPYING; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * For licensing issues, contact <license@farsiweb.info>. */ diff --git a/glib/glib-mirroring-tab/packtab.c b/glib/glib-mirroring-tab/packtab.c index 7c0ff5db4..6ef687673 100644 --- a/glib/glib-mirroring-tab/packtab.c +++ b/glib/glib-mirroring-tab/packtab.c @@ -11,10 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License - * along with this library, in a file named COPYING; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * For licensing issues, contact <fwpg@sharif.edu>. */ diff --git a/glib/glib-mirroring-tab/packtab.h b/glib/glib-mirroring-tab/packtab.h index 7cab9be31..62616659d 100644 --- a/glib/glib-mirroring-tab/packtab.h +++ b/glib/glib-mirroring-tab/packtab.h @@ -11,10 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License - * along with this library, in a file named COPYING; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * For licensing issues, contact <fwpg@sharif.edu>. */ diff --git a/glib/glib.stp.in b/glib/glib.stp.in index 032a698e7..dc80e708d 100644 --- a/glib/glib.stp.in +++ b/glib/glib.stp.in @@ -1,9 +1,9 @@ -global gquarks +global glib_quarks_2_0_@LT_CURRENT@_@LT_REVISION@ /* This is needed to keep track of gquark for use in other probes.*/ probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("quark__new") { - gquarks[pid(), $arg2] = user_string($arg1) + glib_quarks_2_0_@LT_CURRENT@_@LT_REVISION@[pid(), $arg2] = user_string($arg1) } /** diff --git a/glib/gmain.c b/glib/gmain.c index 4f9057400..5aea34f58 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -726,7 +726,7 @@ static GPrivate thread_context_stack = G_PRIVATE_INIT (free_context_stack); /** * g_main_context_push_thread_default: - * @context: (allow-none): a #GMainContext, or %NULL for the global default context + * @context: (nullable): a #GMainContext, or %NULL for the global default context * * Acquires @context and sets it as the thread-default context for the * current thread. This will cause certain asynchronous operations @@ -797,7 +797,7 @@ g_main_context_push_thread_default (GMainContext *context) /** * g_main_context_pop_thread_default: - * @context: (allow-none): a #GMainContext object, or %NULL + * @context: (nullable): a #GMainContext object, or %NULL * * Pops @context off the thread-default context stack (verifying that * it was on the top of the stack). @@ -1173,7 +1173,7 @@ g_source_attach_unlocked (GSource *source, /** * g_source_attach: * @source: a #GSource - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) * * Adds a #GSource to a @context so that it will be executed within * that context. Remove it by calling g_source_destroy(). @@ -1326,7 +1326,7 @@ g_source_get_id (GSource *source) * g_main_current_source(). But calling this function on a source * whose #GMainContext has been destroyed is an error. * - * Returns: (transfer none) (allow-none): the #GMainContext with which the + * Returns: (transfer none) (nullable): the #GMainContext with which the * source is associated, or %NULL if the context has not * yet been added to a source. **/ @@ -1622,7 +1622,7 @@ g_source_set_callback_indirect (GSource *source, * @source: the source * @func: a callback function * @data: the data to pass to callback function - * @notify: (allow-none): a function to call when @data is no longer in use, or %NULL. + * @notify: (nullable): a function to call when @data is no longer in use, or %NULL. * * Sets the callback function for a source. The callback for a source is * called from the source's dispatch function. @@ -2156,7 +2156,7 @@ g_source_unref (GSource *source) /** * g_main_context_find_source_by_id: - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) * @source_id: the source ID, as returned by g_source_get_id(). * * Finds a #GSource given a pair of context and ID. @@ -2197,7 +2197,7 @@ g_main_context_find_source_by_id (GMainContext *context, /** * g_main_context_find_source_by_funcs_user_data: - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used). + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used). * @funcs: the @source_funcs passed to g_source_new(). * @user_data: the user data from the callback. * @@ -3937,7 +3937,7 @@ g_main_context_iterate (GMainContext *context, /** * g_main_context_pending: - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) * * Checks if any sources have pending events for the given context. * @@ -3960,7 +3960,7 @@ g_main_context_pending (GMainContext *context) /** * g_main_context_iteration: - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) * @may_block: whether the call may block. * * Runs a single iteration for the given main loop. This involves @@ -3995,7 +3995,7 @@ g_main_context_iteration (GMainContext *context, gboolean may_block) /** * g_main_loop_new: - * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used). + * @context: (nullable): a #GMainContext (if %NULL, the default context will be used). * @is_running: set to %TRUE to indicate that the loop is running. This * is not very important since calling g_main_loop_run() will set this to * %TRUE anyway. @@ -4285,7 +4285,7 @@ g_main_context_poll (GMainContext *context, /** * g_main_context_add_poll: - * @context: (allow-none): a #GMainContext (or %NULL for the default context) + * @context: (nullable): a #GMainContext (or %NULL for the default context) * @fd: a #GPollFD structure holding information about a file * descriptor to watch. * @priority: the priority for this file descriptor which should be @@ -4751,7 +4751,7 @@ g_timeout_source_new_seconds (guint interval) * (1/1000ths of a second) * @function: function to call * @data: data to pass to @function - * @notify: (allow-none): function to call when the timeout is removed, or %NULL + * @notify: (nullable): function to call when the timeout is removed, or %NULL * * Sets a function to be called at regular intervals, with the given * priority. The function is called repeatedly until it returns @@ -4861,7 +4861,7 @@ g_timeout_add (guint32 interval, * @interval: the time between calls to the function, in seconds * @function: function to call * @data: data to pass to @function - * @notify: (allow-none): function to call when the timeout is removed, or %NULL + * @notify: (nullable): function to call when the timeout is removed, or %NULL * * Sets a function to be called at regular intervals, with @priority. * The function is called repeatedly until it returns %FALSE, at which @@ -5415,7 +5415,7 @@ g_child_watch_source_new (GPid pid) * Windows a handle for a process (which doesn't have to be a child). * @function: function to call * @data: data to pass to @function - * @notify: (allow-none): function to call when the idle is removed, or %NULL + * @notify: (nullable): function to call when the idle is removed, or %NULL * * Sets a function to be called when the child indicated by @pid * exits, at the priority @priority. @@ -5579,7 +5579,7 @@ g_idle_source_new (void) * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. * @function: function to call * @data: data to pass to @function - * @notify: (allow-none): function to call when the idle is removed, or %NULL + * @notify: (nullable): function to call when the idle is removed, or %NULL * * Adds a function to be called whenever there are no higher priority * events pending. If the function returns %FALSE it is automatically @@ -5667,7 +5667,7 @@ g_idle_remove_by_data (gpointer data) /** * g_main_context_invoke: - * @context: (allow-none): a #GMainContext, or %NULL + * @context: (nullable): a #GMainContext, or %NULL * @function: function to call * @data: data to pass to @function * @@ -5707,11 +5707,11 @@ g_main_context_invoke (GMainContext *context, /** * g_main_context_invoke_full: - * @context: (allow-none): a #GMainContext, or %NULL + * @context: (nullable): a #GMainContext, or %NULL * @priority: the priority at which to run @function * @function: function to call * @data: data to pass to @function - * @notify: (allow-none): a function to call when @data is no longer in use, or %NULL. + * @notify: (nullable): a function to call when @data is no longer in use, or %NULL. * * Invokes a function in such a way that @context is owned during the * invocation of @function. diff --git a/glib/gmain.h b/glib/gmain.h index 1eaf9f72d..e8cdeed7a 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -366,10 +366,10 @@ gint g_main_context_query (GMainContext *context, GPollFD *fds, gint n_fds); GLIB_AVAILABLE_IN_ALL -gint g_main_context_check (GMainContext *context, - gint max_priority, - GPollFD *fds, - gint n_fds); +gboolean g_main_context_check (GMainContext *context, + gint max_priority, + GPollFD *fds, + gint n_fds); GLIB_AVAILABLE_IN_ALL void g_main_context_dispatch (GMainContext *context); diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 04ce6e58d..3c7fd49d9 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -3,19 +3,18 @@ * Copyright 2000, 2003 Red Hat, Inc. * Copyright 2007, 2008 Ryan Lortie <desrt@desrt.ca> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -1910,8 +1909,8 @@ g_markup_parse_context_get_element_stack (GMarkupParseContext *context) /** * g_markup_parse_context_get_position: * @context: a #GMarkupParseContext - * @line_number: (allow-none): return location for a line number, or %NULL - * @char_number: (allow-none): return location for a char-on-line number, or %NULL + * @line_number: (nullable): return location for a line number, or %NULL + * @char_number: (nullable): return location for a char-on-line number, or %NULL * * Retrieves the current line number and the number of the character on * that line. Intended for use in error messages; there are no strict diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 13b2343a7..05c3cc9fa 100644 --- a/glib/gmarkup.h +++ b/glib/gmarkup.h @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_MARKUP_H__ diff --git a/glib/gmem.c b/glib/gmem.c index e51f0cd13..05dc0304b 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -137,7 +137,7 @@ g_malloc0 (gsize n_bytes) /** * g_realloc: - * @mem: (allow-none): the memory to reallocate + * @mem: (nullable): the memory to reallocate * @n_bytes: new size of the memory in bytes * * Reallocates the memory pointed to by @mem, so that it now has space for @@ -175,7 +175,7 @@ g_realloc (gpointer mem, /** * g_free: - * @mem: (allow-none): the memory to free + * @mem: (nullable): the memory to free * * Frees the memory pointed to by @mem. * @@ -273,7 +273,7 @@ g_try_malloc0 (gsize n_bytes) /** * g_try_realloc: - * @mem: (allow-none): previously-allocated memory, or %NULL. + * @mem: (nullable): previously-allocated memory, or %NULL. * @n_bytes: number of bytes to allocate. * * Attempts to realloc @mem to a new size, @n_bytes, and returns %NULL @@ -357,7 +357,7 @@ g_malloc0_n (gsize n_blocks, /** * g_realloc_n: - * @mem: (allow-none): the memory to reallocate + * @mem: (nullable): the memory to reallocate * @n_blocks: the number of blocks to allocate * @n_block_bytes: the size of each block in bytes * @@ -425,7 +425,7 @@ g_try_malloc0_n (gsize n_blocks, /** * g_try_realloc_n: - * @mem: (allow-none): previously-allocated memory, or %NULL. + * @mem: (nullable): previously-allocated memory, or %NULL. * @n_blocks: the number of blocks to allocate * @n_block_bytes: the size of each block in bytes * diff --git a/glib/gmessages.c b/glib/gmessages.c index 8f45c3d03..1c62197ff 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -175,7 +175,7 @@ #include <locale.h> #include <errno.h> -#ifdef __linux__ +#if defined(__linux__) && !defined(__BIONIC__) #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -204,8 +204,70 @@ #ifdef G_OS_WIN32 #include <process.h> /* For getpid() */ #include <io.h> -# define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */ # include <windows.h> + +#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING +#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 +#endif + +/* XXX: Remove once XP support really dropped */ +#if _WIN32_WINNT < 0x0600 + +typedef enum _FILE_INFO_BY_HANDLE_CLASS +{ + FileBasicInfo = 0, + FileStandardInfo = 1, + FileNameInfo = 2, + FileRenameInfo = 3, + FileDispositionInfo = 4, + FileAllocationInfo = 5, + FileEndOfFileInfo = 6, + FileStreamInfo = 7, + FileCompressionInfo = 8, + FileAttributeTagInfo = 9, + FileIdBothDirectoryInfo = 10, + FileIdBothDirectoryRestartInfo = 11, + FileIoPriorityHintInfo = 12, + FileRemoteProtocolInfo = 13, + FileFullDirectoryInfo = 14, + FileFullDirectoryRestartInfo = 15, + FileStorageInfo = 16, + FileAlignmentInfo = 17, + FileIdInfo = 18, + FileIdExtdDirectoryInfo = 19, + FileIdExtdDirectoryRestartInfo = 20, + MaximumFileInfoByHandlesClass +} FILE_INFO_BY_HANDLE_CLASS; + +typedef struct _FILE_NAME_INFO +{ + DWORD FileNameLength; + WCHAR FileName[1]; +} FILE_NAME_INFO; + +typedef BOOL (WINAPI fGetFileInformationByHandleEx) (HANDLE, + FILE_INFO_BY_HANDLE_CLASS, + LPVOID, + DWORD); +#endif + +#if defined (_MSC_VER) && (_MSC_VER >=1400) +/* This is ugly, but we need it for isatty() in case we have bad fd's, + * otherwise Windows will abort() the program on msvcrt80.dll and later + */ +#include <crtdbg.h> + +_GLIB_EXTERN void +myInvalidParameterHandler(const wchar_t *expression, + const wchar_t *function, + const wchar_t *file, + unsigned int line, + uintptr_t pReserved) +{ +} +#endif + +#include "gwin32.h" #endif /** @@ -487,7 +549,6 @@ _g_log_abort (gboolean breakpoint) } #ifdef G_OS_WIN32 -# include <windows.h> static gboolean win32_keep_fatal_message = FALSE; /* This default message will usually be overwritten. */ @@ -717,7 +778,7 @@ g_log_set_fatal_mask (const gchar *log_domain, /** * g_log_set_handler: - * @log_domain: (allow-none): the log domain, or %NULL for the default "" + * @log_domain: (nullable): the log domain, or %NULL for the default "" * application domain * @log_levels: the log levels to apply the log handler for. * To handle fatal and recursive messages as well, combine @@ -770,7 +831,7 @@ g_log_set_handler (const gchar *log_domain, /** * g_log_set_handler_full: (rename-to g_log_set_handler) - * @log_domain: (allow-none): the log domain, or %NULL for the default "" + * @log_domain: (nullable): the log domain, or %NULL for the default "" * application domain * @log_levels: the log levels to apply the log handler for. * To handle fatal and recursive messages as well, combine @@ -1408,6 +1469,108 @@ color_reset (gboolean use_color) return "\033[0m"; } +#ifdef G_OS_WIN32 + +/* We might be using tty emulators such as mintty, so try to detect it, if we passed in a valid FD + * so we need to check the name of the pipe if _isatty (fd) == 0 + */ + +static gboolean +win32_is_pipe_tty (int fd) +{ + gboolean result = FALSE; + int error; + HANDLE h_fd; + FILE_NAME_INFO *info = NULL; + gint info_size = sizeof (FILE_NAME_INFO) + sizeof (WCHAR) * MAX_PATH; + wchar_t *name = NULL; + gint length; + + /* XXX: Remove once XP support really dropped */ +#if _WINNT_WIN32 < 0x0600 + HANDLE h_kerneldll = NULL; + fGetFileInformationByHandleEx *GetFileInformationByHandleEx; +#endif + + h_fd = (HANDLE) _get_osfhandle (fd); + + if (h_fd == INVALID_HANDLE_VALUE || GetFileType (h_fd) != FILE_TYPE_PIPE) + goto done_query; + + /* The following check is available on Vista or later, so on XP, no color support */ + /* mintty uses a pipe, in the form of \{cygwin|msys}-xxxxxxxxxxxxxxxx-ptyN-{from|to}-master */ + + /* XXX: Remove once XP support really dropped */ +#if _WINNT_WIN32 < 0x0600 + h_kerneldll = LoadLibraryW (L"kernel32.dll"); + + if (h_kerneldll == NULL) + goto done_query; + + GetFileInformationByHandleEx = + (fGetFileInformationByHandleEx *) GetProcAddress (h_kerneldll, "GetFileInformationByHandleEx"); + + if (GetFileInformationByHandleEx == NULL) + goto done_query; +#endif + + info = g_try_malloc (info_size); + + if (info == NULL || + !GetFileInformationByHandleEx (h_fd, FileNameInfo, info, info_size)) + goto done_query; + + info->FileName[info->FileNameLength / sizeof (WCHAR)] = L'\0'; + name = info->FileName; + + length = wcslen (L"\\cygwin-"); + if (wcsncmp (name, L"\\cygwin-", length)) + { + length = wcslen (L"\\msys-"); + if (wcsncmp (name, L"\\msys-", length)) + goto done_query; + } + + name += length; + length = wcsspn (name, L"0123456789abcdefABCDEF"); + if (length != 16) + goto done_query; + + name += length; + length = wcslen (L"-pty"); + if (wcsncmp (name, L"-pty", length)) + goto done_query; + + name += length; + length = wcsspn (name, L"0123456789"); + if (length != 1) + goto done_query; + + name += length; + length = wcslen (L"-to-master"); + if (wcsncmp (name, L"-to-master", length)) + { + length = wcslen (L"-from-master"); + if (wcsncmp (name, L"-from-master", length)) + goto done_query; + } + + result = TRUE; + +done_query: + if (info != NULL) + g_free (info); + + /* XXX: Remove once XP support really dropped */ +#if _WINNT_WIN32 < 0x0600 + if (h_kerneldll != NULL) + FreeLibrary (h_kerneldll); +#endif + + return result; +} +#endif + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-nonliteral" @@ -1604,7 +1767,7 @@ g_log_structured (const gchar *log_domain, /** * g_log_variant: - * @log_domain: (allow-none): log domain, usually %G_LOG_DOMAIN + * @log_domain: (nullable): log domain, usually %G_LOG_DOMAIN * @log_level: log level, either from #GLogLevelFlags, or a user-defined * level * @fields: a dictionary (#GVariant of the type %G_VARIANT_TYPE_VARDICT) @@ -1823,12 +1986,28 @@ g_log_set_writer_func (GLogWriterFunc func, gboolean g_log_writer_supports_color (gint output_fd) { +#ifdef G_OS_WIN32 + gboolean result = FALSE; + +#if (defined (_MSC_VER) && _MSC_VER >= 1400) + _invalid_parameter_handler oldHandler, newHandler; + int prev_report_mode = 0; +#endif + +#endif + g_return_val_if_fail (output_fd >= 0, FALSE); /* FIXME: This check could easily be expanded in future to be more robust * against different types of terminal, which still vary in their color - * support. cmd.exe on Windows, for example, does not support ANSI colors; - * but bash on Windows does. + * support. cmd.exe on Windows, for example, supports ANSI colors only + * from Windows 10 onwards; bash on Windows has always supported ANSI colors. + * The Windows 10 color support is supported on: + * -Output in the cmd.exe, MSYS/Cygwin standard consoles. + * -Output in the cmd.exe, MSYS/Cygwin piped to the less program. + * but not: + * -Output in Cygwin via mintty (https://github.com/mintty/mintty/issues/482) + * -Color code output when output redirected to file (i.e. program 2> some.txt) * * On UNIX systems, we probably want to use the functions from terminfo to * work out whether colors are supported. @@ -1839,10 +2018,62 @@ g_log_writer_supports_color (gint output_fd) * - http://blog.mmediasys.com/2010/11/24/we-all-love-colors/ * - http://unix.stackexchange.com/questions/198794/where-does-the-term-environment-variable-default-get-set */ +#ifdef G_OS_WIN32 + +#if (defined (_MSC_VER) && _MSC_VER >= 1400) + /* Set up our empty invalid parameter handler, for isatty(), + * in case of bad fd's passed in for isatty(), so that + * msvcrt80.dll+ won't abort the program + */ + newHandler = myInvalidParameterHandler; + oldHandler = _set_invalid_parameter_handler (newHandler); + + /* Disable the message box for assertions. */ + prev_report_mode = _CrtSetReportMode(_CRT_ASSERT, 0); +#endif + + if (g_win32_check_windows_version (10, 0, 0, G_WIN32_OS_ANY)) + { + HANDLE h_output; + DWORD dw_mode; + + if (_isatty (output_fd)) + { + h_output = (HANDLE) _get_osfhandle (output_fd); + + if (!GetConsoleMode (h_output, &dw_mode)) + goto reset_invalid_param_handler; + + if (dw_mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) + result = TRUE; + + if (!SetConsoleMode (h_output, dw_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) + goto reset_invalid_param_handler; + + result = TRUE; + } + } + + /* FIXME: Support colored outputs for structured logs for pre-Windows 10, + * perhaps using WriteConsoleOutput or SetConsoleTextAttribute + * (bug 775468), on standard Windows consoles, such as cmd.exe + */ + if (!result) + result = win32_is_pipe_tty (output_fd); + +reset_invalid_param_handler: +#if defined (_MSC_VER) && (_MSC_VER >= 1400) + _CrtSetReportMode(_CRT_ASSERT, prev_report_mode); + _set_invalid_parameter_handler (oldHandler); +#endif + + return result; +#else return isatty (output_fd); +#endif } -#ifdef __linux__ +#if defined(__linux__) && !defined(__BIONIC__) static int journal_fd = -1; #ifndef SOCK_CLOEXEC @@ -1881,7 +2112,7 @@ open_journal (void) gboolean g_log_writer_is_journald (gint output_fd) { -#ifdef __linux__ +#if defined(__linux__) && !defined(__BIONIC__) /* FIXME: Use the new journal API for detecting whether we’re writing to the * journal. See: https://github.com/systemd/systemd/issues/2473 */ @@ -2016,7 +2247,7 @@ g_log_writer_format_fields (GLogLevelFlags log_level, return g_string_free (gstring, FALSE); } -#ifdef __linux__ +#if defined(__linux__) && !defined(__BIONIC__) static int journal_sendv (struct iovec *iov, gsize iovlen) @@ -2130,7 +2361,7 @@ g_log_writer_journald (GLogLevelFlags log_level, gsize n_fields, gpointer user_data) { -#ifdef __linux__ +#if defined(__linux__) && !defined(__BIONIC__) const char equals = '='; const char newline = '\n'; gsize i, k; @@ -2517,7 +2748,7 @@ g_assert_warning (const char *log_domain, /** * g_test_expect_message: - * @log_domain: (allow-none): the log domain of the message + * @log_domain: (nullable): the log domain of the message * @log_level: the log level of the message * @pattern: a glob-style [pattern][glib-Glob-style-pattern-matching] * diff --git a/glib/goption.c b/glib/goption.c index 19ff541cb..7a21d1ccc 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -323,7 +323,7 @@ G_DEFINE_QUARK (g-option-context-error-quark, g_option_error) /** * g_option_context_new: - * @parameter_string: (allow-none): a string which is displayed in + * @parameter_string: (nullable): a string which is displayed in * the first line of `--help` output, after the usage summary * `programname [OPTION...]` * @@ -637,7 +637,7 @@ g_option_context_get_main_group (GOptionContext *context) * g_option_context_add_main_entries: * @context: a #GOptionContext * @entries: a %NULL-terminated array of #GOptionEntrys - * @translation_domain: (allow-none): a translation domain to use for translating + * @translation_domain: (nullable): a translation domain to use for translating * the `--help` output for the options in @entries * with gettext(), or %NULL * @@ -807,7 +807,7 @@ context_has_h_entry (GOptionContext *context) * g_option_context_get_help: * @context: a #GOptionContext * @main_help: if %TRUE, only include the main group - * @group: (allow-none): the #GOptionGroup to create help for, or %NULL + * @group: (nullable): the #GOptionGroup to create help for, or %NULL * * Returns a formatted, translated help text for the given context. * To obtain the text produced by `--help`, call @@ -1868,8 +1868,8 @@ platform_get_argv0 (void) /** * g_option_context_parse: * @context: a #GOptionContext - * @argc: (inout) (allow-none): a pointer to the number of command line arguments - * @argv: (inout) (array length=argc) (allow-none): a pointer to the array of command line arguments + * @argc: (inout) (optional): a pointer to the number of command line arguments + * @argv: (inout) (array length=argc) (optional): a pointer to the array of command line arguments * @error: a return location for errors * * Parses the command line arguments, recognizing options @@ -2237,9 +2237,9 @@ g_option_context_parse (GOptionContext *context, * @help_description: a description for the `--help-`@name option. * This string is translated using the translation domain or translation function * of the group - * @user_data: (allow-none): user data that will be passed to the pre- and post-parse hooks, + * @user_data: (nullable): user data that will be passed to the pre- and post-parse hooks, * the error hook and to callbacks of %G_OPTION_ARG_CALLBACK options, or %NULL - * @destroy: (allow-none): a function that will be called to free @user_data, or %NULL + * @destroy: (nullable): a function that will be called to free @user_data, or %NULL * * Creates a new #GOptionGroup. * @@ -2361,7 +2361,10 @@ g_option_group_add_entries (GOptionGroup *group, group->entries = g_renew (GOptionEntry, group->entries, group->n_entries + n_entries); - memcpy (group->entries + group->n_entries, entries, sizeof (GOptionEntry) * n_entries); + /* group->entries could be NULL in the trivial case where we add no + * entries to no entries */ + if (n_entries != 0) + memcpy (group->entries + group->n_entries, entries, sizeof (GOptionEntry) * n_entries); for (i = group->n_entries; i < group->n_entries + n_entries; i++) { @@ -2399,8 +2402,8 @@ g_option_group_add_entries (GOptionGroup *group, /** * g_option_group_set_parse_hooks: * @group: a #GOptionGroup - * @pre_parse_func: (allow-none): a function to call before parsing, or %NULL - * @post_parse_func: (allow-none): a function to call after parsing, or %NULL + * @pre_parse_func: (nullable): a function to call before parsing, or %NULL + * @post_parse_func: (nullable): a function to call after parsing, or %NULL * * Associates two functions with @group which will be called * from g_option_context_parse() before the first option is parsed @@ -2449,9 +2452,9 @@ g_option_group_set_error_hook (GOptionGroup *group, /** * g_option_group_set_translate_func: * @group: a #GOptionGroup - * @func: (allow-none): the #GTranslateFunc, or %NULL - * @data: (allow-none): user data to pass to @func, or %NULL - * @destroy_notify: (allow-none): a function which gets called to free @data, or %NULL + * @func: (nullable): the #GTranslateFunc, or %NULL + * @data: (nullable): user data to pass to @func, or %NULL + * @destroy_notify: (nullable): a function which gets called to free @data, or %NULL * * Sets the function which is used to translate user-visible strings, * for `--help` output. Different groups can use different @@ -2510,9 +2513,9 @@ g_option_group_set_translation_domain (GOptionGroup *group, /** * g_option_context_set_translate_func: * @context: a #GOptionContext - * @func: (allow-none): the #GTranslateFunc, or %NULL - * @data: (allow-none): user data to pass to @func, or %NULL - * @destroy_notify: (allow-none): a function which gets called to free @data, or %NULL + * @func: (nullable): the #GTranslateFunc, or %NULL + * @data: (nullable): user data to pass to @func, or %NULL + * @destroy_notify: (nullable): a function which gets called to free @data, or %NULL * * Sets the function which is used to translate the contexts * user-visible strings, for `--help` output. If @func is %NULL, @@ -2569,7 +2572,7 @@ g_option_context_set_translation_domain (GOptionContext *context, /** * g_option_context_set_summary: * @context: a #GOptionContext - * @summary: (allow-none): a string to be shown in `--help` output + * @summary: (nullable): a string to be shown in `--help` output * before the list of options, or %NULL * * Adds a string to be displayed in `--help` output before the list @@ -2613,7 +2616,7 @@ g_option_context_get_summary (GOptionContext *context) /** * g_option_context_set_description: * @context: a #GOptionContext - * @description: (allow-none): a string to be shown in `--help` output + * @description: (nullable): a string to be shown in `--help` output * after the list of options, or %NULL * * Adds a string to be displayed in `--help` output after the list diff --git a/glib/gpattern.c b/glib/gpattern.c index aa045025a..16e70b833 100644 --- a/glib/gpattern.c +++ b/glib/gpattern.c @@ -162,7 +162,7 @@ g_pattern_ph_match (const gchar *match_pattern, * @string_length: the length of @string (in bytes, i.e. strlen(), * not g_utf8_strlen()) * @string: the UTF-8 encoded string to match - * @string_reversed: (allow-none): the reverse of @string or %NULL + * @string_reversed: (nullable): the reverse of @string or %NULL * * Matches a string against a compiled pattern. Passing the correct * length of the string given is mandatory. The reversed string can be diff --git a/glib/gquark.c b/glib/gquark.c index 9e51a92ff..f2b32019c 100644 --- a/glib/gquark.c +++ b/glib/gquark.c @@ -118,7 +118,7 @@ g_quark_init (void) /** * g_quark_try_string: - * @string: (allow-none): a string + * @string: (nullable): a string * * Gets the #GQuark associated with the given string, or 0 if string is * %NULL or it has no associated #GQuark. @@ -192,7 +192,7 @@ quark_from_string (const gchar *string, /** * g_quark_from_string: - * @string: (allow-none): a string + * @string: (nullable): a string * * Gets the #GQuark identifying the given string. If the string does * not currently have an associated #GQuark, a new #GQuark is created, @@ -217,7 +217,7 @@ g_quark_from_string (const gchar *string) /** * g_quark_from_static_string: - * @string: (allow-none): a string + * @string: (nullable): a string * * Gets the #GQuark identifying the given (static) string. If the * string does not currently have an associated #GQuark, a new #GQuark @@ -303,7 +303,7 @@ quark_new (gchar *string) /** * g_intern_string: - * @string: (allow-none): a string + * @string: (nullable): a string * * Returns a canonical representation for @string. Interned strings * can be compared for equality by comparing the pointers, instead of @@ -332,7 +332,7 @@ g_intern_string (const gchar *string) /** * g_intern_static_string: - * @string: (allow-none): a static string + * @string: (nullable): a static string * * Returns a canonical representation for @string. Interned strings * can be compared for equality by comparing the pointers, instead of diff --git a/glib/gregex.c b/glib/gregex.c index b68ee9582..a9f6814e2 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -14,9 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -678,7 +677,7 @@ g_match_info_unref (GMatchInfo *match_info) /** * g_match_info_free: - * @match_info: (allow-none): a #GMatchInfo, or %NULL + * @match_info: (nullable): a #GMatchInfo, or %NULL * * If @match_info is not %NULL, calls g_match_info_unref(); otherwise does * nothing. @@ -895,7 +894,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info) /** * g_match_info_expand_references: - * @match_info: (allow-none): a #GMatchInfo or %NULL + * @match_info: (nullable): a #GMatchInfo or %NULL * @string_to_expand: the string to expand * @error: location to store the error occurring, or %NULL to ignore errors * @@ -917,7 +916,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info) * Use g_regex_check_replacement() to find out whether @string_to_expand * contains references. * - * Returns: (allow-none): the expanded string, or %NULL if an error occurred + * Returns: (nullable): the expanded string, or %NULL if an error occurred * * Since: 2.14 */ @@ -978,7 +977,7 @@ g_match_info_expand_references (const GMatchInfo *match_info, * The string is fetched from the string passed to the match function, * so you cannot call this function after freeing the string. * - * Returns: (allow-none): The matched substring, or %NULL if an error + * Returns: (nullable): The matched substring, or %NULL if an error * occurred. You have to free the string yourself * * Since: 2.14 @@ -1011,9 +1010,9 @@ g_match_info_fetch (const GMatchInfo *match_info, * g_match_info_fetch_pos: * @match_info: #GMatchInfo structure * @match_num: number of the sub expression - * @start_pos: (out) (allow-none): pointer to location where to store + * @start_pos: (out) (optional): pointer to location where to store * the start position, or %NULL - * @end_pos: (out) (allow-none): pointer to location where to store + * @end_pos: (out) (optional): pointer to location where to store * the end position, or %NULL * * Retrieves the position in bytes of the @match_num'th capturing @@ -1109,7 +1108,7 @@ get_matched_substring_number (const GMatchInfo *match_info, * The string is fetched from the string passed to the match function, * so you cannot call this function after freeing the string. * - * Returns: (allow-none): The matched substring, or %NULL if an error + * Returns: (nullable): The matched substring, or %NULL if an error * occurred. You have to free the string yourself * * Since: 2.14 @@ -1136,9 +1135,9 @@ g_match_info_fetch_named (const GMatchInfo *match_info, * g_match_info_fetch_named_pos: * @match_info: #GMatchInfo structure * @name: name of the subexpression - * @start_pos: (out) (allow-none): pointer to location where to store + * @start_pos: (out) (optional): pointer to location where to store * the start position, or %NULL - * @end_pos: (out) (allow-none): pointer to location where to store + * @end_pos: (out) (optional): pointer to location where to store * the end position, or %NULL * * Retrieves the position in bytes of the capturing parentheses named @name. @@ -1660,7 +1659,7 @@ g_regex_match_simple (const gchar *pattern, * @regex: a #GRegex structure from g_regex_new() * @string: the string to scan for matches * @match_options: match options - * @match_info: (out) (allow-none): pointer to location where to store + * @match_info: (out) (optional): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it * * Scans for a match in string for the pattern in @regex. @@ -1723,7 +1722,7 @@ g_regex_match (const GRegex *regex, * @string_len: the length of @string, or -1 if @string is nul-terminated * @start_position: starting index of the string to match, in bytes * @match_options: match options - * @match_info: (out) (allow-none): pointer to location where to store + * @match_info: (out) (optional): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it * @error: location to store the error occurring, or %NULL to ignore errors * @@ -1815,7 +1814,7 @@ g_regex_match_full (const GRegex *regex, * @regex: a #GRegex structure from g_regex_new() * @string: the string to scan for matches * @match_options: match options - * @match_info: (out) (allow-none): pointer to location where to store + * @match_info: (out) (optional): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it * * Using the standard algorithm for regular expression matching only @@ -1854,7 +1853,7 @@ g_regex_match_all (const GRegex *regex, * @string_len: the length of @string, or -1 if @string is nul-terminated * @start_position: starting index of the string to match, in bytes * @match_options: match options - * @match_info: (out) (allow-none): pointer to location where to store + * @match_info: (out) (optional): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it * @error: location to store the error occurring, or %NULL to ignore errors * @@ -1912,6 +1911,7 @@ g_regex_match_all_full (const GRegex *regex, gboolean done; pcre *pcre_re; pcre_extra *extra; + gboolean retval; g_return_val_if_fail (regex != NULL, FALSE); g_return_val_if_fail (string != NULL, FALSE); @@ -1985,13 +1985,14 @@ g_regex_match_all_full (const GRegex *regex, /* set info->pos to -1 so that a call to g_match_info_next() fails. */ info->pos = -1; + retval = info->matches >= 0; if (match_info != NULL) *match_info = info; else g_match_info_free (info); - return info->matches >= 0; + return retval; } /** @@ -2293,7 +2294,6 @@ g_regex_split_full (const GRegex *regex, { g_propagate_error (error, tmp_error); g_list_free_full (list, g_free); - match_info->pos = -1; return NULL; } @@ -2997,7 +2997,7 @@ g_regex_replace_eval (const GRegex *regex, /** * g_regex_check_replacement: * @replacement: the replacement string - * @has_references: (out) (allow-none): location to store information about + * @has_references: (out) (optional): location to store information about * references in @replacement or %NULL * @error: location to store error * diff --git a/glib/gregex.h b/glib/gregex.h index 3921cfadb..afae54e6c 100644 --- a/glib/gregex.h +++ b/glib/gregex.h @@ -14,9 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_REGEX_H__ diff --git a/glib/gsequence.c b/glib/gsequence.c index 8482b8ba2..b813ee88a 100644 --- a/glib/gsequence.c +++ b/glib/gsequence.c @@ -239,7 +239,7 @@ iter_compare (GSequenceIter *node1, /** * g_sequence_new: - * @data_destroy: (allow-none): a #GDestroyNotify function, or %NULL + * @data_destroy: (nullable): a #GDestroyNotify function, or %NULL * * Creates a new GSequence. The @data_destroy function, if non-%NULL will * be called on all items when the sequence is destroyed and on items that diff --git a/glib/gshell.c b/glib/gshell.c index 5fb6a809a..1248ae533 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -4,20 +4,18 @@ * g_execvpe implementation based on GNU libc execvp: * Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gshell.h b/glib/gshell.h index cff6c5cbf..d3d85c90b 100644 --- a/glib/gshell.h +++ b/glib/gshell.h @@ -2,20 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_SHELL_H__ diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c index e7b62402f..6614b0a39 100644 --- a/glib/gspawn-win32-helper.c +++ b/glib/gspawn-win32-helper.c @@ -3,20 +3,18 @@ * Copyright 2000 Red Hat, Inc. * Copyright 2000 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -159,16 +157,12 @@ protect_wargv (gint argc, * Please see http://msdn.microsoft.com/zh-tw/library/ks2530z6%28v=vs.80%29.aspx * for an explanation on this. */ -void myInvalidParameterHandler( - const wchar_t * expression, - const wchar_t * function, - const wchar_t * file, - unsigned int line, - uintptr_t pReserved -) -{ - return; -} +extern void +myInvalidParameterHandler(const wchar_t *expression, + const wchar_t *function, + const wchar_t *file, + unsigned int line, + uintptr_t pReserved); #endif diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index da2a63725..e1048d2c3 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -3,20 +3,18 @@ * Copyright 2000 Red Hat, Inc. * Copyright 2003 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ /* diff --git a/glib/gspawn.c b/glib/gspawn.c index 6ef705df0..6f78f5cd1 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -4,20 +4,18 @@ * g_execvpe implementation based on GNU libc execvp: * Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -105,13 +103,13 @@ G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error) /** * g_spawn_async: - * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit parent's + * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit parent's * @argv: (array zero-terminated=1): child's argument vector - * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's + * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's * @flags: flags from #GSpawnFlags - * @child_setup: (scope async) (allow-none): function to run in the child just before exec() + * @child_setup: (scope async) (nullable): function to run in the child just before exec() * @user_data: (closure): user data for @child_setup - * @child_pid: (out) (allow-none): return location for child process reference, or %NULL + * @child_pid: (out) (optional): return location for child process reference, or %NULL * @error: return location for error * * See g_spawn_async_with_pipes() for a full description; this function @@ -215,15 +213,15 @@ read_data (GString *str, /** * g_spawn_sync: - * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit parent's + * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit parent's * @argv: (array zero-terminated=1): child's argument vector - * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's + * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's * @flags: flags from #GSpawnFlags - * @child_setup: (scope async) (allow-none): function to run in the child just before exec() + * @child_setup: (scope async) (nullable): function to run in the child just before exec() * @user_data: (closure): user data for @child_setup - * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for child output, or %NULL - * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for child error messages, or %NULL - * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid(), or %NULL + * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child output, or %NULL + * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child error messages, or %NULL + * @exit_status: (out) (optional): return location for child exit status, as returned by waitpid(), or %NULL * @error: return location for error, or %NULL * * Executes a child synchronously (waits for the child to exit before returning). @@ -467,16 +465,16 @@ g_spawn_sync (const gchar *working_directory, /** * g_spawn_async_with_pipes: - * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding + * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding * @argv: (array zero-terminated=1): child's argument vector, in the GLib file name encoding - * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's, in the GLib file name encoding + * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the GLib file name encoding * @flags: flags from #GSpawnFlags - * @child_setup: (scope async) (allow-none): function to run in the child just before exec() + * @child_setup: (scope async) (nullable): function to run in the child just before exec() * @user_data: (closure): user data for @child_setup - * @child_pid: (out) (allow-none): return location for child process ID, or %NULL - * @standard_input: (out) (allow-none): return location for file descriptor to write to child's stdin, or %NULL - * @standard_output: (out) (allow-none): return location for file descriptor to read child's stdout, or %NULL - * @standard_error: (out) (allow-none): return location for file descriptor to read child's stderr, or %NULL + * @child_pid: (out) (optional): return location for child process ID, or %NULL + * @standard_input: (out) (optional): return location for file descriptor to write to child's stdin, or %NULL + * @standard_output: (out) (optional): return location for file descriptor to read child's stdout, or %NULL + * @standard_error: (out) (optional): return location for file descriptor to read child's stderr, or %NULL * @error: return location for error * * Executes a child program asynchronously (your program will not @@ -677,9 +675,9 @@ g_spawn_async_with_pipes (const gchar *working_directory, /** * g_spawn_command_line_sync: * @command_line: a command line - * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for child output - * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for child errors - * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid() + * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child output + * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child errors + * @exit_status: (out) (optional): return location for child exit status, as returned by waitpid() * @error: return location for errors * * A simple version of g_spawn_sync() with little-used parameters diff --git a/glib/gspawn.h b/glib/gspawn.h index bae522af3..1409e2f44 100644 --- a/glib/gspawn.h +++ b/glib/gspawn.h @@ -2,20 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_SPAWN_H__ diff --git a/glib/gstdio.c b/glib/gstdio.c index 588b0758e..831ae98e0 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -2,19 +2,18 @@ * * Copyright 2004 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" @@ -753,7 +752,7 @@ g_fopen (const gchar *filename, * @filename: (type filename): a pathname in the GLib file name encoding * (UTF-8 on Windows) * @mode: a string describing the mode in which the file should be opened - * @stream: (allow-none): an existing stream which will be reused, or %NULL + * @stream: (nullable): an existing stream which will be reused, or %NULL * * A wrapper for the POSIX freopen() function. The freopen() function * opens a file and associates it with an existing stream. diff --git a/glib/gstdio.h b/glib/gstdio.h index a0caf735b..3a0ee37bd 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -2,19 +2,18 @@ * * Copyright 2004 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_STDIO_H__ diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 00c484d38..eb0f1deff 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -386,7 +386,7 @@ g_memdup (gconstpointer mem, { gpointer new_mem; - if (mem) + if (mem && byte_size != 0) { new_mem = g_malloc (byte_size); memcpy (new_mem, mem, byte_size); @@ -1964,7 +1964,7 @@ g_strncasecmp (const gchar *s1, /** * g_strdelimit: * @string: the string to convert - * @delimiters: (allow-none): a string containing the current delimiters, + * @delimiters: (nullable): a string containing the current delimiters, * or %NULL to use the standard delimiters defined in #G_STR_DELIMITERS * @new_delimiter: the new delimiter character * @@ -2531,7 +2531,7 @@ g_strdupv (gchar **str_array) /** * g_strjoinv: - * @separator: (allow-none): a string to insert between each of the + * @separator: (nullable): a string to insert between each of the * strings, or %NULL * @str_array: a %NULL-terminated array of strings to join * @@ -2588,7 +2588,7 @@ g_strjoinv (const gchar *separator, /** * g_strjoin: - * @separator: (allow-none): a string to insert between each of the + * @separator: (nullable): a string to insert between each of the * strings, or %NULL * @...: a %NULL-terminated list of strings to join * @@ -2979,7 +2979,7 @@ split_words (const gchar *value) /** * g_str_tokenize_and_fold: * @string: a string - * @translit_locale: (allow-none): the language code (like 'de' or + * @translit_locale: (nullable): the language code (like 'de' or * 'en_GB') from which @string originates * @ascii_alternates: (out) (transfer full) (array zero-terminated=1): a * return location for ASCII alternates diff --git a/glib/gtestutils.c b/glib/gtestutils.c index 3275cdab0..e08b044f9 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -380,7 +380,8 @@ * an error message is logged and the application is terminated. * * The macro can be turned off in final releases of code by defining - * `G_DISABLE_ASSERT` when compiling the application. + * `G_DISABLE_ASSERT` when compiling the application, so code must + * not depend on any side effects from @expr. */ /** @@ -1785,7 +1786,7 @@ g_test_fail (void) /** * g_test_incomplete: - * @msg: (allow-none): explanation + * @msg: (nullable): explanation * * Indicates that a test failed because of some incomplete * functionality. This function can be called multiple times @@ -1810,7 +1811,7 @@ g_test_incomplete (const gchar *msg) /** * g_test_skip: - * @msg: (allow-none): explanation + * @msg: (nullable): explanation * * Indicates that a test was skipped. * @@ -2547,8 +2548,8 @@ g_assertion_message_error (const char *domain, /** * g_strcmp0: - * @str1: (allow-none): a C string or %NULL - * @str2: (allow-none): another C string or %NULL + * @str1: (nullable): a C string or %NULL + * @str2: (nullable): another C string or %NULL * * Compares @str1 and @str2 like strcmp(). Handles %NULL * gracefully by sorting it before non-%NULL strings. @@ -2865,7 +2866,7 @@ g_test_trap_fork (guint64 usec_timeout, /** * g_test_trap_subprocess: - * @test_path: (allow-none): Test to run in a subprocess + * @test_path: (nullable): Test to run in a subprocess * @usec_timeout: Timeout for the subprocess test in micro seconds. * @test_flags: Flags to modify subprocess behaviour. * diff --git a/glib/gtestutils.h b/glib/gtestutils.h index d788eb94b..99e237dc0 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -74,7 +74,7 @@ typedef void (*GTestFixtureFunc) (gpointer fixture, if (__l1 != __l2) \ g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ #l1 " (len(" #m1 ")) == " #l2 " (len(" #m2 "))", __l1, "==", __l2, 'i'); \ - else if (memcmp (__m1, __m2, __l1) != 0) \ + else if (__l1 != 0 && memcmp (__m1, __m2, __l1) != 0) \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ "assertion failed (" #m1 " == " #m2 ")"); \ } G_STMT_END diff --git a/glib/gthread.c b/glib/gthread.c index 623ac63de..fdb367398 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -788,7 +788,7 @@ g_thread_proxy (gpointer data) /** * g_thread_new: - * @name: (allow-none): an (optional) name for the new thread + * @name: (nullable): an (optional) name for the new thread * @func: a function to execute in the new thread * @data: an argument to supply to the new thread * @@ -834,7 +834,7 @@ g_thread_new (const gchar *name, /** * g_thread_try_new: - * @name: (allow-none): an (optional) name for the new thread + * @name: (nullable): an (optional) name for the new thread * @func: a function to execute in the new thread * @data: an argument to supply to the new thread * @error: return location for error, or %NULL diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h index 198b29a6e..ae4c33d0a 100644 --- a/glib/gthreadprivate.h +++ b/glib/gthreadprivate.h @@ -4,19 +4,18 @@ * * Copyright (C) 2003 Sebastian Wilhelmi * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_THREADPRIVATE_H__ diff --git a/glib/gtimezone.c b/glib/gtimezone.c index 2e2369c27..89aa83e41 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c @@ -1279,7 +1279,7 @@ rules_from_identifier (const gchar *identifier, /* Construction {{{1 */ /** * g_time_zone_new: - * @identifier: (allow-none): a timezone identifier + * @identifier: (nullable): a timezone identifier * * Creates a #GTimeZone corresponding to @identifier. * diff --git a/glib/gtranslit.c b/glib/gtranslit.c index c9f07f861..b1e0dff14 100644 --- a/glib/gtranslit.c +++ b/glib/gtranslit.c @@ -301,7 +301,7 @@ get_default_item_id (void) /** * g_str_to_ascii: * @str: a string, in UTF-8 - * @from_locale: (allow-none): the source locale, if known + * @from_locale: (nullable): the source locale, if known * * Transliterate @str to plain ASCII. * diff --git a/glib/gunibreak.c b/glib/gunibreak.c index 8fcd4de36..ad17a5d5e 100644 --- a/glib/gunibreak.c +++ b/glib/gunibreak.c @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gunicode.h b/glib/gunicode.h index 558b37254..f3316779d 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -3,19 +3,18 @@ * Copyright (C) 1999, 2000 Tom Tromey * Copyright 2000, 2005 Red Hat, Inc. * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_UNICODE_H__ diff --git a/glib/gunicollate.c b/glib/gunicollate.c index f9d8b3df0..f7257203d 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -2,19 +2,18 @@ * * Copyright 2001,2005 Red Hat, Inc. * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index 44943c84f..d109eae05 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -3,19 +3,18 @@ * Copyright (C) 1999, 2000 Tom Tromey * Copyright 2000 Red Hat, Inc. * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * The Gnome Library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ /** @@ -686,7 +685,7 @@ g_unichar_compose (gunichar a, * g_unichar_fully_decompose: * @ch: a Unicode character. * @compat: whether perform canonical or compatibility decomposition - * @result: (allow-none): location to store decomposed result, or %NULL + * @result: (nullable): location to store decomposed result, or %NULL * @result_len: length of @result * * Computes the canonical or compatibility decomposition of a diff --git a/glib/guniprop.c b/glib/guniprop.c index 86a706806..3726c7ab3 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -503,6 +503,11 @@ g_unichar_iswide_cjk (gunichar c) if (g_unichar_iswide (c)) return TRUE; + /* bsearch() is declared attribute(nonnull(1)) so we can't validly search + * for a NULL key */ + if (c == 0) + return FALSE; + if (bsearch (GUINT_TO_POINTER (c), g_unicode_width_table_ambiguous, G_N_ELEMENTS (g_unicode_width_table_ambiguous), diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c index 44cf82a07..1978de10f 100644 --- a/glib/gurifuncs.c +++ b/glib/gurifuncs.c @@ -62,9 +62,9 @@ unescape_character (const char *scanner) /** * g_uri_unescape_segment: - * @escaped_string: (allow-none): A string, may be %NULL - * @escaped_string_end: (allow-none): Pointer to end of @escaped_string, may be %NULL - * @illegal_characters: (allow-none): An optional string of illegal characters not to be allowed, may be %NULL + * @escaped_string: (nullable): A string, may be %NULL + * @escaped_string_end: (nullable): Pointer to end of @escaped_string, may be %NULL + * @illegal_characters: (nullable): An optional string of illegal characters not to be allowed, may be %NULL * * Unescapes a segment of an escaped string. * @@ -138,7 +138,7 @@ g_uri_unescape_segment (const char *escaped_string, /** * g_uri_unescape_string: * @escaped_string: an escaped string to be unescaped. - * @illegal_characters: (allow-none): a string of illegal characters not to be + * @illegal_characters: (nullable): a string of illegal characters not to be * allowed, or %NULL. * * Unescapes a whole escaped string. @@ -217,7 +217,7 @@ g_uri_parse_scheme (const char *uri) /** * g_uri_escape_string: * @unescaped: the unescaped input string. - * @reserved_chars_allowed: (allow-none): a string of reserved characters that + * @reserved_chars_allowed: (nullable): a string of reserved characters that * are allowed to be used, or %NULL. * @allow_utf8: %TRUE if the result can include UTF-8 characters. * diff --git a/glib/gutf8.c b/glib/gutf8.c index 4c5caccfd..a3fe787d8 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -1627,7 +1627,7 @@ fast_validate_len (const char *str, * g_utf8_validate: * @str: (array length=max_len) (element-type guint8): a pointer to character data * @max_len: max bytes to validate, or -1 to go until NUL - * @end: (allow-none) (out) (transfer none): return location for end of valid data + * @end: (out) (optional) (transfer none): return location for end of valid data * * Validates UTF-8 encoded text. @str is the text to validate; * if @str is nul-terminated, then @max_len can be -1, otherwise diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c index 9f4bcc50f..3741acb6f 100644 --- a/glib/gvariant-parser.c +++ b/glib/gvariant-parser.c @@ -209,7 +209,10 @@ token_stream_prepare (TokenStream *stream) break; } - else /* ↓↓↓ */; + else + { + /* ↓↓↓ */ + } case 'a': /* 'b' */ case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': @@ -2317,11 +2320,11 @@ parse (TokenStream *stream, /** * g_variant_parse: - * @type: (allow-none): a #GVariantType, or %NULL + * @type: (nullable): a #GVariantType, or %NULL * @text: a string containing a GVariant in text form - * @limit: (allow-none): a pointer to the end of @text, or %NULL - * @endptr: (allow-none): a location to store the end pointer, or %NULL - * @error: (allow-none): a pointer to a %NULL #GError pointer, or %NULL + * @limit: (nullable): a pointer to the end of @text, or %NULL + * @endptr: (nullable): a location to store the end pointer, or %NULL + * @error: (nullable): a pointer to a %NULL #GError pointer, or %NULL * * Parses a #GVariant from a text representation. * diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c index 5df7fc3ab..5643cc18e 100644 --- a/glib/gvariant-serialiser.c +++ b/glib/gvariant-serialiser.c @@ -87,7 +87,7 @@ /* < private > * GVariantSerialised: * @type_info: the #GVariantTypeInfo of this value - * @data: (allow-none): the serialised data of this value, or %NULL + * @data: (nullable): the serialised data of this value, or %NULL * @size: the size of this value * * A structure representing a GVariant in serialised form. This diff --git a/glib/gvariant.c b/glib/gvariant.c index 2a5246cdc..ea6e76a5e 100644 --- a/glib/gvariant.c +++ b/glib/gvariant.c @@ -620,8 +620,8 @@ NUMERIC_TYPE (DOUBLE, double, gdouble) /* Container type Constructor / Deconstructors {{{1 */ /** * g_variant_new_maybe: - * @child_type: (allow-none): the #GVariantType of the child, or %NULL - * @child: (allow-none): the child value, or %NULL + * @child_type: (nullable): the #GVariantType of the child, or %NULL + * @child: (nullable): the child value, or %NULL * * Depending on if @child is %NULL, either wraps @child inside of a * maybe container or creates a Nothing instance for the given @type. @@ -683,7 +683,7 @@ g_variant_new_maybe (const GVariantType *child_type, * Given a maybe-typed #GVariant instance, extract its value. If the * value is Nothing, then this function returns %NULL. * - * Returns: (allow-none) (transfer full): the contents of @value, or %NULL + * Returns: (nullable) (transfer full): the contents of @value, or %NULL * * Since: 2.24 **/ @@ -745,8 +745,8 @@ g_variant_get_variant (GVariant *value) /** * g_variant_new_array: - * @child_type: (allow-none): the element type of the new array - * @children: (allow-none) (array length=n_children): an array of + * @child_type: (nullable): the element type of the new array + * @children: (nullable) (array length=n_children): an array of * #GVariant pointers, the children * @n_children: the length of @children * @@ -996,7 +996,7 @@ g_variant_lookup (GVariant *dictionary, * g_variant_lookup_value: * @dictionary: a dictionary #GVariant * @key: the key to lookup in the dictionary - * @expected_type: (allow-none): a #GVariantType, or %NULL + * @expected_type: (nullable): a #GVariantType, or %NULL * * Looks up a value in a dictionary #GVariant. * @@ -1429,7 +1429,7 @@ g_variant_is_signature (const gchar *string) /** * g_variant_get_string: * @value: a string #GVariant instance - * @length: (allow-none) (default 0) (out): a pointer to a #gsize, + * @length: (optional) (default 0) (out): a pointer to a #gsize, * to store the length * * Returns the string value of a #GVariant instance with a string @@ -1566,7 +1566,7 @@ g_variant_new_strv (const gchar * const *strv, /** * g_variant_get_strv: * @value: an array of strings #GVariant - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of strings #GVariant. This call * makes a shallow copy; the return result should be released with @@ -1616,7 +1616,7 @@ g_variant_get_strv (GVariant *value, /** * g_variant_dup_strv: * @value: an array of strings #GVariant - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of strings #GVariant. This call * makes a deep copy; the return result should be released with @@ -1702,7 +1702,7 @@ g_variant_new_objv (const gchar * const *strv, /** * g_variant_get_objv: * @value: an array of object paths #GVariant - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of object paths #GVariant. This call * makes a shallow copy; the return result should be released with @@ -1752,7 +1752,7 @@ g_variant_get_objv (GVariant *value, /** * g_variant_dup_objv: * @value: an array of object paths #GVariant - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of object paths #GVariant. This call * makes a deep copy; the return result should be released with @@ -1873,7 +1873,7 @@ g_variant_get_bytestring (GVariant *value) /** * g_variant_dup_bytestring: * @value: an array-of-bytes #GVariant instance - * @length: (out) (allow-none) (default NULL): a pointer to a #gsize, to store + * @length: (out) (optional) (default NULL): a pointer to a #gsize, to store * the length (not including the nul terminator) * * Similar to g_variant_get_bytestring() except that instead of @@ -1942,7 +1942,7 @@ g_variant_new_bytestring_array (const gchar * const *strv, /** * g_variant_get_bytestring_array: * @value: an array of array of bytes #GVariant ('aay') - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of array of bytes #GVariant. This call * makes a shallow copy; the return result should be released with @@ -1992,7 +1992,7 @@ g_variant_get_bytestring_array (GVariant *value, /** * g_variant_dup_bytestring_array: * @value: an array of array of bytes #GVariant ('aay') - * @length: (out) (allow-none): the length of the result, or %NULL + * @length: (out) (optional): the length of the result, or %NULL * * Gets the contents of an array of array of bytes #GVariant. This call * makes a deep copy; the return result should be released with @@ -2176,7 +2176,7 @@ g_variant_classify (GVariant *value) /** * g_variant_print_string: (skip) * @value: a #GVariant - * @string: (allow-none) (default NULL): a #GString, or %NULL + * @string: (nullable) (default NULL): a #GString, or %NULL * @type_annotate: %TRUE if type information should be included in * the output * @@ -2278,7 +2278,9 @@ g_variant_print_string (GVariant *value, } else - /* fall through and handle normally... */; + { + /* fall through and handle normally... */ + } } /* @@ -2616,7 +2618,7 @@ g_variant_print (GVariant *value, { return g_string_free (g_variant_print_string (value, NULL, type_annotate), FALSE); -}; +} /* Hash, Equal, Compare {{{1 */ /** @@ -3086,7 +3088,7 @@ g_variant_iter_free (GVariantIter *iter) * } * ]| * - * Returns: (allow-none) (transfer full): a #GVariant, or %NULL + * Returns: (nullable) (transfer full): a #GVariant, or %NULL * * Since: 2.24 **/ @@ -3831,7 +3833,7 @@ ensure_valid_dict (GVariantDict *dict) /** * g_variant_dict_new: - * @from_asv: (allow-none): the #GVariant with which to initialise the + * @from_asv: (nullable): the #GVariant with which to initialise the * dictionary * * Allocates and initialises a new #GVariantDict. @@ -3865,7 +3867,7 @@ g_variant_dict_new (GVariant *from_asv) /** * g_variant_dict_init: (skip) * @dict: a #GVariantDict - * @from_asv: (allow-none): the initial value for @dict + * @from_asv: (nullable): the initial value for @dict * * Initialises a #GVariantDict structure. * @@ -3956,7 +3958,7 @@ g_variant_dict_lookup (GVariantDict *dict, * g_variant_dict_lookup_value: * @dict: a #GVariantDict * @key: the key to lookup in the dictionary - * @expected_type: (allow-none): a #GVariantType, or %NULL + * @expected_type: (nullable): a #GVariantType, or %NULL * * Looks up a value in a #GVariantDict. * @@ -4215,9 +4217,9 @@ g_variant_dict_unref (GVariantDict *dict) /*< private > * g_variant_format_string_scan: * @string: a string that may be prefixed with a format string - * @limit: (allow-none) (default NULL): a pointer to the end of @string, + * @limit: (nullable) (default NULL): a pointer to the end of @string, * or %NULL - * @endptr: (allow-none) (default NULL): location to store the end pointer, + * @endptr: (nullable) (default NULL): location to store the end pointer, * or %NULL * * Checks the string pointed to by @string for starting with a properly @@ -4466,9 +4468,9 @@ g_variant_check_format_string (GVariant *value, /*< private > * g_variant_format_string_scan_type: * @string: a string that may be prefixed with a format string - * @limit: (allow-none) (default NULL): a pointer to the end of @string, + * @limit: (nullable) (default NULL): a pointer to the end of @string, * or %NULL - * @endptr: (allow-none) (default NULL): location to store the end pointer, + * @endptr: (nullable) (default NULL): location to store the end pointer, * or %NULL * * If @string starts with a valid format string then this function will @@ -4481,7 +4483,7 @@ g_variant_check_format_string (GVariant *value, * This function is otherwise exactly like * g_variant_format_string_scan(). * - * Returns: (allow-none): a #GVariantType if there was a valid format string + * Returns: (nullable): a #GVariantType if there was a valid format string * * Since: 2.24 */ @@ -5282,7 +5284,7 @@ g_variant_new (const gchar *format_string, /** * g_variant_new_va: (skip) * @format_string: a string that is prefixed with a format string - * @endptr: (allow-none) (default NULL): location to store the end pointer, + * @endptr: (nullable) (default NULL): location to store the end pointer, * or %NULL * @app: a pointer to a #va_list * @@ -5393,7 +5395,7 @@ g_variant_get (GVariant *value, * g_variant_get_va: (skip) * @value: a #GVariant * @format_string: a string that is prefixed with a format string - * @endptr: (allow-none) (default NULL): location to store the end pointer, + * @endptr: (nullable) (default NULL): location to store the end pointer, * or %NULL * @app: a pointer to a #va_list * diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c index b3e227a42..b8d6faac3 100644 --- a/glib/gvarianttype.c +++ b/glib/gvarianttype.c @@ -197,8 +197,8 @@ g_variant_type_check (const GVariantType *type) /** * g_variant_type_string_scan: * @string: a pointer to any string - * @limit: (allow-none): the end of @string, or %NULL - * @endptr: (out) (allow-none): location to store the end pointer, or %NULL + * @limit: (nullable): the end of @string, or %NULL + * @endptr: (out) (optional): location to store the end pointer, or %NULL * * Scan for a single complete and valid GVariant type string in @string. * The memory pointed to by @limit (or bytes beyond it) is never @@ -292,7 +292,7 @@ g_variant_type_string_is_valid (const gchar *type_string) /** * g_variant_type_free: - * @type: (allow-none): a #GVariantType, or %NULL + * @type: (nullable): a #GVariantType, or %NULL * * Frees a #GVariantType that was allocated with * g_variant_type_copy(), g_variant_type_new() or one of the container diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c index b398d657a..e10a304b1 100644 --- a/glib/gvarianttypeinfo.c +++ b/glib/gvarianttypeinfo.c @@ -220,8 +220,8 @@ g_variant_type_info_get_type_string (GVariantTypeInfo *info) /* < private > * g_variant_type_info_query: * @info: a #GVariantTypeInfo - * @alignment: (allow-none): the location to store the alignment, or %NULL - * @fixed_size: (allow-none): the location to store the fixed size, or %NULL + * @alignment: (nullable): the location to store the alignment, or %NULL + * @fixed_size: (nullable): the location to store the fixed size, or %NULL * * Queries @info to determine the alignment requirements and fixed size * (if any) of the type. @@ -304,8 +304,8 @@ g_variant_type_info_element (GVariantTypeInfo *info) /* < private > * g_variant_type_query_element: * @info: a #GVariantTypeInfo for an array or maybe type - * @alignment: (allow-none): the location to store the alignment, or %NULL - * @fixed_size: (allow-none): the location to store the fixed size, or %NULL + * @alignment: (nullable): the location to store the alignment, or %NULL + * @fixed_size: (nullable): the location to store the fixed size, or %NULL * * Returns the alignment requires and fixed size (if any) for the * element type of the array. This call is a convenience wrapper around diff --git a/glib/gwin32.c b/glib/gwin32.c index e9081cc30..81aab00a1 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -218,7 +218,7 @@ g_win32_error_message (gint error) /** * g_win32_get_package_installation_directory_of_module: - * @hmodule: (allow-none): The Win32 handle for a DLL loaded into the current process, or %NULL + * @hmodule: (nullable): The Win32 handle for a DLL loaded into the current process, or %NULL * * This function tries to determine the installation directory of a * software package based on the location of a DLL of the software @@ -358,8 +358,8 @@ get_package_directory_from_module (const gchar *module_name) /** * g_win32_get_package_installation_directory: - * @package: (allow-none): You should pass %NULL for this. - * @dll_name: (allow-none): The name of a DLL that a package provides in UTF-8, or %NULL. + * @package: (nullable): You should pass %NULL for this. + * @dll_name: (nullable): The name of a DLL that a package provides in UTF-8, or %NULL. * * Try to determine the installation directory for a software package. * @@ -464,8 +464,8 @@ g_win32_get_package_installation_directory (const gchar *package, /** * g_win32_get_package_installation_subdirectory: - * @package: (allow-none): You should pass %NULL for this. - * @dll_name: (allow-none): The name of a DLL that a package provides, in UTF-8, or %NULL. + * @package: (nullable): You should pass %NULL for this. + * @dll_name: (nullable): The name of a DLL that a package provides, in UTF-8, or %NULL. * @subdir: A subdirectory of the package installation directory, also in UTF-8 * * This function is deprecated. Use diff --git a/glib/tests/642026.c b/glib/tests/642026.c index 05f9f259b..140d459a2 100644 --- a/glib/tests/642026.c +++ b/glib/tests/642026.c @@ -64,6 +64,7 @@ testcase (void) freed = 0; t1 = g_thread_create (thread_func, NULL, TRUE, NULL); + g_assert (t1 != NULL); /* wait for t1 to set up its thread-private data */ g_cond_wait (cond, mutex); diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c index f6c3cf0d8..dcb8a8f49 100644 --- a/glib/tests/gdatetime.c +++ b/glib/tests/gdatetime.c @@ -12,9 +12,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index bf1eac73e..f02dbbca5 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -670,7 +670,7 @@ g_module_open (const gchar *file_name, /** * g_module_open: - * @file_name: (allow-none): the name of the file containing the module, or %NULL + * @file_name: (nullable): the name of the file containing the module, or %NULL * to obtain a #GModule representing the main program itself * @flags: the flags used for opening the module. This can be the * logical OR of any of the #GModuleFlags @@ -891,7 +891,7 @@ g_module_name (GModule *module) /** * g_module_build_path: - * @directory: (allow-none): the directory where the module is. This can be + * @directory: (nullable): the directory where the module is. This can be * %NULL or the empty string to indicate that the standard platform-specific * directories will be used, though that is not recommended * @module_name: the name of the module diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 948e86974..b12743cc1 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -242,9 +242,9 @@ gobject_HEADERS_DIR = $(libgobjectincludedir) gobject_HEADERS_INST = $(gobject_public_h_sources) gobject_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/gobject.vcproj $(top_builddir)/build/win32/vs9/gobject.headers +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/gobject.vcproj $(top_builddir)/win32/vs9/gobject.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ diff --git a/gobject/gbinding.c b/gobject/gbinding.c index 01f00a1e1..31c3418ea 100644 --- a/gobject/gbinding.c +++ b/gobject/gbinding.c @@ -775,9 +775,9 @@ g_binding_unbind (GBinding *binding) * @target: (type GObject.Object): the target #GObject * @target_property: the property on @target to bind * @flags: flags to pass to #GBinding - * @transform_to: (scope notified) (allow-none): the transformation function + * @transform_to: (scope notified) (nullable): the transformation function * from the @source to the @target, or %NULL to use the default - * @transform_from: (scope notified) (allow-none): the transformation function + * @transform_from: (scope notified) (nullable): the transformation function * from the @target to the @source, or %NULL to use the default * @user_data: custom data to be passed to the transformation functions, * or %NULL diff --git a/gobject/gboxed.c b/gobject/gboxed.c index 40723f53b..a9010434a 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -479,7 +479,7 @@ value_set_boxed_internal (GValue *value, /** * g_value_set_boxed: * @value: a valid #GValue of %G_TYPE_BOXED derived type - * @v_boxed: (allow-none): boxed value to be set + * @v_boxed: (nullable): boxed value to be set * * Set the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed. */ @@ -496,7 +496,7 @@ g_value_set_boxed (GValue *value, /** * g_value_set_static_boxed: * @value: a valid #GValue of %G_TYPE_BOXED derived type - * @v_boxed: (allow-none): static boxed value to be set + * @v_boxed: (nullable): static boxed value to be set * * Set the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed. * The boxed value is assumed to be static, and is thus not duplicated @@ -515,7 +515,7 @@ g_value_set_static_boxed (GValue *value, /** * g_value_set_boxed_take_ownership: * @value: a valid #GValue of %G_TYPE_BOXED derived type - * @v_boxed: (allow-none): duplicated unowned boxed value to be set + * @v_boxed: (nullable): duplicated unowned boxed value to be set * * This is an internal function introduced mainly for C marshallers. * @@ -531,7 +531,7 @@ g_value_set_boxed_take_ownership (GValue *value, /** * g_value_take_boxed: * @value: a valid #GValue of %G_TYPE_BOXED derived type - * @v_boxed: (allow-none): duplicated unowned boxed value to be set + * @v_boxed: (nullable): duplicated unowned boxed value to be set * * Sets the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed * and takes over the ownership of the callers reference to @v_boxed; diff --git a/gobject/gclosure.c b/gobject/gclosure.c index 815242413..cced5f90b 100644 --- a/gobject/gclosure.c +++ b/gobject/gclosure.c @@ -762,7 +762,7 @@ g_closure_remove_finalize_notifier (GClosure *closure, * @param_values: (array length=n_param_values): an array of * #GValues holding the arguments on which to * invoke the callback of @closure - * @invocation_hint: (allow-none): a context-dependent invocation hint + * @invocation_hint: (nullable): a context-dependent invocation hint * * Invokes the closure, i.e. executes the callback represented by the @closure. */ @@ -1496,13 +1496,13 @@ g_cclosure_marshal_generic (GClosure *closure, /** * g_cclosure_marshal_generic_va: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is * invoked. * @args_list: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array diff --git a/gobject/gclosure.h b/gobject/gclosure.h index 3195809c3..04ebeaf79 100644 --- a/gobject/gclosure.h +++ b/gobject/gclosure.h @@ -97,16 +97,16 @@ typedef void (*GClosureNotify) (gpointer data, /** * GClosureMarshal: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @n_param_values: the length of the @param_values array * @param_values: (array length=n_param_values): an array of * #GValues holding the arguments on which to invoke the * callback of @closure - * @invocation_hint: (allow-none): the invocation hint given as the + * @invocation_hint: (nullable): the invocation hint given as the * last argument to g_closure_invoke() - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @@ -122,13 +122,13 @@ typedef void (*GClosureMarshal) (GClosure *closure, /** * GVaClosureMarshal: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is * invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in index 3d5945f32..f7da97506 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -28,7 +28,7 @@ my $firstenum = 1; # Is this the first enumeration per file? my @entries; # [ $name, $val ] for each entry my $sandbox = Safe->new; # sandbox for safe evaluation of expressions -my $output_file; # Filename to write result into +my $output; # Filename to write result into sub parse_trigraph { my $opts = shift; diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c index f270f2e66..0bb2da5d5 100644 --- a/gobject/gmarshal.c +++ b/gobject/gmarshal.c @@ -423,12 +423,12 @@ /** * g_cclosure_marshal_VOID__VOIDv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -441,12 +441,12 @@ /** * g_cclosure_marshal_VOID__BOOLEANv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -458,12 +458,12 @@ /** * g_cclosure_marshal_VOID__CHARv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -475,12 +475,12 @@ /** * g_cclosure_marshal_VOID__UCHARv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -492,12 +492,12 @@ /** * g_cclosure_marshal_VOID__INTv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -509,12 +509,12 @@ /** * g_cclosure_marshal_VOID__UINTv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -526,12 +526,12 @@ /** * g_cclosure_marshal_VOID__LONGv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -543,12 +543,12 @@ /** * g_cclosure_marshal_VOID__ULONGv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -560,12 +560,12 @@ /** * g_cclosure_marshal_VOID__ENUMv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -577,12 +577,12 @@ /** * g_cclosure_marshal_VOID__FLAGSv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -594,12 +594,12 @@ /** * g_cclosure_marshal_VOID__FLOATv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -611,12 +611,12 @@ /** * g_cclosure_marshal_VOID__DOUBLEv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -628,12 +628,12 @@ /** * g_cclosure_marshal_VOID__STRINGv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -645,12 +645,12 @@ /** * g_cclosure_marshal_VOID__PARAMv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -662,12 +662,12 @@ /** * g_cclosure_marshal_VOID__BOXEDv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -679,12 +679,12 @@ /** * g_cclosure_marshal_VOID__POINTERv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -696,12 +696,12 @@ /** * g_cclosure_marshal_VOID__OBJECTv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -713,12 +713,12 @@ /** * g_cclosure_marshal_VOID__VARIANTv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -730,12 +730,12 @@ /** * g_cclosure_marshal_STRING__OBJECT_POINTERv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -747,12 +747,12 @@ /** * g_cclosure_marshal_VOID__UINT_POINTERv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -764,12 +764,12 @@ /** * g_cclosure_marshal_BOOLEAN__FLAGSv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array @@ -781,12 +781,12 @@ /** * g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv: * @closure: the #GClosure to which the marshaller belongs - * @return_value: (allow-none): a #GValue to store the return + * @return_value: (nullable): a #GValue to store the return * value. May be %NULL if the callback of @closure doesn't return a * value. * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked. * @args: va_list of arguments to be passed to the closure. - * @marshal_data: (allow-none): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @n_params: the length of the @param_types array diff --git a/gobject/gobject.c b/gobject/gobject.c index 766d039df..d04f89c6c 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -2733,7 +2733,7 @@ g_object_weak_unref (GObject *object, /** * g_object_add_weak_pointer: (skip) * @object: The object that should be weak referenced. - * @weak_pointer_location: (inout) (not optional) (nullable): The memory address + * @weak_pointer_location: (inout) (not optional): The memory address * of a pointer. * * Adds a weak reference from weak_pointer to @object to indicate that @@ -2761,7 +2761,7 @@ g_object_add_weak_pointer (GObject *object, /** * g_object_remove_weak_pointer: (skip) * @object: The object that is weak referenced. - * @weak_pointer_location: (inout) (not optional) (nullable): The memory address + * @weak_pointer_location: (inout) (not optional): The memory address * of a pointer. * * Removes a weak reference from @object that was previously added @@ -3271,8 +3271,8 @@ g_object_set_qdata (GObject *object, * g_object_dup_qdata: * @object: the #GObject to store user data on * @quark: a #GQuark, naming the user data pointer - * @dup_func: (allow-none): function to dup the value - * @user_data: (allow-none): passed as user_data to @dup_func + * @dup_func: (nullable): function to dup the value + * @user_data: (nullable): passed as user_data to @dup_func * * This is a variant of g_object_get_qdata() which returns * a 'duplicate' of the value. @dup_func defines the @@ -3312,10 +3312,10 @@ g_object_dup_qdata (GObject *object, * g_object_replace_qdata: * @object: the #GObject to store user data on * @quark: a #GQuark, naming the user data pointer - * @oldval: (allow-none): the old value to compare against - * @newval: (allow-none): the new value - * @destroy: (allow-none): a destroy notify for the new value - * @old_destroy: (allow-none): destroy notify for the existing value + * @oldval: (nullable): the old value to compare against + * @newval: (nullable): the new value + * @destroy: (nullable): a destroy notify for the new value + * @old_destroy: (nullable): destroy notify for the existing value * * Compares the user data for the key @quark on @object with * @oldval, and if they are the same, replaces @oldval with @@ -3478,8 +3478,8 @@ g_object_set_data (GObject *object, * g_object_dup_data: * @object: the #GObject to store user data on * @key: a string, naming the user data pointer - * @dup_func: (allow-none): function to dup the value - * @user_data: (allow-none): passed as user_data to @dup_func + * @dup_func: (nullable): function to dup the value + * @user_data: (nullable): passed as user_data to @dup_func * * This is a variant of g_object_get_data() which returns * a 'duplicate' of the value. @dup_func defines the @@ -3521,10 +3521,10 @@ g_object_dup_data (GObject *object, * g_object_replace_data: * @object: the #GObject to store user data on * @key: a string, naming the user data pointer - * @oldval: (allow-none): the old value to compare against - * @newval: (allow-none): the new value - * @destroy: (allow-none): a destroy notify for the new value - * @old_destroy: (allow-none): destroy notify for the existing value + * @oldval: (nullable): the old value to compare against + * @newval: (nullable): the new value + * @destroy: (nullable): a destroy notify for the new value + * @old_destroy: (nullable): destroy notify for the existing value * * Compares the user data for the key @key on @object with * @oldval, and if they are the same, replaces @oldval with @@ -3706,7 +3706,7 @@ g_value_object_lcopy_value (const GValue *value, /** * g_value_set_object: * @value: a valid #GValue of %G_TYPE_OBJECT derived type - * @v_object: (type GObject.Object) (allow-none): object value to be set + * @v_object: (type GObject.Object) (nullable): object value to be set * * Set the contents of a %G_TYPE_OBJECT derived #GValue to @v_object. * @@ -3748,7 +3748,7 @@ g_value_set_object (GValue *value, /** * g_value_set_object_take_ownership: (skip) * @value: a valid #GValue of %G_TYPE_OBJECT derived type - * @v_object: (allow-none): object value to be set + * @v_object: (nullable): object value to be set * * This is an internal function introduced mainly for C marshallers. * @@ -3764,7 +3764,7 @@ g_value_set_object_take_ownership (GValue *value, /** * g_value_take_object: (skip) * @value: a valid #GValue of %G_TYPE_OBJECT derived type - * @v_object: (allow-none): object value to be set + * @v_object: (nullable): object value to be set * * Sets the contents of a %G_TYPE_OBJECT derived #GValue to @v_object * and takes over the ownership of the callers reference to @v_object; diff --git a/gobject/gobject.stp.in b/gobject/gobject.stp.in index edcdb5033..67a4520af 100644 --- a/gobject/gobject.stp.in +++ b/gobject/gobject.stp.in @@ -1,18 +1,18 @@ -global gtypes -global gtypenames -global gsignalnames +global gobject_types_2_0_@LT_CURRENT@_@LT_REVISION@ +global gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@ +global gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@ /* These are needed to keep track of gtype and signal names for the below * probes. */ probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("type__new") { - gtypes[pid(),user_string($arg1)] = $arg3; - gtypenames[pid(),$arg3] = user_string($arg1); + gobject_types_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),user_string($arg1)] = $arg3; + gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg3] = user_string($arg1); } probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__new") { - gsignalnames[pid(),$arg1] = user_string($arg2); + gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1] = user_string($arg2); } /** @@ -39,7 +39,7 @@ probe gobject.object_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so. { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),$arg2]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2]; probestr = sprintf("gobject.object_new(%s) -> %p", type, object); } @@ -55,7 +55,7 @@ probe gobject.object_ref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so. { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),gtype]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),gtype]; old_refcount = $arg3; refcount = old_refcount+1; probestr = sprintf("gobject.object_ref(%p[%s]) -> %d", object, type, refcount); @@ -72,7 +72,7 @@ probe gobject.object_unref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.s { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),gtype]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),gtype]; old_refcount = $arg3; refcount = old_refcount-1; probestr = sprintf("gobject.object_unref(%p [%s]) -> %d", object, type, refcount); @@ -89,7 +89,7 @@ probe gobject.object_dispose = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0 { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),$arg2]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2]; last_unref = $arg3; probestr = sprintf("gobject.object_dispose(%p[%s])", object, type); } @@ -105,7 +105,7 @@ probe gobject.object_dispose_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),$arg2]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2]; last_unref = $arg3; probestr = sprintf("gobject.object_dispose_end(%p[%s])", object, type); } @@ -120,7 +120,7 @@ probe gobject.object_finalize = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2. { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),$arg2]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2]; probestr = sprintf("gobject.object_finalize(%p[%s])", object, type); } @@ -134,7 +134,7 @@ probe gobject.object_finalize_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobjec { object = $arg1; gtype = $arg2; - type = gtypenames[pid(),$arg2]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2]; probestr = sprintf("gobject.object_finalize_end(%p[%s])", object, type); } @@ -150,7 +150,7 @@ probe gobject.signal_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so. gsignal = $arg1; name = user_string($arg2); gtype = $arg3; - type = gtypenames[pid(),$arg3]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg3]; probestr = sprintf("gobject.signal_new(%s, %s) -> %d", name, type, gsignal); } @@ -167,12 +167,12 @@ probe gobject.signal_emit = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so { gsignal = $arg1; detail = $arg2; - signal = gsignalnames[pid(),$arg1]; + signal = gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1]; if (detail != 0) signal = signal . "::" . gquarks[pid(), detail] object = $arg3; gtype = $arg4; - type = gtypenames[pid(),$arg4]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg4]; probestr = sprintf("gobject.signal_emit(%p[%s], %s)", object, type, signal); } @@ -189,11 +189,11 @@ probe gobject.signal_emit_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2. { gsignal = $arg1; detail = $arg2; - signal = gsignalnames[pid(),$arg1]; + signal = gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1]; if (detail != 0) signal = signal . "::" . gquarks[pid(), detail] object = $arg3; gtype = $arg4; - type = gtypenames[pid(),$arg4]; + type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg4]; probestr = sprintf("gobject.signal_emit_end(%p[%s], %s)", object, type, signal); } diff --git a/gobject/gparam.c b/gobject/gparam.c index 46c359ba2..f50793ae5 100644 --- a/gobject/gparam.c +++ b/gobject/gparam.c @@ -51,7 +51,7 @@ /* --- defines --- */ #define PARAM_FLOATING_FLAG 0x2 -#define G_PARAM_USER_MASK (~0 << G_PARAM_USER_SHIFT) +#define G_PARAM_USER_MASK (~0U << G_PARAM_USER_SHIFT) #define PSPEC_APPLIES_TO_VALUE(pspec, value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_PARAM_SPEC_VALUE_TYPE (pspec))) /* --- prototypes --- */ @@ -1430,7 +1430,7 @@ g_param_type_register_static (const gchar *name, /** * g_value_set_param: * @value: a valid #GValue of type %G_TYPE_PARAM - * @param: (allow-none): the #GParamSpec to be set + * @param: (nullable): the #GParamSpec to be set * * Set the contents of a %G_TYPE_PARAM #GValue to @param. */ @@ -1452,7 +1452,7 @@ g_value_set_param (GValue *value, /** * g_value_set_param_take_ownership: (skip) * @value: a valid #GValue of type %G_TYPE_PARAM - * @param: (allow-none): the #GParamSpec to be set + * @param: (nullable): the #GParamSpec to be set * * This is an internal function introduced mainly for C marshallers. * @@ -1468,7 +1468,7 @@ g_value_set_param_take_ownership (GValue *value, /** * g_value_take_param: (skip) * @value: a valid #GValue of type %G_TYPE_PARAM - * @param: (allow-none): the #GParamSpec to be set + * @param: (nullable): the #GParamSpec to be set * * Sets the contents of a %G_TYPE_PARAM #GValue to @param and takes * over the ownership of the callers reference to @param; the caller diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c index 43fc38365..9685ef446 100644 --- a/gobject/gparamspecs.c +++ b/gobject/gparamspecs.c @@ -2532,7 +2532,7 @@ g_param_spec_override (const gchar *name, * @nick: nick name for the property specified * @blurb: description of the property specified * @type: a #GVariantType - * @default_value: (allow-none) (transfer full): a #GVariant of type @type to + * @default_value: (nullable) (transfer full): a #GVariant of type @type to * use as the default value, or %NULL * @flags: flags for the property specified * diff --git a/gobject/gsignal.c b/gobject/gsignal.c index 26283e09c..5ef29cdce 100644 --- a/gobject/gsignal.c +++ b/gobject/gsignal.c @@ -1389,7 +1389,7 @@ g_signal_query (guint signal_id, * not associate a class method slot with this signal. * @accumulator: the accumulator for this signal; may be %NULL. * @accu_data: user data for the @accumulator. - * @c_marshaller: (allow-none): the function to translate arrays of parameter + * @c_marshaller: (nullable): the function to translate arrays of parameter * values to signal emissions into C language callback invocations or %NULL. * @return_type: the type of return value, or #G_TYPE_NONE for a signal * without a return value. @@ -1457,7 +1457,7 @@ g_signal_new (const gchar *signal_name, * not associate a class method with this signal. * @accumulator: the accumulator for this signal; may be %NULL. * @accu_data: user data for the @accumulator. - * @c_marshaller: (allow-none): the function to translate arrays of parameter + * @c_marshaller: (nullable): the function to translate arrays of parameter * values to signal emissions into C language callback invocations or %NULL. * @return_type: the type of return value, or #G_TYPE_NONE for a signal * without a return value. @@ -1590,11 +1590,11 @@ signal_add_class_closure (SignalNode *node, * @signal_flags: a combination of #GSignalFlags specifying detail of when * the default handler is to be invoked. You should at least specify * %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST - * @class_closure: (allow-none): The closure to invoke on signal emission; + * @class_closure: (nullable): The closure to invoke on signal emission; * may be %NULL - * @accumulator: (allow-none): the accumulator for this signal; may be %NULL + * @accumulator: (nullable): the accumulator for this signal; may be %NULL * @accu_data: user data for the @accumulator - * @c_marshaller: (allow-none): the function to translate arrays of + * @c_marshaller: (nullable): the function to translate arrays of * parameter values to signal emissions into C language callback * invocations or %NULL * @return_type: the type of return value, or #G_TYPE_NONE for a signal @@ -1857,7 +1857,7 @@ g_signal_set_va_marshaller (guint signal_id, * @class_closure: The closure to invoke on signal emission; may be %NULL. * @accumulator: the accumulator for this signal; may be %NULL. * @accu_data: user data for the @accumulator. - * @c_marshaller: (allow-none): the function to translate arrays of parameter + * @c_marshaller: (nullable): the function to translate arrays of parameter * values to signal emissions into C language callback invocations or %NULL. * @return_type: the type of return value, or #G_TYPE_NONE for a signal * without a return value. @@ -2312,7 +2312,7 @@ g_signal_get_invocation_hint (gpointer instance) * * Connects a closure to a signal for a particular object. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ gulong g_signal_connect_closure_by_id (gpointer instance, @@ -2371,7 +2371,7 @@ g_signal_connect_closure_by_id (gpointer instance, * * Connects a closure to a signal for a particular object. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ gulong g_signal_connect_closure (gpointer instance, @@ -2464,7 +2464,7 @@ node_check_deprecated (const SignalNode *node) * used. Specify @connect_flags if you need `..._after()` or * `..._swapped()` variants of this function. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ gulong g_signal_connect_data (gpointer instance, @@ -2645,9 +2645,9 @@ g_signal_handler_disconnect (gpointer instance, /** * g_signal_handler_is_connected: * @instance: (type GObject.Object): The instance where a signal handler is sought. - * @handler_id: the handler id. + * @handler_id: the handler ID. * - * Returns whether @handler_id is the id of a handler connected to @instance. + * Returns whether @handler_id is the ID of a handler connected to @instance. * * Returns: whether @handler_id identifies a handler connected to @instance. */ @@ -2727,7 +2727,7 @@ g_signal_handlers_destroy (gpointer instance) * and/or @data the handler has to match. * @signal_id: Signal the handler has to be connected to. * @detail: Signal detail the handler has to be connected to. - * @closure: (allow-none): The closure the handler will invoke. + * @closure: (nullable): The closure the handler will invoke. * @func: The C closure callback of the handler (useless for non-C closures). * @data: The closure data of the handler's closure. * @@ -2807,7 +2807,7 @@ signal_handlers_foreach_matched_R (gpointer instance, * and/or @data the handlers have to match. * @signal_id: Signal the handlers have to be connected to. * @detail: Signal detail the handlers have to be connected to. - * @closure: (allow-none): The closure the handlers will invoke. + * @closure: (nullable): The closure the handlers will invoke. * @func: The C closure callback of the handlers (useless for non-C closures). * @data: The closure data of the handlers' closures. * @@ -2854,7 +2854,7 @@ g_signal_handlers_block_matched (gpointer instance, * and/or @data the handlers have to match. * @signal_id: Signal the handlers have to be connected to. * @detail: Signal detail the handlers have to be connected to. - * @closure: (allow-none): The closure the handlers will invoke. + * @closure: (nullable): The closure the handlers will invoke. * @func: The C closure callback of the handlers (useless for non-C closures). * @data: The closure data of the handlers' closures. * @@ -2902,7 +2902,7 @@ g_signal_handlers_unblock_matched (gpointer instance, * and/or @data the handlers have to match. * @signal_id: Signal the handlers have to be connected to. * @detail: Signal detail the handlers have to be connected to. - * @closure: (allow-none): The closure the handlers will invoke. + * @closure: (nullable): The closure the handlers will invoke. * @func: The C closure callback of the handlers (useless for non-C closures). * @data: The closure data of the handlers' closures. * diff --git a/gobject/gsignal.h b/gobject/gsignal.h index c699fdfcd..42d4904a2 100644 --- a/gobject/gsignal.h +++ b/gobject/gsignal.h @@ -469,7 +469,7 @@ void g_signal_chain_from_overridden_handler (gpointer instance, * See [memory management of signal handlers][signal-memory-management] for * details on how to handle the return value and memory management of @data. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections) */ #define g_signal_connect(instance, detailed_signal, c_handler, data) \ g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0) @@ -484,7 +484,7 @@ void g_signal_chain_from_overridden_handler (gpointer instance, * * The handler will be called after the default handler of the signal. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections) */ #define g_signal_connect_after(instance, detailed_signal, c_handler, data) \ g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER) @@ -522,7 +522,7 @@ void g_signal_chain_from_overridden_handler (gpointer instance, * (GCallback) button_clicked_cb, other_widget); * ]| * - * Returns: the handler ID (always greater than 0 for successful connections) + * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections) */ #define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \ g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED) diff --git a/gobject/gtype.c b/gobject/gtype.c index 3fe2c0125..f381a7876 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1632,7 +1632,7 @@ g_type_interface_add_prerequisite (GType interface_type, /** * g_type_interface_prerequisites: * @interface_type: an interface type - * @n_prerequisites: (out) (allow-none): location to return the number + * @n_prerequisites: (out) (optional): location to return the number * of prerequisites, or %NULL * * Returns the prerequisites of an interfaces type. @@ -3528,7 +3528,7 @@ g_type_is_a (GType type, /** * g_type_children: * @type: the parent type - * @n_children: (out) (allow-none): location to store the length of + * @n_children: (out) (optional): location to store the length of * the returned array, or %NULL * * Return a newly allocated and 0-terminated array of type IDs, listing @@ -3550,7 +3550,8 @@ g_type_children (GType type, G_READ_LOCK (&type_rw_lock); /* ->children is relocatable */ children = g_new (GType, node->n_children + 1); - memcpy (children, node->children, sizeof (GType) * node->n_children); + if (node->n_children != 0) + memcpy (children, node->children, sizeof (GType) * node->n_children); children[node->n_children] = 0; if (n_children) @@ -3571,7 +3572,7 @@ g_type_children (GType type, /** * g_type_interfaces: * @type: the type to list interface types for - * @n_interfaces: (out) (allow-none): location to store the length of + * @n_interfaces: (out) (optional): location to store the length of * the returned array, or %NULL * * Return a newly allocated and 0-terminated array of type IDs, listing diff --git a/gobject/gtype.h b/gobject/gtype.h index b564bbb96..d010a31a8 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -457,7 +457,8 @@ struct _GTypeQuery * @instance: Location of a #GTypeInstance structure * * Checks if @instance is a valid #GTypeInstance structure, - * otherwise issues a warning and returns %FALSE. + * otherwise issues a warning and returns %FALSE. %NULL is not a valid + * #GTypeInstance. * * This macro should only be used in type implementations. * @@ -466,23 +467,26 @@ struct _GTypeQuery #define G_TYPE_CHECK_INSTANCE(instance) (_G_TYPE_CHI ((GTypeInstance*) (instance))) /** * G_TYPE_CHECK_INSTANCE_CAST: - * @instance: Location of a #GTypeInstance structure + * @instance: (nullable): Location of a #GTypeInstance structure * @g_type: The type to be returned * @c_type: The corresponding C type of @g_type * * Checks that @instance is an instance of the type identified by @g_type * and issues a warning if this is not the case. Returns @instance casted * to a pointer to @c_type. + * + * No warning will be issued if @instance is %NULL, and %NULL will be returned. * * This macro should only be used in type implementations. */ #define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type) (_G_TYPE_CIC ((instance), (g_type), c_type)) /** * G_TYPE_CHECK_INSTANCE_TYPE: - * @instance: Location of a #GTypeInstance structure. + * @instance: (nullable): Location of a #GTypeInstance structure. * @g_type: The type to be checked * - * Checks if @instance is an instance of the type identified by @g_type. + * Checks if @instance is an instance of the type identified by @g_type. If + * @instance is %NULL, %FALSE will be returned. * * This macro should only be used in type implementations. * @@ -491,10 +495,11 @@ struct _GTypeQuery #define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type) (_G_TYPE_CIT ((instance), (g_type))) /** * G_TYPE_CHECK_INSTANCE_FUNDAMENTAL_TYPE: - * @instance: Location of a #GTypeInstance structure. + * @instance: (nullable): Location of a #GTypeInstance structure. * @g_type: The fundamental type to be checked * * Checks if @instance is an instance of the fundamental type identified by @g_type. + * If @instance is %NULL, %FALSE will be returned. * * This macro should only be used in type implementations. * @@ -539,18 +544,18 @@ struct _GTypeQuery * * Checks that @g_class is a class structure of the type identified by @g_type * and issues a warning if this is not the case. Returns @g_class casted - * to a pointer to @c_type. + * to a pointer to @c_type. %NULL is not a valid class structure. * * This macro should only be used in type implementations. */ #define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type) (_G_TYPE_CCC ((g_class), (g_type), c_type)) /** * G_TYPE_CHECK_CLASS_TYPE: - * @g_class: Location of a #GTypeClass structure + * @g_class: (nullable): Location of a #GTypeClass structure * @g_type: The type to be checked * * Checks if @g_class is a class structure of the type identified by - * @g_type. + * @g_type. If @g_class is %NULL, %FALSE will be returned. * * This macro should only be used in type implementations. * diff --git a/gobject/gvalue.c b/gobject/gvalue.c index b39bacd2d..f82c80ed7 100644 --- a/gobject/gvalue.c +++ b/gobject/gvalue.c @@ -327,7 +327,7 @@ g_value_peek_pointer (const GValue *value) /** * g_value_set_instance: * @value: An initialized #GValue structure. - * @instance: (allow-none): the instance + * @instance: (nullable): the instance * * Sets @value from an instantiatable type via the * value_table's collect_value() function. diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c index b279acf96..dccc85237 100644 --- a/gobject/gvaluearray.c +++ b/gobject/gvaluearray.c @@ -210,7 +210,7 @@ g_value_array_copy (const GValueArray *value_array) /** * g_value_array_prepend: * @value_array: #GValueArray to add an element to - * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL + * @value: (nullable): #GValue to copy into #GValueArray, or %NULL * * Insert a copy of @value as first element of @value_array. If @value is * %NULL, an uninitialized value is prepended. @@ -234,7 +234,7 @@ g_value_array_prepend (GValueArray *value_array, /** * g_value_array_append: * @value_array: #GValueArray to add an element to - * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL + * @value: (nullable): #GValue to copy into #GValueArray, or %NULL * * Insert a copy of @value as last element of @value_array. If @value is * %NULL, an uninitialized value is appended. @@ -258,7 +258,7 @@ g_value_array_append (GValueArray *value_array, * g_value_array_insert: * @value_array: #GValueArray to add an element to * @index_: insertion position, must be <= value_array->;n_values - * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL + * @value: (nullable): #GValue to copy into #GValueArray, or %NULL * * Insert a copy of @value at specified position into @value_array. If @value * is %NULL, an uninitialized value is inserted. diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c index fd452fac8..d71797551 100644 --- a/gobject/gvaluetypes.c +++ b/gobject/gvaluetypes.c @@ -1023,7 +1023,7 @@ g_value_get_double (const GValue *value) /** * g_value_set_string: * @value: a valid #GValue of type %G_TYPE_STRING - * @v_string: (allow-none): caller-owned string to be duplicated for the #GValue + * @v_string: (nullable): caller-owned string to be duplicated for the #GValue * * Set the contents of a %G_TYPE_STRING #GValue to @v_string. */ @@ -1048,7 +1048,7 @@ g_value_set_string (GValue *value, /** * g_value_set_static_string: * @value: a valid #GValue of type %G_TYPE_STRING - * @v_string: (allow-none): static string to be set + * @v_string: (nullable): static string to be set * * Set the contents of a %G_TYPE_STRING #GValue to @v_string. * The string is assumed to be static, and is thus not duplicated @@ -1069,7 +1069,7 @@ g_value_set_static_string (GValue *value, /** * g_value_set_string_take_ownership: * @value: a valid #GValue of type %G_TYPE_STRING - * @v_string: (allow-none): duplicated unowned string to be set + * @v_string: (nullable): duplicated unowned string to be set * * This is an internal function introduced mainly for C marshallers. * @@ -1085,7 +1085,7 @@ g_value_set_string_take_ownership (GValue *value, /** * g_value_take_string: * @value: a valid #GValue of type %G_TYPE_STRING - * @v_string: (allow-none): string to take ownership of + * @v_string: (nullable): string to take ownership of * * Sets the contents of a %G_TYPE_STRING #GValue to @v_string. * @@ -1210,7 +1210,7 @@ g_value_get_gtype (const GValue *value) /** * g_value_set_variant: * @value: a valid #GValue of type %G_TYPE_VARIANT - * @variant: (allow-none): a #GVariant, or %NULL + * @variant: (nullable): a #GVariant, or %NULL * * Set the contents of a variant #GValue to @variant. * If the variant is floating, it is consumed. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index e6c32cba7..027f656e8 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -93,7 +93,7 @@ all-yes: $(CATALOGS) all-no: $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \ + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --from-code=UTF-8 \ --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \ --add-comments --keyword=_ --keyword=N_ \ --keyword=C_:1c,2 \ @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-10-06 20:10+0000\n" -"PO-Revision-Date: 2016-10-07 00:08+0200\n" +"POT-Creation-Date: 2016-12-08 10:06+0000\n" +"PO-Revision-Date: 2016-12-18 23:58+0100\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n" "Language-Team: čeština <gnome-cs-list@gnome.org>\n" "Language: cs\n" @@ -42,7 +42,7 @@ msgstr "" "Vstoupit do režimu služby GApplication (použít ze souborů služby D-Bus)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +msgid "Override the application’s ID" msgstr "Přepsat ID aplikace" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -82,8 +82,8 @@ msgid "Launch the application (with optional files to open)" msgstr "Spustit aplikaci (a otevřít v ní volitelné soubory)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" -msgstr "IDAPLIKACE [SOUBOR...]" +msgid "APPID [FILE…]" +msgstr "IDAPLIKACE [SOUBOR…]" #: ../gio/gapplication-tool.c:59 msgid "Activate an action" @@ -122,8 +122,8 @@ msgstr "Příkaz, ke kterému vypsat podrobnou nápovědu" msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "Identifikátor aplikace ve formátu D-Bus (např. org.example.viewer)" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622 -#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "SOUBOR" @@ -169,9 +169,9 @@ msgstr "Použití:\n" msgid "Arguments:\n" msgstr "Argumenty:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" -msgstr "[ARGUMENTY...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" +msgstr "[ARGUMENTY…]" #: ../gio/gapplication-tool.c:134 #, c-format @@ -182,7 +182,7 @@ msgstr "Příkazy:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" "Podrobnou nápovědu získáte spuštěním „%s help PŘÍKAZ“.\n" @@ -199,14 +199,14 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "neplatné ID aplikace: „%s“\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" "„%s“ nelze použít s argumenty\n" @@ -230,8 +230,8 @@ msgstr "název aplikace musí následovat po ID aplikace\n" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" "neplatný název akce: „%s“\n" "názvy akcí mohou obsahovat pouze alfanumerické znaky, „-“ a „.“\n" @@ -324,20 +324,20 @@ msgstr "Neplatná posloupnost bajtů na vstupu převodu" msgid "Error during conversion: %s" msgstr "Chyba při převodu: %s" -#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 msgid "Cancellable initialization not supported" msgstr "Zrušitelné spuštění není podporováno" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "Převod ze znakové sady „%s“ do „%s“ není podporován" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" -msgstr "Nelze otevřít převaděč z „%s“ do „%s“" +msgid "Could not open converter from “%s” to “%s”" +msgstr "Nelze otevřít převodník z „%s“ do „%s“" #: ../gio/gcontenttype.c:335 #, c-format @@ -376,41 +376,41 @@ msgstr "Neočekávaný časný konec proudu" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" -msgstr "Nepodporovaný klíč „%s“ v záznamu adresy „%s“" +msgid "Unsupported key “%s” in address entry “%s”" +msgstr "Nepodporovaný klíč „%s“ v záznamu s adresou „%s“" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" "Adresa „%s“ je neplatná (je zapotřebí právě jeden z klíčů path, tmpdir nebo " "abstract)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" -msgstr "Nesmyslná párová kombinace klíč/hodnota v záznamu adresy „%s“" +msgid "Meaningless key/value pair combination in address entry “%s”" +msgstr "Nesmyslná párová kombinace klíč/hodnota v záznamu s adresou „%s“" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" msgstr "Chyba v adrese „%s“ – atribut portu má chybný formát" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" msgstr "Chyba v adrese „%s“ – atribut rodiny má chybný formát" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "Prvek adresy „%s“ neobsahuje dvojtečku (:)" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" "Pár klíč/hodnota %d, „%s“, v prvku adresy „%s“ neobsahuje znak rovná se" @@ -418,8 +418,8 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" "Chyba v neuvozeném klíči nebo hodnotě v páru klíč/hodnota %d, „%s“, v prvku " "adresy „%s“" @@ -427,25 +427,25 @@ msgstr "" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" "Chyba v adrese „%s“ – unix transport vyžaduje jako nastavený právě jeden z " "klíčů „path“ nebo „abstract“" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut počítače schází nebo má chybný formát" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut portu schází nebo má chybný formát" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut noncefile schází nebo má chybný formát" #: ../gio/gdbusaddress.c:655 @@ -454,27 +454,27 @@ msgstr "Chyba při automatickém spouštění: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" -msgstr "Neznámý nebo nepodporovaný transport „%s“ adresy „%s“" +msgid "Unknown or unsupported transport “%s” for address “%s”" +msgstr "Neznámý nebo nepodporovaný přenos „%s“ adresy „%s“" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" msgstr "Chyba při otevírání souboru nonce „%s“: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" msgstr "Chyba při čtení ze souboru nonce „%s“: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Chyba při čtení ze souboru nonce „%s“, očekáváno 16 bajtů, obdrženo %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Chyba při zápisu obsahu souboru nonce „%s“ do proudu:" #: ../gio/gdbusaddress.c:951 @@ -497,7 +497,7 @@ msgstr "Nelze automaticky spustit D-Bus bez X11 $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " msgstr "Chyba při spouštění příkazového řádku „%s“: " #: ../gio/gdbusaddress.c:1337 @@ -505,26 +505,26 @@ msgstr "Chyba při spouštění příkazového řádku „%s“: " msgid "(Type any character to close this window)\n" msgstr "(Zmáčknutím libovolného znaku okno zavřete)\n" -#: ../gio/gdbusaddress.c:1489 +#: ../gio/gdbusaddress.c:1491 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "Služba dbus sezení neběží a automatické spuštění selhalo" -#: ../gio/gdbusaddress.c:1500 +#: ../gio/gdbusaddress.c:1502 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Nelze určit adresu sběrnice sezení (v tomto OS neimplementováno)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1637 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Nelze určit adresu sběrnice z proměnné prostředí DBUS_STARTER_BUS_TYPE – " "neznámá hodnota „%s“" -#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 +#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -532,7 +532,7 @@ msgstr "" "Nelze určit adresu sběrnice, jelikož proměnná prostředí " "DBUS_STARTER_BUS_TYPE není nastavena" -#: ../gio/gdbusaddress.c:1654 +#: ../gio/gdbusaddress.c:1656 #, c-format msgid "Unknown bus type %d" msgstr "Neznámý typ sběrnice %d" @@ -558,77 +558,77 @@ msgstr "Zrušeno přes GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" msgstr "Chyba při získávání informací pro složku „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" "Oprávnění složky „%s“ mají chybný formát. Očekáván režim 0700, obdržen 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "Chyba při vytváření složky „%s“: %s" +msgid "Error creating directory “%s”: %s" +msgstr "Chyba při vytváření složky %s: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " msgstr "Chyba při otevírání klíčenky „%s“ ke čtení: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Řádek %d klíčenky na „%s“ s obsahem „%s“ má chybný formát" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" -msgstr "První token řádku %d klíčenky na „%s“ s obsahem „%s“ má chybný formát" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" +msgstr "První symbol řádku %d klíčenky na „%s“ s obsahem „%s“ má chybný formát" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" -msgstr "Druhý token řádku %d klíčenky na „%s“ s obsahem „%s“ má chybný formát" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" +msgstr "Druhý symbol řádku %d klíčenky na „%s“ s obsahem „%s“ má chybný formát" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" -msgstr "Nenalezeno cookie s id %d v klíčence na „%s“" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" +msgstr "Nenalezena cookie s id %d v klíčence na „%s“" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" -msgstr "Chyba při mazání zastaralého souboru uzamčení „%s“: %s" +msgid "Error deleting stale lock file “%s”: %s" +msgstr "Chyba při mazání zastaralého zamykacího souboru „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" -msgstr "Chyba při vytváření souboru uzamčení „%s“: %s" +msgid "Error creating lock file “%s”: %s" +msgstr "Chyba při vytváření zamykacího souboru „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" -msgstr "Chyba při zavírání (neodkazovaného) souboru uzamčení „%s“: %s" +msgid "Error closing (unlinked) lock file “%s”: %s" +msgstr "Chyba při zavírání (neodkazovaného) zamykacího souboru „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" -msgstr "Chyba při rušení odkazu souboru uzamčení „%s“: %s" +msgid "Error unlinking lock file “%s”: %s" +msgstr "Chyba mazámí zamykacího souboru „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " msgstr "Chyba při otevírání klíčenky „%s“ k zápisu: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -msgstr "(Navíc selhalo také zrušení uzamčení „%s“: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " +msgstr "(Navíc selhalo také uvolnění zámku pro „%s“: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 msgid "The connection is closed" @@ -727,6 +727,15 @@ msgstr "Metoda „%s“ na rozhraní „%s“ s podpisem „%s“ neexistuje" msgid "A subtree is already exported for %s" msgstr "Podstrom je již exportován pro %s" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Nelze určit adresu sběrnice z proměnné prostředí DBUS_STARTER_BUS_TYPE – " +"neznámá hodnota „%s“" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "typ je INVALID" @@ -773,27 +782,26 @@ msgstr[2] "Zamýšlelo se přečíst %lu bajtů, ale obdrženo %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Očekáván bajt NULL za řetězcem „%s“, ale byl nalezen bajt %d" #: ../gio/gdbusmessage.c:1388 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" -"Očekáván platný řetězec UTF-8, ale byly nalezeny neplatné bajty na offsetu " -"bajtu %d (délka řetězce je %d). Platný řetězec UTF-8 až do příslušného bodu " -"byl „%s“" +"Očekáván platný řetězec UTF-8, ale byly nalezeny neplatné bajty na pozici %d " +"(délka řetězce je %d). Platný řetězec UTF-8 až do příslušného bodu byl „%s“" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Analyzovaná hodnota „%s“ není platná cesta objektu D-Bus" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Analyzovaná hodnota „%s“ není platný podpis D-Bus" #: ../gio/gdbusmessage.c:1656 @@ -812,7 +820,7 @@ msgstr[2] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" "Vyskytlo se pole typu „a%c“, které by mělo mít délku v násobku %u bajtů, ale " @@ -820,21 +828,21 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Analyzovaná hodnota „%s“ varianty není platným podpisem D-Bus" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -"Chyba při rušení serializace GVariant s řetězcem typu „%s“ od přenosového " +"Chyba při rušení serializace GVariant s řetězcem typu „%s“ z přenosového " "formátu D-Bus" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" "Neplatná hodnota endianity. Očekávána 0x6c („l“) nebo 0x42 („B“), ale " @@ -847,12 +855,12 @@ msgstr "Neplatná verze hlavního protokolu. Očekávána 1, ale nalezena %d" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "Nalezeno záhlaví podpisu s podpisem „%s“, ale tělo zprávy je prázdné" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Analyzovaná hodnota „%s“ není platným podpisem D-Bus (pro tělo)" #: ../gio/gdbusmessage.c:2164 @@ -870,7 +878,7 @@ msgstr "Nelze zrušit serializaci zprávy: " #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Chyba při serializaci GVariant s řetězcem typu „%s“ do přenosového formátu D-" "Bus" @@ -889,24 +897,24 @@ msgstr "Nelze serializovat zprávu: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "Tělo zprávy má podpis „%s“, ale záhlaví s podpisem neexistuje" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "Tělo zprávy má podpis typu „%s“, ale podpis v poli se záhlavím je „%s“" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Tělo zprávy je prázdné, ale podpis v poli se záhlavím je „(%s)“" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "Navrácena chyba s tělem typu „%s“" #: ../gio/gdbusmessage.c:3291 @@ -950,18 +958,18 @@ msgstr "Při vytváření serveru nelze určit soubor nonce" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" msgstr "Chyba při zápisu souboru nonce na „%s“: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Řetězec „%s“ není platné D-Bus GUID" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" -msgstr "Nelze naslouchat na nepodporovaném transportu „%s“" +msgid "Cannot listen on unsupported transport “%s”" +msgstr "Nelze naslouchat na nepodporovaném přenosu „%s“" #: ../gio/gdbus-tool.c:95 #, c-format @@ -973,7 +981,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Příkazy:\n" " help Zobrazit tyto informace\n" @@ -1034,16 +1042,17 @@ msgstr "Určeno více koncových bodů spojení" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" -msgstr "Varování: Podle dat introspection rozhraní „%s“ neexistuje\n" +"Warning: According to introspection data, interface “%s” does not exist\n" +msgstr "Varování: Podle introspektivních dat rozhraní „%s“ neexistuje\n" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" -"Varování: Podle dat introspection metoda „%s“ neexistuje na rozhraní „%s“\n" +"Varování: Podle introspektivních dat metoda „%s“ neexistuje na rozhraní " +"„%s“\n" #: ../gio/gdbus-tool.c:542 msgid "Optional destination for signal (unique name)" @@ -1156,12 +1165,12 @@ msgstr "Chyba: Název metody neurčen\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "Chyba: Název metody „%s“ je neplatný\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Chyba při analyzování parametru %d typu „%s“: %s\n" #: ../gio/gdbus-tool.c:1472 @@ -1200,64 +1209,64 @@ msgstr "Cesta objektu určená ke sledování" msgid "Monitor a remote object." msgstr "Sledovat vzdálený objekt." -#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501 +#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 msgid "Unnamed" msgstr "Bez názvu" -#: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" -msgstr "V souboru desktop nezadáno pole Exec" +#: ../gio/gdesktopappinfo.c:2407 +msgid "Desktop file didn’t specify Exec field" +msgstr "V souboru .desktop není určeno pole Exec" -#: ../gio/gdesktopappinfo.c:2689 +#: ../gio/gdesktopappinfo.c:2692 msgid "Unable to find terminal required for application" -msgstr "Nelze nalézt terminál vyžadovaný pro aplikaci" +msgstr "Nezdařilo se najít terminál vyžadovaný pro aplikaci" -#: ../gio/gdesktopappinfo.c:3097 +#: ../gio/gdesktopappinfo.c:3100 #, c-format -msgid "Can't create user application configuration folder %s: %s" -msgstr "Nelze vytvořit uživatelskou konfigurační složku aplikace %s: %s" +msgid "Can’t create user application configuration folder %s: %s" +msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením aplikace: %s" -#: ../gio/gdesktopappinfo.c:3101 +#: ../gio/gdesktopappinfo.c:3104 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" -msgstr "Nelze vytvořit uživatelskou konfigurační složku MIME %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" +msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením MIME: %s" -#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 +#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 msgid "Application information lacks an identifier" msgstr "Informace o aplikaci postrádá identifikátor" -#: ../gio/gdesktopappinfo.c:3599 +#: ../gio/gdesktopappinfo.c:3602 #, c-format -msgid "Can't create user desktop file %s" -msgstr "Nelze vytvořit uživatelský soubor desktop %s" +msgid "Can’t create user desktop file %s" +msgstr "Nezdařilo se vytvořit uživatelský soubor .desktop %s" -#: ../gio/gdesktopappinfo.c:3733 +#: ../gio/gdesktopappinfo.c:3736 #, c-format msgid "Custom definition for %s" msgstr "Vlastní definice %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" -msgstr "mechanika neprovádí vysouvání" +msgid "drive doesn’t implement eject" +msgstr "mechanika neumí vysouvání" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" -msgstr "mechanika neprovádí eject (vysouvání) nebo eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" +msgstr "mechanika neumí vysouvací funkce eject nebo eject_with_operation" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" -msgstr "mechanika neprovádí dotazování na média" +msgid "drive doesn’t implement polling for media" +msgstr "mechanika neumí dotazování na média" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" -msgstr "mechanika neprovádí spuštění" +msgid "drive doesn’t implement start" +msgstr "mechanika neumí spuštění" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" -msgstr "mechanika neprovádí zastavení" +msgid "drive doesn’t implement stop" +msgstr "mechanika neumí zastavení" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 #: ../gio/gdummytlsbackend.c:509 @@ -1270,7 +1279,7 @@ msgstr "Podpora DTLS není dostupná" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Nelze zpracovat verzi %d kódování GEmblem" #: ../gio/gemblem.c:333 @@ -1280,7 +1289,7 @@ msgstr "Chybný počet tokenů (%d) v kódování GEmblem" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Nelze zpracovat verzi %d kódování GEmblemedIcon" #: ../gio/gemblemedicon.c:372 @@ -1312,12 +1321,12 @@ msgstr "Operace není podporována" msgid "Containing mount does not exist" msgstr "Obsahující připojené neexistuje" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" msgstr "Nelze kopírovat nad složku" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Nelze kopírovat složku nad složku" #: ../gio/gfile.c:2583 @@ -1325,7 +1334,7 @@ msgid "Target file exists" msgstr "Cílový soubor existuje" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Složku nelze kopírovat rekurzivně" # For splice(), see http://en.wikipedia.org/w/index.php?title=Splice_(system_call)&oldid=334434835 @@ -1347,11 +1356,11 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopírování (reflink/clone) není podporováno nebo je neplatné" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Kopírování (reflink/clone) není podporováno nebo neproběhlo správně" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Nelze kopírovat zvláštní soubor" #: ../gio/gfile.c:3885 @@ -1364,12 +1373,12 @@ msgstr "Zahozené není podporováno" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" msgstr "Názvy souborů nemohou obsahovat „%c“" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" -msgstr "svazek neprovádí připojení" +msgid "volume doesn’t implement mount" +msgstr "svazek neumí připojení" #: ../gio/gfile.c:6713 msgid "No application is registered as handling this file" @@ -1390,7 +1399,7 @@ msgstr "Souborový enumerator je již uzavřen" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Nelze zpracovat verzi %d kódování GFileIcon" #: ../gio/gfileicon.c:246 @@ -1400,21 +1409,21 @@ msgstr "Chybná vstupní data u GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" -msgstr "Proud nepodporuje query_info" +msgid "Stream doesn’t support query_info" +msgstr "Datový proud nepodporuje query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 #: ../gio/gfileoutputstream.c:371 msgid "Seek not supported on stream" -msgstr "Posouvání není v proudu podporováno" +msgstr "Posouvání není v datovém proudu podporováno" #: ../gio/gfileinputstream.c:369 msgid "Truncate not allowed on input stream" -msgstr "Zkrácení nepodporováno ve vstupním proudu" +msgstr "Oříznutí není možné ve vstupním datovém proudu" #: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447 msgid "Truncate not supported on stream" -msgstr "Zkrácení není v proudu podporováno" +msgstr "Oříznutí není v datovém proudu podporováno" #: ../gio/ghttpproxy.c:136 msgid "Bad HTTP proxy reply" @@ -1472,7 +1481,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s neimplementuje from_tokens() v rozhraní GIcon" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nelze zpracovat poskytnutou verzi kódování ikony" #: ../gio/ginetaddressmask.c:182 @@ -1490,11 +1499,11 @@ msgstr "Adresa má nastavené bity za hranicí danou prefixem délky" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "Nelze zpracovat „%s“ jak masku adresy IP" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 -#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 +#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 msgid "Not enough space for socket address" msgstr "Adresa soketu nemá dostatek místa" @@ -1503,8 +1512,8 @@ msgid "Unsupported socket address" msgstr "Nepodporovaná adresa soketu" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" -msgstr "Vstupní proud neprovádí čtení" +msgid "Input stream doesn’t implement read" +msgstr "Vstupní datový proud neumí čtení" #. Translators: This is an error you get if there is already an #. * operation running against this stream when you try to start @@ -1526,7 +1535,7 @@ msgid "Keep with file when moved" msgstr "Zachovat u souboru, když je přesunut" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" +msgid "“version” takes no arguments" msgstr "„version“ nepřebírá žádné argumenty" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 @@ -1537,6 +1546,10 @@ msgstr "Použití:" msgid "Print version information and exit." msgstr "Vypsat informace o verzi a skončit." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGUMENTY...]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Příkazy:" @@ -1702,7 +1715,7 @@ msgstr "Cíl %s není složka" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " msgstr "%s: přepsat „%s“?" #: ../gio/gio-tool-info.c:34 @@ -1722,7 +1735,7 @@ msgid "ATTRIBUTES" msgstr "ATRIBUTY" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "Nenásledovat symbolické odkazy" #: ../gio/gio-tool-info.c:75 @@ -1792,7 +1805,7 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "info z gio je podobné jako tradiční příkaz ls, ale používá namísto\n" "lokálních souborů umístění GIO: například můžete pro umístění použít\n" @@ -1861,12 +1874,12 @@ msgstr "Musíte zadat jeden typ MIME a případně obsluhu" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "Pro „%s“ není žádná výchozí aplikace\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "Výchozí aplikace pro „%s“: %s\n" #: ../gio/gio-tool-mime.c:124 @@ -1891,12 +1904,12 @@ msgstr "Žádné aplikace nejsou doporučené\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "Selhalo načtení informací pro obsluhu „%s“\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "Selhalo nastavení „%s“ jako výchozí obsluhy pro „%s“: %s\n" #: ../gio/gio-tool-mkdir.c:31 @@ -1930,7 +1943,7 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Sledovat soubor přímo (všimne si i změn přes tvrdé odkazy)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Sledovat soubor přímo, ale nehlásit změny" #: ../gio/gio-tool-monitor.c:45 @@ -2039,7 +2052,7 @@ msgid "Mount or unmount the locations." msgstr "Připojit nebo odpojit umístění." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "Nepoužívat jako náhradu kopírování a mazání" #: ../gio/gio-tool-move.c:99 @@ -2226,17 +2239,17 @@ msgstr "Soubor %s s v prostředku nachází vícekrát" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "Nelze najít „%s“ v žádné ze zdrojových složek" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "Nelze nají „%s“ v aktuální složce" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" msgstr "Neznámá volba zpracování „%s“" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 @@ -2259,62 +2272,66 @@ msgstr "Chyba při komprimaci souboru „%s“" msgid "text may not appear inside <%s>" msgstr "text nemůže být umístěn uvnitř <%s>" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037 msgid "Show program version and exit" msgstr "Zobrazit verzi programu a skončit" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "název výstupního souboru" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" msgstr "Složka, ze které mají být čteny soubory (výchozí je aktuální složka)" -#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038 #: ../gio/glib-compile-schemas.c:2067 msgid "DIRECTORY" msgstr "SLOŽKA" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" "Generovat výstup ve formátu vybraného podle přípony v názvu cílového souboru" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "Generovat hlavičkový soubor" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "" "Generovat zdrojový kód, který se použije ve vašem zdrojovém kódu jako odkaz " "na soubor prostředků" -#: ../gio/glib-compile-resources.c:627 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "Generovat seznam závislostí" -#: ../gio/glib-compile-resources.c:628 +#: ../gio/glib-compile-resources.c:671 msgid "name of the dependency file to generate" msgstr "název souboru se závislostmi, který se má vygenerovat" -#: ../gio/glib-compile-resources.c:629 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "Do generovaných souborů závislostí zahrnout i fiktivní cíle" + +#: ../gio/glib-compile-resources.c:673 +msgid "Don’t automatically create and register resource" msgstr "Prostředek nevytvářet a neregistrovat automaticky" -#: ../gio/glib-compile-resources.c:630 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:674 +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Neexportovat funkce; označit je za G_GNUC_INTERNAL" -#: ../gio/glib-compile-resources.c:631 +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "Název identifikátoru C použitý ke generování zdrojového kódu" -#: ../gio/glib-compile-resources.c:657 +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2324,7 +2341,7 @@ msgstr "" "Soubory se specifikacemi prostředků musí mít příponu .gschema.xml,\n" "a soubor prostředků musí mít příponu .gresource." -#: ../gio/glib-compile-resources.c:679 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "Měl by být zadán právě jeden název souboru\n" @@ -2598,133 +2615,133 @@ msgstr "nedělá se nic.\n" msgid "removed existing output file.\n" msgstr "odstraněn existující výstupní soubor.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Neplatný název souboru %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Chyba při získávání informace o souborovém systému pro %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Přípojení obsahující soubor %s nebylo nalezen" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" msgstr "Nelze přejmenovat kořenovou složku" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Chyba při přejmenovávání souboru %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" msgstr "Soubor nelze přejmenovat, název souboru již existuje" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Chyba při otevírání souboru %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Chyba při odstraňování souboru %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Chyba při zahazování souboru %s do koše: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Nelze vytvořit složku koše %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nelze nalézt složku nejvyšší úrovně pro vyhození %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Nelze nalézt nebo vytvořit složku koše pro %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Nelze vytvořit informační soubor o koši pro %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Nelze zahodit soubor %s do koše mimo hranice souborového systému" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nelze zahodit soubor %s do koše: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Nelze zahodit soubor %s do koše" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Chyba při vytváření složky %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Systém souborů nepodporuje symbolické odkazy" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Chyba při vytváření symbolického odkazu %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Symbolické odkazy nejsou podporovány" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Chyba při přesunování souboru %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" msgstr "Složku nelze přesunout nad složku" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Vytvoření záložního souboru selhalo" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Chyba při odstraňování cílového souboru: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Přesunování mezi připojeními není podporováno" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nelze zjistit využití disku %s: %s" @@ -2743,7 +2760,7 @@ msgstr "Neplatný název rozšířeného atributu" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" msgstr "Chyba při nastavování rozšířeného atributu „%s“: %s" #: ../gio/glocalfileinfo.c:1575 @@ -2752,7 +2769,7 @@ msgstr " (neplatné kódování)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" msgstr "Chyba při získávání informací pro soubor „%s“: %s" #: ../gio/glocalfileinfo.c:2017 @@ -2875,8 +2892,8 @@ msgstr "Chyba při zkracování souboru: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "Chyba při otevírání souboru „%s“: %s" +msgid "Error opening file “%s”: %s" +msgstr "Chyba při otevírání souboru %s: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -2935,54 +2952,55 @@ msgstr "Požadováno hledání za ukončením proudu" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" -msgstr "připojené neprovádí „unmount“ (odpojení)" +msgid "mount doesn’t implement “unmount”" +msgstr "připojené neprovádí odpojovací operaci „unmount“" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" -msgstr "připojené neprovádí „eject“ (vysouvání)" +msgid "mount doesn’t implement “eject”" +msgstr "připojené neumí vysouvací operaci „eject“" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -msgstr "připojené neprovádí „unmount“ (odpojení) nebo „unmount_with_operation“" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" +msgstr "" +"připojené neumí odpojovací operaci „unmount“ nebo „unmount_with_operation“" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -msgstr "připojené neprovádí „eject“ (vysouvání) nebo „eject_with_operation“" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" +msgstr "připojené neumí vysouvací operaci „eject“ nebo „eject_with_operation“" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" -msgstr "připojené neprovádí „remount“ (opakované připojení)" +msgid "mount doesn’t implement “remount”" +msgstr "připojené neumí operaci opakovaného připojení „remount“" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" -msgstr "připojené neprovádí odhad typu obsahu" +msgid "mount doesn’t implement content type guessing" +msgstr "připojené neumí odhad typu obsahu" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" -msgstr "připojené neprovádí synchronní odhad typu obsahu" +msgid "mount doesn’t implement synchronous content type guessing" +msgstr "připojené neumí synchronní odhad typu obsahu" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" msgstr "Název počítače „%s“ obsahuje „[“, ale nikoliv „]“" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 @@ -3013,17 +3031,17 @@ msgid "NetworkManager version too old" msgstr "NetworkManager je v příliš staré verzi" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" -msgstr "Výstupní proud neprovádí zápis" +msgid "Output stream doesn’t implement write" +msgstr "Výstupní datový proud neumí zápis" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "Zdrojový proud je již ukončen" -#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" msgstr "Chyba při řešení „%s“: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -3031,22 +3049,22 @@ msgstr "Chyba při řešení „%s“: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "Prostředek v „%s“ neexistuje" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" -msgstr "Prostředek v „%s“ se nezdařilo dekomprimovat" +msgid "The resource at “%s” failed to decompress" +msgstr "Selhala dekomprimace prostředku v „%s“" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" msgstr "Prostředek v „%s“ není složka" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" -msgstr "Vstupní proud neimplementuje posouvání" +msgid "Input stream doesn’t implement seek" +msgstr "Vstupní datový proud neumí přeskakování" #: ../gio/gresource-tool.c:494 msgid "List sections containing resources in an elf FILE" @@ -3094,7 +3112,7 @@ msgstr "SOUBOR CESTA" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3103,7 +3121,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Použití:\n" @@ -3174,17 +3192,17 @@ msgstr " CESTA Cesta k prostředku\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" msgstr "Schéma „%s“ neexistuje\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "Schéma „%s“ není přemístitelné (cesta nesmí být určena)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "Schéma „%s“ je přemístitelné (cesta musí být určena)\n" #: ../gio/gsettings-tool.c:92 @@ -3306,7 +3324,7 @@ msgstr "SCHÉMA[:CESTA] [KLÍČ]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3324,7 +3342,7 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Použití:\n" @@ -3406,148 +3424,148 @@ msgstr "Poskytnut prázdný název schématu\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" +msgid "No such key “%s”\n" msgstr "Klíč „%s“ neexistuje\n" -#: ../gio/gsocket.c:364 +#: ../gio/gsocket.c:369 msgid "Invalid socket, not initialized" msgstr "Neplatný soket, nebyl spuštěn" -#: ../gio/gsocket.c:371 +#: ../gio/gsocket.c:376 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "Neplatný soket, spuštění selhalo kvůli: %s" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:384 msgid "Socket is already closed" msgstr "Soket je již ukončen" -#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897 -#: ../gio/gsocket.c:3952 +#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 +#: ../gio/gsocket.c:3995 msgid "Socket I/O timed out" msgstr "Časový limit V/V soketu vypršel" -#: ../gio/gsocket.c:526 +#: ../gio/gsocket.c:531 #, c-format msgid "creating GSocket from fd: %s" msgstr "vytváří se GSocket z fd: %s" -#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615 +#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 #, c-format msgid "Unable to create socket: %s" msgstr "Nelze vytvořit soket: %s" -#: ../gio/gsocket.c:608 +#: ../gio/gsocket.c:613 msgid "Unknown family was specified" msgstr "Byla zadána neznámá rodina" -#: ../gio/gsocket.c:615 +#: ../gio/gsocket.c:620 msgid "Unknown protocol was specified" msgstr "Byl zadán neznámý protokol" -#: ../gio/gsocket.c:1104 +#: ../gio/gsocket.c:1111 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "Nelze používat datagramové operace na nedatagramovém soketu." -#: ../gio/gsocket.c:1121 +#: ../gio/gsocket.c:1128 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" "Nelze používat datagramové operace na soketu s nastaveným časovým limitem." -#: ../gio/gsocket.c:1925 +#: ../gio/gsocket.c:1932 #, c-format msgid "could not get local address: %s" msgstr "nezdařilo se získat místní adresu: %s" -#: ../gio/gsocket.c:1968 +#: ../gio/gsocket.c:1975 #, c-format msgid "could not get remote address: %s" msgstr "nezdařilo se získat vzdálenou adresu: %s" -#: ../gio/gsocket.c:2034 +#: ../gio/gsocket.c:2041 #, c-format msgid "could not listen: %s" msgstr "nezdařilo se naslouchání: %s" -#: ../gio/gsocket.c:2133 +#: ../gio/gsocket.c:2140 #, c-format msgid "Error binding to address: %s" msgstr "Chyba při propojení na adresu: %s" -#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285 +#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 #, c-format msgid "Error joining multicast group: %s" msgstr "Chyba připojování ke skupině hromadného vysílání: %s" -#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286 +#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 #, c-format msgid "Error leaving multicast group: %s" msgstr "Chyba při opouštění skupiny hromadného vysílání: %s" -#: ../gio/gsocket.c:2250 +#: ../gio/gsocket.c:2257 msgid "No support for source-specific multicast" msgstr "Není podpora pro hromadné vysílání určené zdrojem" -#: ../gio/gsocket.c:2470 +#: ../gio/gsocket.c:2477 #, c-format msgid "Error accepting connection: %s" msgstr "Chyba při přijímání spojení: %s" -#: ../gio/gsocket.c:2593 +#: ../gio/gsocket.c:2598 msgid "Connection in progress" msgstr "Probíhá spojení" -#: ../gio/gsocket.c:2644 +#: ../gio/gsocket.c:2647 msgid "Unable to get pending error: " msgstr "Nelze získat nevyřízenou chybu: " -#: ../gio/gsocket.c:2816 +#: ../gio/gsocket.c:2817 #, c-format msgid "Error receiving data: %s" msgstr "Chyba při získávání dat: %s" -#: ../gio/gsocket.c:3013 +#: ../gio/gsocket.c:3012 #, c-format msgid "Error sending data: %s" msgstr "Chyba při odesílání dat: %s" -#: ../gio/gsocket.c:3200 +#: ../gio/gsocket.c:3199 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Nelze ukončit soket: %s" -#: ../gio/gsocket.c:3281 +#: ../gio/gsocket.c:3280 #, c-format msgid "Error closing socket: %s" msgstr "Chyba při zavírání soketu: %s" -#: ../gio/gsocket.c:3890 +#: ../gio/gsocket.c:3932 #, c-format msgid "Waiting for socket condition: %s" msgstr "Čeká se na stav soketu: %s" -#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 +#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 #, c-format msgid "Error sending message: %s" msgstr "Chyba při odesílání zprávy: %s" -#: ../gio/gsocket.c:4386 +#: ../gio/gsocket.c:4428 msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage nepodporováno na Windows" -#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 +#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 #, c-format msgid "Error receiving message: %s" msgstr "Chyba při získávání zprávy: %s" -#: ../gio/gsocket.c:5411 +#: ../gio/gsocket.c:5452 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Nelze číst pověření k soketu: %s" -#: ../gio/gsocket.c:5420 +#: ../gio/gsocket.c:5461 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials není u tohoto OS implementováno" @@ -3576,7 +3594,7 @@ msgstr "" #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "Protokol proxy „%s“ není podporován." #: ../gio/gsocketlistener.c:218 @@ -3589,7 +3607,7 @@ msgstr "Přidaný soket je uzavřen" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 nepodporuje adresy IPv6 „%s“" #: ../gio/gsocks4aproxy.c:136 @@ -3598,8 +3616,8 @@ msgstr "Uživatelské jméno je příliš dlouhé na protokol SOCKSv4" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" -msgstr "Název počítače „%s“ je příliš dlouhý na protokol SOCKSv4" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" +msgstr "Název počítače „%s“ je na protokol SOCKSv4 příliš dlouhý" #: ../gio/gsocks4aproxy.c:179 msgid "The server is not a SOCKSv4 proxy server." @@ -3635,8 +3653,8 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" -msgstr "Název počítače „%s“ je příliš dlouhý na protokol SOCKSv5" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" +msgstr "Název počítače „%s“ je na protokol SOCKSv5 příliš dlouhý" #: ../gio/gsocks5proxy.c:348 msgid "The SOCKSv5 proxy server uses unknown address type." @@ -3663,7 +3681,7 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Spojení bylo přes SOCKSv5 proxy odmítnuto." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "SOCKSv5 proxy nepodporuje příkaz „connect“." #: ../gio/gsocks5proxy.c:392 @@ -3676,7 +3694,7 @@ msgstr "Neznámá chyba SOCKSv5 proxy." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Nelze zpracovat verzi %d kódování GThemedIcon" #: ../gio/gthreadedresolver.c:118 @@ -3685,23 +3703,23 @@ msgstr "Nebyly nalezeny žádné platné adresy" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" -msgstr "Chyba při zpětném řešení „%s“: %s" +msgid "Error reverse-resolving “%s”: %s" +msgstr "Chyba při reverzním řešení „%s“: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "Záznam DNS požadovaného typu pro „%s“ neexistuje" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "Dočasně není možné vyřešit „%s“" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +msgid "Error resolving “%s”" msgstr "Chyba při řešení „%s“" #: ../gio/gtlscertificate.c:250 @@ -3810,7 +3828,7 @@ msgstr "Chyba při čtení z popisovače souboru: %s" msgid "Error closing file descriptor: %s" msgstr "Chyba při zavírání popisovače souboru: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420 msgid "Filesystem root" msgstr "Kořen systému souborů" @@ -3819,20 +3837,20 @@ msgstr "Kořen systému souborů" msgid "Error writing to file descriptor: %s" msgstr "Chyba při zápisu do popisovače souboru: %s" -#: ../gio/gunixsocketaddress.c:239 +#: ../gio/gunixsocketaddress.c:241 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "V tomto systému nejsou podporovány abstraktní adresy soketů domén UNIX" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" -msgstr "svazek neprovádí vysouvání" +msgid "volume doesn’t implement eject" +msgstr "svazek neumí vysouvací operaci eject" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" -msgstr "svazek neprovádí eject (vysouvání) nebo eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" +msgstr "svazek neumí vysouvací operaci eject nebo eject_with_operation" #: ../gio/gwin32inputstream.c:185 #, c-format @@ -3893,25 +3911,25 @@ msgstr "Nesprávné argumenty\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "Neočekávaný atribut „%s“ prvku „%s“" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" -msgstr "Atribut „%s“ prvku „%s“ nenalezen" +msgid "Attribute “%s” of element “%s” not found" +msgstr "Atribut „%s“ prvku „%s“ nebyl nalezen" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Neočekávaná značka „%s“, byla očekávána značka „%s“" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "Neočekávaná značka „%s“ v „%s“" #: ../glib/gbookmarkfile.c:1757 @@ -3920,7 +3938,7 @@ msgstr "V datových složkách nebyl nalezen platný soubor záložek" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" msgstr "Záložka URI „%s“ již existuje" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 @@ -3933,32 +3951,32 @@ msgstr "Záložka URI „%s“ již existuje" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" msgstr "Nebyla nalezena záložka URI „%s“" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "V záložce URI „%s“ není definován žádný typ MIME" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" -msgstr "V záložce URI „%s“ definován žádný soukromý příznak" +msgid "No private flag has been defined in bookmark for URI “%s”" +msgstr "V záložce URI „%s“ nebyl definován žádný soukromý příznak" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" -msgstr "Žádné skupiny nenastaveny v záložce URI „%s“" +msgid "No groups set in bookmark for URI “%s”" +msgstr "V záložce URI „%s“ nejsou nastavené žádné skupiny" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Žádná aplikace s názvem „%s“ nezaregistrovala záložku „%s“" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Nelze rozšířit řádek exec „%s“ pomocí URI „%s“" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 @@ -3968,40 +3986,40 @@ msgstr "Částečná posloupnost znaků na konci vstupu" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" -msgstr "Nelze převést ukončení „%s“ do znakové sady „%s“" +msgid "Cannot convert fallback “%s” to codeset “%s”" +msgstr "Nelze převést zálohu „%s“ do znakové sady „%s“" -#: ../glib/gconvert.c:1567 +#: ../glib/gconvert.c:1566 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" -msgstr "URI „%s“ není absolutní URI používající schéma „file“" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" +msgstr "Adresa URI „%s“ není absolutní URI používající schéma „file“" -#: ../glib/gconvert.c:1577 +#: ../glib/gconvert.c:1576 #, c-format -msgid "The local file URI '%s' may not include a '#'" -msgstr "URI „%s“ místního souboru nesmí obsahovat „#“" +msgid "The local file URI “%s” may not include a “#”" +msgstr "Adresa URI „%s“ místního souboru nesmí obsahovat „#“" -#: ../glib/gconvert.c:1594 +#: ../glib/gconvert.c:1593 #, c-format -msgid "The URI '%s' is invalid" -msgstr "URI „%s“ je neplatné" +msgid "The URI “%s” is invalid" +msgstr "Adresa URI „%s“ je neplatné" -#: ../glib/gconvert.c:1606 +#: ../glib/gconvert.c:1605 #, c-format -msgid "The hostname of the URI '%s' is invalid" -msgstr "Název počítače v URI „%s“ je neplatný" +msgid "The hostname of the URI “%s” is invalid" +msgstr "Název počítače v adrese URI „%s“ je neplatný" -#: ../glib/gconvert.c:1622 +#: ../glib/gconvert.c:1621 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "URI „%s“ obsahuje nesprávně změněné znaky" -#: ../glib/gconvert.c:1717 +#: ../glib/gconvert.c:1716 #, c-format -msgid "The pathname '%s' is not an absolute path" -msgstr "„%s“ není absolutní cestou" +msgid "The pathname “%s” is not an absolute path" +msgstr "Název cesty „%s“ není absolutní cestou" -#: ../glib/gconvert.c:1727 +#: ../glib/gconvert.c:1726 msgid "Invalid hostname" msgstr "Neplatný název počítače" @@ -4237,94 +4255,94 @@ msgstr "ne" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" msgstr "Chyba při otevírání složky „%s“: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "Nelze alokovat %lu bajtů k přečtení souboru „%s“" msgstr[1] "Nelze alokovat %lu bajty k přečtení souboru „%s“" msgstr[2] "Nelze alokovat %lu bajtů k přečtení souboru „%s“" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" +msgid "Error reading file “%s”: %s" msgstr "Chyba čtení souboru „%s“: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "Soubor „%s“ je příliš velký" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" msgstr "Chyba při čtení ze souboru „%s“: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" msgstr "Nelze otevřít soubor „%s“: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Nelze získat atributy souboru „%s“: funkce fstat() selhala: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" -msgstr "Nelze otevřít soubor „%s“: funkce fdopen() selhalo: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" +msgstr "Nelze otevřít soubor „%s“: funkce fdopen() selhala: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Nelze přejmenovat soubor „%s“ na „%s“: funkce g_rename() selhala: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" msgstr "Nelze vytvořit soubor „%s“: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" msgstr "Nelze zapisovat do souboru „%s“: funkce write() selhala: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Nelze zapisovat do souboru „%s“: funkce fsync() selhala: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Existující soubor „%s“ nelze odstranit: funkce g_unlink() selhala: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Šablona „%s“ je neplatná, neměla by obsahovat „%s“" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Šablona „%s“ neobsahuje XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "Nelze přečíst symbolický odkaz „%s“: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Nelze otevřít převodník z „%s“ do „%s“: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Nelze přímo číst v g_io_channel_read_line_string" #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 @@ -4337,7 +4355,7 @@ msgid "Channel terminates in a partial character" msgstr "Kanál ukončen částí znaku" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Nelze přímo číst v g_io_channel_read_to_end" #: ../glib/gkeyfile.c:737 @@ -4351,7 +4369,7 @@ msgstr "Není obyčejným souborem" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "Soubor klíče obsahuje „%s“, což není dvojice klíč-hodnota, skupina ani " "komentář" @@ -4372,37 +4390,37 @@ msgstr "Neplatný název klíče: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "Soubor klíče obsahuje nepodporované kódování „%s“" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "Soubor klíče nemá skupinu „%s“" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "Soubor klíče nemá klíč „%s“ ve skupině „%s“" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Soubor klíče obsahuje klíč „%s“ s hodnotou „%s“, která není v UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Soubor klíče obsahuje klíč „%s“, který má neinterpretovatelnou hodnotu." #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" "Soubor klíče obsahuje klíč „%s“ ve skupině „%s“, který má " @@ -4410,7 +4428,7 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Klíč „%s“ ve skupině „%s“ má hodnotu „%s“, když byla očekávána „%s“" #: ../glib/gkeyfile.c:4133 @@ -4419,32 +4437,32 @@ msgstr "Soubor klíče obsahuje na konci řádku znak změny" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" -msgstr "Soubor klíče obsahuje neplatnou posloupnost pro změnu „%s“" +msgid "Key file contains invalid escape sequence “%s”" +msgstr "Soubor klíče obsahuje neplatnou únikovou sekvenci „%s“" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "Hodnotu „%s“ nelze interpretovat jako číslo." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" -msgstr "Celočíselná hodnota „%s“ mimo rozsah" +msgid "Integer value “%s” out of range" +msgstr "Celočíselná hodnota „%s“ je mimo rozsah" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." -msgstr "Hodnotu „%s“ nelze interpretovat jako reálné (float) číslo." +msgid "Value “%s” cannot be interpreted as a float number." +msgstr "Hodnotu „%s“ nelze interpretovat jako reálné (plovoucí) číslo." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Hodnotu „%s“ nelze interpretovat jako pravdivostní hodnotu." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "Nelze získat atributy souboru „%s%s%s%s“: fstat() selhalo: %s" #: ../glib/gmappedfile.c:195 @@ -4454,7 +4472,7 @@ msgstr "Nelze mapovat „%s%s%s%s“: mmap() selhalo: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" msgstr "Nelze otevřít soubor „%s“: open() selhalo: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 @@ -4659,7 +4677,7 @@ msgstr "" "Dokument neočekávaně skončil uvnitř komentáře nebo instrukce pro zpracování" #: ../glib/goption.c:861 -msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[PŘEPÍNAČ…]" #: ../glib/goption.c:977 @@ -4684,23 +4702,25 @@ msgstr "Přepínače:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "Nelze zpracovat celočíselnou hodnotu „%s“ u %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" -msgstr "Celočíselná hodnota „%s“ u %s mimo rozsah" +msgid "Integer value “%s” for %s out of range" +msgstr "Celočíselná hodnota „%s“ pro %s je mimo rozsah" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" -msgstr "Nelze zpracovat celočíselnou (double) hodnotu „%s“ u %s" +msgid "Cannot parse double value “%s” for %s" +msgstr "" +"Nelze zpracovat reálnou hodnotu s dvojitou přesností (double) „%s“ u %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" -msgstr "Celočíselná (double) hodnota „%s“ u %s mimo rozsah" +msgid "Double value “%s” for %s out of range" +msgstr "" +"Reálná hodnota s dvojitou přesností (double) „%s“ pro %s je mimo rozsah" #: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format @@ -5046,15 +5066,15 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Chyba při kompilaci regulárního výrazu %s na znaku %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" -msgstr "očekáváno číslo nebo „}“" +msgid "hexadecimal digit or “}” expected" +msgstr "očekávána šestnáctková číslice nebo „}“" #: ../glib/gregex.c:2429 msgid "hexadecimal digit expected" -msgstr "očekáváno šestnáctkové číslo" +msgstr "očekávána šestnáctková číslice" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" msgstr "v symbolickém odkazu chybí „<“" #: ../glib/gregex.c:2478 @@ -5067,27 +5087,27 @@ msgstr "symbolický odkaz o nulové délce" #: ../glib/gregex.c:2496 msgid "digit expected" -msgstr "očekáváno číslo" +msgstr "očekávána číslice" #: ../glib/gregex.c:2514 msgid "illegal symbolic reference" msgstr "nedovolený symbolický odkaz" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" +msgid "stray final “\\”" msgstr "osamocené koncové „\\“" #: ../glib/gregex.c:2580 msgid "unknown escape sequence" -msgstr "neznámá posloupnost pro změnu" +msgstr "neznámá úniková sekvence" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" -msgstr "Chyba při analyzování náhradního textu „%s“ na znaku %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" +msgstr "Chyba při zpracování náhradního textu „%s“ na znaku %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Text v uvozovkách nezačíná uvozovkami" #: ../glib/gshell.c:186 @@ -5097,12 +5117,12 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "Text skončil právě za znakem „\\“. (Text zněl „%s“)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Text skončil před nalezením odpovídajících uvozovek znakem %c. (Text zněl " "„%s“)" @@ -5158,12 +5178,12 @@ msgstr "Nelze rozvětvit (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" msgstr "Nelze přejít do složky „%s“ (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "Nelze spustit proces potomka „%s“ (%s)" #: ../glib/gspawn.c:1510 @@ -5178,7 +5198,7 @@ msgstr "Nelze rozvětvit proces potomka (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" msgstr "Neznámá chyba při běhu procesu potomka „%s“" #: ../glib/gspawn.c:1551 @@ -5255,78 +5275,78 @@ msgstr "Znak je mimo rozsah UTF-16" #, c-format msgid "%u byte" msgid_plural "%u bytes" -msgstr[0] "%u bajt" -msgstr[1] "%u bajty" -msgstr[2] "%u bajtů" +msgstr[0] "%u bajt" +msgstr[1] "%u bajty" +msgstr[2] "%u bajtů" #: ../glib/gutils.c:2145 #, c-format msgid "%.1f KiB" -msgstr "%.1f KiB" +msgstr "%.1f KiB" #: ../glib/gutils.c:2147 #, c-format msgid "%.1f MiB" -msgstr "%.1f MiB" +msgstr "%.1f MiB" #: ../glib/gutils.c:2150 #, c-format msgid "%.1f GiB" -msgstr "%.1f GiB" +msgstr "%.1f GiB" #: ../glib/gutils.c:2153 #, c-format msgid "%.1f TiB" -msgstr "%.1f TiB" +msgstr "%.1f TiB" #: ../glib/gutils.c:2156 #, c-format msgid "%.1f PiB" -msgstr "%.1f PiB" +msgstr "%.1f PiB" #: ../glib/gutils.c:2159 #, c-format msgid "%.1f EiB" -msgstr "%.1f EiB" +msgstr "%.1f EiB" #: ../glib/gutils.c:2172 #, c-format msgid "%.1f kB" -msgstr "%.1f kB" +msgstr "%.1f kB" #: ../glib/gutils.c:2175 ../glib/gutils.c:2290 #, c-format msgid "%.1f MB" -msgstr "%.1f MB" +msgstr "%.1f MB" #: ../glib/gutils.c:2178 ../glib/gutils.c:2295 #, c-format msgid "%.1f GB" -msgstr "%.1f GB" +msgstr "%.1f GB" #: ../glib/gutils.c:2180 ../glib/gutils.c:2300 #, c-format msgid "%.1f TB" -msgstr "%.1f TB" +msgstr "%.1f TB" #: ../glib/gutils.c:2183 ../glib/gutils.c:2305 #, c-format msgid "%.1f PB" -msgstr "%.1f PB" +msgstr "%.1f PB" #: ../glib/gutils.c:2186 ../glib/gutils.c:2310 #, c-format msgid "%.1f EB" -msgstr "%.1f EB" +msgstr "%.1f EB" #. Translators: the %s in "%s bytes" will always be replaced by a number. #: ../glib/gutils.c:2223 #, c-format msgid "%s byte" msgid_plural "%s bytes" -msgstr[0] "%s bajt" -msgstr[1] "%s bajty" -msgstr[2] "%s bajtů" +msgstr[0] "%s bajt" +msgstr[1] "%s bajty" +msgstr[2] "%s bajtů" #. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to #. * mean 1024 bytes. I am aware that 'KB' is not correct, but it has been preserved for reasons of @@ -5336,4 +5356,4 @@ msgstr[2] "%s bajtů" #: ../glib/gutils.c:2285 #, c-format msgid "%.1f KB" -msgstr "%.1f KB" +msgstr "%.1f KB" @@ -17,16 +17,16 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-10-06 20:10+0000\n" -"PO-Revision-Date: 2016-10-11 22:52+0200\n" -"Last-Translator: Benedikt M. Thoma <gnome@thomba.net>\n" +"POT-Creation-Date: 2016-10-28 15:59+0000\n" +"PO-Revision-Date: 2016-10-29 15:43+0200\n" +"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: Deutsch <gnome-de@gnome.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: ../gio/gapplication.c:493 msgid "GApplication options" @@ -41,7 +41,7 @@ msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "GApplication Dienstmodus starten (aus D-Bus Dienstdateien verwenden)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +msgid "Override the application’s ID" msgstr "Anwendungskennung überschreiben" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -81,7 +81,7 @@ msgid "Launch the application (with optional files to open)" msgstr "Die Anwendung starten (mit optional zu öffnenden Dateien)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" +msgid "APPID [FILE…]" msgstr "ANWENDUNGSKENNUNG [DATEI …]" #: ../gio/gapplication-tool.c:59 @@ -167,8 +167,8 @@ msgstr "Aufruf:\n" msgid "Arguments:\n" msgstr "Argumente:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" msgstr "[ARGUMENTE …]" #: ../gio/gapplication-tool.c:134 @@ -180,10 +180,10 @@ msgstr "Befehle:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Verwenden Sie »%s help BEFEHL«, um detaillierte Hilfe zu erhalten.\n" +"Rufen Sie »%s help BEFEHL« auf, um detaillierte Hilfe zu erhalten.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -197,14 +197,14 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "Ungültige Anwendungskennung: »%s«\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" "»%s« akzeptiert keine Argumente\n" @@ -228,8 +228,8 @@ msgstr "Der Aktionsname muss nach der Anwendungskennung angegeben werden\n" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" "Ungültiger Aktionsname: »%s«\n" "Aktionsnamen dürfen nur aus alphanumerischen Zeichen, »-« und ».« bestehen\n" @@ -329,12 +329,12 @@ msgstr "Abbrechbare Initialisierung wird nicht unterstützt" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "Umwandlung von Zeichensatz »%s« in »%s« wird nicht unterstützt" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" msgstr "Konverter von »%s« in »%s« konnte nicht geöffnet werden" #: ../gio/gcontenttype.c:335 @@ -375,41 +375,41 @@ msgstr "Unerwartet frühes Datenstromende" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nicht unterstützter Schlüssel »%s« im Adresseintrag »%s«" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" "Adresse »%s« ist ungültig (benötigt genau einen der Schlüssel path, tmpdir " "oder abstract)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Bedeutungsloses Schlüssel-Wert-Paar im Adresseintrag »%s«" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" -msgstr "Fehler in Adresse »%s« - Das Port-Attribut ist nicht korrekt" +msgid "Error in address “%s” — the port attribute is malformed" +msgstr "Fehler in Adresse »%s« – Das Port-Attribut ist nicht korrekt" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" -msgstr "Fehler in Adresse »%s« - Das Familien-Attribut ist nicht korrekt" +msgid "Error in address “%s” — the family attribute is malformed" +msgstr "Fehler in Adresse »%s« – Das Familien-Attribut ist nicht korrekt" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "Adresselement »%s« enthält keinen Doppelpunkt" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" "Schlüssel-Wert-Paar %d, »%s«, in Adresselement »%s« enthält kein " @@ -418,38 +418,38 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" -"Fehler beim Entfernen von Escape-Zeichen im Schlüssel-Wert-Paar %d, »%s« im " +"Fehler beim Entfernen von Escape-Zeichen im Schlüssel-Wert-Paar %d, »%s«, im " "Adresselement »%s«" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" "Fehler in Adresse »%s« - für den Unix-Transport muss genau einer der " "Schlüssel »path« oder »abstract« gesetzt sein" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" -"Fehler in Adresse »%s« - Das Host-Attribut fehlt oder ist nicht korrekt" +"Fehler in Adresse »%s« – Das Host-Attribut fehlt oder ist nicht korrekt" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" -"Fehler in Adresse »%s« - Das Port-Attribut fehlt oder ist nicht korrekt" +"Fehler in Adresse »%s« – Das Port-Attribut fehlt oder ist nicht korrekt" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -"Fehler in Adresse »%s« - Das noncefile-Attribut fehlt oder ist nicht korrekt" +"Fehler in Adresse »%s« – Das noncefile-Attribut fehlt oder ist nicht korrekt" #: ../gio/gdbusaddress.c:655 msgid "Error auto-launching: " @@ -457,29 +457,29 @@ msgstr "Fehler beim automatischen Starten:" #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Unbekannter oder nicht unterstützter Transport »%s« für Adresse »%s«" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" msgstr "Fehler beim Öffnen der Nonce-Datei »%s«: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" msgstr "Fehler beim Lesen der Nonce-Datei »%s«: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Fehler beim Lesen der Nonce-Datei »%s«, erwartet wurden 16 Bytes, jedoch %d " "erhalten" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Fehler beim Schreiben des Inhalts der Nonce-Datei »%s« in den Datenstrom:" @@ -504,8 +504,8 @@ msgstr "D-Bus kann nicht automatisch ohne X11 $DISPLAY gestartet werden" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " -msgstr "Fehler beim Erzeugen der Befehlszeile »%s«:" +msgid "Error spawning command line “%s”: " +msgstr "Fehler beim Erzeugen der Befehlszeile »%s«: " #: ../gio/gdbusaddress.c:1337 #, c-format @@ -525,14 +525,14 @@ msgstr "" "Adresse des Sitzungsbus konnte nicht ermittelt werden (für dieses " "Betriebssystem nicht implementiert)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1635 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE " -"ermittelt werden, unbekannter Wert »%s«" +"ermittelt werden – unbekannter Wert »%s«" #: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 msgid "" @@ -570,83 +570,83 @@ msgstr "Abgebrochen durch GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" msgstr "Fehler beim Holen der Informationen für Ordner »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" "Zugriffsrechte des Ordners »%s« sind inkorrekt. Erwarteter Modus ist 0700, " "0%o wurde erhalten" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" +msgid "Error creating directory “%s”: %s" msgstr "Fehler beim Erstellen des Ordners »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " -msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Lesen:" +msgid "Error opening keyring “%s” for reading: " +msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Lesen: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Zeile %d des Schlüsselbundes auf »%s« mit Inhalt »%s« ist inkorrekt" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"Der erste Token in Zeile %d des Schlüsselrings bei »%s« mit dem Inhalt »%s« " +"Der erste Token in Zeile %d des Schlüsselbundes bei »%s« mit dem Inhalt »%s« " "ist inkorrekt" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"Der zweite Token in Zeile %d des Schlüsselrings bei »%s« mit dem Inhalt »%s« " -"ist inkorrekt" +"Der zweite Token in Zeile %d des Schlüsselbundes bei »%s« mit dem Inhalt " +"»%s« ist inkorrekt" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "" "Cookie mit Kennung %d konnte im Schlüsselbund auf »%s« nicht gefunden werden" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" msgstr "Fehler beim Löschen der alten Sperrdatei »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" msgstr "Fehler beim Erstellen der Sperrdatei »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Fehler beim Schließen der entknüpften Sperrdatei »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" msgstr "Fehler beim Entknüpfen der Sperrdatei »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " -msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Schreiben:" +msgid "Error opening keyring “%s” for writing: " +msgstr "Fehler beim Öffnen des Schlüsselbundes »%s« zum Schreiben: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -msgstr "(Außerdem schlug das Entsperren von »%s« ebenso fehl: %s)" +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " +msgstr "(Außerdem schlug das Entsperren von »%s« ebenso fehl: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 msgid "The connection is closed" @@ -747,6 +747,15 @@ msgstr "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nic msgid "A subtree is already exported for %s" msgstr "Ein Unterbaum wurde bereits für %s exportiert" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE " +"ermittelt werden, unbekannter Wert »%s«" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "Typ ist UNGÜLTIG" @@ -792,7 +801,7 @@ msgstr[1] "%lu Bytes sollten gelesen werden, aber nur %lu erhalten" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Ein NUL-Byte wurde nach der Zeichenkette »%s« erwartet, aber es wurde Byte " "%d gefunden" @@ -801,20 +810,20 @@ msgstr "" #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" -"Gültige UTF-8-Zeichenkette wurde erwartet, aber ungültige Bytes am Byte-" -"Versatz %d gefunden (Länge der Zeichenkette ist %d). Die gültige UTF-8-" -"Zeichenkette bis zu diesem Punkt war »%s«)" +"Gültige UTF-8-Zeichenkette wurde erwartet, aber ungültige Bytes an Byte-" +"Position %d gefunden (Länge der Zeichenkette ist %d). Die gültige UTF-8-" +"Zeichenkette bis zu diesem Punkt war »%s«." #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Verarbeiteter Wert »%s« ist kein gültiger D-Bus-Objektpfad" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur" #: ../gio/gdbusmessage.c:1656 @@ -833,7 +842,7 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" "Es wurde ein Feld des Typs »a%c« gefunden. Erwartet wurde als Länge ein " @@ -841,13 +850,13 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Verarbeiteter Wert »%s« für Variante ist keine gültige D-Bus-Signatur" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« aus " "dem D-Bus Wire-Format" @@ -855,11 +864,11 @@ msgstr "" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Ungültiger Wert für die Speicherreihenfolge. Es wird entweder 0x6c ('l') " -"oder 0x42 ('B') erwartet, aber der Wert 0x%02x gefunden" +"Ungültiger Wert für die Speicherreihenfolge. Es wird entweder 0x6c (»l«) " +"oder 0x42 (»B«) erwartet, aber der Wert 0x%02x gefunden" #: ../gio/gdbusmessage.c:2064 #, c-format @@ -869,14 +878,14 @@ msgstr "" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signatur-Kopfzeilenfeld mit Signatur »%s« gefunden, aber Nachrichtenrumpf " "ist leer" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur (für Rumpf)" #: ../gio/gdbusmessage.c:2164 @@ -897,7 +906,7 @@ msgstr "Meldung kann nicht deserialisiert werden:" #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« in " "das D-Bus Wire-Format" @@ -917,7 +926,7 @@ msgstr "Meldung kann nicht serialisiert werden:" #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Nachrichtenrumpf hat den Signaturtyp »%s«, aber es gibt keine Signatur im " "Kopfzeilenfeld" @@ -925,21 +934,21 @@ msgstr "" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" "Nachrichtenrumpf hat den Signaturtyp »%s«, aber die Signatur im " "Kopfzeilenfeld ist »%s«" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Nachrichtenrumpf ist leer, aber die Signatur im Kopfzeilenfeld ist »(%s)«" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "Fehlerrückmeldung mit Inhalt des Typs »%s«" #: ../gio/gdbusmessage.c:3291 @@ -985,17 +994,17 @@ msgstr "Nonce-Datei kann beim Erstellen eines Servers nicht angegeben werden" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" msgstr "Fehler beim Schreiben der Nonce-Datei auf »%s«: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Die Zeichenkette »%s« ist keine gültige GUID für D-Bus" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" msgstr "An nicht unterstützter Übertragung »%s« kann nicht gelauscht werden" #: ../gio/gdbus-tool.c:95 @@ -1008,14 +1017,14 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Befehle:\n" -" help Diese Information anzeigen\n" -" introspect Ein entferntes Objekt inspizieren\n" -" monitor Ein entferntes Objekt überwachen\n" -" call Eine Methode für ein entferntes Objekt aufrufen\n" -" emit Ein Signal ausgeben\n" +" help zeigt diese Information an\n" +" introspect inspiziert ein entferntes Objekt\n" +" monitor überwacht ein entferntes Objekt\n" +" call ruft eine Methode für ein entferntes Objekt auf\n" +" emit gibt ein Signal aus\n" "\n" "Mit »%s BEFEHL --help« erhalten Sie Hilfe zu jedem der Befehle.\n" @@ -1069,7 +1078,7 @@ msgstr "Mehrere Gegenstellen der Verbindung angegeben" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Warnung: Entsprechend den Inspektionsdaten existiert die Schnittstelle »%s« " "nicht\n" @@ -1077,8 +1086,8 @@ msgstr "" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" "Warnung: Entsprechend den Inspektionsdaten existiert die Methode »%s« nicht " "in der Schnittstelle »%s«\n" @@ -1194,12 +1203,12 @@ msgstr "Fehler: Name der Methode wurde nicht angegeben\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "Fehler: Name der Methode »%s« ist ungültig\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Fehler bei der Verarbeitung des Parameters %d vom Typ »%s«: %s\n" #: ../gio/gdbus-tool.c:1472 @@ -1243,7 +1252,7 @@ msgid "Unnamed" msgstr "Unbenannt" #: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "Desktop-Datei hat kein Exec-Feld angegeben" #: ../gio/gdesktopappinfo.c:2689 @@ -1252,14 +1261,14 @@ msgstr "Für die Anwendung benötigtes Terminal konnte nicht gefunden werden" #: ../gio/gdesktopappinfo.c:3097 #, c-format -msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Konfigurationsordner %s für Benutzeranwendungen konnte nicht erstellt " "werden: %s" #: ../gio/gdesktopappinfo.c:3101 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "MIME-Konfigurationsordner %s des Benutzers konnte nicht erstellt werden: %s" @@ -1269,7 +1278,7 @@ msgstr "Den Anwendungsinformationen fehlt ein Bezeichner" #: ../gio/gdesktopappinfo.c:3599 #, c-format -msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "Benutzer-Desktop-Datei %s kann nicht erstellt werden" #: ../gio/gdesktopappinfo.c:3733 @@ -1278,26 +1287,26 @@ msgid "Custom definition for %s" msgstr "Benutzerdefinition für %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "Laufwerk unterstützt Auswerfen nicht" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "Laufwerk unterstützt weder ein Auswerfen noch »eject_with_operation«" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "Laufwerk unterstützt Prüfen auf Datenträger nicht" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "Laufwerk unterstützt keinen Startvorgang" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "Laufwerk unterstützt keinen Stoppvorgang" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1311,7 +1320,7 @@ msgstr "DTLS-Unterstützung ist nicht verfügbar" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Version %d der GEmblem-Kodierung kann nicht verarbeitet werden" #: ../gio/gemblem.c:333 @@ -1321,7 +1330,7 @@ msgstr "Ungültige Symbolanzahl (%d) in GEmblem-Kodierung" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Version %d der GEmblemedIcon-Kodierung kann nicht verarbeitet werden" #: ../gio/gemblemedicon.c:372 @@ -1353,12 +1362,12 @@ msgstr "Vorgang wird nicht unterstützt" msgid "Containing mount does not exist" msgstr "Enthaltender Einhängepunkt existiert nicht" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" msgstr "Es kann nicht über den Ordner kopiert werden" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Ordner kann nicht über Ordner kopiert werden" #: ../gio/gfile.c:2583 @@ -1366,7 +1375,7 @@ msgid "Target file exists" msgstr "Zieldatei existiert" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Ordner kann nicht rekursiv kopiert werden" #: ../gio/gfile.c:2884 @@ -1387,12 +1396,12 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopieren (reflink/clone) wird nicht unterstützt oder ist ungültig" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "" "Kopieren (reflink/clone) wird nicht unterstützt oder funktioniert nicht" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Spezielle Datei kann nicht kopiert werden" #: ../gio/gfile.c:3885 @@ -1405,11 +1414,11 @@ msgstr "Papierkorb nicht unterstützt" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" msgstr "Dateinamen dürfen kein »%c« enthalten" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "Datenträger unterstützt Einhängen nicht" #: ../gio/gfile.c:6713 @@ -1431,7 +1440,7 @@ msgstr "Datei-Enumerator ist bereits geschlossen" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Version %d der GFileIcon-Kodierung kann nicht verarbeitet werden" #: ../gio/gfileicon.c:246 @@ -1441,7 +1450,7 @@ msgstr "Ungültige Eingangsdaten für GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "Datenstrom unterstützt query_info nicht" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1513,7 +1522,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s implementiert nicht from_tokens() der GIcon-Schnittstelle" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Übergebene Version der Symbol-Kodierung kann nicht verarbeitet werden" #: ../gio/ginetaddressmask.c:182 @@ -1531,7 +1540,7 @@ msgstr "Für die Adresse sind Bits außerhalb der Präfix-Länge gesetzt" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "»%s« konnte nicht als IP-Adressmaske verarbeitet werden" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 @@ -1544,7 +1553,7 @@ msgid "Unsupported socket address" msgstr "Nicht unterstützte Socket-Adresse" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "Eingabedatenstrom unterstützt kein Lesen" #. Translators: This is an error you get if there is already an @@ -1567,7 +1576,7 @@ msgid "Keep with file when moved" msgstr "Zusammen mit Datei verschieben" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" +msgid "“version” takes no arguments" msgstr "»version« akzeptiert keine Argumente" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 @@ -1578,6 +1587,10 @@ msgstr "Aufruf:" msgid "Print version information and exit." msgstr "Versionsinformationen ausgeben und beenden." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGUMENTE …]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Befehle:" @@ -1743,7 +1756,7 @@ msgstr "Das Ziel »%s« ist kein Ordner" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " msgstr "%s: Soll »%s« überschrieben werden? " #: ../gio/gio-tool-info.c:34 @@ -1763,7 +1776,7 @@ msgid "ATTRIBUTES" msgstr "ATTRIBUTE" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "Symbolischen Verknüpfungen nicht folgen" #: ../gio/gio-tool-info.c:75 @@ -1833,13 +1846,13 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info arbeitet vergleichbar mit dem herkömmlichen ls-Programm,\n" "jedoch werden GIO-Orte statt lokaler Dateien verwendet; z.B. können\n" "Sie als Ort etwas wie »smb://server/ressource/Datei.txt« angeben.\n" "Dateiattribute können anhand der GIO-Namen, z.B. «standard::icon«, oder\n" -"anhand des Namensraums, z.B. »unix¢, oder durch »*« angegeben werden,\n" +"anhand des Namensraums, z.B. »unix«, oder durch »*« angegeben werden,\n" "was auf alle Attribute passt." #: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74 @@ -1906,12 +1919,12 @@ msgstr "" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "Keine Vorgabeanwendungen für »%s«\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "Standardanwendung für »%s«: %s\n" #: ../gio/gio-tool-mime.c:124 @@ -1936,12 +1949,12 @@ msgstr "Keine empfohlenen Anwendungen\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "Information zur Anwendung »%s« kann nicht geladen werden\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "»%s« kann nicht als Vorgabeanwendung für »%s« gesetzt werden: %s\n" #: ../gio/gio-tool-mkdir.c:31 @@ -1977,7 +1990,7 @@ msgstr "" "Änderungen)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Überwacht eine Datei direkt, aber berichtet nicht über Änderungen" #: ../gio/gio-tool-monitor.c:45 @@ -2090,7 +2103,7 @@ msgid "Mount or unmount the locations." msgstr "Die Orte ein- oder aushängen." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "Ersatz für Kopieren und Löschen nicht verwenden" #: ../gio/gio-tool-move.c:99 @@ -2278,18 +2291,18 @@ msgstr "Datei %s tritt in der Ressource mehrfach auf" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "»%s« konnte in keinem Quellordner gefunden werden" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "»%s« konnte im aktuellen Ordner nicht gefunden werden" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" -msgstr "Unbekannte Verarbeitungsoption %s" +msgid "Unknown processing option “%s”" +msgstr "Unbekannte Verarbeitungsoption »%s«" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format @@ -2356,11 +2369,11 @@ msgid "name of the dependency file to generate" msgstr "Name der zu erzeugenden Abhängigkeitsdatei" #: ../gio/glib-compile-resources.c:629 -msgid "Don't automatically create and register resource" +msgid "Don’t automatically create and register resource" msgstr "Die Ressource nicht automatisch anlegen und registrieren" #: ../gio/glib-compile-resources.c:630 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Keine Funktionen exportieren; als G_GNUC_INTERNAL deklarieren" #: ../gio/glib-compile-resources.c:631 @@ -2657,137 +2670,137 @@ msgstr "Nichts wird getan.\n" msgid "removed existing output file.\n" msgstr "Vorhandene Ausgabedatei wurde entfernt.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Ungültiger Dateiname %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Fehler beim Einlesen der Dateisystem-Information für %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Enthaltender Einhängepunkt für Datei %s wurde nicht gefunden" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" msgstr "Wurzelordner kann nicht umbenannt werden" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Fehler beim Umbenennen der Datei %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" msgstr "Datei kann nicht umbenannt werden, da der Dateiname bereits existiert" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Fehler beim Öffnen der Datei »%s«: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Fehler beim Entfernen der Datei »%s«: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Fehler beim Verschieben der Datei %s in den Papierkorb: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Papierkorb-Ordner %s konnte nicht angelegt werden: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Oberster Ordner konnte zum Verschieben von %s in den Papierkorb nicht " "gefunden werden" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Papierkorb-Ordner konnte für %s nicht gefunden oder angelegt werden" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Löschprotokoll-Datei für %s konnte nicht angelegt werden: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Datei %s kann nicht über Dateisystemgrenzen hinweg in den Papierkorb " "verschoben werden" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Datei %s kann nicht in den Papierkorb verschoben werden: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Datei %s kann nicht in den Papierkorb verschoben werden" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Fehler beim Erstellen des Ordners »%s«: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Das Dateisystem unterstützt keine symbolische Verknüpfungen" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Fehler beim Erstellen der symbolischen Verknüpfung %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Symbolische Verknüpfungen nicht unterstützt" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Fehler beim Verschieben der Datei %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" msgstr "Ordner kann nicht über Ordner verschoben werden" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Erstellen der Sicherungsdatei gescheitert" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Fehler beim Entfernen der Zieldatei: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Verschieben zwischen Einhängepunkten nicht unterstützt" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Konnte die Festplattenbelegung von %s nicht bestimmen: %s" @@ -2806,7 +2819,7 @@ msgstr "Ungültiger erweiterter Attributname" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" msgstr "Fehler beim Setzen des erweiterten Attributs »%s«: %s" #: ../gio/glocalfileinfo.c:1575 @@ -2815,7 +2828,7 @@ msgstr " (ungültige Kodierung)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" msgstr "Fehler beim Holen der Informationen für Datei »%s«: %s" #: ../gio/glocalfileinfo.c:2017 @@ -2941,7 +2954,7 @@ msgstr "Fehler beim Abschneiden der Datei: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" +msgid "Error opening file “%s”: %s" msgstr "Fehler beim Öffnen der Datei »%s«: %s" #: ../gio/glocalfileoutputstream.c:816 @@ -3001,21 +3014,21 @@ msgstr "Angeforderte Suche nach dem Ende des Datenstroms" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" msgstr "Einhängepunkt unterstützt Aushängen nicht" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" msgstr "Einhängepunkt unterstützt Auswerfen nicht" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" "Einhängepunkt unterstützt nicht das Aushängen oder »unmount_with_operation«" @@ -3023,33 +3036,33 @@ msgstr "" #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "Einhängepunkt unterstützt Auswerfen oder »eject_with_operation« nicht" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" msgstr "Einhängepunkt unterstützt erneutes Einhängen nicht" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "Einhängepunkt unterstützt Erraten des Inhaltstyps nicht" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "Einhängepunkt unterstützt synchrones Erraten des Inhaltstyps nicht" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" msgstr "Rechnername »%s« enthält »[«, aber nicht »]«" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 @@ -3080,17 +3093,17 @@ msgid "NetworkManager version too old" msgstr "Die Version von NetworkManager ist zu alt" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "Ausgabedatenstrom unterstützt kein Schreiben" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "Quelldatenstrom ist bereits geschlossen" -#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" msgstr "Fehler beim Auflösen von »%s«: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -3098,21 +3111,21 @@ msgstr "Fehler beim Auflösen von »%s«: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "Die Ressource auf »%s« existiert nicht" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" msgstr "Die Ressource auf »%s« konnte nicht entpackt werden" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" -msgstr "Die Ressource »%s« ist ein Ordner" +msgid "The resource at “%s” is not a directory" +msgstr "Die Ressource auf »%s« ist ein Ordner" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "Eingabedatenstrom unterstützt kein Suchen" #: ../gio/gresource-tool.c:494 @@ -3161,7 +3174,7 @@ msgstr "DATEIPFAD" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3170,18 +3183,18 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Aufruf:\n" -" gresource [--section SEKTION] BEFEHL [ARGUMENTE...]\n" +" gresource [--section SEKTION] BEFEHL [ARGUMENTE …]\n" "\n" "Befehle:\n" -" help Diese Information anzeigen\n" -" sections Ressourcensektionen auflisten\n" -" list Ressourcen auflisten\n" -" details Ressourcen detailliert auflisten\n" -" extract Eine Ressource entpacken\n" +" help zeigt diese Information an\n" +" sections listet Ressourcensektionen auf\n" +" list listet Ressourcen auf\n" +" details listet Ressourcen detailliert auf\n" +" extract entpackt eine Ressource\n" "\n" "Rufen Sie »gresource help BEFEHL« auf, um detaillierte Hilfe zu erhalten.\n" "\n" @@ -3242,18 +3255,18 @@ msgstr " PFAD Ein Ressourcenpfad\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" -msgstr "Keine derartiges Schema »%s«\n" +msgid "No such schema “%s”\n" +msgstr "Kein derartiges Schema »%s«\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "" "Schema »%s« ist nicht verschiebbar (Pfad darf nicht angegeben werden)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "Schema »%s« ist verschiebbar (Pfad muss angegeben werden)\n" #: ../gio/gsettings-tool.c:92 @@ -3377,7 +3390,7 @@ msgstr "SCHEMA[:PFAD] [SCHLÜSSEL]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3395,29 +3408,29 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Aufruf:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] BEFEHL [ARGUMENTE...]\n" +" gsettings [--schemadir SCHEMAORDNER] BEFEHL [ARGUMENTE …]\n" "\n" "Befehle:\n" -" help Diese Information anzeigen\n" -" list-schemas Installierte Schemata auflisten\n" -" list-relocatable-schemas Verschiebbare Schemata auflisten\n" -" list-keys Schlüssel in einem Schema auflisten\n" -" list-children Unterelemente eines Schemas auflisten\n" -" list-recursively Schlüssel und Werte rekursiv auflisten\n" -" range Bereich eines Schlüssels abfragen\n" -" describe Beschreibung eines Schlüssels abfragen\n" -" get Wert eines Schlüssels ermitteln\n" -" set Wert eines Schlüssels setzen\n" -" reset Wert eines Schlüssels zurücksetzen\n" -" reset-recursively Werte aller Schlüssel eines gegebenen\n" -" Schemas zurücksetzen\n" -" writable Prüfen, ob Schlüssel schreibgeschützt ist\n" -" monitor Auf Änderungen überwachen\n" +" help zeigt diese Information an\n" +" list-schemas listet installierte Schemata auf\n" +" list-relocatable-schemas listet verschiebbare Schemata auf\n" +" list-keys listet Schlüssel in einem Schema auf\n" +" list-children listet Unterelemente eines Schemas auf\n" +" list-recursively listet Schlüssel und Werte rekursiv auf\n" +" range fragt den Bereich eines Schlüssels ab\n" +" describe fragt die Beschreibung eines Schlüssels ab\n" +" get ermittelt den Wert eines Schlüssels\n" +" set setzt den Wert eines Schlüssels\n" +" reset setzt den Wert eines Schlüssels zurück\n" +" reset-recursively setzt die Werte aller Schlüssel eines gegebenen\n" +" Schemas zurück\n" +" writable prüft, ob der Schlüssel schreibgeschützt ist\n" +" monitor überwacht auf Änderungen\n" "\n" "Rufen Sie »gsettings help BEFEHL« auf, um eine detaillierte Hilfe zu " "erhalten.\n" @@ -3479,8 +3492,8 @@ msgstr "Leerer Schema-Name wurde angegeben\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" -msgstr "Keine derartiger Schlüssel »%s«\n" +msgid "No such key “%s”\n" +msgstr "Kein derartiger Schlüssel »%s«\n" #: ../gio/gsocket.c:364 msgid "Invalid socket, not initialized" @@ -3652,7 +3665,7 @@ msgstr "Nicht-TCP-Verbindung über Proxy wird nicht unterstützt." #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "Proxy-Protokoll »%s« wird nicht unterstützt." #: ../gio/gsocketlistener.c:218 @@ -3665,17 +3678,17 @@ msgstr "Der hinzugefügte Socket ist geschlossen" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 unterstützt die IPv6-Adresse »%s« nicht" #: ../gio/gsocks4aproxy.c:136 msgid "Username is too long for SOCKSv4 protocol" -msgstr "Benutzername ist zu lang für das SOCKSv5-Protokoll" +msgstr "Benutzername ist zu lang für das SOCKSv4-Protokoll" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" -msgstr "Rechnername »%s« ist zu lang für das SOCKSv5-Protokoll" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" +msgstr "Rechnername »%s« ist zu lang für das SOCKSv4-Protokoll" #: ../gio/gsocks4aproxy.c:179 msgid "The server is not a SOCKSv4 proxy server." @@ -3714,7 +3727,7 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "Rechnername »%s« ist zu lang für das SOCKSv5-Protokoll" #: ../gio/gsocks5proxy.c:348 @@ -3742,7 +3755,7 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Verbindung wurde durch SOCKSv5-Proxy abgewiesen." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "SOCKSv5-Proxy unterstützt den Befehl »connect« nicht." #: ../gio/gsocks5proxy.c:392 @@ -3755,7 +3768,7 @@ msgstr "Unbekannter Fehler im SOCKSv5-Proxy." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Version %d der GThemedIcon-Kodierung kann nicht verarbeitet werden" #: ../gio/gthreadedresolver.c:118 @@ -3764,23 +3777,23 @@ msgstr "Es wurden keine gültigen Adressen gefunden" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" msgstr "Fehler beim Rückwärtsauflösen von »%s«: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "Kein DNS-Datensatz des angeforderten Typs für »%s«" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "»%s« kann vorübergehend nicht aufgelöst werden" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +msgid "Error resolving “%s”" msgstr "Fehler beim Auflösen von »%s«" #: ../gio/gtlscertificate.c:250 @@ -3888,7 +3901,7 @@ msgstr "Fehler beim Lesen aus dem Dateideskriptor: %s" msgid "Error closing file descriptor: %s" msgstr "Fehler beim Schließen des Dateideskriptors: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 msgid "Filesystem root" msgstr "Wurzelordner des Dateisystems" @@ -3904,14 +3917,14 @@ msgstr "" "unterstützt" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "Datenträger unterstützt Auswerfen nicht" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" msgstr "Datenträger unterstützt weder Auswerfen noch »eject_with_operation«" #: ../gio/gwin32inputstream.c:185 @@ -3973,25 +3986,25 @@ msgstr "Falsche Argumente\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "Unerwartetes Attribut »%s« des Elements »%s«" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" msgstr "Attribut »%s« des Elements »%s« konnte nicht gefunden werden" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Unerwarteter Tag »%s«; Tag »%s« wird erwartet" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "Unerwarteter Tag »%s« innerhalb von »%s«" #: ../glib/gbookmarkfile.c:1757 @@ -4000,7 +4013,7 @@ msgstr "Es wurde keine gültige Lesezeichendatei in den Datenordnern gefunden" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" msgstr "Es existiert bereits ein Lesezeichen für die Adresse »%s«" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 @@ -4013,37 +4026,37 @@ msgstr "Es existiert bereits ein Lesezeichen für die Adresse »%s«" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" msgstr "Es konnte kein Lesezeichen für die Adresse »%s« gefunden werden." #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Es ist kein MIME-Typ im Lesezeichen für die Adresse »%s« definiert." #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" "Es konnte keine »privat«-Markierung für das Lesezeichen für die Adresse »%s« " "gefunden werden." #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" msgstr "" "Es wurden keine Gruppen für das Lesezeichen für die Adresse »%s« festgelegt." #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" "Es wurde keine Anwendung namens »%s« gefunden, die ein Lesezeichen für »%s« " "registriert hat." #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" "Die Befehlszeile »%s« konnte nicht mit der Adresse »%s« verknüpft werden." @@ -4054,39 +4067,39 @@ msgstr "Bruchstückhafte Zeichenfolge am Eingabeende" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "Notnagel »%s« kann nicht in Kodierung »%s« umgewandelt werden" #: ../glib/gconvert.c:1567 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "" "Die Adresse »%s« ist keine absolute Adresse, die das »file«-Schema verwendet" #: ../glib/gconvert.c:1577 #, c-format -msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" msgstr "Die lokale Adresse »%s« darf kein »#« enthalten" #: ../glib/gconvert.c:1594 #, c-format -msgid "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" msgstr "Die Adresse »%s« ist ungültig" #: ../glib/gconvert.c:1606 #, c-format -msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" msgstr "Der Rechnername der Adresse »%s« ist ungültig" # CHECK #: ../glib/gconvert.c:1622 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "Die Adresse »%s« enthält ungültige Escape-Zeichen" #: ../glib/gconvert.c:1717 #, c-format -msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" msgstr "Der Pfadname »%s« ist kein absoluter Pfad" #: ../glib/gconvert.c:1727 @@ -4321,100 +4334,100 @@ msgstr "So" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" msgstr "Fehler beim Öffnen des Ordners »%s«: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "%lu Byte konnte nicht zugeordnet werden, um Datei »%s« zu lesen" msgstr[1] "%lu Bytes konnten nicht zugeordnet werden, um Datei »%s« zu lesen" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" +msgid "Error reading file “%s”: %s" msgstr "Fehler beim Lesen der Datei »%s«: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "Datei »%s« ist zu groß" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" msgstr "Aus der Datei »%s« konnte nicht gelesen werden: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Attribute der Datei »%s« konnten nicht ermittelt werden: fstat() " "gescheitert: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: fdopen() gescheitert: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Datei »%s« konnte nicht in »%s« umbenannt werden: g_rename() ist " "gescheitert: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" msgstr "Datei »%s« konnte nicht angelegt werden: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" msgstr "Schreiben der Datei »%s« schlug fehl: write() ist gescheitert: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "" "Datei »%s« konnte nicht geschrieben werden: fsync() ist gescheitert: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Die vorhandene Datei »%s« konnte nicht entfernt werden: g_unlink() ist " "gescheitert: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Vorlage »%s« ungültig, sollte kein »%s« enthalten" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Vorlage »%s« enthält nicht XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "Die symbolische Verknüpfung »%s« konnte nicht gelesen werden: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Konverter von »%s« in »%s« konnte nicht geöffnet werden: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Raw-read in g_io_channel_read_line_string nicht möglich" #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 @@ -4427,7 +4440,7 @@ msgid "Channel terminates in a partial character" msgstr "Kanal endet mit einem Teilzeichen" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Raw-read in g_io_channel_read_to_end nicht möglich" #: ../glib/gkeyfile.c:737 @@ -4441,7 +4454,7 @@ msgstr "Keine reguläre Datei" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "Die Schlüsselwertedatei enthält die Zeile »%s«, welche kein zulässiges " "Schlüssel-Wert-Paar, keine Gruppe und kein Kommentar ist." @@ -4462,24 +4475,24 @@ msgstr "Ungültiger Schlüsselname: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "Die Schlüsselwertedatei enthält die nicht unterstützte Kodierung »%s«" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "Die Schlüsselwertedatei enthält nicht die Gruppe »%s«" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "Die Schlüsselwertedatei hat keinen Schlüssel »%s« in der Gruppe »%s«" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "" "Die Schlüsselwertedatei enthält den Schlüssel »%s« mit dem Wert »%s«, der " "nicht in UTF-8 kodiert ist" @@ -4487,7 +4500,7 @@ msgstr "" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Die Schlüsselwertedatei enthält den Schlüssel »%s« mit einem Wert, der nicht " "interpretiert werden konnte." @@ -4495,7 +4508,7 @@ msgstr "" #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" "Die Schlüsselwertedatei enthält den Schlüssel »%s« in der Gruppe »%s« mit " @@ -4503,7 +4516,7 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" "Der Schlüssel »%s« in der Gruppe »%s« enthält den Wert »%s«, obwohl %s " "erwartet wurde" @@ -4515,33 +4528,33 @@ msgstr "Die Schlüsselwertedatei enthält ein Escape-Zeichen am Zeilenende" # CHECK #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" msgstr "Die Schlüsselwertedatei enthält das ungültige Escape-Zeichen »%s«" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "Der Wert »%s« konnte nicht als Zahl interpretiert werden." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" msgstr "Ganzzahliger Wert »%s« ist außerhalb des Wertebereiches." #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." msgstr "Der Wert »%s« konnte nicht als Gleitkommazahl interpretiert werden." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "" "Der Wert »%s« konnte nicht als boolescher Ausdruck interpretiert werden." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Attribute der Datei »%s%s%s%s« konnten nicht ermittelt werden: fstat() " "gescheitert: %s" @@ -4553,7 +4566,7 @@ msgstr "»%s%s%s%s« konnte nicht abgebildet werden: mmap() ist gescheitert: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: open() ist gescheitert: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 @@ -4770,7 +4783,7 @@ msgstr "" "Verarbeitungsanweisung" #: ../glib/goption.c:861 -msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[OPTION …]" #: ../glib/goption.c:977 @@ -4795,22 +4808,22 @@ msgstr "Optionen:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "»%s« konnte nicht als ganzzahliger Wert für %s interpretiert werden." #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" msgstr "Ganzzahliger Wert »%s« für %s ist außerhalb des Bereiches." #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "»%s« konnte nicht als »double«-Wert für %s interpretiert werden." #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" msgstr "»double«-Wert »%s« für %s ist außerhalb des Bereiches." #: ../glib/goption.c:1448 ../glib/goption.c:1527 @@ -5169,7 +5182,7 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Fehler beim Kompilieren des regulären Ausdrucks %s an Zeichen %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" msgstr "Hexadezimalzahl oder »}« erwartet" #: ../glib/gregex.c:2429 @@ -5177,7 +5190,7 @@ msgid "hexadecimal digit expected" msgstr "Hexadezimalzahl erwartet" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" msgstr "Fehlendes »<» in symbolischer Referenz" #: ../glib/gregex.c:2478 @@ -5197,7 +5210,7 @@ msgid "illegal symbolic reference" msgstr "Illegale symbolische Referenz" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" +msgid "stray final “\\”" msgstr "Verirrtes abschließendes »\\«" #: ../glib/gregex.c:2580 @@ -5206,11 +5219,11 @@ msgstr "Unbekannte Escape-Sequenz" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Fehler beim Verarbeiten des Ersetzungstextes »%s« an Zeichen %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Zitierter Text beginnt nicht mit einem Anführungszeichen" #: ../glib/gshell.c:186 @@ -5221,12 +5234,12 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "Text endete nach einem »\\«-Zeichen. (Der Text war »%s«)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Text endete, bevor ein passendes Anführungszeichen für %c gefunden wurde. " "(Der Text war »%s«)" @@ -5283,12 +5296,12 @@ msgstr "Abspalten gescheitert (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" msgstr "In Ordner »%s« (%s) konnte nicht gewechselt werden" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "Kindprozess »%s« konnte nicht ausgeführt werden (%s)" #: ../glib/gspawn.c:1510 @@ -5303,7 +5316,7 @@ msgstr "Abspalten des Kindprozesses gescheitert (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" msgstr "Unbekannter Fehler beim Ausführen des Kindprozesses »%s«" #: ../glib/gspawn.c:1551 @@ -5466,6 +5479,15 @@ msgstr[1] "%s Bytes" msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Fehler beim Erstellen des Ordners »%s«: %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Fehler beim Öffnen der Datei »%s«: %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Fehler beim Lesen der Datei »%s«: %s" + #~ msgid "No locations gives" #~ msgstr "Keine Orte angegeben" @@ -1,14 +1,13 @@ # translation of glib.HEAD.po to Español # Spanish translation of glib. # Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# +# # José Antonio Salgueiro <joseantsa@eresmas.net>, 2001. # Germán Poo Caamaño <gpoo@ubiobio.cl>, 2002. # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006. -# -# +# +# # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011, 2012. -# # Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # msgid "" @@ -16,10 +15,10 @@ msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-25 18:43+0000\n" -"PO-Revision-Date: 2016-08-29 13:59+0200\n" +"POT-Creation-Date: 2016-10-24 14:43+0000\n" +"PO-Revision-Date: 2016-10-25 17:19+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" -"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n" +"Language-Team: es <gnome-es-list@gnome.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +41,8 @@ msgstr "" "de D-Bus)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +#| msgid "Override the application's ID" +msgid "Override the application’s ID" msgstr "Omitir el ID de la aplicación" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -82,7 +82,8 @@ msgid "Launch the application (with optional files to open)" msgstr "Lanzar la aplicación (con archivos opcionales que abrir)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" +#| msgid "APPID [FILE...]" +msgid "APPID [FILE…]" msgstr "APPID [ARCHIVO...]" #: ../gio/gapplication-tool.c:59 @@ -124,8 +125,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" "Identificador de la aplicación en formato D-Bus (ej. org.example.viewer)" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:620 -#: ../gio/glib-compile-resources.c:626 ../gio/glib-compile-resources.c:652 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "ARCHIVO" @@ -170,9 +171,10 @@ msgstr "Uso:\n" msgid "Arguments:\n" msgstr "Argumentos:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" -msgstr "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +#| msgid "[ARGS...]" +msgid "[ARGS…]" +msgstr "[ARGS…]" #: ../gio/gapplication-tool.c:134 #, c-format @@ -182,8 +184,11 @@ msgstr "Comandos:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. #: ../gio/gapplication-tool.c:146 #, c-format +#| msgid "" +#| "Use '%s help COMMAND' to get detailed help.\n" +#| "\n" msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" "Use «%s help COMANDO» para obtener ayuda detallada.\n" @@ -200,14 +205,18 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +#| msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "ID de aplicación no válido: «%s»\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format +#| msgid "" +#| "'%s' takes no arguments\n" +#| "\n" msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" "«%s» no lleva ningún argumento\n" @@ -231,9 +240,12 @@ msgstr "" #: ../gio/gapplication-tool.c:325 #, c-format +#| msgid "" +#| "invalid action name: '%s'\n" +#| "action names must consist of only alphanumerics, '-' and '.'\n" msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" "nombre de acción no válido: «%s»\n" "los nombres de las acciones sólo pueden tener caracteres alfanuméricos «-» y " @@ -334,13 +346,15 @@ msgstr "La inicialización cancelable no eestá soportada" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +#| msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "" "La conversión desde el conjunto de caracteres «%s» a «%s» no está soportada" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" +#| msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" msgstr "No se pudo abrir el conversor de «%s» a «%s»" #: ../gio/gcontenttype.c:335 @@ -380,42 +394,53 @@ msgstr "Final de flujo inesperadamente prematuro" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" +#| msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" msgstr "Clave «%s» no soportada en la entrada de dirección «%s»" #: ../gio/gdbusaddress.c:180 #, c-format +#| msgid "" +#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract " +#| "keys)" msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -"La dirección «%s» no es válida (se necesita exactamente una ruta, dirtemp o " -"claves abstractas)" +"La dirección «%s» no es válida (se necesita exactamente una ruta, carpeta " +"temporal o claves abstractas)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +#| msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "" "Combinación del par clave/valor sin sentido en la entrada de dirección «%s»" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" +#| msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" msgstr "Error en la dirección «%s»; el atributo de puerto está mal formado" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" +#| msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" msgstr "Error en la dirección «%s»; el atributo de familia está mal formado" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +#| msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "El elemento de dirección «%s» no contiene dos puntos (:)" #: ../gio/gdbusaddress.c:478 #, c-format +#| msgid "" +#| "Key/Value pair %d, '%s', in address element '%s' does not contain an " +#| "equal sign" msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" "El par clave/valor %d, «%s», en el elemento de dirección «%s», no contiene " @@ -423,39 +448,49 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format +#| msgid "" +#| "Error unescaping key or value in Key/Value pair %d, '%s', in address " +#| "element '%s'" msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" "Error al desescapar la clave o el valor en el par clave/valor %d, «%s», en " "el elemento de dirección «%s»" #: ../gio/gdbusaddress.c:570 #, c-format +#| msgid "" +#| "Error in address '%s' - the unix transport requires exactly one of the " +#| "keys 'path' or 'abstract' to be set" msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" "Error en la dirección «%s»: el transporte UNIX requiere exactamente que una " "de las claves «path» o «abstract» esté establecida" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +#| msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "servidor" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +#| msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "puerto" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +#| msgid "" +#| "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "archivo de número usado una sola vez" @@ -466,29 +501,34 @@ msgstr "Error al autolanzar: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +#| msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" +#| msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" msgstr "Error al abrir el archivo de número usado una sola vez «%s»: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" +#| msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" msgstr "Error al leer el archivo de número usado una sola vez «%s»: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Error al leer el archivo de número usado una sola vez «%s», se esperaban 16 " "bytes, se obtuvieron %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +#| msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Error al escribir el contenido del archivo de número usado una sola vez «%s» " "al flujo:" @@ -513,7 +553,8 @@ msgstr "No se puede lanzar D-Bus automáticamente sin X11 $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " +#| msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " msgstr "Error al lanzar («spawn») el comando «%s»: " #: ../gio/gdbusaddress.c:1337 @@ -534,11 +575,14 @@ msgstr "" "No se puede determinar la dirección del bus de sesión (no implementado para " "este SO)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1635 #, c-format +#| msgid "" +#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " +#| "variable - unknown value '%s'" msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "No se puede determinar la dirección del bus desde la variable de entorno " "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida" @@ -579,83 +623,102 @@ msgstr "Cancelado a través de GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" +#| msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" msgstr "Error al obtener la información de la carpeta «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format +#| msgid "" +#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" "Los permisos de la carpeta «%s» están mal formados. Se esperaba el modo " "0700, se obtuvo 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "Error al crear la carpeta «%s»: %s" +#| msgid "Error creating directory %s: %s" +msgid "Error creating directory “%s”: %s" +msgstr "Error al crear la carpeta %s: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " +#| msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " msgstr "Error al abrir el depósito de claves «%s» para su lectura: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "La línea %d del depósito de claves en «%s» con contenido «%s» está mal " "formada" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format +#| msgid "" +#| "First token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "El primer token de la línea %d del depósito de claves en «%s» con contenido " "«%s» está mal formado" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format +#| msgid "" +#| "Second token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "El segundo token de la línea %d del depósito de claves en «%s» con contenido " "«%s» está mal formado" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +#| msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "No se encontró la «cookie» con ID %d en el depósito de claves en «%s»" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" +#| msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" msgstr "Error al eliminar el archivo de bloqueo antiguo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" +#| msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" msgstr "Error al crear el archivo de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +#| msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Error al cerrar (desenlazar) el archivo de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" +#| msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" msgstr "Error al desenlazar el archivo de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " +#| msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " msgstr "Error al abrir el depósito de claves «%s» para su escritura:" #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "" "(Adicionalmente, también falló la liberación del bloqueo para «%s»: %s)" @@ -758,6 +821,15 @@ msgstr "El método «%s» con interfaz «%s» y firma «%s» no existe" msgid "A subtree is already exported for %s" msgstr "Ya se ha exportado un subárbol para %s" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"No se puede determinar la dirección del bus desde la variable de entorno " +"DBUS_STARTER_BUS_TYPE; variable «%s» desconocida" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "el tipo no es válido («INVALID»)" @@ -804,16 +876,21 @@ msgstr[1] "Se querían leer %lu bytes pero sólo se obtuvo %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +#| msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Se esperaba el byte NULL después de la cadena «%s» pero se encontró el byte " "%d" #: ../gio/gdbusmessage.c:1388 #, c-format +#| msgid "" +#| "Expected valid UTF-8 string but found invalid bytes at byte offset %d " +#| "(length of string is %d). The valid UTF-8 string up until that point was " +#| "'%s'" msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" "Se esperaba una cadena válida en UTF-8 pero se encontraron bytes no válidos " "en el byte desplazado %d (la longitud de la cadena es %d). La cadena UTF-8 " @@ -821,12 +898,14 @@ msgstr "" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +#| msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "El valor analizado «%s» no es un objeto de ruta D-Bus válido" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +#| msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "El valor analizado «%s» no es una firma de D-Bus válida" #: ../gio/gdbusmessage.c:1656 @@ -844,8 +923,11 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format +#| msgid "" +#| "Encountered array of type 'a%c', expected to have a length a multiple of " +#| "%u bytes, but found to be %u bytes in length" msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" "Encontrado un vector de tipo «a%c», esperando que su longitud fuese múltiplo " @@ -853,22 +935,29 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "El valor analizado «%s» para la variante no es una firma de D-Bus válida" #: ../gio/gdbusmessage.c:1867 #, c-format +#| msgid "" +#| "Error deserializing GVariant with type string '%s' from the D-Bus wire " +#| "format" msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Error al deserializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" #: ../gio/gdbusmessage.c:2051 #, c-format +#| msgid "" +#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found " +#| "value 0x%02x" msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" "Valor endian no válido. Se esperaba 0x6c («l») o 0x42 («B»)» pero se obtuvo " @@ -883,14 +972,16 @@ msgstr "" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +#| msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Se encontró la cabecera de firma con firma «%s» pero el cuerpo del mensaje " "está vacío" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "El valor analizado «%s» no es una firma de D-Bus válida (para el cuerpo)" @@ -911,8 +1002,10 @@ msgstr "No se puede deserializar el mensaje: " #: ../gio/gdbusmessage.c:2515 #, c-format +#| msgid "" +#| "Error serializing GVariant with type string '%s' to the D-Bus wire format" msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Error al serializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" @@ -932,29 +1025,35 @@ msgstr "No se puede serializar el mensaje: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +#| msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" "El cuerpo del mensaje tiene la firma «%s» pero no existe la cabecera de firma" #: ../gio/gdbusmessage.c:2714 #, c-format +#| msgid "" +#| "Message body has type signature '%s' but signature in the header field is " +#| "'%s'" msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" "El cuerpo del mensaje tiene un tipo de firma «%s» pero la firma en el campo " "de cabecera es «%s»" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +#| msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "El cuerpo del mensaje está vacío pero la firma en el campo de cabecera es " "«(%s)»" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +#| msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "Error al devolver el cuerpo de tipo «%s»" #: ../gio/gdbusmessage.c:3291 @@ -1001,21 +1100,33 @@ msgstr "" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" +#| msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" msgstr "Error al escribir el archivo de número usado una sola vez en «%s»: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +#| msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "La cadena «%s» no es un GUID válido de D-Bus" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" +#| msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" msgstr "No se puede escuchar en un transporte no soportado «%s»" #: ../gio/gdbus-tool.c:95 #, c-format +#| msgid "" +#| "Commands:\n" +#| " help Shows this information\n" +#| " introspect Introspect a remote object\n" +#| " monitor Monitor a remote object\n" +#| " call Invoke a method on a remote object\n" +#| " emit Emit a signal\n" +#| "\n" +#| "Use \"%s COMMAND --help\" to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -1024,7 +1135,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Comandos:\n" " help Mostrar esta información\n" @@ -1084,17 +1195,22 @@ msgstr "Se especificaron varios puntos de conexión extremos" #: ../gio/gdbus-tool.c:471 #, c-format +#| msgid "" +#| "Warning: According to introspection data, interface '%s' does not exist\n" msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Advertencia: según la introspección de los datos, la interfaz «%s» no " "existe\n" #: ../gio/gdbus-tool.c:480 #, c-format +#| msgid "" +#| "Warning: According to introspection data, method '%s' does not exist on " +#| "interface '%s'\n" msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" "Advertencia: según la introspección de los datos, el método «%s» no existe " "en la interfaz «%s»\n" @@ -1210,12 +1326,14 @@ msgstr "Error: no se especificó el nombre del método\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +#| msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "Error: el nombre del método «%s» no es válido\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +#| msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Error al analizar el parámetro %d del tipo «%s»: %s\n" #: ../gio/gdbus-tool.c:1472 @@ -1259,7 +1377,8 @@ msgid "Unnamed" msgstr "Sin nombre" #: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +#| msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "El archivo de escritorio no especificó el campo Exec" #: ../gio/gdesktopappinfo.c:2689 @@ -1268,14 +1387,16 @@ msgstr "Imposible encontrar el terminal requerido por la aplicación" #: ../gio/gdesktopappinfo.c:3097 #, c-format -msgid "Can't create user application configuration folder %s: %s" +#| msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "" "No se puede crear la carpeta de configuración de la aplicación %s del " "usuario: %s" #: ../gio/gdesktopappinfo.c:3101 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +#| msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "No se puede crear la carpeta de configuración MIME %s del usuario: %s" #: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 @@ -1284,7 +1405,8 @@ msgstr "La información de la aplicación carece de un identificador" #: ../gio/gdesktopappinfo.c:3599 #, c-format -msgid "Can't create user desktop file %s" +#| msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "No se puede crear el archivo de escritorio %s del usuario" #: ../gio/gdesktopappinfo.c:3733 @@ -1293,26 +1415,31 @@ msgid "Custom definition for %s" msgstr "Definición personalizada para %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" +#| msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "la unidad no implementa la expulsión" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" +#| msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "la unidad no implementa la expulsión o expulsión con operación" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +#| msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "la unidad no implementa el sondeo para medios" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +#| msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "la unidad no implementa reproducir" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +#| msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "la unidad no implementa detener" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1326,7 +1453,8 @@ msgstr "Soporte de DTSL no disponible" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +#| msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "No se puede manejar la versión %d de la codificación GEmblem" #: ../gio/gemblem.c:333 @@ -1336,7 +1464,8 @@ msgstr "Número de tokens (%d) mal formados en la codificación GEmblem" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +#| msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "No se puede manejar la versión %d de la codificación GEmblemedIcon" #: ../gio/gemblemedicon.c:372 @@ -1368,12 +1497,14 @@ msgstr "Operación no soportada" msgid "Containing mount does not exist" msgstr "El punto de montaje contenido no existe" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +#| msgid "Can't copy over directory" +msgid "Can’t copy over directory" msgstr "No se puede copiar sobre la carpeta" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +#| msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "No se puede copiar una carpeta sobre otra" #: ../gio/gfile.c:2583 @@ -1381,7 +1512,8 @@ msgid "Target file exists" msgstr "El archivo destino ya existe" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +#| msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "No se puede copiar la carpeta recursivamente" #: ../gio/gfile.c:2884 @@ -1402,11 +1534,13 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Copiar (reflink/clone) no está soportado o no es válido" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +#| msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Copiar (reflink/clone) no está soportado o no ha funcionado" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +#| msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "No se puede copiar el archivo especial" #: ../gio/gfile.c:3885 @@ -1419,12 +1553,14 @@ msgstr "No se soporta mover a la papelera" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" +#| msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" msgstr "Los nombres de archivo no pueden contener «%c»" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" -msgstr "el volumen no implementa el montado" +#| msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" +msgstr "el volumen no implementa el montaje" #: ../gio/gfile.c:6713 msgid "No application is registered as handling this file" @@ -1445,7 +1581,8 @@ msgstr "El enumerador del archivo ya está cerrado" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +#| msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "No se puede manejar la versión %d de la codificación GFileIcon" #: ../gio/gfileicon.c:246 @@ -1455,7 +1592,8 @@ msgstr "Datos de entrada mal formados para GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +#| msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "El flujo no soporta query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1527,7 +1665,8 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "El tipo %s no implementa from_tokens() en la interfaz GIcon" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +#| msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "" "No se puede manejar la versión proporcionada de la codificación de icono" @@ -1546,7 +1685,8 @@ msgstr "La dirección tiene bits más allá de la longitud del prefijo" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +#| msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "No se pudo analizar «%s» como una máscara de una dirección IP" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 @@ -1559,7 +1699,8 @@ msgid "Unsupported socket address" msgstr "Dirección del socket no soportada" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +#| msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "El flujo de entrada no implementa la lectura" #. Translators: This is an error you get if there is already an @@ -1582,7 +1723,8 @@ msgid "Keep with file when moved" msgstr "Mantener con archivo cuando se mueva" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" +#| msgid "'version' takes no arguments" +msgid "“version” takes no arguments" msgstr "«version» no lleva ningún argumento" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 @@ -1593,6 +1735,10 @@ msgstr "Uso:" msgid "Print version information and exit." msgstr "Mostrar información de la versión y salir." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGS...]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Comandos:" @@ -1760,7 +1906,8 @@ msgstr "El destino %s no es una carpeta" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " +#| msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " msgstr "%s: ¿sobrescribir «%s» ? " #: ../gio/gio-tool-info.c:34 @@ -1781,7 +1928,8 @@ msgstr "ATRIBUTOS" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 #: ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +#| msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "No seguir enlaces simbólicos" #: ../gio/gio-tool-info.c:75 @@ -1846,12 +1994,18 @@ msgid "Show information about locations." msgstr "Mostrar información sobre las ubicaciones." #: ../gio/gio-tool-info.c:285 +#| msgid "" +#| "gio info is similar to the traditional ls utility, but using GIO\n" +#| "locations instead of local files: for example, you can use something\n" +#| "like smb://server/resource/file.txt as location. File attributes can\n" +#| "be specified with their GIO name, e.g. standard::icon, or just by\n" +#| "namespace, e.g. unix, or by '*', which matches all attributes" msgid "" "gio info is similar to the traditional ls utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info es similar a la utilidad «ls» tradicional, pero usando ubicaciones\n" "GIO en lugar de archivos locales: por ejemplo, puede usar algo\n" @@ -1924,12 +2078,14 @@ msgstr "Debe especificar un único tipo MIME, y tal vez un manejador" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +#| msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "No hay aplicación predeterminada para «%s»\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +#| msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "Aplicación predeterminada para «%s»: %s\n" #: ../gio/gio-tool-mime.c:124 @@ -1954,12 +2110,14 @@ msgstr "No hay aplicaciones recomendadas\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" +#| msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "Falló al cargar la información para el manejador «%s»\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +#| msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" "Falló al establecer el manejador «%s» como predeterminado para «%s»: %s\n" @@ -1996,7 +2154,8 @@ msgstr "" "enlaces duros)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +#| msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Monitoriza un archivo directamente, pero no informa de los cambios" #: ../gio/gio-tool-monitor.c:45 @@ -2107,7 +2266,8 @@ msgid "Mount or unmount the locations." msgstr "Montar o desmontar las ubicaciones." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +#| msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "No usar copia y eliminación de reserva" #: ../gio/gio-tool-move.c:99 @@ -2294,17 +2454,20 @@ msgstr "El archivo %s aparece varias veces en el recurso" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +#| msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "Falló al buscar «%s» en cualquier carpeta fuente" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +#| msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "Falló al buscar «%s» en la carpeta actual" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" +#| msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" msgstr "Opción de procesado desconocida «%s»" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 @@ -2327,11 +2490,15 @@ msgstr "Error al comprimir el archivo %s" msgid "text may not appear inside <%s>" msgstr "El texto no debe aparecer dentro de <%s>" -#: ../gio/glib-compile-resources.c:620 +#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037 +msgid "Show program version and exit" +msgstr "Mostrar la versión del programa y salir" + +#: ../gio/glib-compile-resources.c:622 msgid "name of the output file" msgstr "nombre del archivo de salida" -#: ../gio/glib-compile-resources.c:621 +#: ../gio/glib-compile-resources.c:623 msgid "" "The directories where files are to be read from (default to current " "directory)" @@ -2339,49 +2506,51 @@ msgstr "" "La carpeta de la que se tienen que leer los archivos (la predeterminada es " "la carpeta actual)" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2036 -#: ../gio/glib-compile-schemas.c:2065 +#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2067 msgid "DIRECTORY" msgstr "CARPETA" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:624 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" "Generar salida en el formato seleccionado por la extensión del nombre del " "archivo objetivo" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:625 msgid "Generate source header" msgstr "Generar cabecera fuente" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:626 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "" "Generar el código fuente usado para enlazar el archivo del recurso en su " "código fuente" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:627 msgid "Generate dependency list" msgstr "Generar lista de dependencias" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:628 msgid "name of the dependency file to generate" msgstr "nombre del archivo de dependencias que generar" -#: ../gio/glib-compile-resources.c:627 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:629 +#| msgid "Don't automatically create and register resource" +msgid "Don’t automatically create and register resource" msgstr "No crear y registrar automáticamente un recurso" -#: ../gio/glib-compile-resources.c:628 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:630 +#| msgid "Don't export functions; declare them G_GNUC_INTERNAL" +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "No exportar funciones; declararlas como G_GNUC_INTERNAL" -#: ../gio/glib-compile-resources.c:629 +#: ../gio/glib-compile-resources.c:631 msgid "C identifier name used for the generated source code" msgstr "Nombre del identificador C usado para el código fuente generado" -#: ../gio/glib-compile-resources.c:655 +#: ../gio/glib-compile-resources.c:657 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2392,7 +2561,7 @@ msgstr "" "gresource.xml,\n" "y el archivo del recurso debe tener la extensión se llama .gresource." -#: ../gio/glib-compile-resources.c:671 +#: ../gio/glib-compile-resources.c:679 #, c-format msgid "You should give exactly one file name\n" msgstr "Deberá proporcionar exactamente un nombre de archivo\n" @@ -2621,23 +2790,23 @@ msgstr "" "la clave de sobrescritura «%s» en el esquema «%s» en el archivo de " "sobrescritura «%s» no está en la lista de opciones válidas" -#: ../gio/glib-compile-schemas.c:2036 +#: ../gio/glib-compile-schemas.c:2038 msgid "where to store the gschemas.compiled file" msgstr "dónde almacenar el archivo gschemas.compiled" -#: ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-schemas.c:2039 msgid "Abort on any errors in schemas" msgstr "Abortar ante cualquier error en los esquemas" -#: ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2040 msgid "Do not write the gschema.compiled file" msgstr "No escribir el archivo gschemas.compiled" -#: ../gio/glib-compile-schemas.c:2039 +#: ../gio/glib-compile-schemas.c:2041 msgid "Do not enforce key name restrictions" msgstr "No forzar las restricciones de nombre de las claves" -#: ../gio/glib-compile-schemas.c:2068 +#: ../gio/glib-compile-schemas.c:2070 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2648,154 +2817,157 @@ msgstr "" "Los archivos de esquema deben tener la extensión .gschema.xml,\n" "y el archivo de caché se llama gschemas.compiled." -#: ../gio/glib-compile-schemas.c:2084 +#: ../gio/glib-compile-schemas.c:2092 #, c-format msgid "You should give exactly one directory name\n" msgstr "Deberá proporcionar exactamente un nombre de carpeta\n" -#: ../gio/glib-compile-schemas.c:2123 +#: ../gio/glib-compile-schemas.c:2131 #, c-format msgid "No schema files found: " msgstr "No se encontró ningún archivo de esquemas: " -#: ../gio/glib-compile-schemas.c:2126 +#: ../gio/glib-compile-schemas.c:2134 #, c-format msgid "doing nothing.\n" msgstr "sin hacer nada.\n" -#: ../gio/glib-compile-schemas.c:2129 +#: ../gio/glib-compile-schemas.c:2137 #, c-format msgid "removed existing output file.\n" msgstr "se quitó el archivo de salida existente.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Nombre de archivo no válido %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Error al obtener la información del sistema de archivos para %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "No se ha encontrado el punto de montaje para el archivo %s" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +#| msgid "Can't rename root directory" +msgid "Can’t rename root directory" msgstr "No se puede renombrar la carpeta raíz" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Error al leer el archivo %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +#| msgid "Can't rename file, filename already exists" +msgid "Can’t rename file, filename already exists" msgstr "No se puede renombrar el archivo, el nombre de archivo ya existe" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Nombre de archivo no válido" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Error al abrir el archivo %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Error al eliminar el archivo %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Error al mover a la papelera el archivo %s: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "No se pudo crear la carpeta de papelera %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "No se pudo encontrar la carpeta de nivel superior para la papelera %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "No se pudo encontrar o crear la carpeta de la papelera para %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "No se pudo crear la información de papelera para el archivo %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "No se pudo enviar a la papelera el archivo %s entre sistemas de archivos" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "No se pudo enviar a la papelera el archivo %s: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "No se pudo enviar a la papelera el archivo %s" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Error al crear la carpeta %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "El sistema de archivos no soporta enlaces simbólicos" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Error al crear el enlace simbólico %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Enlaces simbólicos no soportados" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Error al mover el archivo %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +#| msgid "Can't move directory over directory" +msgid "Can’t move directory over directory" msgstr "No se puede mover una carpeta sobre una carpeta" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Falló la creación del archivo de respaldo" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Error al eliminar el archivo destino: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "No se soporta mover archivos entre puntos de montaje" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "No se pudo determinar el uso de disco de %s: %s" @@ -2814,7 +2986,8 @@ msgstr "Nombre extendido del atributo no válido" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" +#| msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" msgstr "Error al establecer el atributo extendido «%s»: %s" #: ../gio/glocalfileinfo.c:1575 @@ -2823,7 +2996,8 @@ msgstr " (codificación no válida)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" +#| msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" msgstr "Error al obtener la información del archivo «%s»: %s" #: ../gio/glocalfileinfo.c:2017 @@ -2948,8 +3122,9 @@ msgstr "Error al truncar el archivo: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "Error al abrir el archivo «%s»: %s" +#| msgid "Error opening file %s: %s" +msgid "Error opening file “%s”: %s" +msgstr "Error al abrir el archivo %s: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -3008,21 +3183,24 @@ msgstr "La búsqueda solicitada después del final del flujo" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" +#| msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" msgstr "el punto de montaje no implementa el desmontado («unmount»)" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" +#| msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" msgstr "el punto de montaje no implementa la expulsión («eject»)" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" "el punto de montaje no implementa desmontado («umount») o desmontado con " "operación («unmount_with_operation»)" @@ -3031,7 +3209,8 @@ msgstr "" #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "" "el punto de montaje no implementa la expulsión («eject») o expulsión con " "operación («eject_with_operation»)" @@ -3040,27 +3219,31 @@ msgstr "" #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" +#| msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" msgstr "el punto de montaje no implementa el remontado («remount»)" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +#| msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "el punto de montaje no implementa averiguación del tipo de contenido" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +#| msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "" -"el punto de montaje no implementa averiguación del tipo de contenido síncrona" +"el punto de montaje no implementa averiguación síncrona del tipo de contenido" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" +#| msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" msgstr "El nombre del equipo «%s» contiene «[» pero no «]»" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 @@ -3091,17 +3274,19 @@ msgid "NetworkManager version too old" msgstr "Versión de NetworkManager demasiado antigua" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +#| msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "El flujo de salida no implementa la escritura" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "El flujo de origen ya está cerrado" -#: ../gio/gresolver.c:330 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +#| msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" msgstr "Error al resolver «%s»: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -3109,21 +3294,25 @@ msgstr "Error al resolver «%s»: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +#| msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "El recurso en «%s» no existe" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" +#| msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" msgstr "El recurso en «%s» falló al descomprimir" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" +#| msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" msgstr "El recurso en «%s» no es una carpeta" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +#| msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "El flujo de entrada no implementa la búsqueda" #: ../gio/gresource-tool.c:494 @@ -3170,9 +3359,22 @@ msgid "FILE PATH" msgstr "ARCHIVO RUTA" #: ../gio/gresource-tool.c:534 +#| msgid "" +#| "Usage:\n" +#| " gresource [--section SECTION] COMMAND [ARGS...]\n" +#| "\n" +#| "Commands:\n" +#| " help Show this information\n" +#| " sections List resource sections\n" +#| " list List resources\n" +#| " details List resources with details\n" +#| " extract Extract a resource\n" +#| "\n" +#| "Use 'gresource help COMMAND' to get detailed help.\n" +#| "\n" msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3181,7 +3383,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" @@ -3189,10 +3391,10 @@ msgstr "" "\n" "Comandos:\n" " help Mostrar esta información\n" -" sections Listar secciones de recursos\n" -" list Listar recursos\n" -" details Listar recursos con detalle\n" -" extract Extraer un recurso\n" +" sections Listar secciones de recursos\n" +" list Listar recursos\n" +" details Listar recursos con detalle\n" +" extract Extraer un recurso\n" "\n" "Use «gresource help COMANDO» para obtener ayuda detallada.\n" "\n" @@ -3252,17 +3454,20 @@ msgstr " RUTA La ruta de un recurso\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" +#| msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" msgstr "No existe el esquema «%s»\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +#| msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "El esquema «%s» no es reubicable (no se debe especificar la ruta)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +#| msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "El esquema «%s» es reubicable (se debe especificar la ruta)\n" #: ../gio/gsettings-tool.c:92 @@ -3343,7 +3548,6 @@ msgid "Query the range of valid values for KEY" msgstr "Consultar el rango de valores válidos para la CLAVE" #: ../gio/gsettings-tool.c:575 -#| msgid "Query the range of valid values for KEY" msgid "Query the description for KEY" msgstr "Consultar la descripción para la CLAVE" @@ -3396,6 +3600,7 @@ msgstr "ESQUEMA[:RUTA] [CLAVE]" #| " list-children List children of a schema\n" #| " list-recursively List keys and values, recursively\n" #| " range Queries the range of a key\n" +#| " describe Queries the description of a key\n" #| " get Get the value of a key\n" #| " set Set the value of a key\n" #| " reset Reset the value of a key\n" @@ -3408,7 +3613,7 @@ msgstr "ESQUEMA[:RUTA] [CLAVE]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3426,7 +3631,7 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" @@ -3509,7 +3714,8 @@ msgstr "Se proporcionó un nombre de esquema vacío\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" +#| msgid "No such key '%s'\n" +msgid "No such key “%s”\n" msgstr "No existe la clave «%s»\n" #: ../gio/gsocket.c:364 @@ -3682,7 +3888,8 @@ msgstr "" #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +#| msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "El protocolo del proxy «%s» no está soportado." #: ../gio/gsocketlistener.c:218 @@ -3695,7 +3902,8 @@ msgstr "El socket añadido está cerrado" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +#| msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 no soporta la dirección de IPv6 «%s»" #: ../gio/gsocks4aproxy.c:136 @@ -3704,7 +3912,8 @@ msgstr "El nombre de usuario es demasiado largo para el protocolo SOCKSv4" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" +#| msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "" "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv4\t" @@ -3746,7 +3955,8 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" +#| msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv5" #: ../gio/gsocks5proxy.c:348 @@ -3774,7 +3984,8 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Se rechazó la conexión a través del proxy SOCKSv5." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +#| msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "El proxy SOCKSv5 no soporta el comando «connect»." #: ../gio/gsocks5proxy.c:392 @@ -3787,7 +3998,8 @@ msgstr "Error desconocido del proxy SOCKSv5." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +#| msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "No se puede manejar la versión %d de la codificación GThemedIcon" #: ../gio/gthreadedresolver.c:118 @@ -3796,23 +4008,27 @@ msgstr "No se han encontrado direcciones válidas" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" -msgstr "Error al resolver «%s» de forma invertida: %s" +#| msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" +msgstr "Error al resolver «%s» de forma inversa: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +#| msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "No hay un registro de DNS del tipo solicitado para «%s»" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +#| msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "No se puede resolver «%s» temporalmente" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +#| msgid "Error resolving '%s'" +msgid "Error resolving “%s”" msgstr "Error al resolver «%s»" #: ../gio/gtlscertificate.c:250 @@ -3919,7 +4135,7 @@ msgstr "Error al leer del descriptor del archivo: %s" msgid "Error closing file descriptor: %s" msgstr "Error al cerrar el descriptor del archivo: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 msgid "Filesystem root" msgstr "Sistema de archivos raíz" @@ -3934,14 +4150,16 @@ msgstr "" "Este sistema no soporta direcciones de socket de dominio UNIX abstracto" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +#| msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "el volumen no implementa la expulsión" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" +#| msgid "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" msgstr "el volumen no implementa la expulsión o expulsión con operación" #: ../gio/gwin32inputstream.c:185 @@ -4003,25 +4221,29 @@ msgstr "Argumentos incorrectos\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +#| msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo inesperado «%s» para el elemento «%s»" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" +#| msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" msgstr "El atributo «%s» del elemento «%s» no se ha encontrado" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +#| msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Etiqueta «%s» inesperada, se esperaba la etiqueta «%s»" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +#| msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "Etiqueta «%s» inesperada dentro de «%s»" #: ../glib/gbookmarkfile.c:1757 @@ -4032,7 +4254,8 @@ msgstr "" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" +#| msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" msgstr "Ya existe un marcador para el URI «%s»" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 @@ -4045,32 +4268,38 @@ msgstr "Ya existe un marcador para el URI «%s»" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" +#| msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" msgstr "No se encontró un marcador para el URI «%s»" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" +#| msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Ningún tipo MIME definido en el marcador para la URI «%s»" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" +#| msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "No se ha definido ningún flag privado en el marcador para el URI «%s»" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" +#| msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" msgstr "No se ha establecido ningún grupo en el marcador para el URI «%s»" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +#| msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Ninguna aplicación con nombre «%s» registró un marcador para «%s»" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +#| msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Falló la expansión de lalinea ejecutable «%s» con el URI «%s»" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 @@ -4080,37 +4309,44 @@ msgstr "Hay una secuencia parcial de caracteres en el final de la entrada" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +#| msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "No se puede convertir el fallback «%s» al conjunto de códigos «%s»" #: ../glib/gconvert.c:1567 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "El URI «%s» no es una URI absoluta utilizando el esquema «file»" #: ../glib/gconvert.c:1577 #, c-format -msgid "The local file URI '%s' may not include a '#'" +#| msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" msgstr "El archivo local en la URI «%s» no debe incluir un «#»" #: ../glib/gconvert.c:1594 #, c-format -msgid "The URI '%s' is invalid" +#| msgid "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" msgstr "El URI «%s» no es válido" #: ../glib/gconvert.c:1606 #, c-format -msgid "The hostname of the URI '%s' is invalid" +#| msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" msgstr "El nombre del host de la URI «%s» no es válido" #: ../glib/gconvert.c:1622 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +#| msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "El URI «%s» contiene caracteres de escape no válidos" #: ../glib/gconvert.c:1717 #, c-format -msgid "The pathname '%s' is not an absolute path" +#| msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" msgstr "El nombre de la ruta «%s» no es una ruta absoluta" #: ../glib/gconvert.c:1727 @@ -4345,93 +4581,112 @@ msgstr "Dom" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" +#| msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" msgstr "Falló al abrir la carpeta «%s»: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +#| msgid "Could not allocate %lu byte to read file \"%s\"" +#| msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "No se pudo asignar %lu byte para leer el archivo «%s»" msgstr[1] "No se pudieron asignar %lu bytes para leer el archivo «%s»" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" -msgstr "Falló al leer el archivo «%s»: %s" +#| msgid "Error reading file %s: %s" +msgid "Error reading file “%s”: %s" +msgstr "Error al leer el archivo %s: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +#| msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "El archivo «%s» es demasiado grande" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" +#| msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" msgstr "Falló al leer del archivo «%s»: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" +#| msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" msgstr "Falló al abrir el archivo «%s»: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +#| msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Falló al obtener los atributos del archivo «%s»: fstat() falló: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +#| msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Falló al abrir el archivo «%s»: fdopen() falló: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Falló al renombrar el archivo «%s» a «%s»: g_rename() falló: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" +#| msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" msgstr "Falló al crear el archivo «%s»: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" +#| msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" msgstr "Falló al escribir el archivo «%s»: falló write(): %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +#| msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Falló al escribir el archivo «%s»: falló fsync(): %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "El archivo existente «%s» no se pudo eliminar: g_unlink() falló: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +#| msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "La plantilla «%s» no es válida, no debería contener un «%s»" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +#| msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "La plantilla «%s» no contiene XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +#| msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "Falló al leer el enlace simbólico «%s»: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +#| msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "No se pudo abrir el conversor de «%s» a «%s»: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +#| msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "" "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_line_string" @@ -4445,7 +4700,8 @@ msgid "Channel terminates in a partial character" msgstr "El canal termina en un carácter parcial" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +#| msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "" "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_to_end" @@ -4460,8 +4716,11 @@ msgstr "No es un archivo regular" #: ../glib/gkeyfile.c:1204 #, c-format +#| msgid "" +#| "Key file contains line '%s' which is not a key-value pair, group, or " +#| "comment" msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "El archivo de claves contiene la línea «%s» que no es un par valor-clave, " "grupo o comentario" @@ -4482,40 +4741,49 @@ msgstr "Nombre de clave no válida: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +#| msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "El archivo de claves contiene una codificación «%s» no soportada" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +#| msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "El archivo de claves no tiene el grupo «%s»" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +#| msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "El archivo de claves no tiene la clave «%s» en el grupo «%s»" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +#| msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "" "El archivo de claves contiene la clave «%s» con el valor «%s» el cual no es " "UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format +#| msgid "" +#| "Key file contains key '%s' which has a value that cannot be interpreted." msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "El archivo de claves contiene la clave «%s» que tiene un valor que no se " "puede interpretar." #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format +#| msgid "" +#| "Key file contains key '%s' in group '%s' which has a value that cannot be " +#| "interpreted." msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" "El archivo de claves contiene la clave «%s» en el grupo «%s» que tiene un " @@ -4523,7 +4791,8 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +#| msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" "La clave «%s» en el grupo «%s» tiene el valor «%s», pero se esperaba %s" @@ -4534,32 +4803,38 @@ msgstr "" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" +#| msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" msgstr "El archivo de claves contiene la secuencia de escape no válida «%s»" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +#| msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "El valor «%s» no puede interpretarse como un número." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" +#| msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" msgstr "El valor entero «%s» está fuera de rango" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." +#| msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." msgstr "El valor «%s» no puede interpretarse como un número de coma flotante." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +#| msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "El valor «%s» no puede interpretarse como un booleano." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +#| msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Falló al obtener los atributos del archivo «%s%s%s%s»: fstat() falló: %s" @@ -4570,7 +4845,8 @@ msgstr "Falló al mapear el archivo «%s%s%s%s»: mmap() falló: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" msgstr "Falló al abrir el archivo «%s»: open() falló: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 @@ -4790,7 +5066,8 @@ msgstr "" "de proceso" #: ../glib/goption.c:861 -msgid "[OPTION...]" +#| msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[OPCIÓN…]" #: ../glib/goption.c:977 @@ -4815,35 +5092,39 @@ msgstr "Opciones:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +#| msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "No se puede analizar el valor entero «%s» para %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" +#| msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" msgstr "El valor entero «%s» para %s está fuera de rango" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +#| msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "No se puede analizar el valor doble «%s» para %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" +#| msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" msgstr "El valor doble «%s» para %s está fuera de rango" -#: ../glib/goption.c:1442 ../glib/goption.c:1521 +#: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format msgid "Error parsing option %s" msgstr "Error al analizar la opción: %s" -#: ../glib/goption.c:1552 ../glib/goption.c:1665 +#: ../glib/goption.c:1558 ../glib/goption.c:1671 #, c-format msgid "Missing argument for %s" msgstr "Falta un argumento para %s" -#: ../glib/goption.c:2126 +#: ../glib/goption.c:2132 #, c-format msgid "Unknown option %s" msgstr "Opción desconocida %s" @@ -5185,7 +5466,8 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Error al compilar la expresión regular %s en el carácter %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" +#| msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" msgstr "se esperaba un dígito hexadecimal o «}»" #: ../glib/gregex.c:2429 @@ -5193,7 +5475,8 @@ msgid "hexadecimal digit expected" msgstr "se esperaba un dígito hexadecimal" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" +#| msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" msgstr "falta «<» en la referencia simbólica" #: ../glib/gregex.c:2478 @@ -5213,7 +5496,8 @@ msgid "illegal symbolic reference" msgstr "referencia simbólica ilegal" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" +#| msgid "stray final '\\'" +msgid "stray final “\\”" msgstr "«\\» al final de la cadena" #: ../glib/gregex.c:2580 @@ -5222,11 +5506,13 @@ msgstr "secuencia de escape desconocida" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +#| msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Error al analizar el texto de reemplazo «%s» en el carácter %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +#| msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "El texto entrecomillado no empieza por un signo de comilla" #: ../glib/gshell.c:186 @@ -5237,13 +5523,16 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +#| msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "" "El texto termina justo después de un carácter '\\'. (El texto era «%s»)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +#| msgid "" +#| "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "El texto terminó antes de que se encontrase la comilla correspondiente con " "%c. (El texto era «%s»)" @@ -5299,12 +5588,14 @@ msgstr "Falló al bifurcar (fork) (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" +#| msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" msgstr "Falló al cambiar a la carpeta «%s» (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +#| msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "Falló al ejecutar el proceso hijo «%s» (%s)" #: ../glib/gspawn.c:1510 @@ -5319,8 +5610,9 @@ msgstr "Falló al bifurcar el proceso hijo (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" -msgstr "Falló desconocido al ejecutar el proceso hijo «%s»" +#| msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" +msgstr "Error desconocido al ejecutar el proceso hijo «%s»" #: ../glib/gspawn.c:1551 #, c-format @@ -5480,6 +5772,15 @@ msgstr[1] "%s bytes" msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Error al crear la carpeta «%s»: %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Error al abrir el archivo «%s»: %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Falló al leer el archivo «%s»: %s" + #~ msgid "No locations gives" #~ msgstr "No se han indicado las ubicaciones" @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-11 15:40+0200\n" -"PO-Revision-Date: 2016-10-11 15:40+0200\n" +"POT-Creation-Date: 2016-12-27 00:11+0100\n" +"PO-Revision-Date: 2016-12-27 00:35+0200\n" "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n" "Language-Team: Galician\n" "Language: gl\n" @@ -42,7 +42,7 @@ msgstr "" "servizo D-Bus)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +msgid "Override the application’s ID" msgstr "Omitir o ID do aplicativo" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -82,7 +82,7 @@ msgid "Launch the application (with optional files to open)" msgstr "Inicia un aplicativo (con ficheiros opcionais a abrir)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" +msgid "APPID [FILE…]" msgstr "APPID [FICHEIRO...]" #: ../gio/gapplication-tool.c:59 @@ -124,8 +124,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" "Identificador de aplicativo en formato D-Bus (p.ex.: org.exemplo.visor)" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622 -#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "FICHEIRO" @@ -169,8 +169,8 @@ msgstr "Uso:\n" msgid "Arguments:\n" msgstr "Argumentos:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" msgstr "[ARGS...]" #: ../gio/gapplication-tool.c:134 @@ -182,10 +182,10 @@ msgstr "Ordes:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Use '%s help ORDE' para obter axuda detallada.\n" +"Use «%s help ORDE» para obter axuda detallada.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -199,14 +199,14 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "id de aplicativo non válido: «%s»\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" "«%s» non recolle argumentos\n" @@ -230,8 +230,8 @@ msgstr "o nome da acción debe fornecerse logo do id de aplicativo\n" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" "nome da acción non válido: «%s»\n" "os nomes de acción deben consistir só de alfanuméricos, «-» e «.»\n" @@ -324,19 +324,19 @@ msgstr "A secuencia de bytes non é válida na entrada da conversión" msgid "Error during conversion: %s" msgstr "Produciuse un erro durante a conversión: %s" -#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 msgid "Cancellable initialization not supported" msgstr "Non se permite a inicialización cancelábel" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" -msgstr "Non se asiste conversión do conxunto de caracteres «%s» a «%s»" +msgid "Conversion from character set “%s” to “%s” is not supported" +msgstr "Non se admite a conversión do conxunto de caracteres «%s» a «%s»" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" msgstr "Non foi posíbel abrir o conversor de «%s» a «%s»" #: ../gio/gcontenttype.c:335 @@ -376,41 +376,41 @@ msgstr "Final de fluxo inesperadamente prematuro" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" msgstr "Clave «%s» non admitida na entrada do enderezo «%s»" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" "O enderezo «%s» non é válido (necesítase exactamente unha ruta, tmpdir ou " "claves abstractas)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Combinación de par clave/valor sen sentido na entrada do enderezo «%s»" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" -msgstr "Erro no enderezo «%s» o atributo do porto está mal formado" +msgid "Error in address “%s” — the port attribute is malformed" +msgstr "Erro no enderezo «%s» — o atributo do porto está mal formado" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" -msgstr "Erro no enderezo «%s» - o atributo da familia está mal formada" +msgid "Error in address “%s” — the family attribute is malformed" +msgstr "Erro no enderezo «%s» — o atributo da familia está mal formado" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "O elemento do enderezo «%s» non contén un caracter dous puntos (:)" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" "O par clave/valor %d, «%s» no elemento do enderezo «%s» non contén un signo " @@ -419,8 +419,8 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" "Produciuse un erro ao desescapar a clave ou o valor no par clave/valor %d, " "«%s», no elemento de enderezo «%s»" @@ -428,28 +428,28 @@ msgstr "" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" -"Erro no enderezo «%s» - o transporte unix require que se estabeleza " +"Erro no enderezo «%s» — o transporte unix require que se estabeleza " "exactamente unha das claves «path» ou «abstract»" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" -msgstr "Erro no enderezo «%s» - falta o atributo do equipo ou está mal formado" +msgid "Error in address “%s” — the host attribute is missing or malformed" +msgstr "Erro no enderezo «%s» — falta o atributo do equipo ou está mal formado" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" -msgstr "Erro no enderezo «%s» - falta o atributo do porto ou está mal formado" +msgid "Error in address “%s” — the port attribute is missing or malformed" +msgstr "Erro no enderezo «%s» — falta o atributo do porto ou está mal formado" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -"Produciuse un erro no enderezo «%s» - falta o atributo do ficheiro de uso de " -"unha vez ou está mal formado" +"Erro no enderezo «%s» — falta o atributo do ficheiro de uso de unha vez ou " +"está mal formado" #: ../gio/gdbusaddress.c:655 msgid "Error auto-launching: " @@ -457,29 +457,29 @@ msgstr "Produciuse un erro ao autoiniciar: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transporte «%s» descoñecido ou non compatíbel para o enderezo «%s»" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro de uso de unha vez «%s»: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" msgstr "Produciuse un erro ao ler o ficheiro de uso de unha vez «%s»: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Produciuse un erro ao ler o ficheiro de uso de unha vez «%s»:, esperábanse " "16 bytes, obtivéronse %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Produciuse un erro ao gravar os contidos do ficheiro de uso de unha vez «%s» " "ao fluxo:" @@ -505,7 +505,7 @@ msgstr "Non é posíbel autoiniciar D-Bus sen un $DISPLAY X11" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " msgstr "Produciuse un erro ao iniciar («spawn») a orde «%s»:" #: ../gio/gdbusaddress.c:1337 @@ -513,28 +513,28 @@ msgstr "Produciuse un erro ao iniciar («spawn») a orde «%s»:" msgid "(Type any character to close this window)\n" msgstr "(Prema calquera caracter para pechar esta xanela)\n" -#: ../gio/gdbusaddress.c:1489 +#: ../gio/gdbusaddress.c:1491 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "O DBus de sesión non está executándose e o autoiniciado fallou" -#: ../gio/gdbusaddress.c:1500 +#: ../gio/gdbusaddress.c:1502 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Non é posíbel determinar o enderezo do bus de sesión (non está implementado " "para este SO)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1637 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Non é posíbel determinar o enderezo do bus desde a variábel de ambiente " "DBUS_STARTER_BUS_TYPE - valor descoñecido «%s»" -#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 +#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -542,7 +542,7 @@ msgstr "" "Non é posíbel determinar o enderezo do bus xa que a variábel de ambiente " "DBUS_STARTER_BUS_TYPE non está estabelecida" -#: ../gio/gdbusaddress.c:1654 +#: ../gio/gdbusaddress.c:1656 #, c-format msgid "Unknown bus type %d" msgstr "Tipo de bus %d descoñecido" @@ -569,36 +569,36 @@ msgstr "Cancelando mediante GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" msgstr "Produciuse un erro ao obter a información do directorio «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" "Os permisos no directorio «%s» están malformados. Esperábase o modo 0700 e " "obtívose 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "Produciuse un erro ao crear o directorio «%s»: %s" +msgid "Error creating directory “%s”: %s" +msgstr "Produciuse un erro ao crear o directorio %s: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " msgstr "Produciuse un erro ao abrir o anel de chaves «%s» para a súa lectura:" #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "A liña %d do anel de chaves en «%s» con contido «%s» está malformada" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "O primeiro token da liña %d no anel de chaves en «%s» co contido «%s» está " "malformado" @@ -606,44 +606,44 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "O segundo token da liña %d no anel de chaves en «%s» co contido «%s» está " "malformado" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Non foi posíbel atopar a cookie co id %d no anel de chave en «%s»" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" msgstr "Produciuse un erro ao eliminar o ficheiro de bloqueo antigo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" msgstr "Produciuse un erro ao crear o ficheiro de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Produciuse un erro ao pechar o ficheiro de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro de bloqueo «%s»: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " msgstr "Produciuse un erro ao abrir o anel de chaves «%s» para escribir:" #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Ademais, a liberación do bloqueo para «%s» tamén fallou: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 @@ -744,6 +744,15 @@ msgstr "O método «%s» na interface «%s» coa sinatura «%s» non existe" msgid "A subtree is already exported for %s" msgstr "Xa se exportou un subárbore para %s" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Non é posíbel determinar o enderezo do bus desde a variábel de ambiente " +"DBUS_STARTER_BUS_TYPE - valor descoñecido «%s»" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "o tipo é INVALID" @@ -789,14 +798,14 @@ msgstr[1] "Quixéronse ler %lu bytes pero obtívose un %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Esperábase un byte NUL despois da cadea «%s» pero atopouse o byte %d" #: ../gio/gdbusmessage.c:1388 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" "Esperábase unha cadea UTF-8 correcta pero atopáronse bytes non válidos no " "byte desvío %d (a lonxitude da cadea é %d). A cadea UTF-8 correcta até ese " @@ -804,12 +813,12 @@ msgstr "" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "O valor analizado «%s» non é unha ruta de obxecto D-Bus correcta" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "O valor analizado «%s» non é unha sinatura D-Bus correcta" #: ../gio/gdbusmessage.c:1656 @@ -828,7 +837,7 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" "Atopouse unha matriz de tipo «a%c», agardábase ter unha de lonxitude de " @@ -836,14 +845,14 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "O valor «%s» analizado para a variante non é unha sinatura de D-Bus correcta" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Produciuse un erro ao deserializar o GVariant co tipo cadea «%s» desde o " "formato ligado D-Bus" @@ -851,7 +860,7 @@ msgstr "" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" "Valor de «endianness» non válido. Esperábase 0x6c («|») ou 0x42 («B») pero " @@ -865,14 +874,14 @@ msgstr "" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Atopouse a cabeceira de sinatura coa sinatura «%s» máis o corpo da mensaxe " "está baleiro" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "O valor analizado «%s» non é unha sinatura D-Bus correcta (para o corpo)" @@ -894,7 +903,7 @@ msgstr "Non foi posíbel deserializar a mensaxe: " #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Produciuse un erro ao serializar o GVariant co tipo cadea «%s» desde o " "formato ligado D-Bus" @@ -914,7 +923,7 @@ msgstr "Non foi posíbel serializar a mensaxe: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" "O corpo da mensaxe ten a sinatura «%s» máis non está presente a cabeceira de " "sinatura" @@ -922,22 +931,22 @@ msgstr "" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" "O corpo da mensaxe ten a sinatura de tipo «%s» pero a sintura no campo da " "cabeceira é «%s»" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "O corpo da mensaxe está baleiro máis a sinatura do campo da cabeceira é " "«(%s)»" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "Produciuse un erro ao devolver co corpo de tipo «%s»" #: ../gio/gdbusmessage.c:3291 @@ -982,18 +991,18 @@ msgstr "" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" msgstr "" "Produciuse un erro ao escribir no ficheiro de uso de unha vez en «%s»: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "A cadea «%s» non é un GUID de D-BUS correcta" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" msgstr "Non é posíbel escoitar nun transporte «%s» non admitido" #: ../gio/gdbus-tool.c:95 @@ -1006,13 +1015,14 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Ordes:\n" " help Mostra esta axuda\n" " introspect Instrospecciona un obxecto remoto\n" " monitor Monitorizar un obxecto remoto\n" " call Invoca un método nun obxecto remoto\n" +" emit Emite un sinal\n" "\n" "Use '%s ORDE --help' para obter axuda sobre cada orde.\n" @@ -1066,14 +1076,14 @@ msgstr "Especificáronse varios puntos finais da conexión" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Aviso: segundo os datos de introspección a interface «%s» non existe\n" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" "Aviso: segundo os datos de introspección o método «%s» non existe na " "interface «%s»\n" @@ -1189,12 +1199,12 @@ msgstr "Erro: non se especificou o nome do método\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "Erro: o nome do método «%s» non é válido\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Produciuse un erro ao analizar o parámetro %d do tipo «%s»: %s\n" #: ../gio/gdbus-tool.c:1472 @@ -1233,66 +1243,66 @@ msgstr "Ruta do obxecto a monitorizar" msgid "Monitor a remote object." msgstr "Monitoriza un obxecto remoto." -#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501 +#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 msgid "Unnamed" msgstr "Sen nome" -#: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +#: ../gio/gdesktopappinfo.c:2407 +msgid "Desktop file didn’t specify Exec field" msgstr "O ficheiro de escritorio non especificou o campo Exec" -#: ../gio/gdesktopappinfo.c:2689 +#: ../gio/gdesktopappinfo.c:2692 msgid "Unable to find terminal required for application" msgstr "Non é posíbel atopar o terminal requirido polo aplicativo" -#: ../gio/gdesktopappinfo.c:3097 +#: ../gio/gdesktopappinfo.c:3100 #, c-format -msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Non é posíbel crear o directorio de configuración do aplicativo de usuario " "%s: %s" -#: ../gio/gdesktopappinfo.c:3101 +#: ../gio/gdesktopappinfo.c:3104 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "Non é posíbel crear o directorio de configuración MIME %s do usuario: %s" -#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 +#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 msgid "Application information lacks an identifier" msgstr "A información do aplicativo carece dun identificador" -#: ../gio/gdesktopappinfo.c:3599 +#: ../gio/gdesktopappinfo.c:3602 #, c-format -msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "Non é posíbel crear o ficheiro de escritorio %s do usuario" -#: ../gio/gdesktopappinfo.c:3733 +#: ../gio/gdesktopappinfo.c:3736 #, c-format msgid "Custom definition for %s" msgstr "Definición personalizada para %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "a unidade non implementa a expulsión" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" -msgstr "a unidade non implementa a expulsión ou operación_de_expulsión" +msgid "drive doesn’t implement eject or eject_with_operation" +msgstr "a unidade non implementa eject ou eject_with_operation" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "a unidade non implementa a consulta para medios" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "a unidade non implementa o inicio" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "a unidade non implementa a detención" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1306,7 +1316,7 @@ msgstr "A compatibilidade de DTLS non está dispoñíbel" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Non é posíbel manipular a versión %d da codificación de GEmblem" #: ../gio/gemblem.c:333 @@ -1317,7 +1327,7 @@ msgstr "" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Non é posíbel manipular a versión %d da codificación de GEmblemedicon" #: ../gio/gemblemedicon.c:372 @@ -1351,12 +1361,12 @@ msgstr "Operación non permitida" msgid "Containing mount does not exist" msgstr "O punto de montaxe contido non existe" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" msgstr "Non é posíbel copiar sobre o directorio" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Non é posíbel copiar un directorio sobre o directorio" #: ../gio/gfile.c:2583 @@ -1364,7 +1374,7 @@ msgid "Target file exists" msgstr "O ficheiro de destino xa existe" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Non é posíbel copiar o directorio recursivamente" #: ../gio/gfile.c:2884 @@ -1385,11 +1395,11 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Copiar (reflink/clone) non é compatíbel ou non é válido" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Copiar (reflink/clone) non é compatíbel ou non funciona" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Non é posíbel copiar o ficheiro especial" #: ../gio/gfile.c:3885 @@ -1402,11 +1412,11 @@ msgstr "O Lixo non é compatíbel" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" -msgstr "Os nomes de ficheiro non poden conter '%c'" +msgid "File names cannot contain “%c”" +msgstr "Os nomes de ficheiro non poden conter «%c»" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "o volume non implementa o montado" #: ../gio/gfile.c:6713 @@ -1428,7 +1438,7 @@ msgstr "O enumerador do ficheiro xa está pechado" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Non é posíbel manipular a versión %d da codificación de GFileIcon" #: ../gio/gfileicon.c:246 @@ -1438,7 +1448,7 @@ msgstr "Datos de entrada formados incorrectamente para o GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "O fluxo non permite query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1510,7 +1520,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "O tipo %s non implementa from_tokens() na interface do GIcon" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Non é posíbel manipular a versión fornecida da codificación da icona" #: ../gio/ginetaddressmask.c:182 @@ -1528,11 +1538,11 @@ msgstr "O enderezo ten bits máis aló da lonxitude do prefixo" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "Non foi posíbel analizar «%s» como unha máscara dun enderezo IP" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 -#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 +#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 msgid "Not enough space for socket address" msgstr "Non hai espazo abondo para o enderezo do socket" @@ -1541,7 +1551,7 @@ msgid "Unsupported socket address" msgstr "Non se admite o enderezo do socket" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "O fluxo de entrada non implementa a lectura" #. Translators: This is an error you get if there is already an @@ -1564,7 +1574,7 @@ msgid "Keep with file when moved" msgstr "Manter co ficheiro ao mover" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" +msgid "“version” takes no arguments" msgstr "«version» non recolle argumentos" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 @@ -1575,6 +1585,10 @@ msgstr "Uso:" msgid "Print version information and exit." msgstr "Mostrar información da versión e saír." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGS...]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Ordes:" @@ -1741,7 +1755,7 @@ msgstr "O destino %s non é un cartafol" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " msgstr "%s: sobrescribir «%s»?" #: ../gio/gio-tool-info.c:34 @@ -1761,7 +1775,7 @@ msgid "ATTRIBUTES" msgstr "ATRIBUTOS" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "Non seguir as ligazóns simbólicas" #: ../gio/gio-tool-info.c:75 @@ -1831,7 +1845,7 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info é similar á utilidade ls tradicional, pero usando localizacións\n" "GIO no lugar de ficheiros locais: por exemplo, pode usar algo así como \n" @@ -1902,12 +1916,12 @@ msgstr "Debe especificar un tipo mime único, e pode que un xestor" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "Non hai ningún aplicativo predeterminado para «%s»\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "Aplicativo predeterminado para «%s»: %s\n" #: ../gio/gio-tool-mime.c:124 @@ -1932,12 +1946,12 @@ msgstr "Non hai aplicativos recomendados\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "Produciuse un erro ao ler a información do xestor «%s»\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" "Produciuse un erro ao estabelecer «%s» como xestor predeterminado para «%s»: " "%s\n" @@ -1976,7 +1990,7 @@ msgstr "" "ligazóns duras)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Monitoriza un ficheiro directamente, pero non informa dos cambios" #: ../gio/gio-tool-monitor.c:45 @@ -2087,7 +2101,7 @@ msgid "Mount or unmount the locations." msgstr "Montar ou desmontar as localizacións." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "Non usar a copia e eliminación alternativas" #: ../gio/gio-tool-move.c:99 @@ -2275,17 +2289,17 @@ msgstr "O ficheiro %s aparece varias veces no recurso" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "Produciuse un erro ao buscar «%s» en calquera directorio fonte" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "Produciuse un erro ao buscar «%s» no directorio actual" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" msgstr "Opción de procesado descoñecida «%s»" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 @@ -2308,15 +2322,15 @@ msgstr "Produciuse un erro ao comprimir o ficheiro: %s" msgid "text may not appear inside <%s>" msgstr "o texto non debe aparecer dentro de <%s>" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037 msgid "Show program version and exit" msgstr "Mostrar a versión do programa e saír" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "o nome do ficheiro de saída" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" @@ -2324,48 +2338,52 @@ msgstr "" "O directorio da que se ten que ler os ficheiros (o predeterminado é o " "directorio actual)" -#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038 #: ../gio/glib-compile-schemas.c:2067 msgid "DIRECTORY" msgstr "DIRECTORIO" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" "Xerar saída no formato seleccionado pola extensión do nome do ficheiro " "obxetivo" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "Xerar unha cabeceira de orixe" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "" "Xera o código fonte usado para ligar o ficheiro do recurso no seu código" -#: ../gio/glib-compile-resources.c:627 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "Xerar lista de dependencias" -#: ../gio/glib-compile-resources.c:628 +#: ../gio/glib-compile-resources.c:671 msgid "name of the dependency file to generate" msgstr "nome do ficheiro de dependencia a xerar" -#: ../gio/glib-compile-resources.c:629 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "Inclúe obxectivos phony no ficheiro de dependencias xerado" + +#: ../gio/glib-compile-resources.c:673 +msgid "Don’t automatically create and register resource" msgstr "Non crear e rexistrar o recurso automaticamente" -#: ../gio/glib-compile-resources.c:630 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:674 +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Non exporte as funcións; decláreas en G_GNUC_INTERNAL" -#: ../gio/glib-compile-resources.c:631 +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "O nome de identificador C usado para xerar o código fonte" -#: ../gio/glib-compile-resources.c:657 +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2376,7 +2394,7 @@ msgstr "" "xml,\n" "e o ficheiro do recurso ten a extensión .gresource." -#: ../gio/glib-compile-resources.c:679 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "Debería fornecer exactamente un nome de ficheiro\n" @@ -2650,137 +2668,137 @@ msgstr "sen facer nada.\n" msgid "removed existing output file.\n" msgstr "retirouse o ficheiro de saída existente.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "O nome do ficheiro non é válido %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" "Produciuse un erro ao obter a información do sistema de ficheiros %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Non se atopa o punto de montaxe que contén o ficheiro %s" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" msgstr "Non é posíbel renomear o directorio raíz" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Produciuse un erro ao renomear o ficheiro %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" msgstr "Non é posíbel renomear o ficheiro, o ficheiro xa existe" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "O nome do ficheiro non é válido" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Produciuse un erro ao abrir o ficheiro %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Produciuse un erro ao eliminar o ficheiro %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Produciuse un erro ao mover ao lixo o ficheiro %s: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Non é posíbel crear o directorio do lixo %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Non é posíbel atopar o directorio de nivel superior para mover ao lixo %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Non é posíbel atopar ou crear o directorio do lixo para %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Non é posíbel crear a información de lixo para o ficheiro %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Non é posíbel mover ao lixo o ficheiro %s a través dos límites do sistema de " "ficheiros" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Non é posíbel mover ao lixo o ficheiro %s: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Non é posíbel mover ao lixo o ficheiro %s" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Produciuse un erro ao crear o directorio %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "O sistema de ficheiros non é compatíbel coas ligazóns simbólicas" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Produciuse un erro ao crear a ligazón simbólica %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "As ligazóns simbólicas non se admiten" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Produciuse un erro ao mover o ficheiro %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" msgstr "Non é posíbel mover o directorio sobre un directorio" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Fallou a creación do ficheiro de seguranza" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Produciuse un erro ao retirar o ficheiro obxectivo: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Non se permite mover entre puntos de montaxe" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Non foi posíbel determinar o uso de disco de %s: %s" @@ -2799,7 +2817,7 @@ msgstr "Nome estendido do atributo non válido" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" msgstr "Produciuse un erro ao estabelecer o atributo estendido «%s»: %s" #: ../gio/glocalfileinfo.c:1575 @@ -2808,7 +2826,7 @@ msgstr " (codificación non válida)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" msgstr "Produciuse un erro ao obter a información do ficheiro «%s»: %s" #: ../gio/glocalfileinfo.c:2017 @@ -2936,8 +2954,8 @@ msgstr "Produciuse un erro ao truncar o ficheiro: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "Produciuse un erro ao abrir o ficheiro «%s»: %s" +msgid "Error opening file “%s”: %s" +msgstr "Produciuse un erro ao abrir o ficheiro %s: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -2996,56 +3014,55 @@ msgstr "Solicitouse unha busca máis aló do final do fluxo" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" -msgstr "montaxe non implementa \"desmontaxe\"" +msgid "mount doesn’t implement “unmount”" +msgstr "montaxe non implementa «desmontaxe»" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" -msgstr "mount non implementa \"extraer\"" +msgid "mount doesn’t implement “eject”" +msgstr "mount non implementa «extraer»" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -msgstr "" -"a montaxe non implementa o \"desmontado\" ou a \"operación_con_desmontado\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" +msgstr "a montaxe non implementa o «unmount» ou a «unmount_with_operation»" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -msgstr "a montaxe non implementa a expulsión ou a \"operación_con_expulsión\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" +msgstr "a montaxe non implementa a «eject» ou a \"eject_with_operation\"" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" -msgstr "a montaxe non implementa a \"remontaxe\"" +msgid "mount doesn’t implement “remount”" +msgstr "a montaxe non implementa \"remount\"" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "a montaxe non implementa a averiguación do tipo de contido" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "a montaxe non implementa a averiguación síncrona do tipo de contido" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" -msgstr "O nome do host «%s» contén '[' mais non ']'" +msgid "Hostname “%s” contains “[” but not “]”" +msgstr "O nome do host «%s» contén «[» mais non «]»" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 msgid "Network unreachable" @@ -3075,17 +3092,17 @@ msgid "NetworkManager version too old" msgstr "A versión NetworkManager é demasiado antiga" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "O fluxo de saída non implementa a escritura" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "O fluxo de orixe xa está pechado" -#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" msgstr "Produciuse un erro ao resolver «%s»: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -3093,21 +3110,21 @@ msgstr "Produciuse un erro ao resolver «%s»: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "Non existe o recurso en «%s»" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" msgstr "Produciuse un erro ao descomprimir o recurso en «%s»" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" msgstr "O recurso en «%s» non é un cartafol" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "O fluxo de entrada non implementa seek" #: ../gio/gresource-tool.c:494 @@ -3156,7 +3173,7 @@ msgstr "FICHEIRO RUTA" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3165,7 +3182,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" @@ -3236,17 +3253,17 @@ msgstr " RUTA Unha ruta dun recurso\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" msgstr "Non existe o esquema «%s»\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "O esquema «%s» non pode reposicionarse (non debe especificar a ruta)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "O esquema «%s» pode reposicionarse (debe especificarse a ruta)\n" #: ../gio/gsettings-tool.c:92 @@ -3369,7 +3386,7 @@ msgstr "ESQUEMA[:RUTA] [CLAVE]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3387,7 +3404,7 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" @@ -3401,6 +3418,7 @@ msgstr "" " list-keys Mostra as claves dun esquema\n" " list-children Mostra os fillos nun esquema\n" " list-recursively Lista claves e valores, recursivamente\n" +" range Consulta o rango dunha chave\n" " describe Consulta a descrición dunha chave\n" " get Obtén os valores dunha clave\n" " set Estabelece o valor dunha clave\n" @@ -3469,151 +3487,151 @@ msgstr "Forneceuse un nome de esquema baleiro\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" +msgid "No such key “%s”\n" msgstr "Non existe a clave «%s»\n" -#: ../gio/gsocket.c:364 +#: ../gio/gsocket.c:369 msgid "Invalid socket, not initialized" msgstr "O socket non é válido, non se inicializou" -#: ../gio/gsocket.c:371 +#: ../gio/gsocket.c:376 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "O socket non é válido, a inicialización fallou debido a: %s" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:384 msgid "Socket is already closed" msgstr "O fluxo de orixe xa está pechado" -#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897 -#: ../gio/gsocket.c:3952 +#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 +#: ../gio/gsocket.c:3995 msgid "Socket I/O timed out" msgstr "Tempo de espera do Socket de E/S superado" -#: ../gio/gsocket.c:526 +#: ../gio/gsocket.c:531 #, c-format msgid "creating GSocket from fd: %s" msgstr "creando o GSocket a partir de fd: %s" -#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615 +#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 #, c-format msgid "Unable to create socket: %s" msgstr "Non é posíbel crear o socket: %s" -#: ../gio/gsocket.c:608 +#: ../gio/gsocket.c:613 msgid "Unknown family was specified" msgstr "Especificouse unha familia descoñecida" -#: ../gio/gsocket.c:615 +#: ../gio/gsocket.c:620 msgid "Unknown protocol was specified" msgstr "Especificouse un protocolo descoñecido" -#: ../gio/gsocket.c:1104 +#: ../gio/gsocket.c:1111 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" "Non é posíbel usar as operacions de datagramas nun socket que non é de " "datagramas." -#: ../gio/gsocket.c:1121 +#: ../gio/gsocket.c:1128 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" "Non é posíbel usar operacións de datagramas nun socket con un tempo de " "espera máximo estabelecido." -#: ../gio/gsocket.c:1925 +#: ../gio/gsocket.c:1932 #, c-format msgid "could not get local address: %s" msgstr "non foi posíbel obter un enderezo local: %s" -#: ../gio/gsocket.c:1968 +#: ../gio/gsocket.c:1975 #, c-format msgid "could not get remote address: %s" msgstr "non foi posíbel obter un enderezo remoto: %s" -#: ../gio/gsocket.c:2034 +#: ../gio/gsocket.c:2041 #, c-format msgid "could not listen: %s" msgstr "non foi posíbel escoitar: %s" -#: ../gio/gsocket.c:2133 +#: ../gio/gsocket.c:2140 #, c-format msgid "Error binding to address: %s" msgstr "Produciuse un erro ao conectar co enderezo: %s" -#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285 +#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 #, c-format msgid "Error joining multicast group: %s" msgstr "Produciuse un erro ao unirse ao grupo multicast: %s" -#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286 +#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 #, c-format msgid "Error leaving multicast group: %s" msgstr "Produciuse un erro ao deixar o grupo multicast: %s" -#: ../gio/gsocket.c:2250 +#: ../gio/gsocket.c:2257 msgid "No support for source-specific multicast" msgstr "Non se admite o multicast específico da fonte" -#: ../gio/gsocket.c:2470 +#: ../gio/gsocket.c:2477 #, c-format msgid "Error accepting connection: %s" msgstr "Produciuse un erro ao aceptar a conexión: %s" -#: ../gio/gsocket.c:2593 +#: ../gio/gsocket.c:2598 msgid "Connection in progress" msgstr "Conexión en marcha" -#: ../gio/gsocket.c:2644 +#: ../gio/gsocket.c:2647 msgid "Unable to get pending error: " msgstr "Non é posíbel obter o erro pendente:" -#: ../gio/gsocket.c:2816 +#: ../gio/gsocket.c:2817 #, c-format msgid "Error receiving data: %s" msgstr "Produciuse un erro ao recibir datos: %s" -#: ../gio/gsocket.c:3013 +#: ../gio/gsocket.c:3012 #, c-format msgid "Error sending data: %s" msgstr "Produciuse un erro ao enviar datos: %s" -#: ../gio/gsocket.c:3200 +#: ../gio/gsocket.c:3199 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Non é posíbel desconectar o socket: %s" -#: ../gio/gsocket.c:3281 +#: ../gio/gsocket.c:3280 #, c-format msgid "Error closing socket: %s" msgstr "Produciuse un erro ao pechar o socket: %s" -#: ../gio/gsocket.c:3890 +#: ../gio/gsocket.c:3932 #, c-format msgid "Waiting for socket condition: %s" msgstr "Agardando pola situación do socket: %s" -#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 +#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 #, c-format msgid "Error sending message: %s" msgstr "Produciuse un erro ao enviar a mensaxe: %s" -#: ../gio/gsocket.c:4386 +#: ../gio/gsocket.c:4428 msgid "GSocketControlMessage not supported on Windows" msgstr "O GSocketControlMessage non está permitido en Windows" -#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 +#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 #, c-format msgid "Error receiving message: %s" msgstr "Produciuse un erro ao recibir a mensaxe: %s" -#: ../gio/gsocket.c:5411 +#: ../gio/gsocket.c:5452 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Non é posíbel ler as credenciais do socket: %s" -#: ../gio/gsocket.c:5420 +#: ../gio/gsocket.c:5461 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" "g_socket_get_credentials non está implementado para este sistema operativo" @@ -3643,7 +3661,7 @@ msgstr "" #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "Non é posíbel usar o proxy co protocolo «%s»." #: ../gio/gsocketlistener.c:218 @@ -3656,7 +3674,7 @@ msgstr "O socket engadido está pechado" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 non ten compatibilidade para enderezos IPv6 «%s»" #: ../gio/gsocks4aproxy.c:136 @@ -3665,7 +3683,7 @@ msgstr "O nome de usuario é demasiado longo para o protocolo SOCKSv5" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "O nome do equipo «%s» é demasiado longo para o protocolo SOCKSv5" #: ../gio/gsocks4aproxy.c:179 @@ -3706,7 +3724,7 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "O nome do equipo «%s» é demasiado longo para o protocolo SOCKSv5" #: ../gio/gsocks5proxy.c:348 @@ -3734,7 +3752,7 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Rexeitouse a conexión mediante o proxy SOCKSv5." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "O proxy SOCKSv5 non é compatíbel coa orde «connect»." #: ../gio/gsocks5proxy.c:392 @@ -3747,8 +3765,8 @@ msgstr "Erro no proxy SOCKSv5 descoñecido." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" -msgstr "endNon é posíbel manipular a versión %d da codificación de GThemedIcon" +msgid "Can’t handle version %d of GThemedIcon encoding" +msgstr "Non é posíbel manipular a versión %d da codificación de GThemedIcon" #: ../gio/gthreadedresolver.c:118 msgid "No valid addresses were found" @@ -3756,23 +3774,23 @@ msgstr "Non se atopou ningún enderezo válido" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" msgstr "Produciuse un erro ao resolver inversamente «%s»: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "Non hai un rexistro de DNS do tipo solicitado para «%s»" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "Non é posíbel resolver temporalmente «%s»" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +msgid "Error resolving “%s”" msgstr "Produciuse un erro ao resolver «%s»" #: ../gio/gtlscertificate.c:250 @@ -3880,7 +3898,7 @@ msgstr "Produciuse un erro ao ler do descritor do ficheiro: %s" msgid "Error closing file descriptor: %s" msgstr "Produciuse un erro ao pechar o descritor do ficheiro: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420 msgid "Filesystem root" msgstr "Raíz do sistema de ficheiros" @@ -3889,21 +3907,21 @@ msgstr "Raíz do sistema de ficheiros" msgid "Error writing to file descriptor: %s" msgstr "Produciuse un erro ao escribir no descritor do ficheiro: %s" -#: ../gio/gunixsocketaddress.c:239 +#: ../gio/gunixsocketaddress.c:241 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" "Neste sistema non se permiten enderezos de socket de dominios UNIX abstractos" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "o volume non implementa a expulsión" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" -msgstr "o volume non implementa a expulsión ou a operación_de_expulsión" +msgid "volume doesn’t implement eject or eject_with_operation" +msgstr "o volume non implementa a «eject» ou «eject_with_operation»" #: ../gio/gwin32inputstream.c:185 #, c-format @@ -3964,25 +3982,25 @@ msgstr "Argumentos incorrectos\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo «%s» inesperado para o elemento «%s»" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" msgstr "Non se atopou o atributo «%s» do elemento «%s»" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Etiqueta «%s» inesperada, esperábase a etiqueta «%s»" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "Etiqueta «%s» inesperada dentro de «%s»" #: ../glib/gbookmarkfile.c:1757 @@ -3993,7 +4011,7 @@ msgstr "" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" msgstr "Xa existe un marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 @@ -4006,32 +4024,32 @@ msgstr "Xa existe un marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" msgstr "Non se atopou ningún marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Non hai ningún tipo MIME definido no marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Non se definiu ningún parámetro privado no marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" msgstr "Non existe ningún grupo definido no marcador para o URI «%s»" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Ningún aplicativo denominado «%s» rexistrou un marcador para «%s»" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Produciuse un erro ao expandir a liña executábel «%s» co URI «%s»" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 @@ -4041,42 +4059,42 @@ msgstr "Hai unha secuencia de carácter parcial ao final da entrada" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "" "Non é posíbel converter o modo de emerxencia «%s» na codificación de " "caracteres «%s»" -#: ../glib/gconvert.c:1567 +#: ../glib/gconvert.c:1566 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" -msgstr "O URI «%s» non é un URI absoluto usando o esquema \"file\"" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" +msgstr "O URI «%s» non é un URI absoluto usando o esquema «file»" -#: ../glib/gconvert.c:1577 +#: ../glib/gconvert.c:1576 #, c-format -msgid "The local file URI '%s' may not include a '#'" -msgstr "O URI do ficheiro local «%s» non pode incluír un '#'" +msgid "The local file URI “%s” may not include a “#”" +msgstr "O URI do ficheiro local «%s» non pode incluír un «#»" -#: ../glib/gconvert.c:1594 +#: ../glib/gconvert.c:1593 #, c-format -msgid "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" msgstr "O URI «%s» non é válido" -#: ../glib/gconvert.c:1606 +#: ../glib/gconvert.c:1605 #, c-format -msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" msgstr "O nome de host do URI «%s» non é válido" -#: ../glib/gconvert.c:1622 +#: ../glib/gconvert.c:1621 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "O URI «%s» contén caracteres de escape non válidos" -#: ../glib/gconvert.c:1717 +#: ../glib/gconvert.c:1716 #, c-format -msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" msgstr "O nome da ruta «%s» non é un camiño absoluto" -#: ../glib/gconvert.c:1727 +#: ../glib/gconvert.c:1726 msgid "Invalid hostname" msgstr "O nome do host non é válido" @@ -4308,97 +4326,97 @@ msgstr "Dom" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" msgstr "Produciuse un erro ao abrir o directorio «%s»: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" -msgstr[0] "Non foi posíbel asignar %lu byte para ler o ficheiro \"%s\"" -msgstr[1] "Non foi posíbel asignar %lu bytes para ler o ficheiro \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" +msgstr[0] "Non foi posíbel asignar %lu byte para ler o ficheiro «%s»" +msgstr[1] "Non foi posíbel asignar %lu bytes para ler o ficheiro «%s»" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" +msgid "Error reading file “%s”: %s" msgstr "Produciuse un erro ao ler o ficheiro «%s»: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "O ficheiro «%s» é demasiado grande" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" msgstr "Produciuse un erro ao ler desde o ficheiro «%s»: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Produciuse un erro ao obter os atributos do ficheiro «%s»: fstat() fallou: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: fdopen() fallou: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Produciuse un erro ao renomear o ficheiro «%s» como «%s»: g_rename() fallou: " "%s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" msgstr "Produciuse un erro ao crear o ficheiro «%s»: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" msgstr "Produciuse un erro ao escribir o ficheiro «%s»: write() fallou: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Produciuse un erro ao escribir o ficheiro «%s»: fsync() fallou: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Non foi posíbel retirar o ficheiro existente «%s»: g_unlink() fallou: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "O modelo «%s» non é válido, non debería conter «%s»" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "O modelo «%s» non contén XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "Produciuse un erro ao ler a ligazón simbólica «%s»: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Non foi posíbel abrir o conversor de «%s» a «%s»: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "" "Non é posíbel facer unha lectura en bruto en g_io_channel_read_line_string" @@ -4412,7 +4430,7 @@ msgid "Channel terminates in a partial character" msgstr "O canal termina nun carácter parcial" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Non é posíbel facer unha lectura en bruto en g_io_channel_read_to_end" #: ../glib/gkeyfile.c:737 @@ -4427,7 +4445,7 @@ msgstr "Non é un ficheiro normal" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "O ficheiro clave contén a liña «%s» que non é un par valor-clave, grupo ou " "comentario" @@ -4448,30 +4466,30 @@ msgstr "Nome de clave non válido: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "O ficheiro clave contén unha codificación non permitida «%s»" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "O ficheiro clave non ten un grupo «%s»" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "O ficheiro clave non ten a clave «%s» no grupo «%s»" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "O ficheiro clave contén a clave «%s» co valor «%s» que non é UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "O ficheiro clave contén a clave «%s» que ten un valor que non é posíbel " "interpretar." @@ -4479,7 +4497,7 @@ msgstr "" #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" "O ficheiro clave contén a clave «%s» no grupo «%s» que ten un valor que non " @@ -4487,7 +4505,7 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "A clave «%s» do grupo «%s» ten o valor «%s», pero agardábase %s" #: ../glib/gkeyfile.c:4133 @@ -4496,32 +4514,32 @@ msgstr "O ficheiro clave contén un carácter de escape ao final da liña" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" msgstr "O ficheiro clave contén a secuencia de escape non válida «%s»" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "Non é posíbel interpretar o valor «%s» como un número." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" msgstr "O valor enteiro «%s» está fóra do intervalo" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." msgstr "Non é posíbel interpretar o valor «%s» como un número flotante." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Non é posíbel interpretar o valor «%s» como un booleano." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Produciuse un erro ao obter os atributos do ficheiro «%s%s%s%s»: fstat() " "fallou: %s" @@ -4533,7 +4551,7 @@ msgstr "Produciuse un erro ao mapear «%s%s%s%s»: mmap() fallou: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: open() fallou: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 @@ -4750,7 +4768,7 @@ msgstr "" "procesamento" #: ../glib/goption.c:861 -msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[OPCIÓN…]" #: ../glib/goption.c:977 @@ -4775,22 +4793,22 @@ msgstr "Opcións:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "Non é posíbel analizar o valor enteiro «%s» para %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" msgstr "O valor enteiro «%s» para %s está fóra do intervalo" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "Non é posíbel analizar o valor \"double\" «%s» para %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" msgstr "O valor \"double\" «%s» para %s está fóra do intervalo" #: ../glib/goption.c:1448 ../glib/goption.c:1527 @@ -5143,7 +5161,7 @@ msgstr "" "Produciuse un erro ao compilar a expresión regular %s no carácter %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" msgstr "esperábase un díxito hexadecimal ou '}'" #: ../glib/gregex.c:2429 @@ -5151,8 +5169,8 @@ msgid "hexadecimal digit expected" msgstr "esperábase un díxito hexadecimal" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" -msgstr "falta '<' na referencia simbólica" +msgid "missing “<” in symbolic reference" +msgstr "falta «<» na referencia simbólica" #: ../glib/gregex.c:2478 msgid "unfinished symbolic reference" @@ -5171,8 +5189,8 @@ msgid "illegal symbolic reference" msgstr "referencia simbólica ilegal" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" -msgstr "'\\' final perdido" +msgid "stray final “\\”" +msgstr "«\\» final perdido" #: ../glib/gregex.c:2580 msgid "unknown escape sequence" @@ -5180,13 +5198,13 @@ msgstr "secuencia de escape descoñecida" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" "Produciuse un erro ao analizar o texto de substitución «%s» no carácter %lu: " "%s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "O texto citado non comeza con comiñas" #: ../glib/gshell.c:186 @@ -5197,12 +5215,12 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" -msgstr "O texto rematou despois dun carácter '\\'. (O texto era «%s»)" +msgid "Text ended just after a “\\” character. (The text was “%s”)" +msgstr "O texto rematou despois dun carácter «\\». (O texto era «%s»)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "O texto rematou antes de atopar a comiña final para %c. (O texto era «%s»)" @@ -5257,12 +5275,12 @@ msgstr "Produciuse un erro ao facer fork (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" msgstr "Produciuse un erro ao cambiar ao directorio «%s» (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "Produciuse un erro ao executar o proceso fillo «%s» (%s)" #: ../glib/gspawn.c:1510 @@ -5278,7 +5296,7 @@ msgstr "Produciuse un erro ao facer fork ao proceso fillo (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" msgstr "Produciuse un erro descoñecido ao executar o proceso fillo «%s»" #: ../glib/gspawn.c:1551 @@ -5440,6 +5458,15 @@ msgstr[1] "%s bytes" msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Produciuse un erro ao crear o directorio «%s»: %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Produciuse un erro ao abrir o ficheiro «%s»: %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Produciuse un erro ao ler o ficheiro «%s»: %s" + #~ msgid "Error renaming file: %s" #~ msgstr "Produciuse un erro ao renomear o ficheiro: %s" @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: glib.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-06 11:30+0300\n" -"PO-Revision-Date: 2016-09-06 11:30+0300\n" +"POT-Creation-Date: 2016-12-11 07:14+0200\n" +"PO-Revision-Date: 2016-12-11 07:14+0200\n" "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n" "Language-Team: עברית <>\n" "Language: he\n" @@ -38,8 +38,8 @@ msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "Enter GApplication service mode (use from D-Bus service files)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" -msgstr "Override the application's ID" +msgid "Override the application’s ID" +msgstr "Override the application’s ID" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 #: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488 @@ -77,8 +77,8 @@ msgid "Launch the application (with optional files to open)" msgstr "Launch the application (with optional files to open)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" -msgstr "APPID [FILE...]" +msgid "APPID [FILE…]" +msgstr "APPID [FILE…]" #: ../gio/gapplication-tool.c:59 msgid "Activate an action" @@ -117,8 +117,8 @@ msgstr "The command to print detailed help for" msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "Application identifier in D-Bus format (eg: org.example.viewer)" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:620 -#: ../gio/glib-compile-resources.c:626 ../gio/glib-compile-resources.c:652 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "FILE" @@ -162,9 +162,9 @@ msgstr "Usage:\n" msgid "Arguments:\n" msgstr "Arguments:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" -msgstr "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" +msgstr "[ARGS…]" #: ../gio/gapplication-tool.c:134 #, c-format @@ -175,10 +175,10 @@ msgstr "Commands:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -192,17 +192,17 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" -msgstr "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" +msgstr "invalid application id: “%s”\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" #: ../gio/gapplication-tool.c:266 @@ -223,11 +223,11 @@ msgstr "action name must be given after application id\n" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" #: ../gio/gapplication-tool.c:344 #, c-format @@ -317,7 +317,7 @@ msgstr "Invalid byte sequence in conversion input" msgid "Error during conversion: %s" msgstr "Error during conversion: %s" -#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 msgid "Cancellable initialization not supported" msgstr "Cancellable initialization not supported" @@ -326,13 +326,13 @@ msgstr "Cancellable initialization not supported" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" -msgstr "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" +msgstr "Conversion from character set “%s” to “%s” is not supported" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" -msgstr "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" +msgstr "Could not open converter from “%s” to “%s”" #: ../gio/gcontenttype.c:335 #, c-format @@ -371,78 +371,78 @@ msgstr "Unexpected early end-of-stream" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" -msgstr "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" +msgstr "Unsupported key “%s” in address entry “%s”" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" -msgstr "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" +msgstr "Meaningless key/value pair combination in address entry “%s”" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" -msgstr "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" +msgstr "Error in address “%s” — the port attribute is malformed" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" -msgstr "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" +msgstr "Error in address “%s” — the family attribute is malformed" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" -msgstr "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" +msgstr "Address element “%s” does not contain a colon (:)" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" -msgstr "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" +msgstr "Error in address “%s” — the host attribute is missing or malformed" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" -msgstr "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" +msgstr "Error in address “%s” — the port attribute is missing or malformed" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -"Error in address '%s' - the noncefile attribute is missing or malformed" +"Error in address “%s” — the noncefile attribute is missing or malformed" #: ../gio/gdbusaddress.c:655 msgid "Error auto-launching: " @@ -450,28 +450,28 @@ msgstr "Error auto-launching: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" -msgstr "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" +msgstr "Unknown or unsupported transport “%s” for address “%s”" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" -msgstr "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" +msgstr "Error opening nonce file “%s”: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" -msgstr "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" +msgstr "Error reading from nonce file “%s”: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" -msgstr "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" +msgstr "Error reading from nonce file “%s”, expected 16 bytes, got %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" -msgstr "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" +msgstr "Error writing contents of nonce file “%s” to stream:" #: ../gio/gdbusaddress.c:951 msgid "The given address is empty" @@ -493,34 +493,34 @@ msgstr "Cannot autolaunch D-Bus without X11 $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " -msgstr "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " +msgstr "Error spawning command line “%s”: " #: ../gio/gdbusaddress.c:1337 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Type any character to close this window)\n" -#: ../gio/gdbusaddress.c:1489 +#: ../gio/gdbusaddress.c:1491 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "Session dbus not running, and autolaunch failed" -#: ../gio/gdbusaddress.c:1500 +#: ../gio/gdbusaddress.c:1502 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Cannot determine session bus address (not implemented for this OS)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1637 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" -#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 +#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -528,7 +528,7 @@ msgstr "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" -#: ../gio/gdbusaddress.c:1654 +#: ../gio/gdbusaddress.c:1656 #, c-format msgid "Unknown bus type %d" msgstr "Unknown bus type %d" @@ -554,79 +554,79 @@ msgstr "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" -msgstr "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" +msgstr "Error when getting information for directory “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "Error creating directory '%s': %s" +msgid "Error creating directory “%s”: %s" +msgstr "Error creating directory “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " -msgstr "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " +msgstr "Error opening keyring “%s” for reading: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" -msgstr "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" +msgstr "Line %d of the keyring at “%s” with content “%s” is malformed" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" -msgstr "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" +msgstr "Didn’t find cookie with id %d in the keyring at “%s”" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" -msgstr "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" +msgstr "Error deleting stale lock file “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" -msgstr "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" +msgstr "Error creating lock file “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" -msgstr "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" +msgstr "Error closing (unlinked) lock file “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" -msgstr "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" +msgstr "Error unlinking lock file “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " -msgstr "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " +msgstr "Error opening keyring “%s” for writing: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -msgstr "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " +msgstr "(Additionally, releasing the lock for “%s” also failed: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 msgid "The connection is closed" @@ -723,6 +723,15 @@ msgstr "Method '%s' on interface '%s' with signature '%s' does not exist" msgid "A subtree is already exported for %s" msgstr "A subtree is already exported for %s" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "type is INVALID" @@ -768,27 +777,27 @@ msgstr[1] "Wanted to read %lu bytes but only got %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" -msgstr "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" +msgstr "Expected NUL byte after the string “%s” but found byte %d" #: ../gio/gdbusmessage.c:1388 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" -msgstr "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" +msgstr "Parsed value “%s” is not a valid D-Bus object path" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" -msgstr "'%s' is not a valid name " +msgid "Parsed value “%s” is not a valid D-Bus signature" +msgstr "Parsed value “%s” is not a valid D-Bus signature" #: ../gio/gdbusmessage.c:1656 #, c-format @@ -804,31 +813,31 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" -msgstr "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" +msgstr "Parsed value “%s” for variant is not a valid D-Bus signature" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" #: ../gio/gdbusmessage.c:2064 @@ -838,13 +847,13 @@ msgstr "Invalid major protocol version. Expected 1 but found %d" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" -msgstr "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" +msgstr "Signature header with signature “%s” found but message body is empty" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" -msgstr "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" +msgstr "Parsed value “%s” is not a valid D-Bus signature (for body)" #: ../gio/gdbusmessage.c:2164 #, c-format @@ -860,9 +869,9 @@ msgstr "Cannot deserialize message: " #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" #: ../gio/gdbusmessage.c:2652 #, c-format @@ -879,27 +888,27 @@ msgstr "Cannot serialize message: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" -msgstr "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" +msgstr "Message body has signature “%s” but there is no signature header" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" -msgstr "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" +msgstr "Message body is empty but signature in the header field is “(%s)”" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" -msgstr "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" +msgstr "Error return with body of type “%s”" #: ../gio/gdbusmessage.c:3291 msgid "Error return with empty body" @@ -942,18 +951,18 @@ msgstr "Cannot specify nonce file when creating a server" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" -msgstr "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" +msgstr "Error writing nonce file at “%s”: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" -msgstr "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" +msgstr "The string “%s” is not a valid D-Bus GUID" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" -msgstr "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" +msgstr "Cannot listen on unsupported transport “%s”" #: ../gio/gdbus-tool.c:95 #, c-format @@ -965,7 +974,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Commands:\n" " help Shows this information\n" @@ -974,7 +983,7 @@ msgstr "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" #: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298 #: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067 @@ -1026,18 +1035,18 @@ msgstr "Multiple connection endpoints specified" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" #: ../gio/gdbus-tool.c:542 msgid "Optional destination for signal (unique name)" @@ -1150,13 +1159,13 @@ msgstr "Error: Method name is not specified\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" -msgstr "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" +msgstr "Error: Method name “%s” is invalid\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" -msgstr "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" +msgstr "Error parsing parameter %d of type “%s”: %s\n" #: ../gio/gdbus-tool.c:1472 msgid "Destination name to introspect" @@ -1194,64 +1203,64 @@ msgstr "Object path to monitor" msgid "Monitor a remote object." msgstr "corrupted object" -#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501 +#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 msgid "Unnamed" msgstr "Unnamed" -#: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" -msgstr "Desktop file didn't specify Exec field" +#: ../gio/gdesktopappinfo.c:2407 +msgid "Desktop file didn’t specify Exec field" +msgstr "Desktop file didn’t specify Exec field" -#: ../gio/gdesktopappinfo.c:2689 +#: ../gio/gdesktopappinfo.c:2692 msgid "Unable to find terminal required for application" msgstr "Unable to find terminal required for application" -#: ../gio/gdesktopappinfo.c:3097 +#: ../gio/gdesktopappinfo.c:3100 #, c-format -msgid "Can't create user application configuration folder %s: %s" -msgstr "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" +msgstr "Can’t create user application configuration folder %s: %s" -#: ../gio/gdesktopappinfo.c:3101 +#: ../gio/gdesktopappinfo.c:3104 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" -msgstr "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" +msgstr "Can’t create user MIME configuration folder %s: %s" -#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 +#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 msgid "Application information lacks an identifier" msgstr "Application information lacks an identifier" -#: ../gio/gdesktopappinfo.c:3599 +#: ../gio/gdesktopappinfo.c:3602 #, c-format -msgid "Can't create user desktop file %s" -msgstr "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" +msgstr "Can’t create user desktop file %s" -#: ../gio/gdesktopappinfo.c:3733 +#: ../gio/gdesktopappinfo.c:3736 #, c-format msgid "Custom definition for %s" msgstr "Custom definition for %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" -msgstr "drive doesn't implement eject" +msgid "drive doesn’t implement eject" +msgstr "drive doesn’t implement eject" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" -msgstr "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" +msgstr "drive doesn’t implement eject or eject_with_operation" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" -msgstr "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" +msgstr "drive doesn’t implement polling for media" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" -msgstr "drive doesn't implement start" +msgid "drive doesn’t implement start" +msgstr "drive doesn’t implement start" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" -msgstr "drive doesn't implement stop" +msgid "drive doesn’t implement stop" +msgstr "drive doesn’t implement stop" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 #: ../gio/gdummytlsbackend.c:509 @@ -1264,8 +1273,8 @@ msgstr "DTLS support is not available" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" -msgstr "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" +msgstr "Can’t handle version %d of GEmblem encoding" #: ../gio/gemblem.c:333 #, c-format @@ -1274,8 +1283,8 @@ msgstr "Malformed number of tokens (%d) in GEmblem encoding" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" -msgstr "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" +msgstr "Can’t handle version %d of GEmblemedIcon encoding" #: ../gio/gemblemedicon.c:372 #, c-format @@ -1306,21 +1315,21 @@ msgstr "Operation not supported" msgid "Containing mount does not exist" msgstr "Containing mount does not exist" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" -msgstr "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" +msgstr "Can’t copy over directory" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" -msgstr "Can't copy directory over directory" +msgid "Can’t copy directory over directory" +msgstr "Can’t copy directory over directory" #: ../gio/gfile.c:2583 msgid "Target file exists" msgstr "Target file exists" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" -msgstr "Can't recursively copy directory" +msgid "Can’t recursively copy directory" +msgstr "Can’t recursively copy directory" #: ../gio/gfile.c:2884 msgid "Splice not supported" @@ -1340,12 +1349,12 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Copy (reflink/clone) is not supported or invalid" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" -msgstr "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" +msgstr "Copy (reflink/clone) is not supported or didn’t work" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" -msgstr "Can't copy special file" +msgid "Can’t copy special file" +msgstr "Can’t copy special file" #: ../gio/gfile.c:3885 msgid "Invalid symlink value given" @@ -1357,12 +1366,12 @@ msgstr "Trash not supported" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" -msgstr "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" +msgstr "File names cannot contain “%c”" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" -msgstr "volume doesn't implement mount" +msgid "volume doesn’t implement mount" +msgstr "volume doesn’t implement mount" #: ../gio/gfile.c:6713 msgid "No application is registered as handling this file" @@ -1383,8 +1392,8 @@ msgstr "File enumerator is already closed" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" -msgstr "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" +msgstr "Can’t handle version %d of GFileIcon encoding" #: ../gio/gfileicon.c:246 msgid "Malformed input data for GFileIcon" @@ -1393,8 +1402,8 @@ msgstr "Malformed input data for GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" -msgstr "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" +msgstr "Stream doesn’t support query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 #: ../gio/gfileoutputstream.c:371 @@ -1465,8 +1474,8 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Type %s does not implement from_tokens() on the GIcon interface" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" -msgstr "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" +msgstr "Can’t handle the supplied version of the icon encoding" #: ../gio/ginetaddressmask.c:182 msgid "No address specified" @@ -1483,11 +1492,11 @@ msgstr "Address has bits set beyond prefix length" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" -msgstr "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" +msgstr "Could not parse “%s” as IP address mask" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 -#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 +#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 msgid "Not enough space for socket address" msgstr "Not enough space for socket address" @@ -1496,8 +1505,8 @@ msgid "Unsupported socket address" msgstr "Unsupported socket address" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" -msgstr "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" +msgstr "Input stream doesn’t implement read" #. Translators: This is an error you get if there is already an #. * operation running against this stream when you try to start @@ -1519,8 +1528,8 @@ msgid "Keep with file when moved" msgstr "Keep with file when moved" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" -msgstr "'version' takes no arguments" +msgid "“version” takes no arguments" +msgstr "“version” takes no arguments" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 msgid "Usage:" @@ -1530,6 +1539,10 @@ msgstr "Usage:" msgid "Print version information and exit." msgstr "Print version information and exit." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGS...]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Commands:" @@ -1695,8 +1708,8 @@ msgstr "Destination %s is not a directory" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " -msgstr "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " +msgstr "%s: overwrite “%s”? " #: ../gio/gio-tool-info.c:34 msgid "List writable attributes" @@ -1715,8 +1728,8 @@ msgid "ATTRIBUTES" msgstr "ATTRIBUTES" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" -msgstr "Don't follow symbolic links" +msgid "Don’t follow symbolic links" +msgstr "Don’t follow symbolic links" #: ../gio/gio-tool-info.c:75 #, c-format @@ -1785,13 +1798,13 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info is similar to the traditional ls utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" #: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74 msgid "No locations given" @@ -1854,13 +1867,13 @@ msgstr "Must specify a single mimetype, and maybe a handler" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" -msgstr "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" +msgstr "No default applications for “%s”\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" -msgstr "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" +msgstr "Default application for “%s”: %s\n" #: ../gio/gio-tool-mime.c:124 #, c-format @@ -1884,13 +1897,13 @@ msgstr "No recommended applications\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" -msgstr "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" +msgstr "Failed to load info for handler “%s”\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" -msgstr "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" +msgstr "Failed to set “%s” as the default handler for “%s”: %s\n" #: ../gio/gio-tool-mkdir.c:31 msgid "Create parent directories" @@ -1923,8 +1936,8 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Monitor a file directly (notices changes made via hardlinks)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" -msgstr "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" +msgstr "Monitors a file directly, but doesn’t report changes" #: ../gio/gio-tool-monitor.c:45 msgid "Report moves and renames as simple deleted/created events" @@ -2032,8 +2045,8 @@ msgid "Mount or unmount the locations." msgstr "Mount or unmount the locations." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" -msgstr "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" +msgstr "Don’t use copy and delete fallback" #: ../gio/gio-tool-move.c:99 msgid "Move one or more files from SOURCE to DEST." @@ -2219,18 +2232,18 @@ msgstr "File %s appears multiple times in the resource" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" -msgstr "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" +msgstr "Failed to locate “%s” in any source directory" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" -msgstr "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" +msgstr "Failed to locate “%s” in current directory" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" -msgstr "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" +msgstr "Unknown processing option “%s”" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format @@ -2252,11 +2265,15 @@ msgstr "Error compressing file %s" msgid "text may not appear inside <%s>" msgstr "text may not appear inside <%s>" -#: ../gio/glib-compile-resources.c:620 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2031 +msgid "Show program version and exit" +msgstr "Show program version and exit" + +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "name of the output file" -#: ../gio/glib-compile-resources.c:621 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" @@ -2264,46 +2281,50 @@ msgstr "" "The directories where files are to be read from (default to current " "directory)" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2030 -#: ../gio/glib-compile-schemas.c:2059 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2032 +#: ../gio/glib-compile-schemas.c:2061 msgid "DIRECTORY" msgstr "DIRECTORY" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" "Generate output in the format selected for by the target filename extension" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "Generate source header" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "Generate sourcecode used to link in the resource file into your code" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "Generate dependency list" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:671 msgid "name of the dependency file to generate" msgstr "name of the dependency file to generate" -#: ../gio/glib-compile-resources.c:627 -msgid "Don't automatically create and register resource" -msgstr "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "Include phony targets in the generated dependency file" -#: ../gio/glib-compile-resources.c:628 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" -msgstr "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:673 +msgid "Don’t automatically create and register resource" +msgstr "Don’t automatically create and register resource" -#: ../gio/glib-compile-resources.c:629 +#: ../gio/glib-compile-resources.c:674 +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" +msgstr "Don’t export functions; declare them G_GNUC_INTERNAL" + +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "C identifier name used for the generated source code" -#: ../gio/glib-compile-resources.c:655 +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2313,7 +2334,7 @@ msgstr "" "Resource specification files have the extension .gresource.xml,\n" "and the resource file have the extension called .gresource." -#: ../gio/glib-compile-resources.c:671 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "You should give exactly one file name\n" @@ -2537,23 +2558,23 @@ msgstr "" "override for key '%s' in schema '%s' in override file '%s' is not in the " "list of valid choices" -#: ../gio/glib-compile-schemas.c:2030 +#: ../gio/glib-compile-schemas.c:2032 msgid "where to store the gschemas.compiled file" msgstr "where to store the gschemas.compiled file" -#: ../gio/glib-compile-schemas.c:2031 +#: ../gio/glib-compile-schemas.c:2033 msgid "Abort on any errors in schemas" msgstr "Abort on any errors in schemas" -#: ../gio/glib-compile-schemas.c:2032 +#: ../gio/glib-compile-schemas.c:2034 msgid "Do not write the gschema.compiled file" msgstr "Do not write the gschema.compiled file" -#: ../gio/glib-compile-schemas.c:2033 +#: ../gio/glib-compile-schemas.c:2035 msgid "Do not enforce key name restrictions" msgstr "Do not enforce key name restrictions" -#: ../gio/glib-compile-schemas.c:2062 +#: ../gio/glib-compile-schemas.c:2064 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2563,153 +2584,153 @@ msgstr "" "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." -#: ../gio/glib-compile-schemas.c:2078 +#: ../gio/glib-compile-schemas.c:2086 #, c-format msgid "You should give exactly one directory name\n" msgstr "You should give exactly one directory name\n" -#: ../gio/glib-compile-schemas.c:2117 +#: ../gio/glib-compile-schemas.c:2125 #, c-format msgid "No schema files found: " msgstr "No schema files found: " -#: ../gio/glib-compile-schemas.c:2120 +#: ../gio/glib-compile-schemas.c:2128 #, c-format msgid "doing nothing.\n" msgstr "doing nothing.\n" -#: ../gio/glib-compile-schemas.c:2123 +#: ../gio/glib-compile-schemas.c:2131 #, c-format msgid "removed existing output file.\n" msgstr "removed existing output file.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Invalid filename %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Error getting filesystem info for %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Containing mount for file %s not found" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" -msgstr "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" +msgstr "Can’t rename root directory" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Error renaming file %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" -msgstr "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" +msgstr "Can’t rename file, filename already exists" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Invalid filename" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Error opening file %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Error removing file %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Error trashing file %s: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Unable to create trash dir %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Unable to find toplevel directory to trash %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Unable to find or create trash directory for %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Unable to create trashing info file for %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Unable to trash file %s across filesystem boundaries" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Unable to trash file %s: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Unable to trash file %s" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Error creating directory %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filesystem does not support symbolic links" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Error making symbolic link %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Symbolic links not supported" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Error moving file %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" -msgstr "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" +msgstr "Can’t move directory over directory" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Backup file creation failed" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Error removing target file: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Move between mounts not supported" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Could not determine the disk usage of %s: %s" @@ -2728,8 +2749,8 @@ msgstr "Invalid extended attribute name" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" -msgstr "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" +msgstr "Error setting extended attribute “%s”: %s" #: ../gio/glocalfileinfo.c:1575 msgid " (invalid encoding)" @@ -2737,8 +2758,8 @@ msgstr " (invalid encoding)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" -msgstr "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" +msgstr "Error when getting information for file “%s”: %s" #: ../gio/glocalfileinfo.c:2017 #, c-format @@ -2860,8 +2881,8 @@ msgstr "Error truncating file: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "Error opening file '%s': %s" +msgid "Error opening file “%s”: %s" +msgstr "Error opening file “%s”: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -2920,55 +2941,55 @@ msgstr "Requested seek beyond the end of the stream" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" -msgstr "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" +msgstr "mount doesn’t implement “unmount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" -msgstr "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" +msgstr "mount doesn’t implement “eject”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -msgstr "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" +msgstr "mount doesn’t implement “unmount” or “unmount_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -msgstr "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" +msgstr "mount doesn’t implement “eject” or “eject_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" -msgstr "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" +msgstr "mount doesn’t implement “remount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" -msgstr "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" +msgstr "mount doesn’t implement content type guessing" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" -msgstr "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" +msgstr "mount doesn’t implement synchronous content type guessing" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" -msgstr "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" +msgstr "Hostname “%s” contains “[” but not “]”" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 msgid "Network unreachable" @@ -2998,40 +3019,40 @@ msgid "NetworkManager version too old" msgstr "NetworkManager version too old" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" -msgstr "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" +msgstr "Output stream doesn’t implement write" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "Source stream is already closed" -#: ../gio/gresolver.c:330 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" -msgstr "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" +msgstr "Error resolving “%s”: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 #: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" -msgstr "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" +msgstr "The resource at “%s” does not exist" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" -msgstr "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" +msgstr "The resource at “%s” failed to decompress" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" -msgstr "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" +msgstr "The resource at “%s” is not a directory" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" -msgstr "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" +msgstr "Input stream doesn’t implement seek" #: ../gio/gresource-tool.c:494 msgid "List sections containing resources in an elf FILE" @@ -3079,7 +3100,7 @@ msgstr "FILE PATH" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3088,11 +3109,11 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3101,7 +3122,7 @@ msgstr "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" #: ../gio/gresource-tool.c:548 @@ -3158,18 +3179,18 @@ msgstr " PATH A resource path\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" -msgstr "No such schema '%s'\n" +msgid "No such schema “%s”\n" +msgstr "No such schema “%s”\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" -msgstr "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" +msgstr "Schema “%s” is not relocatable (path must not be specified)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" -msgstr "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" +msgstr "Schema “%s” is relocatable (path must be specified)\n" #: ../gio/gsettings-tool.c:92 #, c-format @@ -3290,7 +3311,7 @@ msgstr "SCHEMA[:PATH] [KEY]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3308,12 +3329,12 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3331,7 +3352,7 @@ msgstr "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" #: ../gio/gsettings-tool.c:644 @@ -3390,147 +3411,147 @@ msgstr "Empty schema name given\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" -msgstr "No such key '%s'\n" +msgid "No such key “%s”\n" +msgstr "No such key “%s”\n" -#: ../gio/gsocket.c:364 +#: ../gio/gsocket.c:369 msgid "Invalid socket, not initialized" msgstr "Invalid socket, not initialized" -#: ../gio/gsocket.c:371 +#: ../gio/gsocket.c:376 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "Invalid socket, initialization failed due to: %s" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:384 msgid "Socket is already closed" msgstr "Socket is already closed" -#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897 -#: ../gio/gsocket.c:3952 +#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 +#: ../gio/gsocket.c:3995 msgid "Socket I/O timed out" msgstr "Socket I/O timed out" -#: ../gio/gsocket.c:526 +#: ../gio/gsocket.c:531 #, c-format msgid "creating GSocket from fd: %s" msgstr "creating GSocket from fd: %s" -#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615 +#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 #, c-format msgid "Unable to create socket: %s" msgstr "Unable to create socket: %s" -#: ../gio/gsocket.c:608 +#: ../gio/gsocket.c:613 msgid "Unknown family was specified" msgstr "Unknown family was specified" -#: ../gio/gsocket.c:615 +#: ../gio/gsocket.c:620 msgid "Unknown protocol was specified" msgstr "Unknown protocol was specified" -#: ../gio/gsocket.c:1104 +#: ../gio/gsocket.c:1111 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "Cannot use datagram operations on a non-datagram socket." -#: ../gio/gsocket.c:1121 +#: ../gio/gsocket.c:1128 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "Cannot use datagram operations on a socket with a timeout set." -#: ../gio/gsocket.c:1925 +#: ../gio/gsocket.c:1932 #, c-format msgid "could not get local address: %s" msgstr "could not get local address: %s" -#: ../gio/gsocket.c:1968 +#: ../gio/gsocket.c:1975 #, c-format msgid "could not get remote address: %s" msgstr "could not get remote address: %s" -#: ../gio/gsocket.c:2034 +#: ../gio/gsocket.c:2041 #, c-format msgid "could not listen: %s" msgstr "could not listen: %s" -#: ../gio/gsocket.c:2133 +#: ../gio/gsocket.c:2140 #, c-format msgid "Error binding to address: %s" msgstr "Error binding to address: %s" -#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285 +#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 #, c-format msgid "Error joining multicast group: %s" msgstr "Error joining multicast group: %s" -#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286 +#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 #, c-format msgid "Error leaving multicast group: %s" msgstr "Error leaving multicast group: %s" -#: ../gio/gsocket.c:2250 +#: ../gio/gsocket.c:2257 msgid "No support for source-specific multicast" msgstr "No support for source-specific multicast" -#: ../gio/gsocket.c:2470 +#: ../gio/gsocket.c:2477 #, c-format msgid "Error accepting connection: %s" msgstr "Error accepting connection: %s" -#: ../gio/gsocket.c:2593 +#: ../gio/gsocket.c:2598 msgid "Connection in progress" msgstr "Connection in progress" -#: ../gio/gsocket.c:2644 +#: ../gio/gsocket.c:2647 msgid "Unable to get pending error: " msgstr "Unable to get pending error: " -#: ../gio/gsocket.c:2816 +#: ../gio/gsocket.c:2817 #, c-format msgid "Error receiving data: %s" msgstr "Error receiving data: %s" -#: ../gio/gsocket.c:3013 +#: ../gio/gsocket.c:3012 #, c-format msgid "Error sending data: %s" msgstr "Error sending data: %s" -#: ../gio/gsocket.c:3200 +#: ../gio/gsocket.c:3199 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Unable to shutdown socket: %s" -#: ../gio/gsocket.c:3281 +#: ../gio/gsocket.c:3280 #, c-format msgid "Error closing socket: %s" msgstr "Error closing socket: %s" -#: ../gio/gsocket.c:3890 +#: ../gio/gsocket.c:3932 #, c-format msgid "Waiting for socket condition: %s" msgstr "Waiting for socket condition: %s" -#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 +#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 #, c-format msgid "Error sending message: %s" msgstr "Error sending message: %s" -#: ../gio/gsocket.c:4386 +#: ../gio/gsocket.c:4428 msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage not supported on Windows" -#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 +#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 #, c-format msgid "Error receiving message: %s" msgstr "Error receiving message: %s" -#: ../gio/gsocket.c:5411 +#: ../gio/gsocket.c:5452 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Unable to read socket credentials: %s" -#: ../gio/gsocket.c:5420 +#: ../gio/gsocket.c:5461 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials not implemented for this OS" @@ -3558,8 +3579,8 @@ msgstr "Proxying over a non-TCP connection is not supported." #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." -msgstr "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." +msgstr "Proxy protocol “%s” is not supported." #: ../gio/gsocketlistener.c:218 msgid "Listener is already closed" @@ -3571,8 +3592,8 @@ msgstr "Added socket is closed" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" -msgstr "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" +msgstr "SOCKSv4 does not support IPv6 address “%s”" #: ../gio/gsocks4aproxy.c:136 msgid "Username is too long for SOCKSv4 protocol" @@ -3580,8 +3601,8 @@ msgstr "Username is too long for SOCKSv4 protocol" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" -msgstr "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" +msgstr "Hostname “%s” is too long for SOCKSv4 protocol" #: ../gio/gsocks4aproxy.c:179 msgid "The server is not a SOCKSv4 proxy server." @@ -3618,8 +3639,8 @@ msgstr "SOCKSv5 authentication failed due to wrong username or password." #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" -msgstr "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" +msgstr "Hostname “%s” is too long for SOCKSv5 protocol" #: ../gio/gsocks5proxy.c:348 msgid "The SOCKSv5 proxy server uses unknown address type." @@ -3646,8 +3667,8 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Connection refused through SOCKSv5 proxy." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." -msgstr "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." +msgstr "SOCKSv5 proxy does not support “connect” command." #: ../gio/gsocks5proxy.c:392 msgid "SOCKSv5 proxy does not support provided address type." @@ -3659,8 +3680,8 @@ msgstr "Unknown SOCKSv5 proxy error." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" -msgstr "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" +msgstr "Can’t handle version %d of GThemedIcon encoding" #: ../gio/gthreadedresolver.c:118 msgid "No valid addresses were found" @@ -3668,24 +3689,24 @@ msgstr "No valid addresses were found" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" -msgstr "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" +msgstr "Error reverse-resolving “%s”: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" -msgstr "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" +msgstr "No DNS record of the requested type for “%s”" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" -msgstr "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" +msgstr "Temporarily unable to resolve “%s”" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" -msgstr "Error resolving '%s'" +msgid "Error resolving “%s”" +msgstr "Error resolving “%s”" #: ../gio/gtlscertificate.c:250 msgid "Cannot decrypt PEM-encoded private key" @@ -3790,7 +3811,7 @@ msgstr "Error reading from file descriptor: %s" msgid "Error closing file descriptor: %s" msgstr "Error closing file descriptor: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420 msgid "Filesystem root" msgstr "Filesystem root" @@ -3799,20 +3820,20 @@ msgstr "Filesystem root" msgid "Error writing to file descriptor: %s" msgstr "Error writing to file descriptor: %s" -#: ../gio/gunixsocketaddress.c:239 +#: ../gio/gunixsocketaddress.c:241 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "Abstract UNIX domain socket addresses not supported on this system" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" -msgstr "volume doesn't implement eject" +msgid "volume doesn’t implement eject" +msgstr "volume doesn’t implement eject" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" -msgstr "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" +msgstr "volume doesn’t implement eject or eject_with_operation" #: ../gio/gwin32inputstream.c:185 #, c-format @@ -3873,26 +3894,26 @@ msgstr "Wrong args\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" -msgstr "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" +msgstr "Unexpected attribute “%s” for element “%s”" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" -msgstr "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" +msgstr "Attribute “%s” of element “%s” not found" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" -msgstr "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" +msgstr "Unexpected tag “%s”, tag “%s” expected" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" -msgstr "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" +msgstr "Unexpected tag “%s” inside “%s”" #: ../glib/gbookmarkfile.c:1757 msgid "No valid bookmark file found in data dirs" @@ -3900,8 +3921,8 @@ msgstr "No valid bookmark file found in data dirs" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" -msgstr "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" +msgstr "A bookmark for URI “%s” already exists" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 #: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327 @@ -3913,33 +3934,33 @@ msgstr "A bookmark for URI '%s' already exists" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" -msgstr "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" +msgstr "No bookmark found for URI “%s”" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" -msgstr "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" +msgstr "No MIME type defined in the bookmark for URI “%s”" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" -msgstr "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" +msgstr "No private flag has been defined in bookmark for URI “%s”" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" -msgstr "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" +msgstr "No groups set in bookmark for URI “%s”" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" -msgstr "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" +msgstr "No application with name “%s” registered a bookmark for “%s”" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" -msgstr "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" +msgstr "Failed to expand exec line “%s” with URI “%s”" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 #: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304 @@ -3948,40 +3969,40 @@ msgstr "Partial character sequence at end of input" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" -msgstr "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" +msgstr "Cannot convert fallback “%s” to codeset “%s”" -#: ../glib/gconvert.c:1567 +#: ../glib/gconvert.c:1566 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" -msgstr "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" +msgstr "The URI “%s” is not an absolute URI using the “file” scheme" -#: ../glib/gconvert.c:1577 +#: ../glib/gconvert.c:1576 #, c-format -msgid "The local file URI '%s' may not include a '#'" -msgstr "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" +msgstr "The local file URI “%s” may not include a “#”" -#: ../glib/gconvert.c:1594 +#: ../glib/gconvert.c:1593 #, c-format -msgid "The URI '%s' is invalid" -msgstr "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" +msgstr "The URI “%s” is invalid" -#: ../glib/gconvert.c:1606 +#: ../glib/gconvert.c:1605 #, c-format -msgid "The hostname of the URI '%s' is invalid" -msgstr "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" +msgstr "The hostname of the URI “%s” is invalid" -#: ../glib/gconvert.c:1622 +#: ../glib/gconvert.c:1621 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" -msgstr "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" +msgstr "The URI “%s” contains invalidly escaped characters" -#: ../glib/gconvert.c:1717 +#: ../glib/gconvert.c:1716 #, c-format -msgid "The pathname '%s' is not an absolute path" -msgstr "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" +msgstr "The pathname “%s” is not an absolute path" -#: ../glib/gconvert.c:1727 +#: ../glib/gconvert.c:1726 msgid "Invalid hostname" msgstr "Invalid hostname" @@ -4213,94 +4234,94 @@ msgstr "א׳" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" -msgstr "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" +msgstr "Error opening directory “%s”: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" -msgstr[0] "Could not allocate %lu byte to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" +msgstr[0] "Could not allocate %lu bytes to read file “%s”" msgstr[1] "Could not allocate %lu bytes to read file \"%s\"" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" -msgstr "Error reading file '%s': %s" +msgid "Error reading file “%s”: %s" +msgstr "Error reading file “%s”: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" -msgstr "File \"%s\" is too large" +msgid "File “%s” is too large" +msgstr "File “%s” is too large" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" -msgstr "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" +msgstr "Failed to read from file “%s”: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" -msgstr "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" +msgstr "Failed to open file “%s”: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" -msgstr "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" +msgstr "Failed to get attributes of file “%s”: fstat() failed: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" -msgstr "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" +msgstr "Failed to open file “%s”: fdopen() failed: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" -msgstr "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" +msgstr "Failed to rename file “%s” to “%s”: g_rename() failed: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" -msgstr "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" +msgstr "Failed to create file “%s”: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" -msgstr "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" +msgstr "Failed to write file “%s”: write() failed: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" -msgstr "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" +msgstr "Failed to write file “%s”: fsync() failed: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" -msgstr "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" +msgstr "Existing file “%s” could not be removed: g_unlink() failed: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" -msgstr "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" +msgstr "Template “%s” invalid, should not contain a “%s”" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" -msgstr "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" +msgstr "Template “%s” doesn’t contain XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" -msgstr "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" +msgstr "Failed to read the symbolic link “%s”: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" -msgstr "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" +msgstr "Could not open converter from “%s” to “%s”: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" -msgstr "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" +msgstr "Can’t do a raw read in g_io_channel_read_line_string" #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 #: ../glib/giochannel.c:2125 @@ -4312,8 +4333,8 @@ msgid "Channel terminates in a partial character" msgstr "Channel terminates in a partial character" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" -msgstr "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" +msgstr "Can’t do a raw read in g_io_channel_read_to_end" #: ../glib/gkeyfile.c:737 msgid "Valid key file could not be found in search dirs" @@ -4326,9 +4347,9 @@ msgstr "Not a regular file" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" #: ../glib/gkeyfile.c:1261 #, c-format @@ -4346,46 +4367,46 @@ msgstr "Invalid key name: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" -msgstr "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" +msgstr "Key file contains unsupported encoding “%s”" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" -msgstr "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" +msgstr "Key file does not have group “%s”" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" -msgstr "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" +msgstr "Key file does not have key “%s” in group “%s”" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" -msgstr "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" +msgstr "Key file contains key “%s” with value “%s” which is not UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" -msgstr "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" +msgstr "Key “%s” in group “%s” has value “%s” where %s was expected" #: ../glib/gkeyfile.c:4133 msgid "Key file contains escape character at end of line" @@ -4393,33 +4414,33 @@ msgstr "Key file contains escape character at end of line" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" -msgstr "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" +msgstr "Key file contains invalid escape sequence “%s”" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." -msgstr "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." +msgstr "Value “%s” cannot be interpreted as a number." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" -msgstr "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" +msgstr "Integer value “%s” out of range" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." -msgstr "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." +msgstr "Value “%s” cannot be interpreted as a float number." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." -msgstr "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." +msgstr "Value “%s” cannot be interpreted as a boolean." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" -msgstr "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" +msgstr "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" #: ../glib/gmappedfile.c:195 #, c-format @@ -4428,8 +4449,8 @@ msgstr "Failed to map %s%s%s%s: mmap() failed: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" -msgstr "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" +msgstr "Failed to open file “%s”: open() failed: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 #, c-format @@ -4637,8 +4658,8 @@ msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Document ended unexpectedly inside a comment or processing instruction" #: ../glib/goption.c:861 -msgid "[OPTION...]" -msgstr "[OPTION...]" +msgid "[OPTION…]" +msgstr "[OPTION…]" #: ../glib/goption.c:977 msgid "Help Options:" @@ -4662,35 +4683,35 @@ msgstr "Options:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" -msgstr "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" +msgstr "Cannot parse integer value “%s” for %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" -msgstr "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" +msgstr "Integer value “%s” for %s out of range" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" -msgstr "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" +msgstr "Cannot parse double value “%s” for %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" -msgstr "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" +msgstr "Double value “%s” for %s out of range" -#: ../glib/goption.c:1442 ../glib/goption.c:1521 +#: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format msgid "Error parsing option %s" msgstr "Error parsing option %s" -#: ../glib/goption.c:1552 ../glib/goption.c:1665 +#: ../glib/goption.c:1558 ../glib/goption.c:1671 #, c-format msgid "Missing argument for %s" msgstr "Missing·argument·for·%s" -#: ../glib/goption.c:2126 +#: ../glib/goption.c:2132 #, c-format msgid "Unknown option %s" msgstr "Unknown option %s" @@ -5022,16 +5043,16 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Error while compiling regular expression %s at char %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" -msgstr "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" +msgstr "hexadecimal digit or “}” expected" #: ../glib/gregex.c:2429 msgid "hexadecimal digit expected" msgstr "hexadecimal digit expected" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" -msgstr "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" +msgstr "missing “<” in symbolic reference" #: ../glib/gregex.c:2478 msgid "unfinished symbolic reference" @@ -5050,8 +5071,8 @@ msgid "illegal symbolic reference" msgstr "illegal symbolic reference" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" -msgstr "stray final '\\'" +msgid "stray final “\\”" +msgstr "stray final “\\”" #: ../glib/gregex.c:2580 msgid "unknown escape sequence" @@ -5059,12 +5080,12 @@ msgstr "unknown escape sequence" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" -msgstr "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" +msgstr "Error while parsing replacement text “%s” at char %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" -msgstr "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" +msgstr "Quoted text doesn’t begin with a quotation mark" #: ../glib/gshell.c:186 msgid "Unmatched quotation mark in command line or other shell-quoted text" @@ -5072,13 +5093,13 @@ msgstr "Unmatched quotation mark in command line or other shell-quoted text" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" -msgstr "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" +msgstr "Text ended just after a “\\” character. (The text was “%s”)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" -msgstr "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" +msgstr "Text ended before matching quote was found for %c. (The text was “%s”)" #: ../glib/gshell.c:601 msgid "Text was empty (or contained only whitespace)" @@ -5131,13 +5152,13 @@ msgstr "Failed to fork (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" -msgstr "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" +msgstr "Failed to change to directory “%s” (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" -msgstr "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" +msgstr "Failed to execute child process “%s” (%s)" #: ../glib/gspawn.c:1510 #, c-format @@ -5151,8 +5172,8 @@ msgstr "Failed to fork child process (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" -msgstr "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" +msgstr "Unknown error executing child process “%s”" #: ../glib/gspawn.c:1551 #, c-format @@ -5310,6 +5331,15 @@ msgstr[1] "%s בתים" msgid "%.1f KB" msgstr "%.1f ק״ב" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Error creating directory '%s': %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Error opening file '%s': %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Error reading file '%s': %s" + #~ msgid "No locations gives" #~ msgstr "No locations gives" @@ -1,15 +1,15 @@ # glib to kazakh. # Copyright (C) 2010 HZ # This file is distributed under the same license as the glib package. -# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010. +# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010-2016. # msgid "" msgstr "" "Project-Id-Version: master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-25 18:43+0000\n" -"PO-Revision-Date: 2016-09-03 22:18+0500\n" +"POT-Creation-Date: 2016-11-20 18:36+0000\n" +"PO-Revision-Date: 2016-12-08 15:03+0500\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n" "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n" "Language: kk\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.11\n" #: ../gio/gapplication.c:493 msgid "GApplication options" @@ -32,7 +32,8 @@ msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +#| msgid "List applications" +msgid "Override the application’s ID" msgstr "" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -71,8 +72,8 @@ msgid "Launch the application (with optional files to open)" msgstr "" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" -msgstr "APPID [ФАЙЛ...]" +msgid "APPID [FILE…]" +msgstr "APPID [ФАЙЛ…]" #: ../gio/gapplication-tool.c:59 msgid "Activate an action" @@ -111,8 +112,8 @@ msgstr "" msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:620 -#: ../gio/glib-compile-resources.c:626 ../gio/glib-compile-resources.c:652 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "ФАЙЛ" @@ -154,8 +155,8 @@ msgstr "Қолданылуы:\n" msgid "Arguments:\n" msgstr "Аргументтер:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" msgstr "" #: ../gio/gapplication-tool.c:134 @@ -167,7 +168,7 @@ msgstr "Командалар:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" @@ -180,17 +181,17 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" -"'%s' аргументтерді қабылдамайды\n" +"\"%s\" аргументтерді қабылдамайды\n" "\n" #: ../gio/gapplication-tool.c:266 @@ -211,8 +212,8 @@ msgstr "" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" #: ../gio/gapplication-tool.c:344 @@ -310,12 +311,12 @@ msgstr "" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" msgstr "" #: ../gio/gcontenttype.c:335 @@ -355,69 +356,69 @@ msgstr "" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" msgstr "" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" msgstr "" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" msgstr "" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" #: ../gio/gdbusaddress.c:655 @@ -426,27 +427,27 @@ msgstr "" #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" -msgstr "" +msgid "Error opening nonce file “%s”: %s" +msgstr "\"%s\" файлын ашу қатесі: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" -msgstr "" +msgid "Error reading from nonce file “%s”: %s" +msgstr "\"%s\" nonce файлынан оқу қатесі: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" #: ../gio/gdbusaddress.c:951 @@ -469,7 +470,8 @@ msgstr "" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " +#| msgid "Error opening file %s: %s" +msgid "Error spawning command line “%s”: " msgstr "" #: ../gio/gdbusaddress.c:1337 @@ -487,11 +489,11 @@ msgstr "" msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1635 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" #: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 @@ -525,75 +527,80 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" -msgstr "" +#| msgid "Error creating directory %s: %s" +msgid "Error when getting information for directory “%s”: %s" +msgstr "\"%s\" бума ақпаратын алу қатесі: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "'%s' бумасын жасау қатесі: %s" +msgid "Error creating directory “%s”: %s" +msgstr "\"%s\" бумасын жасау қатесі: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " msgstr "" #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" +#| msgid "Error opening file %s: %s" +msgid "Error deleting stale lock file “%s”: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" +#| msgid "Error renaming file %s: %s" +msgid "Error creating lock file “%s”: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +#| msgid "Error closing file: %s" +msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" +#| msgid "Error opening file %s: %s" +msgid "Error unlinking lock file “%s”: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " msgstr "" #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "" #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 @@ -689,6 +696,13 @@ msgstr "" msgid "A subtree is already exported for %s" msgstr "" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "" @@ -729,24 +743,24 @@ msgstr[0] "" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" #: ../gio/gdbusmessage.c:1388 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "" #: ../gio/gdbusmessage.c:1656 @@ -760,25 +774,25 @@ msgstr[0] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" @@ -789,12 +803,12 @@ msgstr "" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" #: ../gio/gdbusmessage.c:2164 @@ -810,7 +824,7 @@ msgstr "" #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" #: ../gio/gdbusmessage.c:2652 @@ -826,24 +840,24 @@ msgstr "" #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "" #: ../gio/gdbusmessage.c:3291 @@ -885,17 +899,17 @@ msgstr "" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" -msgstr "" +msgid "Error writing nonce file at “%s”: %s" +msgstr "\"%s\" үшін nonce файлын жазу қатесі: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" msgstr "" #: ../gio/gdbus-tool.c:95 @@ -908,7 +922,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" #: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298 @@ -961,14 +975,14 @@ msgstr "" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" #: ../gio/gdbus-tool.c:542 @@ -985,13 +999,13 @@ msgstr "" #: ../gio/gdbus-tool.c:578 msgid "Emit a signal." -msgstr "" +msgstr "Сигналды жіберу." #: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615 #: ../gio/gdbus-tool.c:1850 #, c-format msgid "Error connecting: %s\n" -msgstr "" +msgstr "Байланысу қатесі: %s\n" #: ../gio/gdbus-tool.c:624 #, c-format @@ -1007,7 +1021,7 @@ msgstr "" #: ../gio/gdbus-tool.c:635 #, c-format msgid "Error: signal not specified.\n" -msgstr "" +msgstr "Қате: сигнал көрсетілмеген.\n" #: ../gio/gdbus-tool.c:642 #, c-format @@ -1082,12 +1096,12 @@ msgstr "" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "" #: ../gio/gdbus-tool.c:1472 @@ -1100,7 +1114,7 @@ msgstr "" #: ../gio/gdbus-tool.c:1474 msgid "Print XML" -msgstr "" +msgstr "XML баспаға шығару" #: ../gio/gdbus-tool.c:1475 msgid "Introspect children" @@ -1108,7 +1122,7 @@ msgstr "" #: ../gio/gdbus-tool.c:1476 msgid "Only print properties" -msgstr "" +msgstr "Тек қасиеттерін баспаға шығару" #: ../gio/gdbus-tool.c:1567 msgid "Introspect a remote object." @@ -1116,7 +1130,7 @@ msgstr "" #: ../gio/gdbus-tool.c:1772 msgid "Destination name to monitor" -msgstr "" +msgstr "Бақылау үшін мақсат атауы" #: ../gio/gdbus-tool.c:1773 msgid "Object path to monitor" @@ -1131,7 +1145,7 @@ msgid "Unnamed" msgstr "Атаусыз" #: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "" #: ../gio/gdesktopappinfo.c:2689 @@ -1140,12 +1154,12 @@ msgstr "" #: ../gio/gdesktopappinfo.c:3097 #, c-format -msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "" #: ../gio/gdesktopappinfo.c:3101 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" #: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 @@ -1154,8 +1168,8 @@ msgstr "" #: ../gio/gdesktopappinfo.c:3599 #, c-format -msgid "Can't create user desktop file %s" -msgstr "" +msgid "Can’t create user desktop file %s" +msgstr "%s пайдаланушы жұмыс үстел файлын жасау мүмкін емес" #: ../gio/gdesktopappinfo.c:3733 #, c-format @@ -1163,26 +1177,26 @@ msgid "Custom definition for %s" msgstr "" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1196,7 +1210,7 @@ msgstr "DTLS қолдауы қолжетерсіз" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "" #: ../gio/gemblem.c:333 @@ -1206,7 +1220,7 @@ msgstr "" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "" #: ../gio/gemblemedicon.c:372 @@ -1238,20 +1252,20 @@ msgstr "Әрекетке қолдау жоқ" msgid "Containing mount does not exist" msgstr "" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" -msgstr "" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" +msgstr "Бума үстіне көшіру мүмкін емес" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" -msgstr "" +msgid "Can’t copy directory over directory" +msgstr "Буманы бума үстіне көшіру мүмкін емес" #: ../gio/gfile.c:2583 msgid "Target file exists" msgstr "Мақсат файлы бар болып тұр" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Буманы рекурсивті көшіру мүмкін емес" #: ../gio/gfile.c:2884 @@ -1272,11 +1286,11 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "" #: ../gio/gfile.c:3885 @@ -1289,11 +1303,11 @@ msgstr "" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" msgstr "" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "" #: ../gio/gfile.c:6713 @@ -1315,7 +1329,7 @@ msgstr "" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "" #: ../gio/gfileicon.c:246 @@ -1325,7 +1339,7 @@ msgstr "" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1397,7 +1411,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "" #: ../gio/ginetaddressmask.c:182 @@ -1415,7 +1429,7 @@ msgstr "" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 @@ -1428,7 +1442,7 @@ msgid "Unsupported socket address" msgstr "" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "" #. Translators: This is an error you get if there is already an @@ -1451,8 +1465,8 @@ msgid "Keep with file when moved" msgstr "" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" -msgstr "" +msgid "“version” takes no arguments" +msgstr "\"version\" аргументтерді қабылдамайды" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 msgid "Usage:" @@ -1462,6 +1476,10 @@ msgstr "Қолданылуы:" msgid "Print version information and exit." msgstr "Нұсқа ақпаратын шығару және шығу." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[АРГУМЕНТТЕР...]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Командалар:" @@ -1472,7 +1490,7 @@ msgstr "" #: ../gio/gio-tool.c:212 msgid "Copy one or more files" -msgstr "" +msgstr "Бір немесе бірнеше файлды көшіру" #: ../gio/gio-tool.c:213 msgid "Show information about locations" @@ -1492,39 +1510,39 @@ msgstr "Бумаларды жасау" #: ../gio/gio-tool.c:217 msgid "Monitor files and directories for changes" -msgstr "" +msgstr "Файлдар және бумаларды өзгерістерге бақылау" #: ../gio/gio-tool.c:218 msgid "Mount or unmount the locations" -msgstr "" +msgstr "Орналасуларды тіркеу немесе тіркеуден босату" #: ../gio/gio-tool.c:219 msgid "Move one or more files" -msgstr "" +msgstr "Бір немесе бірнеше файлды жылжыту" #: ../gio/gio-tool.c:220 msgid "Open files with the default application" -msgstr "" +msgstr "Файлдарды үнсіз келісім қолданбасымен ашу" #: ../gio/gio-tool.c:221 msgid "Rename a file" -msgstr "" +msgstr "Файл атын ауыстыру" #: ../gio/gio-tool.c:222 msgid "Delete one or more files" -msgstr "" +msgstr "Бір немесе бірнеше файлды өшіру" #: ../gio/gio-tool.c:223 msgid "Read from standard input and save" -msgstr "" +msgstr "Қалыпты кірістен оқу және сақтау" #: ../gio/gio-tool.c:224 msgid "Set a file attribute" -msgstr "" +msgstr "Файл атрибутын орнату" #: ../gio/gio-tool.c:225 msgid "Move files or directories to the trash" -msgstr "" +msgstr "Файлдар немесе бумаларды қоқыс шелегіне тастау" #: ../gio/gio-tool.c:226 msgid "Lists the contents of locations in a tree" @@ -1549,7 +1567,7 @@ msgstr "ОРНАЛАСУ" #: ../gio/gio-tool-cat.c:129 msgid "Concatenate files and print to standard output." -msgstr "" +msgstr "Файлдарды біріктіріп, қалыпты шығысқа шығару." #: ../gio/gio-tool-cat.c:131 msgid "" @@ -1560,7 +1578,7 @@ msgstr "" #: ../gio/gio-tool-cat.c:151 msgid "No files given" -msgstr "" +msgstr "Файлдар көрсетілмеген" #: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38 msgid "No target directory" @@ -1568,20 +1586,20 @@ msgstr "Мақсат бумасы жоқ" #: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39 msgid "Show progress" -msgstr "" +msgstr "Орындалу барысын көрсету" #: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40 msgid "Prompt before overwrite" -msgstr "" +msgstr "Үстінен жазу алдында сұрау" #: ../gio/gio-tool-copy.c:45 msgid "Preserve all attributes" -msgstr "" +msgstr "Барлық атрибуттарды сақтап қалу" #: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41 #: ../gio/gio-tool-save.c:49 msgid "Backup existing destination files" -msgstr "" +msgstr "Бар болып тұрған мақсат файлдардың қор көшірмелерін жасау" #: ../gio/gio-tool-copy.c:47 msgid "Never follow symbolic links" @@ -1595,13 +1613,13 @@ msgstr "" #. Translators: commandline placeholder #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94 msgid "SOURCE" -msgstr "" +msgstr "ҚАЙНАР_КӨЗІ" #. Translators: commandline placeholder #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94 #: ../gio/gio-tool-save.c:165 msgid "DESTINATION" -msgstr "" +msgstr "МАҚСАТЫ" #: ../gio/gio-tool-copy.c:103 msgid "Copy one or more files from SOURCE to DESTINATION." @@ -1616,14 +1634,13 @@ msgstr "" #: ../gio/gio-tool-copy.c:143 #, c-format -#| msgid "Target file is a directory" msgid "Destination %s is not a directory" msgstr "%s мақсаты бума емес" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " -msgstr "" +msgid "%s: overwrite “%s”? " +msgstr "%s: \"%s\" үстінен жазу керек пе? " #: ../gio/gio-tool-info.c:34 msgid "List writable attributes" @@ -1639,16 +1656,16 @@ msgstr "" #: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35 msgid "ATTRIBUTES" -msgstr "" +msgstr "АТРИБУТТАР" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "" #: ../gio/gio-tool-info.c:75 #, c-format msgid "attributes:\n" -msgstr "" +msgstr "атрибуттар:\n" #. Translators: This is a noun and represents and attribute of a file #: ../gio/gio-tool-info.c:127 @@ -1665,32 +1682,30 @@ msgstr "" #: ../gio/gio-tool-info.c:138 #, c-format msgid "name: %s\n" -msgstr "" +msgstr "аты: %s\n" #: ../gio/gio-tool-info.c:145 #, c-format msgid "type: %s\n" -msgstr "" +msgstr "түрі: %s\n" #: ../gio/gio-tool-info.c:151 #, c-format msgid "size: " -msgstr "" +msgstr "өлшемі: " #: ../gio/gio-tool-info.c:156 #, c-format msgid "hidden\n" -msgstr "" +msgstr "жасырын\n" #: ../gio/gio-tool-info.c:159 #, c-format -#| msgid "Error: %s\n" msgid "uri: %s\n" msgstr "uri: %s\n" #: ../gio/gio-tool-info.c:221 #, c-format -#| msgid "Error setting owner: %s" msgid "Error getting writable attributes: %s\n" msgstr "" @@ -1714,7 +1729,7 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" #: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74 @@ -1723,7 +1738,7 @@ msgstr "" #: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32 msgid "Show hidden files" -msgstr "" +msgstr "Жасырын файлдарды көрсету" #: ../gio/gio-tool-list.c:37 msgid "Use a long listing format" @@ -1748,7 +1763,7 @@ msgstr "" #. Translators: commandline placeholder #: ../gio/gio-tool-mime.c:71 msgid "MIMETYPE" -msgstr "" +msgstr "MIME_ТҮРІ" #: ../gio/gio-tool-mime.c:71 msgid "HANDLER" @@ -1771,18 +1786,18 @@ msgstr "" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "" #: ../gio/gio-tool-mime.c:124 #, c-format msgid "Registered applications:\n" -msgstr "" +msgstr "Тіркелген қолданбалар:\n" #: ../gio/gio-tool-mime.c:126 #, c-format @@ -1792,7 +1807,7 @@ msgstr "Тіркелген қолданбалар жоқ\n" #: ../gio/gio-tool-mime.c:137 #, c-format msgid "Recommended applications:\n" -msgstr "" +msgstr "Ұсынылатын қолданбалар:\n" #: ../gio/gio-tool-mime.c:139 #, c-format @@ -1801,14 +1816,12 @@ msgstr "Ұсынылатын қолданбалар жоқ\n" #: ../gio/gio-tool-mime.c:159 #, c-format -#| msgid "Failed to read from file '%s': %s" -msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "" #: ../gio/gio-tool-mime.c:165 #, c-format -#| msgid "Failed to create file '%s': %s" -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" #: ../gio/gio-tool-mkdir.c:31 @@ -1839,7 +1852,7 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "" #: ../gio/gio-tool-monitor.c:45 @@ -1868,11 +1881,11 @@ msgstr "" #: ../gio/gio-tool-mount.c:60 msgid "Unmount" -msgstr "" +msgstr "Тіркеуден босату" #: ../gio/gio-tool-mount.c:61 msgid "Eject" -msgstr "" +msgstr "Шығару" #: ../gio/gio-tool-mount.c:62 msgid "Unmount all mounts with the given scheme" @@ -1893,11 +1906,11 @@ msgstr "" #. Translator: List here is a verb as in 'List all mounts' #: ../gio/gio-tool-mount.c:66 msgid "List" -msgstr "" +msgstr "Тізім" #: ../gio/gio-tool-mount.c:67 msgid "Monitor events" -msgstr "" +msgstr "Оқиғаларды бақылау" #: ../gio/gio-tool-mount.c:68 msgid "Show extra information" @@ -1920,19 +1933,16 @@ msgstr "Тіркеуден босату қатесі: %s\n" #: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419 #, c-format -#| msgid "Error sending message: %s" msgid "Error finding enclosing mount: %s\n" msgstr "" #: ../gio/gio-tool-mount.c:394 #, c-format -#| msgid "Error setting owner: %s" msgid "Error ejecting mount: %s\n" msgstr "" #: ../gio/gio-tool-mount.c:875 #, c-format -#| msgid "Error moving file: %s" msgid "Error mounting %s: %s\n" msgstr "%s тіркеу қатесі: %s\n" @@ -1948,10 +1958,10 @@ msgstr "" #: ../gio/gio-tool-mount.c:1136 msgid "Mount or unmount the locations." -msgstr "" +msgstr "Орналасуларды тіркеу немесе тіркеуден шығару." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "" #: ../gio/gio-tool-move.c:99 @@ -1978,7 +1988,7 @@ msgstr "" #: ../gio/gio-tool-open.c:69 msgid "No files to open" -msgstr "" +msgstr "Ашу үшін файлдар жоқ" #: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31 msgid "Ignore nonexistent files, never prompt" @@ -1986,23 +1996,23 @@ msgstr "" #: ../gio/gio-tool-remove.c:52 msgid "Delete the given files." -msgstr "" +msgstr "Көрсетілген файлдарды өшіру." #: ../gio/gio-tool-remove.c:70 msgid "No files to delete" -msgstr "" +msgstr "Өшіру үшін файлдар жоқ" #: ../gio/gio-tool-rename.c:45 msgid "NAME" -msgstr "" +msgstr "АТЫ" #: ../gio/gio-tool-rename.c:50 msgid "Rename a file." -msgstr "" +msgstr "Файл атын ауыстыру." #: ../gio/gio-tool-rename.c:68 msgid "Missing argument" -msgstr "" +msgstr "Аргумент жетіспейді." #: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192 #: ../gio/gio-tool-set.c:134 @@ -2047,7 +2057,6 @@ msgstr "" #. Translators: The "etag" is a token allowing to verify whether a file has been modified #: ../gio/gio-tool-save.c:145 #, c-format -#| msgid "TLS support is not available" msgid "Etag not available\n" msgstr "Etag қолжетерсіз\n" @@ -2065,15 +2074,15 @@ msgstr "" #: ../gio/gio-tool-set.c:33 msgid "TYPE" -msgstr "" +msgstr "ТҮРІ" #: ../gio/gio-tool-set.c:89 msgid "ATTRIBUTE" -msgstr "" +msgstr "АТРИБУТ" #: ../gio/gio-tool-set.c:89 msgid "VALUE" -msgstr "" +msgstr "МӘНІ" #: ../gio/gio-tool-set.c:93 msgid "Set a file attribute of LOCATION." @@ -2093,19 +2102,17 @@ msgstr "" #: ../gio/gio-tool-set.c:176 #, c-format -#| msgid "Invalid group name: %s" msgid "Invalid attribute type %s\n" msgstr "Қате атрибут түрі %s\n" #: ../gio/gio-tool-set.c:189 #, c-format -#| msgid "Error setting owner: %s" msgid "Error setting attribute: %s\n" msgstr "Атрибутты орнату қатесі: %s\n" #: ../gio/gio-tool-trash.c:32 msgid "Empty the trash" -msgstr "" +msgstr "Қоқыс шелегін тазарту" #: ../gio/gio-tool-trash.c:86 msgid "Move files or directories to the trash." @@ -2136,18 +2143,18 @@ msgstr "" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" -msgstr "" +msgid "Unknown processing option “%s”" +msgstr "Белгісіз өңдеу опциясы \"%s\"" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format @@ -2157,74 +2164,82 @@ msgstr "" #: ../gio/glib-compile-resources.c:382 #, c-format msgid "Error reading file %s: %s" -msgstr "" +msgstr "%s файлын оқу қатесі: %s" #: ../gio/glib-compile-resources.c:402 #, c-format msgid "Error compressing file %s" -msgstr "" +msgstr "%s файлын сығу қатесі" #: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603 #, c-format msgid "text may not appear inside <%s>" msgstr "мәтін <%s> ішінде болмауы мүмкін" -#: ../gio/glib-compile-resources.c:620 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037 +msgid "Show program version and exit" +msgstr "" + +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "" -#: ../gio/glib-compile-resources.c:621 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" msgstr "" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2036 -#: ../gio/glib-compile-schemas.c:2065 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2067 msgid "DIRECTORY" msgstr "БУМА" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:671 msgid "name of the dependency file to generate" msgstr "" -#: ../gio/glib-compile-resources.c:627 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "" + +#: ../gio/glib-compile-resources.c:673 +msgid "Don’t automatically create and register resource" msgstr "" -#: ../gio/glib-compile-resources.c:628 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:674 +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "" -#: ../gio/glib-compile-resources.c:629 +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "" -#: ../gio/glib-compile-resources.c:655 +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" "and the resource file have the extension called .gresource." msgstr "" -#: ../gio/glib-compile-resources.c:671 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "" @@ -2434,178 +2449,176 @@ msgid "" "list of valid choices" msgstr "" -#: ../gio/glib-compile-schemas.c:2036 +#: ../gio/glib-compile-schemas.c:2038 msgid "where to store the gschemas.compiled file" msgstr "" -#: ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-schemas.c:2039 msgid "Abort on any errors in schemas" msgstr "" -#: ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2040 msgid "Do not write the gschema.compiled file" msgstr "" -#: ../gio/glib-compile-schemas.c:2039 +#: ../gio/glib-compile-schemas.c:2041 msgid "Do not enforce key name restrictions" msgstr "" -#: ../gio/glib-compile-schemas.c:2068 +#: ../gio/glib-compile-schemas.c:2070 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." msgstr "" -#: ../gio/glib-compile-schemas.c:2084 +#: ../gio/glib-compile-schemas.c:2092 #, c-format msgid "You should give exactly one directory name\n" msgstr "" -#: ../gio/glib-compile-schemas.c:2123 +#: ../gio/glib-compile-schemas.c:2131 #, c-format msgid "No schema files found: " msgstr "" -#: ../gio/glib-compile-schemas.c:2126 +#: ../gio/glib-compile-schemas.c:2134 #, c-format msgid "doing nothing.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:2129 +#: ../gio/glib-compile-schemas.c:2137 #, c-format msgid "removed existing output file.\n" msgstr "" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Қате файл аты %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "%s үшін файлдық жүйе ақпаратын алу қатесі: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" msgstr "Түбірлік буманың атын ауыстыру мүмкін емес" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "%s файл атын ауыстыру қатесі: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" -msgstr "Файл атын ауыстыру мүмкін емес, мақсат файлы бар болып тұр" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" +msgstr "Файл атын ауыстыру мүмкін емес, ондай файл бар болып тұр" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Файл аты қате" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "%s файлын ашу қатесі: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "%s файлын өшіру қатесі: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "%s файлын қоқысқа тастау қатесі: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format -#| msgid "Unable to trash file: %s" msgid "Unable to create trashing info file for %s: %s" msgstr "" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format -#| msgid "Unable to trash file: %s" msgid "Unable to trash file %s across filesystem boundaries" msgstr "" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "%s файлын қоқысқа тастау мүмкін емес: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "%s файлын қоқысқа тастау мүмкін емес" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "%s бумасын жасау қатесі: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "%s символдық сілтемесін жасау қатесі: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Символдық сілтемелерге қолдау жоқ" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "%s файлын жылжыту қатесі: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" -msgstr "" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" +msgstr "Буманы бума үстіне жылжыту мүмкін емес" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Мақсат файлын өшіру қатесі: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "" @@ -2624,8 +2637,8 @@ msgstr "" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" -msgstr "" +msgid "Error setting extended attribute “%s”: %s" +msgstr "\"%s\" кеңейтілген атрибутын орнату қатесі: %s" #: ../gio/glocalfileinfo.c:1575 msgid " (invalid encoding)" @@ -2633,8 +2646,8 @@ msgstr " (кодталуы қате)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" -msgstr "" +msgid "Error when getting information for file “%s”: %s" +msgstr "\"%s\" файлы ақпаратын алу қатесі: %s" #: ../gio/glocalfileinfo.c:2017 #, c-format @@ -2755,8 +2768,8 @@ msgstr "" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "'%s' файлын ашу қатесі: %s" +msgid "Error opening file “%s”: %s" +msgstr "\"%s\" файлын ашу қатесі: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -2813,54 +2826,54 @@ msgstr "" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" msgstr "" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 @@ -2891,17 +2904,18 @@ msgid "NetworkManager version too old" msgstr "NetworkManager нұсқасы тым ескі" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "" -#: ../gio/gresolver.c:330 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +#| msgid "Error removing file %s: %s" +msgid "Error resolving “%s”: %s" msgstr "" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -2909,21 +2923,22 @@ msgstr "" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" msgstr "" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" +#| msgid "Target %s is not a directory" +msgid "The resource at “%s” is not a directory" msgstr "" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "" #: ../gio/gresource-tool.c:494 @@ -2965,7 +2980,7 @@ msgstr "" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -2974,7 +2989,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" @@ -3025,17 +3040,17 @@ msgstr "" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" msgstr "" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "" #: ../gio/gsettings-tool.c:92 @@ -3152,7 +3167,7 @@ msgstr "" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3170,7 +3185,7 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" @@ -3223,7 +3238,7 @@ msgstr "" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" +msgid "No such key “%s”\n" msgstr "" #: ../gio/gsocket.c:364 @@ -3344,26 +3359,26 @@ msgstr "" msgid "Waiting for socket condition: %s" msgstr "" -#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 +#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619 #, c-format msgid "Error sending message: %s" msgstr "Хабарламаны жіберу сәтсіз: %s" -#: ../gio/gsocket.c:4386 +#: ../gio/gsocket.c:4385 msgid "GSocketControlMessage not supported on Windows" msgstr "" -#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 +#: ../gio/gsocket.c:4838 ../gio/gsocket.c:4911 ../gio/gsocket.c:5138 #, c-format msgid "Error receiving message: %s" msgstr "" -#: ../gio/gsocket.c:5411 +#: ../gio/gsocket.c:5410 #, c-format msgid "Unable to read socket credentials: %s" msgstr "" -#: ../gio/gsocket.c:5420 +#: ../gio/gsocket.c:5419 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" @@ -3391,7 +3406,7 @@ msgstr "" #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "" #: ../gio/gsocketlistener.c:218 @@ -3404,7 +3419,7 @@ msgstr "" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "" #: ../gio/gsocks4aproxy.c:136 @@ -3413,7 +3428,7 @@ msgstr "" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "" #: ../gio/gsocks4aproxy.c:179 @@ -3449,7 +3464,7 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "" #: ../gio/gsocks5proxy.c:348 @@ -3477,7 +3492,7 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "" #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "" #: ../gio/gsocks5proxy.c:392 @@ -3490,7 +3505,7 @@ msgstr "" #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "" #: ../gio/gthreadedresolver.c:118 @@ -3499,23 +3514,25 @@ msgstr "" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" +#| msgid "Error removing file %s: %s" +msgid "Error reverse-resolving “%s”: %s" msgstr "" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +#| msgid "Error removing file %s: %s" +msgid "Error resolving “%s”" msgstr "" #: ../gio/gtlscertificate.c:250 @@ -3617,7 +3634,7 @@ msgstr "" msgid "Error closing file descriptor: %s" msgstr "" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 msgid "Filesystem root" msgstr "Файлдық жүйе түбірі" @@ -3631,14 +3648,14 @@ msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" msgstr "" #: ../gio/gwin32inputstream.c:185 @@ -3700,25 +3717,25 @@ msgstr "" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" msgstr "" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "" #: ../glib/gbookmarkfile.c:1757 @@ -3727,7 +3744,7 @@ msgstr "" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" msgstr "" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 @@ -3740,32 +3757,32 @@ msgstr "" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" msgstr "" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" msgstr "" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 @@ -3775,37 +3792,38 @@ msgstr "" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "" #: ../glib/gconvert.c:1567 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "" #: ../glib/gconvert.c:1577 #, c-format -msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" msgstr "" #: ../glib/gconvert.c:1594 #, c-format -msgid "The URI '%s' is invalid" -msgstr "URI '%s' қате" +msgid "The URI “%s” is invalid" +msgstr "URI \"%s\" қате" #: ../glib/gconvert.c:1606 #, c-format -msgid "The hostname of the URI '%s' is invalid" +#| msgid "The URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" msgstr "" #: ../glib/gconvert.c:1622 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "" #: ../glib/gconvert.c:1717 #, c-format -msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" msgstr "" #: ../glib/gconvert.c:1727 @@ -4040,92 +4058,95 @@ msgstr "Жк" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" -msgstr "'%s' бумасын ашу қатесі: %s" +msgid "Error opening directory “%s”: %s" +msgstr "\"%s\" бумасын ашу қатесі: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" -msgstr "'%s' файлын оқу қатесі: %s" +msgid "Error reading file “%s”: %s" +msgstr "\"%s\" файлын оқу қатесі: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "\"%s\" файлы тым үлкен" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" -msgstr "'%s' файлынан оқу қатесі: %s" +msgid "Failed to read from file “%s”: %s" +msgstr "\"%s\" файлынан оқу қатесі: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" -msgstr "'%s' файлын ашу сәтсіз: %s" +msgid "Failed to open file “%s”: %s" +msgstr "\"%s\" файлын ашу қатесі: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" -msgstr "'%s' файлын жасау сәтсіз: %s" +msgid "Failed to create file “%s”: %s" +msgstr "\"%s\" файлын жасау сәтсіз: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" -msgstr "" +msgid "Failed to write file “%s”: write() failed: %s" +msgstr "\"%s\" файлын жазу сәтсіз: write() сәтсіз аяқталды: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" -msgstr "" +msgid "Failed to write file “%s”: fsync() failed: %s" +msgstr "\"%s\" файлын жазу сәтсіз: fsync() сәтсіз аяқталды: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "" #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 @@ -4138,7 +4159,7 @@ msgid "Channel terminates in a partial character" msgstr "" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "" #: ../glib/gkeyfile.c:737 @@ -4152,7 +4173,7 @@ msgstr "Қалыпты файл емес" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" #: ../glib/gkeyfile.c:1261 @@ -4171,42 +4192,42 @@ msgstr "" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" #: ../glib/gkeyfile.c:4133 @@ -4215,32 +4236,32 @@ msgstr "" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" msgstr "" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "" #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" msgstr "" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." msgstr "" #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "" #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" #: ../glib/gmappedfile.c:195 @@ -4250,8 +4271,8 @@ msgstr "" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" -msgstr "'%s' файлын ашу сәтсіз: open() сәтсіз: %s" +msgid "Failed to open file “%s”: open() failed: %s" +msgstr "\"%s\" файлын ашу сәтсіз: open() аяқталды: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 #, c-format @@ -4430,8 +4451,8 @@ msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" #: ../glib/goption.c:861 -msgid "[OPTION...]" -msgstr "[ОПЦИЯ...]" +msgid "[OPTION…]" +msgstr "[ОПЦИЯ…]" #: ../glib/goption.c:977 msgid "Help Options:" @@ -4455,35 +4476,35 @@ msgstr "Опциялар:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" msgstr "" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" msgstr "" -#: ../glib/goption.c:1442 ../glib/goption.c:1521 +#: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format msgid "Error parsing option %s" msgstr "" -#: ../glib/goption.c:1552 ../glib/goption.c:1665 +#: ../glib/goption.c:1558 ../glib/goption.c:1671 #, c-format msgid "Missing argument for %s" msgstr "" -#: ../glib/goption.c:2126 +#: ../glib/goption.c:2132 #, c-format msgid "Unknown option %s" msgstr "Белгісіз опция %s" @@ -4530,7 +4551,7 @@ msgstr "қате шегініс" #: ../glib/gregex.c:304 msgid "short utf8" -msgstr "" +msgstr "қысқа utf8" #: ../glib/gregex.c:306 msgid "recursion loop" @@ -4813,7 +4834,7 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" msgstr "" #: ../glib/gregex.c:2429 @@ -4821,7 +4842,7 @@ msgid "hexadecimal digit expected" msgstr "" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" msgstr "" #: ../glib/gregex.c:2478 @@ -4841,20 +4862,20 @@ msgid "illegal symbolic reference" msgstr "" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" +msgid "stray final “\\”" msgstr "" #: ../glib/gregex.c:2580 msgid "unknown escape sequence" -msgstr "" +msgstr "белгісіз escape тізбегі" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "" #: ../glib/gshell.c:186 @@ -4863,17 +4884,17 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" #: ../glib/gshell.c:601 msgid "Text was empty (or contained only whitespace)" -msgstr "" +msgstr "Мәтін бос болды (немесе тек бос аралықтан тұрды)" #: ../glib/gspawn.c:209 #, c-format @@ -4922,12 +4943,13 @@ msgstr "" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" -msgstr "" +msgid "Failed to change to directory “%s” (%s)" +msgstr "\"%s\" бумасына ауысу сәтсіз аяқталды (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +#| msgid "Failed to execute helper program (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "" #: ../glib/gspawn.c:1510 @@ -4942,7 +4964,7 @@ msgstr "" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" msgstr "" #: ../glib/gspawn.c:1551 @@ -5097,6 +5119,12 @@ msgstr[0] "%s байт" msgid "%.1f KB" msgstr "%.1f КБ" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "'%s' бумасын жасау қатесі: %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "'%s' файлын ашу қатесі: %s" + #~ msgid "Error opening file: %s" #~ msgstr "Файлды ашу қатесі: %s" @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: lt\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-10-15 19:10+0000\n" -"PO-Revision-Date: 2016-10-23 14:27+0300\n" +"POT-Creation-Date: 2016-10-28 15:59+0000\n" +"PO-Revision-Date: 2016-10-30 13:16+0200\n" "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n" "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n" "Language: lt\n" @@ -41,7 +41,6 @@ msgstr "" "Įveskite GApplication tarnybos veikseną (naudoti iš D-Bus tarnybų failų)" #: ../gio/gapplication.c:550 -#| msgid "Override the application's ID" msgid "Override the application’s ID" msgstr "Pakeisti programos ID" @@ -82,7 +81,6 @@ msgid "Launch the application (with optional files to open)" msgstr "Paleisti programą (su nebūtinais failais atvėrimui)" #: ../gio/gapplication-tool.c:57 -#| msgid "APPID [FILE...]" msgid "APPID [FILE…]" msgstr "APPID [FAILAS...]" @@ -170,7 +168,6 @@ msgid "Arguments:\n" msgstr "Argumentai:\n" #: ../gio/gapplication-tool.c:133 -#| msgid "[ARGS...]" msgid "[ARGS…]" msgstr "[ARG...]" @@ -182,9 +179,6 @@ msgstr "Komandos:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. #: ../gio/gapplication-tool.c:146 #, c-format -#| msgid "" -#| "Use '%s help COMMAND' to get detailed help.\n" -#| "\n" msgid "" "Use “%s help COMMAND” to get detailed help.\n" "\n" @@ -199,16 +193,12 @@ msgstr "%s komanda reikalauja iš karto pateikti programos id\n" #: ../gio/gapplication-tool.c:171 #, c-format -#| msgid "invalid application id: '%s'\n" msgid "invalid application id: “%s”\n" msgstr "netinkamas programos id: „%s“\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format -#| msgid "" -#| "'%s' takes no arguments\n" -#| "\n" msgid "" "“%s” takes no arguments\n" "\n" @@ -231,9 +221,6 @@ msgstr "veiksmo pavadinimas turi būti pateiktas po programos id\n" #: ../gio/gapplication-tool.c:325 #, c-format -#| msgid "" -#| "invalid action name: '%s'\n" -#| "action names must consist of only alphanumerics, '-' and '.'\n" msgid "" "invalid action name: “%s”\n" "action names must consist of only alphanumerics, “-” and “.”\n" @@ -336,13 +323,11 @@ msgstr "Atšaukiamas inicijavimas nepalaikomas" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -#| msgid "Conversion from character set '%s' to '%s' is not supported" msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "Keitimas iš koduotės „%s“ į koduotę „%s“ nepalaikomas" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -#| msgid "Could not open converter from '%s' to '%s'" msgid "Could not open converter from “%s” to “%s”" msgstr "Nepavyko atverti keitiklio iš „%s“ į „%s“" @@ -383,15 +368,11 @@ msgstr "Netikėta ankstyva srauto pabaiga" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -#| msgid "Unsupported key '%s' in address entry '%s'" msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nepalaikomas raktas „%s“ adreso įvestyje „%s“" #: ../gio/gdbusaddress.c:180 #, c-format -#| msgid "" -#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract " -#| "keys)" msgid "" "Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" @@ -400,33 +381,26 @@ msgstr "" #: ../gio/gdbusaddress.c:193 #, c-format -#| msgid "Meaningless key/value pair combination in address entry '%s'" msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Beprasmė rakto/reikšmės poros kombinacija adreso įvestyje „%s“" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -#| msgid "Error in address '%s' - the port attribute is malformed" msgid "Error in address “%s” — the port attribute is malformed" msgstr "Klaida adrese „%s“ - neteisingai suformuotas prievado atributas" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -#| msgid "Error in address '%s' - the family attribute is malformed" msgid "Error in address “%s” — the family attribute is malformed" msgstr "Klaida adrese „%s“ - neteisingai suformuotas šeimos atributas" #: ../gio/gdbusaddress.c:457 #, c-format -#| msgid "Address element '%s' does not contain a colon (:)" msgid "Address element “%s” does not contain a colon (:)" msgstr "Adreso elementas „%s“ neturi dvitaškio (:)" #: ../gio/gdbusaddress.c:478 #, c-format -#| msgid "" -#| "Key/Value pair %d, '%s', in address element '%s' does not contain an " -#| "equal sign" msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" @@ -435,9 +409,6 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format -#| msgid "" -#| "Error unescaping key or value in Key/Value pair %d, '%s', in address " -#| "element '%s'" msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" @@ -447,9 +418,6 @@ msgstr "" #: ../gio/gdbusaddress.c:570 #, c-format -#| msgid "" -#| "Error in address '%s' - the unix transport requires exactly one of the " -#| "keys 'path' or 'abstract' to be set" msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" @@ -459,7 +427,6 @@ msgstr "" #: ../gio/gdbusaddress.c:606 #, c-format -#| msgid "Error in address '%s' - the host attribute is missing or malformed" msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - pagrindinio kompiuterio atributas neįvestas arba blogai " @@ -467,15 +434,12 @@ msgstr "" #: ../gio/gdbusaddress.c:620 #, c-format -#| msgid "Error in address '%s' - the port attribute is missing or malformed" msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - prievado atributas neįvestas arba blogai suformuotas" #: ../gio/gdbusaddress.c:634 #, c-format -#| msgid "" -#| "Error in address '%s' - the noncefile attribute is missing or malformed" msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - laikino failo atributas neįvestas arba blogai " @@ -487,32 +451,27 @@ msgstr "Klaida automatiškai paleidžiant: " #: ../gio/gdbusaddress.c:663 #, c-format -#| msgid "Unknown or unsupported transport '%s' for address '%s'" msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Nežinomas arba nepalaikomas duomenų perdavimas „%s“ adresui „%s“" #: ../gio/gdbusaddress.c:699 #, c-format -#| msgid "Error opening nonce file '%s': %s" msgid "Error opening nonce file “%s”: %s" msgstr "Klaida atveriant vienkartinio kodo failą „%s“: %s" #: ../gio/gdbusaddress.c:717 #, c-format -#| msgid "Error reading from nonce file '%s': %s" msgid "Error reading from nonce file “%s”: %s" msgstr "Klaida skaitant iš vienkartinio kodo failo „%s“: %s" #: ../gio/gdbusaddress.c:726 #, c-format -#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Klaida skaitant iš vienkartinio kodo failo „%s“, tikėtasi 16 baitų, gauta %d" #: ../gio/gdbusaddress.c:744 #, c-format -#| msgid "Error writing contents of nonce file '%s' to stream:" msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Klaida rašant vienkartinio kodo failo turinį „%s“ į srautą:" @@ -536,7 +495,6 @@ msgstr "Negalima automatiškai paleisti D-Bus be X11 $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -#| msgid "Error spawning command line '%s': " msgid "Error spawning command line “%s”: " msgstr "Klaida paleidžiant komandų eilutę „%s“: " @@ -557,11 +515,8 @@ msgstr "" "Nepavyko nustatyti sesijos magistralės adreso (nerealizuota šiai operacinei " "sistemai)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1635 #, c-format -#| msgid "" -#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " -#| "variable - unknown value '%s'" msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" @@ -604,14 +559,11 @@ msgstr "Atšaukta per GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -#| msgid "Error when getting information for directory '%s': %s" msgid "Error when getting information for directory “%s”: %s" msgstr "Klaida gaunant informaciją apie katalogą „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format -#| msgid "" -#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" @@ -620,28 +572,22 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -#| msgid "Error creating directory %s: %s" msgid "Error creating directory “%s”: %s" msgstr "Klaida kuriant katalogą %s: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -#| msgid "Error opening keyring '%s' for reading: " msgid "Error opening keyring “%s” for reading: " msgstr "Klaida atveriant raktinę „%s“ skaitymui: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed" msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "%d eilutė raktinės vietoje „%s“ su turiniu „%s“ yra suformuota neteisingai" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format -#| msgid "" -#| "First token of line %d of the keyring at '%s' with content '%s' is " -#| "malformed" msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" @@ -650,9 +596,6 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format -#| msgid "" -#| "Second token of line %d of the keyring at '%s' with content '%s' is " -#| "malformed" msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" @@ -661,43 +604,36 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -#| msgid "Didn't find cookie with id %d in the keyring at '%s'" msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Nerastas slapukas su id %d raktinės vietoje „%s“" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -#| msgid "Error deleting stale lock file '%s': %s" msgid "Error deleting stale lock file “%s”: %s" msgstr "Klaida trinant nebegaliojantį rakinimo failą „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -#| msgid "Error creating lock file '%s': %s" msgid "Error creating lock file “%s”: %s" msgstr "Klaida kuriant rakinimo failą „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -#| msgid "Error closing (unlinked) lock file '%s': %s" msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Klaida užveriant (nesusietą) rakinimo failą „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -#| msgid "Error unlinking lock file '%s': %s" msgid "Error unlinking lock file “%s”: %s" msgstr "Klaida atsiejant rakinimo failą „%s“: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -#| msgid "Error opening keyring '%s' for writing: " msgid "Error opening keyring “%s” for writing: " msgstr "Klaida atveriant raktinę „%s“ rašymui: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) " msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Papildomai, užrakto atlaisvinimas „%s“ taip pat nepavyko: %s)." @@ -717,40 +653,40 @@ msgstr "Nepalaikomi požymiai aptikti konstruojant kliento pusės ryšį" #: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456 #, c-format #| msgid "" -#| "No such interface 'org.freedesktop.DBus.Properties' on object at path %s" +#| "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgid "" -"No such interface “org.freedesktop.DBus.Properties” on object at path %s" +"No such interface 'org.freedesktop.DBus.Properties' on object at path %s" msgstr "" "Nėra sąsajos „org.freedesktop.DBus.Properties“ objektui, kurio kelias %s" #: ../gio/gdbusconnection.c:4251 #, c-format -#| msgid "No such property '%s'" -msgid "No such property “%s”" +#| msgid "No such property “%s”" +msgid "No such property '%s'" msgstr "Nėra savybės „%s“" #: ../gio/gdbusconnection.c:4263 #, c-format -#| msgid "Property '%s' is not readable" -msgid "Property “%s” is not readable" +#| msgid "Property “%s” is not readable" +msgid "Property '%s' is not readable" msgstr "Savybė „%s“ yra neskaitoma" #: ../gio/gdbusconnection.c:4274 #, c-format -#| msgid "Property '%s' is not writable" -msgid "Property “%s” is not writable" +#| msgid "Property “%s” is not writable" +msgid "Property '%s' is not writable" msgstr "Savybė „%s“ nėra rašoma" #: ../gio/gdbusconnection.c:4294 #, c-format -#| msgid "Error setting property '%s': Expected type '%s' but got '%s'" -msgid "Error setting property “%s”: Expected type “%s” but got “%s”" +#| msgid "Error setting property “%s”: Expected type “%s” but got “%s”" +msgid "Error setting property '%s': Expected type '%s' but got '%s'" msgstr "Klaida nustatant savybę „%s“: tikėtasi tipo „%s“, bet gauta „%s“" #: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573 #, c-format -#| msgid "No such interface '%s'" -msgid "No such interface “%s”" +#| msgid "No such interface" +msgid "No such interface '%s'" msgstr "Nėra sąsajos „%s“" #: ../gio/gdbusconnection.c:4607 @@ -759,20 +695,20 @@ msgstr "Nėra tokios sąsajos" #: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082 #, c-format -#| msgid "No such interface '%s' on object at path %s" -msgid "No such interface “%s” on object at path %s" +#| msgid "No such interface “%s” on object at path %s" +msgid "No such interface '%s' on object at path %s" msgstr "Nėra sąsajos „%s“ objektui, kurio kelias %s" #: ../gio/gdbusconnection.c:4923 #, c-format -#| msgid "No such method '%s'" -msgid "No such method “%s”" +#| msgid "No such method “%s”" +msgid "No such method '%s'" msgstr "Nėra metodo „%s“" #: ../gio/gdbusconnection.c:4954 #, c-format -#| msgid "Type of message, '%s', does not match expected type '%s'" -msgid "Type of message, “%s”, does not match expected type “%s”" +#| msgid "Type of message, “%s”, does not match expected type “%s”" +msgid "Type of message, '%s', does not match expected type '%s'" msgstr "Pranešimo tipas „%s“ neatitinka laukiamo tipo „%s“" #: ../gio/gdbusconnection.c:5152 @@ -792,14 +728,14 @@ msgstr "Nepavyko nustatyti savybės: %s.%s" #: ../gio/gdbusconnection.c:5610 #, c-format -#| msgid "Method '%s' returned type '%s', but expected '%s'" -msgid "Method “%s” returned type “%s”, but expected “%s”" +#| msgid "Method “%s” returned type “%s”, but expected “%s”" +msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "Metodas „%s“ grąžino tipą „%s“, bet laukta „%s“" #: ../gio/gdbusconnection.c:6684 #, c-format -#| msgid "Method '%s' on interface '%s' with signature '%s' does not exist" -msgid "Method “%s” on interface “%s” with signature “%s” does not exist" +#| msgid "Method “%s” on interface “%s” with signature “%s” does not exist" +msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "Metodas „%s“ sąsajoje „%s“ su signatūra „%s“ neegzistuoja" #: ../gio/gdbusconnection.c:6805 @@ -807,6 +743,18 @@ msgstr "Metodas „%s“ sąsajoje „%s“ su signatūra „%s“ neegzistuoja" msgid "A subtree is already exported for %s" msgstr "Pomedis %s jau yra eksportuotas" +#: ../gio/gdbusconnection.c:7133 +#, c-format +#| msgid "" +#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " +#| "variable — unknown value “%s”" +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Nepavyko nustatyti magistralės adreso iš DBUS_STARTER_BUS_TYPE aplinkos " +"kintamojo - nežinoma reikšmė „%s“" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "tipas yra NETINKAMAS" @@ -853,16 +801,11 @@ msgstr[2] "Norėta nuskaityti %lu baitų, bet gauta tik %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -#| msgid "Expected NUL byte after the string '%s' but found byte %d" msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Tikėtasi NUL baito po simbolių eilutės „%s“, bet rastas baitas %d" #: ../gio/gdbusmessage.c:1388 #, c-format -#| msgid "" -#| "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -#| "(length of string is %d). The valid UTF-8 string up until that point was " -#| "'%s'" msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " "(length of string is %d). The valid UTF-8 string up until that point was “%s”" @@ -872,13 +815,11 @@ msgstr "" #: ../gio/gdbusmessage.c:1587 #, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus object path" msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Perskaityta reikšmė „%s“ nėra tinkamas D-Bus objekto kelias" #: ../gio/gdbusmessage.c:1609 #, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus signature" msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra" @@ -897,9 +838,6 @@ msgstr[2] "" #: ../gio/gdbusmessage.c:1676 #, c-format -#| msgid "" -#| "Encountered array of type 'a%c', expected to have a length a multiple of " -#| "%u bytes, but found to be %u bytes in length" msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" @@ -909,15 +847,11 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature" msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Perskaityta reikšmė „%s“ variantui nėra tinkama D-Bus signatūra" #: ../gio/gdbusmessage.c:1867 #, c-format -#| msgid "" -#| "Error deserializing GVariant with type string '%s' from the D-Bus wire " -#| "format" msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" @@ -925,9 +859,6 @@ msgstr "" #: ../gio/gdbusmessage.c:2051 #, c-format -#| msgid "" -#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found " -#| "value 0x%02x" msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" @@ -942,7 +873,6 @@ msgstr "Netinkama pagrindinė protokolo versija. Tikėtasi 1, bet rasta %d" #: ../gio/gdbusmessage.c:2120 #, c-format -#| msgid "Signature header with signature '%s' found but message body is empty" msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signatūros antraštė su signatūra „%s“ rasta, bet pranešimo pagrindinė dalis " @@ -950,7 +880,6 @@ msgstr "" #: ../gio/gdbusmessage.c:2134 #, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra (pagrindinei daliai)" @@ -975,8 +904,6 @@ msgstr "Nepavyko atstatyti pranešimo: " #: ../gio/gdbusmessage.c:2515 #, c-format -#| msgid "" -#| "Error serializing GVariant with type string '%s' to the D-Bus wire format" msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" @@ -997,16 +924,12 @@ msgstr "Nepavyko išsaugoti pranešimo: " #: ../gio/gdbusmessage.c:2704 #, c-format -#| msgid "Message body has signature '%s' but there is no signature header" msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Pranešimo pagrindinė dalis turi signatūrą „%s“, bet nėra signatūros antraštės" #: ../gio/gdbusmessage.c:2714 #, c-format -#| msgid "" -#| "Message body has type signature '%s' but signature in the header field is " -#| "'%s'" msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" @@ -1016,7 +939,6 @@ msgstr "" #: ../gio/gdbusmessage.c:2730 #, c-format -#| msgid "Message body is empty but signature in the header field is '(%s)'" msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Pranešimo pagrindinė dalis yra tuščia, bet signatūra antraštės lauke yra " @@ -1024,7 +946,6 @@ msgstr "" #: ../gio/gdbusmessage.c:3283 #, c-format -#| msgid "Error return with body of type '%s'" msgid "Error return with body of type “%s”" msgstr "Klaidos grąžinimas su pagrindinės dalies tipu „%s“" @@ -1069,33 +990,21 @@ msgstr "Negalima nurodyti laikino failo kuriant serverį" #: ../gio/gdbusserver.c:873 #, c-format -#| msgid "Error writing nonce file at '%s': %s" msgid "Error writing nonce file at “%s”: %s" msgstr "Klaida rašant vienkartinio kodo failą vietoje „%s“: %s" #: ../gio/gdbusserver.c:1044 #, c-format -#| msgid "The string '%s' is not a valid D-Bus GUID" msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Eilutė „%s“ nėra tinkamas D-Bus GUID" #: ../gio/gdbusserver.c:1084 #, c-format -#| msgid "Cannot listen on unsupported transport '%s'" msgid "Cannot listen on unsupported transport “%s”" msgstr "Negalima laukti duomenų iš nepalaikomo perdavimo „%s“" #: ../gio/gdbus-tool.c:95 #, c-format -#| msgid "" -#| "Commands:\n" -#| " help Shows this information\n" -#| " introspect Introspect a remote object\n" -#| " monitor Monitor a remote object\n" -#| " call Invoke a method on a remote object\n" -#| " emit Emit a signal\n" -#| "\n" -#| "Use \"%s COMMAND --help\" to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -1164,17 +1073,12 @@ msgstr "Nurodytos kelio ryšio pabaigos" #: ../gio/gdbus-tool.c:471 #, c-format -#| msgid "" -#| "Warning: According to introspection data, interface '%s' does not exist\n" msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Perspėjimas: pagal introspekcijos duomenis, sąsaja „%s“ neegzistuoja\n" #: ../gio/gdbus-tool.c:480 #, c-format -#| msgid "" -#| "Warning: According to introspection data, method '%s' does not exist on " -#| "interface '%s'\n" msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" @@ -1293,13 +1197,11 @@ msgstr "Klaida: nenurodytas metodo vardas\n" #: ../gio/gdbus-tool.c:950 #, c-format -#| msgid "Error: Method name '%s' is invalid\n" msgid "Error: Method name “%s” is invalid\n" msgstr "Klaida: metodo vardas „%s“ yra netinkamas\n" #: ../gio/gdbus-tool.c:1028 #, c-format -#| msgid "Error parsing parameter %d of type '%s': %s\n" msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Klaida skaitant parametrą %d, kurio tipas „%s“: %s\n" @@ -1344,7 +1246,6 @@ msgid "Unnamed" msgstr "Nepavadinta" #: ../gio/gdesktopappinfo.c:2404 -#| msgid "Desktop file didn't specify Exec field" msgid "Desktop file didn’t specify Exec field" msgstr "Darbalaukio failas nenurodė Exec lauko" @@ -1354,13 +1255,11 @@ msgstr "Nerastas terminalas, reikalingas programai" #: ../gio/gdesktopappinfo.c:3097 #, c-format -#| msgid "Can't create user application configuration folder %s: %s" msgid "Can’t create user application configuration folder %s: %s" msgstr "Nepavyko sukurti naudotojo nustatymų aplanko %s: %s" #: ../gio/gdesktopappinfo.c:3101 #, c-format -#| msgid "Can't create user MIME configuration folder %s: %s" msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nepavyko sukurti naudotojo MIME nustatymų aplanko %s: %s" @@ -1370,7 +1269,6 @@ msgstr "Programos informacijai trūksta identifikatoriaus" #: ../gio/gdesktopappinfo.c:3599 #, c-format -#| msgid "Can't create user desktop file %s" msgid "Can’t create user desktop file %s" msgstr "Nepavyko sukurti naudotojo darbalaukio failo %s" @@ -1380,7 +1278,6 @@ msgid "Custom definition for %s" msgstr "Specialus apibrėžimas %s" #: ../gio/gdrive.c:417 -#| msgid "drive doesn't implement eject" msgid "drive doesn’t implement eject" msgstr "įrenginys nerealizuoja išstūmimo" @@ -1388,23 +1285,19 @@ msgstr "įrenginys nerealizuoja išstūmimo" #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -#| msgid "drive doesn't implement eject or eject_with_operation" msgid "drive doesn’t implement eject or eject_with_operation" msgstr "" "įrenginys nerealizuoja išstūmimo nei su papildoma operacija, nei be jos" #: ../gio/gdrive.c:571 -#| msgid "drive doesn't implement polling for media" msgid "drive doesn’t implement polling for media" msgstr "įrenginys nerealizuoja laikmenos tikrinimo užklausimo" #: ../gio/gdrive.c:776 -#| msgid "drive doesn't implement start" msgid "drive doesn’t implement start" msgstr "įrenginys nerealizuoja startavimo" #: ../gio/gdrive.c:878 -#| msgid "drive doesn't implement stop" msgid "drive doesn’t implement stop" msgstr "įrenginys nerealizuoja stabdymo" @@ -1419,7 +1312,6 @@ msgstr "Nėra DTLS palaikymo" #: ../gio/gemblem.c:323 #, c-format -#| msgid "Can't handle version %d of GEmblem encoding" msgid "Can’t handle version %d of GEmblem encoding" msgstr "Nepavyko apdoroti GEmblem koduotės versijos %d" @@ -1430,7 +1322,6 @@ msgstr "Netinkamas leksemų skaičius (%d) GEmblem koduotėje" #: ../gio/gemblemedicon.c:362 #, c-format -#| msgid "Can't handle version %d of GEmblemedIcon encoding" msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Nepavyko apdoroti GEmblemedIcon koduotės versijos %d" @@ -1464,12 +1355,10 @@ msgid "Containing mount does not exist" msgstr "Tėvinis prijungimo taškas neegzistuoja" #: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 -#| msgid "Can't copy over directory" msgid "Can’t copy over directory" msgstr "Negalima kopijuoti ant aplanko viršaus" #: ../gio/gfile.c:2575 -#| msgid "Can't copy directory over directory" msgid "Can’t copy directory over directory" msgstr "Negalima kopijuoti aplanko ant aplanko" @@ -1478,7 +1367,6 @@ msgid "Target file exists" msgstr "Nurodytas failas jau egzistuoja" #: ../gio/gfile.c:2602 -#| msgid "Can't recursively copy directory" msgid "Can’t recursively copy directory" msgstr "Negalima rekursyviai kopijuoti aplanko" @@ -1500,12 +1388,10 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopijavimas (reflink/clone) nepalaikomas arba netinkamas" #: ../gio/gfile.c:3028 -#| msgid "Copy (reflink/clone) is not supported or didn't work" msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Kopijavimas (reflink/clone) nepalaikomas arba nesuveikė" #: ../gio/gfile.c:3091 -#| msgid "Can't copy special file" msgid "Can’t copy special file" msgstr "Negalima kopijuoti specialaus failo" @@ -1519,12 +1405,10 @@ msgstr "Šiukšlės nepalaikomos" #: ../gio/gfile.c:4158 #, c-format -#| msgid "File names cannot contain '%c'" msgid "File names cannot contain “%c”" msgstr "Failų pavadinimuose negali būti '%c'" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -#| msgid "volume doesn't implement mount" msgid "volume doesn’t implement mount" msgstr "tomas nepalaiko prijungimo" @@ -1547,7 +1431,6 @@ msgstr "Failų enumeratorius jau užvertas" #: ../gio/gfileicon.c:236 #, c-format -#| msgid "Can't handle version %d of GFileIcon encoding" msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Nepavyko apdoroti GFileIcon koduotės versijos %d" @@ -1558,7 +1441,6 @@ msgstr "Netinkami GFileIcon įvesties duomenys" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -#| msgid "Stream doesn't support query_info" msgid "Stream doesn’t support query_info" msgstr "Srautas nepalaiko query_info" @@ -1631,7 +1513,6 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Tipas %s nerealizuoja from_tokens() GIcon sąsajoje" #: ../gio/gicon.c:461 -#| msgid "Can't handle the supplied version of the icon encoding" msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nepavyko apdoroti pateiktosios piktogramos koduotės versijos" @@ -1650,7 +1531,6 @@ msgstr "Adresas turi nustatytus bitus už priešdėlio ilgio" #: ../gio/ginetaddressmask.c:300 #, c-format -#| msgid "Could not parse '%s' as IP address mask" msgid "Could not parse “%s” as IP address mask" msgstr "Nepavyko perskaityti „%s“ kaip IP adreso kaukės" @@ -1664,7 +1544,6 @@ msgid "Unsupported socket address" msgstr "Nepalaikomas lizdo adresas" #: ../gio/ginputstream.c:188 -#| msgid "Input stream doesn't implement read" msgid "Input stream doesn’t implement read" msgstr "Šaltinio srautas nerealizuoja skaitymo" @@ -1688,7 +1567,6 @@ msgid "Keep with file when moved" msgstr "Palikti kartu su failu kai perkeliama" #: ../gio/gio-tool.c:187 -#| msgid "'version' takes no arguments" msgid "“version” takes no arguments" msgstr "„version“ nepriima argumentų" @@ -1869,7 +1747,6 @@ msgstr "Paskirtis %s nėra katalogas" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -#| msgid "%s: overwrite '%s'? " msgid "%s: overwrite “%s”? " msgstr "%s: perrašyti „%s“? " @@ -1890,7 +1767,6 @@ msgid "ATTRIBUTES" msgstr "ATRIBUTAI" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -#| msgid "Don't follow symbolic links" msgid "Don’t follow symbolic links" msgstr "Nesekti simbolinėmis nuorodomis" @@ -1956,12 +1832,6 @@ msgid "Show information about locations." msgstr "Rodyti informaciją apie vietas." #: ../gio/gio-tool-info.c:285 -#| msgid "" -#| "gio info is similar to the traditional ls utility, but using GIO\n" -#| "locations instead of local files: for example, you can use something\n" -#| "like smb://server/resource/file.txt as location. File attributes can\n" -#| "be specified with their GIO name, e.g. standard::icon, or just by\n" -#| "namespace, e.g. unix, or by '*', which matches all attributes" msgid "" "gio info is similar to the traditional ls utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" @@ -2036,13 +1906,11 @@ msgstr "Reikia nurodyti vieną MIME tipą arba apdorotoją" #: ../gio/gio-tool-mime.c:113 #, c-format -#| msgid "No default applications for '%s'\n" msgid "No default applications for “%s”\n" msgstr "Nėra „%s“ numatytų programų\n" #: ../gio/gio-tool-mime.c:119 #, c-format -#| msgid "Default application for '%s': %s\n" msgid "Default application for “%s”: %s\n" msgstr "Numatyta „%s“ programa: %s\n" @@ -2068,13 +1936,11 @@ msgstr "Nėra rekomenduojamų programų:\n" #: ../gio/gio-tool-mime.c:159 #, c-format -#| msgid "Failed to load info for handler '%s'\n" msgid "Failed to load info for handler “%s”\n" msgstr "Nepavyko įkelti „%s“ apdorodojo informacijos\n" #: ../gio/gio-tool-mime.c:165 #, c-format -#| msgid "Failed to set '%s' as the default handler for '%s': %s\n" msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "Nepavyko nustatyti „%s“ kaip numatytojo „%s“ apdorotojo: %s\n" @@ -2111,7 +1977,6 @@ msgstr "" "pakeitimus)" #: ../gio/gio-tool-monitor.c:43 -#| msgid "Monitors a file directly, but doesn't report changes" msgid "Monitors a file directly, but doesn’t report changes" msgstr "Stebi failą tiesiogiai, bet nepraneša apie pasikeitimus" @@ -2223,7 +2088,6 @@ msgid "Mount or unmount the locations." msgstr "Prijungti ar atjungti vietas." #: ../gio/gio-tool-move.c:42 -#| msgid "Don't use copy and delete fallback" msgid "Don’t use copy and delete fallback" msgstr "Nenaudoti kopijavimo ir trynimo atsarginės veiksenos" @@ -2411,19 +2275,16 @@ msgstr "Failas %s resurse aptinkamas kelis kartus" #: ../gio/glib-compile-resources.c:248 #, c-format -#| msgid "Failed to locate '%s' in any source directory" msgid "Failed to locate “%s” in any source directory" msgstr "Nepavyko rasti „%s“ jokiame šaltinio kataloge" #: ../gio/glib-compile-resources.c:259 #, c-format -#| msgid "Failed to locate '%s' in current directory" msgid "Failed to locate “%s” in current directory" msgstr "Nepavyko rasti „%s“ esamame kataloge" #: ../gio/glib-compile-resources.c:290 #, c-format -#| msgid "Unknown processing option \"%s\"" msgid "Unknown processing option “%s”" msgstr "Nežinomas apdorojimo parametras „%s“" @@ -2488,12 +2349,10 @@ msgid "name of the dependency file to generate" msgstr "generuojamo priklausomybių failo pavadinimas" #: ../gio/glib-compile-resources.c:629 -#| msgid "Don't automatically create and register resource" msgid "Don’t automatically create and register resource" msgstr "Automatiškai negeneruoti ir neregistruoti resurso" #: ../gio/glib-compile-resources.c:630 -#| msgid "Don't export functions; declare them G_GNUC_INTERNAL" msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Neeksportuoti funkcijų; deklaruoti jas G_GNUC_INTERNAL" @@ -2522,41 +2381,41 @@ msgstr "neleidžiami tušti pavadinimai" #: ../gio/glib-compile-schemas.c:794 #, c-format -#| msgid "invalid name '%s': names must begin with a lowercase letter" -msgid "invalid name “%s”: names must begin with a lowercase letter" +#| msgid "invalid name “%s”: names must begin with a lowercase letter" +msgid "invalid name '%s': names must begin with a lowercase letter" msgstr "" "netinkamas pavadinimas „%s“: pavadinimai turi prasidėti mažosiomis raidėmis" #: ../gio/glib-compile-schemas.c:806 #, c-format #| msgid "" -#| "invalid name '%s': invalid character '%c'; only lowercase letters, " -#| "numbers and hyphen ('-') are permitted." +#| "invalid name “%s”: invalid character “%c”; only lowercase letters, " +#| "numbers and hyphen (“-”) are permitted." msgid "" -"invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " -"and hyphen (“-”) are permitted." +"invalid name '%s': invalid character '%c'; only lowercase letters, numbers " +"and hyphen ('-') are permitted." msgstr "" "netinkamas pavadinimas „%s“: netinkamas simbolis „%c“; leidžiamos tik " "mažosios raidės, skaitmenys ir brūkšniai („-“)." #: ../gio/glib-compile-schemas.c:815 #, c-format -#| msgid "invalid name '%s': two successive hyphens ('--') are not permitted." -msgid "invalid name “%s”: two successive hyphens (“--”) are not permitted." +#| msgid "invalid name “%s”: two successive hyphens (“--”) are not permitted." +msgid "invalid name '%s': two successive hyphens ('--') are not permitted." msgstr "" "netinkamas pavadinimas „%s“: du brūkšniai („--“) vienos po kito neleidžiami." #: ../gio/glib-compile-schemas.c:824 #, c-format -#| msgid "invalid name '%s': the last character may not be a hyphen ('-')." -msgid "invalid name “%s”: the last character may not be a hyphen (“-”)." +#| msgid "invalid name “%s”: the last character may not be a hyphen (“-”)." +msgid "invalid name '%s': the last character may not be a hyphen ('-')." msgstr "" "netinkamas pavadinimas „%s“: paskutinis simbolis negali būti brūkšnys („-“)." #: ../gio/glib-compile-schemas.c:832 #, c-format -#| msgid "invalid name '%s': maximum length is 1024" -msgid "invalid name “%s”: maximum length is 1024" +#| msgid "invalid name “%s”: maximum length is 1024" +msgid "invalid name '%s': maximum length is 1024" msgstr "netinkamas pavadinimas „%s“: didžiausias leistinas ilgis yra 1024" #: ../gio/glib-compile-schemas.c:901 @@ -2565,8 +2424,8 @@ msgid "<child name='%s'> already specified" msgstr "<child name='%s'> jau nurodyta" #: ../gio/glib-compile-schemas.c:927 -#| msgid "cannot add keys to a 'list-of' schema" -msgid "cannot add keys to a “list-of” schema" +#| msgid "cannot add keys to a “list-of” schema" +msgid "cannot add keys to a 'list-of' schema" msgstr "nepavyko pridėti raktų į „list-of“ schemą" #: ../gio/glib-compile-schemas.c:938 @@ -2586,13 +2445,13 @@ msgstr "" #: ../gio/glib-compile-schemas.c:967 #, c-format #| msgid "" -#| "exactly one of 'type', 'enum' or 'flags' must be specified as an " +#| "exactly one of “type”, “enum” or “flags” must be specified as an " #| "attribute to <key>" msgid "" -"exactly one of “type”, “enum” or “flags” must be specified as an attribute " +"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute " "to <key>" msgstr "" -"Kaip atributas elementui <key> turi būti nurodytas vienintelis iš „type“, " +"kaip atributas elementui <key> turi būti nurodytas vienintelis iš „type“, " "„enum“ arba „flags“" #: ../gio/glib-compile-schemas.c:986 @@ -2602,13 +2461,13 @@ msgstr "<%s id='%s'> (dar) neapibrėžta." #: ../gio/glib-compile-schemas.c:1001 #, c-format -#| msgid "invalid GVariant type string '%s'" -msgid "invalid GVariant type string “%s”" +#| msgid "invalid GVariant type string “%s”" +msgid "invalid GVariant type string '%s'" msgstr "netinkama GVariant tipo eilutė „%s“" #: ../gio/glib-compile-schemas.c:1031 -#| msgid "<override> given but schema isn't extending anything" -msgid "<override> given but schema isn’t extending anything" +#| msgid "<override> given but schema isn’t extending anything" +msgid "<override> given but schema isn't extending anything" msgstr "<override> nurodytas, bet schema nieko neišplečia" #: ../gio/glib-compile-schemas.c:1044 @@ -2628,14 +2487,14 @@ msgstr "<schema id='%s'> jau nurodytas" #: ../gio/glib-compile-schemas.c:1137 #, c-format -#| msgid "<schema id='%s'> extends not yet existing schema '%s'" -msgid "<schema id='%s'> extends not yet existing schema “%s”" +#| msgid "<schema id='%s'> extends not yet existing schema “%s”" +msgid "<schema id='%s'> extends not yet existing schema '%s'" msgstr "<schema id='%s'> išplečia dar neegzistuojančią schemą „%s“" #: ../gio/glib-compile-schemas.c:1153 #, c-format -#| msgid "<schema id='%s'> is list of not yet existing schema '%s'" -msgid "<schema id='%s'> is list of not yet existing schema “%s”" +#| msgid "<schema id='%s'> is list of not yet existing schema “%s”" +msgid "<schema id='%s'> is list of not yet existing schema '%s'" msgstr "<schema id='%s'> yra sąrašas dar neegzistuojančios schemos „%s“" #: ../gio/glib-compile-schemas.c:1161 @@ -2660,10 +2519,10 @@ msgstr "" #, c-format #| msgid "" #| "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but " -#| "'%s' does not extend '%s'" +#| "“%s” does not extend “%s”" msgid "" -"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " -"does not extend “%s”" +"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' " +"does not extend '%s'" msgstr "" "<schema id='%s' list-of='%s'> išplečia <schema id='%s' list-of='%s'>, bet " "„%s“ neišplečia „%s“" @@ -2675,8 +2534,8 @@ msgstr "kelias, jei pateiktas, turi prasidėti ir baigtis pasviruoju brūkšniu" #: ../gio/glib-compile-schemas.c:1215 #, c-format -#| msgid "the path of a list must end with ':/'" -msgid "the path of a list must end with “:/”" +#| msgid "the path of a list must end with “:/”" +msgid "the path of a list must end with ':/'" msgstr "sąrašo kelias turi baigtis „:/“" #: ../gio/glib-compile-schemas.c:1247 @@ -2713,8 +2572,8 @@ msgstr "Nepaisoma šio failo.\n" #: ../gio/glib-compile-schemas.c:1901 #, c-format -#| msgid "No such key '%s' in schema '%s' as specified in override file '%s'" -msgid "No such key “%s” in schema “%s” as specified in override file “%s”" +#| msgid "No such key “%s” in schema “%s” as specified in override file “%s”" +msgid "No such key '%s' in schema '%s' as specified in override file '%s'" msgstr "Nėra rakto „%s“ schemoje „%s“ kaip nurodyta perrašančiame faile „%s“" #: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965 @@ -2732,10 +2591,10 @@ msgstr " ir --strict nurodyta; išeinama.\n" #: ../gio/glib-compile-schemas.c:1927 #, c-format #| msgid "" -#| "error parsing key '%s' in schema '%s' as specified in override file '%s': " +#| "error parsing key “%s” in schema “%s” as specified in override file “%s”: " #| "%s." msgid "" -"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s." +"error parsing key '%s' in schema '%s' as specified in override file '%s': %s." msgstr "" "klaida skaitant raktą „%s“ schemoje „%s“ kaip nurodyta perrašančiame faile " "„%s“: %s." @@ -2748,10 +2607,10 @@ msgstr "Nepaisoma šio rakto perrašymo.\n" #: ../gio/glib-compile-schemas.c:1955 #, c-format #| msgid "" -#| "override for key '%s' in schema '%s' in override file '%s' is outside the " +#| "override for key “%s” in schema “%s” in override file “%s” is outside the " #| "range given in the schema" msgid "" -"override for key “%s” in schema “%s” in override file “%s” is outside the " +"override for key '%s' in schema '%s' in override file '%s' is outside the " "range given in the schema" msgstr "" "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ yra už schemoje " @@ -2760,10 +2619,10 @@ msgstr "" #: ../gio/glib-compile-schemas.c:1983 #, c-format #| msgid "" -#| "override for key '%s' in schema '%s' in override file '%s' is not in the " +#| "override for key “%s” in schema “%s” in override file “%s” is not in the " #| "list of valid choices" msgid "" -"override for key “%s” in schema “%s” in override file “%s” is not in the " +"override for key '%s' in schema '%s' in override file '%s' is not in the " "list of valid choices" msgstr "" "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ nėra iš " @@ -2831,7 +2690,6 @@ msgid "Containing mount for file %s not found" msgstr "Nerastas tėvinis prijungimo taškas %s" #: ../gio/glocalfile.c:1199 -#| msgid "Can't rename root directory" msgid "Can’t rename root directory" msgstr "Negalima pervadinti šakninio aplanko" @@ -2841,7 +2699,6 @@ msgid "Error renaming file %s: %s" msgstr "Klaida pervadinant failą %s: %s" #: ../gio/glocalfile.c:1224 -#| msgid "Can't rename file, filename already exists" msgid "Can’t rename file, filename already exists" msgstr "Nepavyko pervadinti failo, failo vardas jau užimtas" @@ -2925,7 +2782,6 @@ msgid "Error moving file %s: %s" msgstr "Klaida perkeliant failą %s: %s" #: ../gio/glocalfile.c:2370 -#| msgid "Can't move directory over directory" msgid "Can’t move directory over directory" msgstr "Negalima perkelti aplanko ant aplanko" @@ -2963,7 +2819,6 @@ msgstr "netaisyklingas išplėstinio atributo pavadinimas" #: ../gio/glocalfileinfo.c:775 #, c-format -#| msgid "Error setting extended attribute '%s': %s" msgid "Error setting extended attribute “%s”: %s" msgstr "Klaida nustatant išplėstinį atributą „%s“: %s" @@ -2973,7 +2828,6 @@ msgstr " (netaisyklinga koduotė)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -#| msgid "Error when getting information for file '%s': %s" msgid "Error when getting information for file “%s”: %s" msgstr "Klaida gaunant informaciją apie failą „%s“: %s" @@ -3096,7 +2950,6 @@ msgstr "Klaida trumpinant failą: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -#| msgid "Error opening file %s: %s" msgid "Error opening file “%s”: %s" msgstr "Klaida atveriant failą %s: %s" @@ -3157,7 +3010,6 @@ msgstr "Prašoma perkelti poziciją jau už srauto pabaigos" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -#| msgid "mount doesn't implement \"unmount\"" msgid "mount doesn’t implement “unmount”" msgstr "prijungtasis objektas nepalaiko atjungimo" @@ -3165,7 +3017,6 @@ msgstr "prijungtasis objektas nepalaiko atjungimo" #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -#| msgid "mount doesn't implement \"eject\"" msgid "mount doesn’t implement “eject”" msgstr "prijungtasis objektas nepalaiko išstūmimo" @@ -3173,7 +3024,6 @@ msgstr "prijungtasis objektas nepalaiko išstūmimo" #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" "prijungtasis objektas nepalaiko atjungimo nei su papildoma operacija, nei be " @@ -3183,7 +3033,6 @@ msgstr "" #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "" "prijungtasis objektas nepalaiko išstūmimo nei su papildoma operacija, nei be " @@ -3193,7 +3042,6 @@ msgstr "" #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -#| msgid "mount doesn't implement \"remount\"" msgid "mount doesn’t implement “remount”" msgstr "prijungtasis objektas nepalaiko pakartotinio prijungimo" @@ -3201,7 +3049,6 @@ msgstr "prijungtasis objektas nepalaiko pakartotinio prijungimo" #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -#| msgid "mount doesn't implement content type guessing" msgid "mount doesn’t implement content type guessing" msgstr "prijungimo taškas nepalaiko turinio tipo spėjimo" @@ -3209,13 +3056,11 @@ msgstr "prijungimo taškas nepalaiko turinio tipo spėjimo" #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -#| msgid "mount doesn't implement synchronous content type guessing" msgid "mount doesn’t implement synchronous content type guessing" msgstr "prijungimo taškas nepalaiko sinchroninio turinio tipo spėjimo" #: ../gio/gnetworkaddress.c:378 #, c-format -#| msgid "Hostname '%s' contains '[' but not ']'" msgid "Hostname “%s” contains “[” but not “]”" msgstr "Mazgo varde „%s“ yra ženklas „[“, bet nėra „]“" @@ -3247,7 +3092,6 @@ msgid "NetworkManager version too old" msgstr "Per sena NetworkManager versija" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -#| msgid "Output stream doesn't implement write" msgid "Output stream doesn’t implement write" msgstr "Išvedimo srautas nepalaiko rašymo" @@ -3255,10 +3099,9 @@ msgstr "Išvedimo srautas nepalaiko rašymo" msgid "Source stream is already closed" msgstr "Šaltinio srautas jau užvertas" -#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -#| msgid "Error resolving '%s': %s" msgid "Error resolving “%s”: %s" msgstr "Klaida surandant „%s“: %s" @@ -3267,24 +3110,20 @@ msgstr "Klaida surandant „%s“: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -#| msgid "The resource at '%s' does not exist" msgid "The resource at “%s” does not exist" msgstr "Išteklius vietoje „%s“ neegzistuoja" #: ../gio/gresource.c:760 #, c-format -#| msgid "The resource at '%s' failed to decompress" msgid "The resource at “%s” failed to decompress" msgstr "Ištekliaus vietoje „%s“ nepavyko išskleisti" #: ../gio/gresourcefile.c:709 #, c-format -#| msgid "The resource at '%s' is not a directory" msgid "The resource at “%s” is not a directory" msgstr "Išteklius vietoje „%s“ nėra katalogas" #: ../gio/gresourcefile.c:917 -#| msgid "Input stream doesn't implement seek" msgid "Input stream doesn’t implement seek" msgstr "Įvesties srautas nerealizuoja nenuoseklaus skaitymo" @@ -3332,19 +3171,6 @@ msgid "FILE PATH" msgstr "FAILO KELIAS" #: ../gio/gresource-tool.c:534 -#| msgid "" -#| "Usage:\n" -#| " gresource [--section SECTION] COMMAND [ARGS...]\n" -#| "\n" -#| "Commands:\n" -#| " help Show this information\n" -#| " sections List resource sections\n" -#| " list List resources\n" -#| " details List resources with details\n" -#| " extract Extract a resource\n" -#| "\n" -#| "Use 'gresource help COMMAND' to get detailed help.\n" -#| "\n" msgid "" "Usage:\n" " gresource [--section SECTION] COMMAND [ARGS…]\n" @@ -3427,19 +3253,16 @@ msgstr " KELIAS Resurso kelias\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -#| msgid "No such schema '%s'\n" msgid "No such schema “%s”\n" msgstr "Nėra schemos „%s“\n" #: ../gio/gsettings-tool.c:57 #, c-format -#| msgid "Schema '%s' is not relocatable (path must not be specified)\n" msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "Schema „%s“ yra neperkeliama (kelias neturi būti nurodomas)\n" #: ../gio/gsettings-tool.c:78 #, c-format -#| msgid "Schema '%s' is relocatable (path must be specified)\n" msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "Schema „%s“ yra perkeliama (kelias turi būti nurodytas)\n" @@ -3559,29 +3382,6 @@ msgid "SCHEMA[:PATH] [KEY]" msgstr "SCHEMA[:KELIAS] [RAKTAS]" #: ../gio/gsettings-tool.c:620 -#| msgid "" -#| "Usage:\n" -#| " gsettings --version\n" -#| " gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" -#| "\n" -#| "Commands:\n" -#| " help Show this information\n" -#| " list-schemas List installed schemas\n" -#| " list-relocatable-schemas List relocatable schemas\n" -#| " list-keys List keys in a schema\n" -#| " list-children List children of a schema\n" -#| " list-recursively List keys and values, recursively\n" -#| " range Queries the range of a key\n" -#| " describe Queries the description of a key\n" -#| " get Get the value of a key\n" -#| " set Set the value of a key\n" -#| " reset Reset the value of a key\n" -#| " reset-recursively Reset all values in a given schema\n" -#| " writable Check if a key is writable\n" -#| " monitor Watch for changes\n" -#| "\n" -#| "Use 'gsettings help COMMAND' to get detailed help.\n" -#| "\n" msgid "" "Usage:\n" " gsettings --version\n" @@ -3685,7 +3485,6 @@ msgstr "Pateiktas tuščias schemos pavadinimas\n" #: ../gio/gsettings-tool.c:864 #, c-format -#| msgid "No such key '%s'\n" msgid "No such key “%s”\n" msgstr "Nėra rakto „%s“\n" @@ -3855,7 +3654,6 @@ msgstr "Bandymas naudoti proxy ne per TCP ryšį nepalaikomas." #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -#| msgid "Proxy protocol '%s' is not supported." msgid "Proxy protocol “%s” is not supported." msgstr "Tarpinio serverio protokolas „%s“ nepalaikomas." @@ -3869,7 +3667,6 @@ msgstr "Pridėtasis lizdas yra užvertas" #: ../gio/gsocks4aproxy.c:118 #, c-format -#| msgid "SOCKSv4 does not support IPv6 address '%s'" msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 nepalaiko IPv6 adreso „%s“" @@ -3879,7 +3676,6 @@ msgstr "Naudotojo vardas yra per ilgas SOCKSv4 protokolui" #: ../gio/gsocks4aproxy.c:153 #, c-format -#| msgid "Hostname '%s' is too long for SOCKSv4 protocol" msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "Kompiuterio vardas „%s“ yra per ilgas SOCKSv4 protokolui" @@ -3919,7 +3715,6 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -#| msgid "Hostname '%s' is too long for SOCKSv5 protocol" msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "Kompiuterio vardas „%s“ yra per ilgas SOCKSv5 protokolui" @@ -3948,7 +3743,6 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Ryšys per SOCKSv5 proxy atmestas." #: ../gio/gsocks5proxy.c:386 -#| msgid "SOCKSv5 proxy does not support 'connect' command." msgid "SOCKSv5 proxy does not support “connect” command." msgstr "SOCKSv5 proxy nepalaiko „connect“ komandos." @@ -3962,7 +3756,6 @@ msgstr "Nežinoma SOCKSv5 proxy klaida." #: ../gio/gthemedicon.c:518 #, c-format -#| msgid "Can't handle version %d of GThemedIcon encoding" msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Nepavyko apdoroti GThemedIcon koduotės versijos %d" @@ -3972,26 +3765,22 @@ msgstr "Nerasta tinkamų adresų" #: ../gio/gthreadedresolver.c:213 #, c-format -#| msgid "Error reverse-resolving '%s': %s" msgid "Error reverse-resolving “%s”: %s" msgstr "Klaida atvirkščiai surandant „%s“: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -#| msgid "No DNS record of the requested type for '%s'" msgid "No DNS record of the requested type for “%s”" msgstr "Nėra DNS įrašo prašomam tipui „%s“" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -#| msgid "Temporarily unable to resolve '%s'" msgid "Temporarily unable to resolve “%s”" msgstr "Laikinai nepavyko surasti „%s“" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -#| msgid "Error resolving '%s'" msgid "Error resolving “%s”" msgstr "Klaida surandant „%s“" @@ -4115,7 +3904,6 @@ msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "Abstrakčiųjų UNIX srities lizdų adresai šioje sistemoje nepalaikomi" #: ../gio/gvolume.c:437 -#| msgid "volume doesn't implement eject" msgid "volume doesn’t implement eject" msgstr "tomas nerealizuoja išstūmimo" @@ -4123,7 +3911,6 @@ msgstr "tomas nerealizuoja išstūmimo" #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -#| msgid "volume doesn't implement eject or eject_with_operation" msgid "volume doesn’t implement eject or eject_with_operation" msgstr "tomas nerealizuoja išstūmimo nei su papildoma operacija,nei be jos" @@ -4186,28 +3973,24 @@ msgstr "Blogi argumentai\n" #: ../glib/gbookmarkfile.c:755 #, c-format -#| msgid "Unexpected attribute '%s' for element '%s'" msgid "Unexpected attribute “%s” for element “%s”" msgstr "Netikėtas atributas „%s“ elementui „%s“" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -#| msgid "Attribute '%s' of element '%s' not found" msgid "Attribute “%s” of element “%s” not found" msgstr "Nerastas elemento „%2$s“ atributas „%1$s“" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -#| msgid "Unexpected tag '%s', tag '%s' expected" msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Netikėta žyma „%s“, tikėtasi žymos „%s“" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -#| msgid "Unexpected tag '%s' inside '%s'" msgid "Unexpected tag “%s” inside “%s”" msgstr "Netikėta žyma „%s“ „%s“ viduje" @@ -4217,7 +4000,6 @@ msgstr "Duomenų aplankuose nerasta tinkamo žymelių failo" #: ../glib/gbookmarkfile.c:1958 #, c-format -#| msgid "A bookmark for URI '%s' already exists" msgid "A bookmark for URI “%s” already exists" msgstr "URI „%s“ žymelė jau yra" @@ -4231,37 +4013,31 @@ msgstr "URI „%s“ žymelė jau yra" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -#| msgid "No bookmark found for URI '%s'" msgid "No bookmark found for URI “%s”" msgstr "Nerasta žymelė URI „%s“" #: ../glib/gbookmarkfile.c:2336 #, c-format -#| msgid "No MIME type defined in the bookmark for URI '%s'" msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "URI „%s“ žymelėje neapibrėžtas MIME tipas" #: ../glib/gbookmarkfile.c:2421 #, c-format -#| msgid "No private flag has been defined in bookmark for URI '%s'" msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "URI „%s“ žymelėje neapibrėžta privati vėliavėlė" #: ../glib/gbookmarkfile.c:2800 #, c-format -#| msgid "No groups set in bookmark for URI '%s'" msgid "No groups set in bookmark for URI “%s”" msgstr "URI „%s“ žymelėje nenurodyta jokia grupė" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -#| msgid "No application with name '%s' registered a bookmark for '%s'" msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Nėra programos pavadinimu „%s“ registravusios „%s“ žymelę" #: ../glib/gbookmarkfile.c:3378 #, c-format -#| msgid "Failed to expand exec line '%s' with URI '%s'" msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Nepavyko išskleisti vykdomosios eilutės „%s“ su URI „%s“" @@ -4272,43 +4048,36 @@ msgstr "Nepilna simbolio seka įvedimo pabaigoje" #: ../glib/gconvert.c:742 #, c-format -#| msgid "Cannot convert fallback '%s' to codeset '%s'" msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "Negalima keisti atgalinio varianto „%s“ į koduotę „%s“" #: ../glib/gconvert.c:1567 #, c-format -#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "Adresas „%s“ nėra absoliutus adresas naudojantis „file“ schemą" #: ../glib/gconvert.c:1577 #, c-format -#| msgid "The local file URI '%s' may not include a '#'" msgid "The local file URI “%s” may not include a “#”" msgstr "Vietinio failo adresas „%s“ negali turėti simbolio „#“" #: ../glib/gconvert.c:1594 #, c-format -#| msgid "The URI '%s' is invalid" msgid "The URI “%s” is invalid" msgstr "URI „%s“ yra klaidingas" #: ../glib/gconvert.c:1606 #, c-format -#| msgid "The hostname of the URI '%s' is invalid" msgid "The hostname of the URI “%s” is invalid" msgstr "Kompiuterio vardas URI „%s“ yra netinkamas" #: ../glib/gconvert.c:1622 #, c-format -#| msgid "The URI '%s' contains invalidly escaped characters" msgid "The URI “%s” contains invalidly escaped characters" msgstr "URI „%s“ yra klaidingai perkoduoti simboliai" #: ../glib/gconvert.c:1717 #, c-format -#| msgid "The pathname '%s' is not an absolute path" msgid "The pathname “%s” is not an absolute path" msgstr "Kelias „%s“ nėra absoliutus" @@ -4544,14 +4313,11 @@ msgstr "Sek" #: ../glib/gdir.c:155 #, c-format -#| msgid "Error opening directory '%s': %s" msgid "Error opening directory “%s”: %s" msgstr "Klaida atveriant aplanką „%s“: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -#| msgid "Could not allocate %lu byte to read file \"%s\"" -#| msgid_plural "Could not allocate %lu bytes to read file \"%s\"" msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "Nepavyko išskirti %lu baito failo „%s“ perskaitymui" @@ -4560,96 +4326,80 @@ msgstr[2] "Nepavyko išskirti %lu baitų failo „%s“ perskaitymui" #: ../glib/gfileutils.c:718 #, c-format -#| msgid "Error reading file %s: %s" msgid "Error reading file “%s”: %s" msgstr "Klaida skaitant failą „%s“: %s" #: ../glib/gfileutils.c:754 #, c-format -#| msgid "File \"%s\" is too large" msgid "File “%s” is too large" msgstr "Failas „%s“ per didelis" #: ../glib/gfileutils.c:818 #, c-format -#| msgid "Failed to read from file '%s': %s" msgid "Failed to read from file “%s”: %s" msgstr "Nepavyko perskaityti failo „%s“: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -#| msgid "Failed to open file '%s': %s" msgid "Failed to open file “%s”: %s" msgstr "Nepavyko atverti failo „%s“: %s" #: ../glib/gfileutils.c:878 #, c-format -#| msgid "Failed to get attributes of file '%s': fstat() failed: %s" msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Nepavyko gauti failo „%s“ atributų: fstat() klaida: %s" #: ../glib/gfileutils.c:908 #, c-format -#| msgid "Failed to open file '%s': fdopen() failed: %s" msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Nepavyko atverti failo „%s“: fdopen() klaida: %s" #: ../glib/gfileutils.c:1007 #, c-format -#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Nepavyko pervadinti failo „%s“ į „%s“: g_rename() klaida: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -#| msgid "Failed to create file '%s': %s" msgid "Failed to create file “%s”: %s" msgstr "Nepavyko sukurti failo „%s“: %s" #: ../glib/gfileutils.c:1069 #, c-format -#| msgid "Failed to write file '%s': write() failed: %s" msgid "Failed to write file “%s”: write() failed: %s" msgstr "Nepavyko įrašyti failo „%s“: write() klaida: %s" #: ../glib/gfileutils.c:1112 #, c-format -#| msgid "Failed to write file '%s': fsync() failed: %s" msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Nepavyko įrašyti failo „%s“: fsync() klaida: %s" #: ../glib/gfileutils.c:1236 #, c-format -#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Nepavyko pašalinti egzistuojančio failo „%s“: g_unlink() klaida: %s" #: ../glib/gfileutils.c:1507 #, c-format -#| msgid "Template '%s' invalid, should not contain a '%s'" msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Šablonas „%s“ klaidingas, jame negali būti „%s“" #: ../glib/gfileutils.c:1520 #, c-format -#| msgid "Template '%s' doesn't contain XXXXXX" msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Šablone „%s“ nėra XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -#| msgid "Failed to read the symbolic link '%s': %s" msgid "Failed to read the symbolic link “%s”: %s" msgstr "Nepavyko perskaityti simbolinės nuorodos „%s“: %s" #: ../glib/giochannel.c:1388 #, c-format -#| msgid "Could not open converter from '%s' to '%s': %s" msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Nepavyko atverti keitiklio iš „%s“ į „%s“: %s" #: ../glib/giochannel.c:1733 -#| msgid "Can't do a raw read in g_io_channel_read_line_string" msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Negalima vykdyti tiesioginio skaitymo iš g_io_channel_read_line_string" @@ -4663,7 +4413,6 @@ msgid "Channel terminates in a partial character" msgstr "Kanalas pasibaigia nepilnu simboliu" #: ../glib/giochannel.c:1924 -#| msgid "Can't do a raw read in g_io_channel_read_to_end" msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Negalima vykdyti tiesioginio skaitymo iš g_io_channel_read_to_end" @@ -4677,9 +4426,6 @@ msgstr "Nėra paprastas failas" #: ../glib/gkeyfile.c:1204 #, c-format -#| msgid "" -#| "Key file contains line '%s' which is not a key-value pair, group, or " -#| "comment" msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" @@ -4702,7 +4448,6 @@ msgstr "Netinkamas rakto pavadinimas: %s" #: ../glib/gkeyfile.c:1336 #, c-format -#| msgid "Key file contains unsupported encoding '%s'" msgid "Key file contains unsupported encoding “%s”" msgstr "Raktų faile yra nepalaikoma koduotė „%s“" @@ -4710,35 +4455,27 @@ msgstr "Raktų faile yra nepalaikoma koduotė „%s“" #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -#| msgid "Key file does not have group '%s'" msgid "Key file does not have group “%s”" msgstr "Raktų failas neturi grupės „%s“" #: ../glib/gkeyfile.c:1707 #, c-format -#| msgid "Key file does not have key '%s' in group '%s'" msgid "Key file does not have key “%s” in group “%s”" msgstr "Raktų faile nėra rakto „%s“ grupėje „%s“" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -#| msgid "Key file contains key '%s' with value '%s' which is not UTF-8" msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Raktų faile yra raktas „%s“ su reikšme „%s“, kuri nėra UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format -#| msgid "" -#| "Key file contains key '%s' which has a value that cannot be interpreted." msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "Raktų faile yra raktas „%s“, turintis nesuprantamą reikšmę." #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format -#| msgid "" -#| "Key file contains key '%s' in group '%s' which has a value that cannot be " -#| "interpreted." msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." @@ -4748,7 +4485,6 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -#| msgid "Key '%s' in group '%s' has value '%s' where %s was expected" msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Raktas „%s“ grupėje „%s“ turi reikšmę „%s“, nors tikimasi %s" @@ -4758,38 +4494,32 @@ msgstr "Raktų faile, eilutės pabaigoje yra pabėgimo simbolis" #: ../glib/gkeyfile.c:4155 #, c-format -#| msgid "Key file contains invalid escape sequence '%s'" msgid "Key file contains invalid escape sequence “%s”" msgstr "Raktų faile yra klaidinga kaitos eilutė „%s“" #: ../glib/gkeyfile.c:4297 #, c-format -#| msgid "Value '%s' cannot be interpreted as a number." msgid "Value “%s” cannot be interpreted as a number." msgstr "Reikšmės „%s“ negalima interpretuoti kaip skaičiaus." #: ../glib/gkeyfile.c:4311 #, c-format -#| msgid "Integer value '%s' out of range" msgid "Integer value “%s” out of range" msgstr "Sveikoji reikšmė „%s“ viršija ribas" #: ../glib/gkeyfile.c:4344 #, c-format -#| msgid "Value '%s' cannot be interpreted as a float number." msgid "Value “%s” cannot be interpreted as a float number." msgstr "" "Reikšmės „%s“ negalima interpretuoti kaip slankiojo kablelio skaičiaus." #: ../glib/gkeyfile.c:4383 #, c-format -#| msgid "Value '%s' cannot be interpreted as a boolean." msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Reikšmės „%s“ negalima interpretuoti kaip loginės." #: ../glib/gmappedfile.c:129 #, c-format -#| msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "Nepavyko gauti failo „%s%s%s%s“ atributų: fstat() klaida: %s" @@ -4800,7 +4530,6 @@ msgstr "Nepavyko pažymėti failo %s%s%s%s: mmap() klaida: %s" #: ../glib/gmappedfile.c:262 #, c-format -#| msgid "Failed to open file '%s': open() failed: %s" msgid "Failed to open file “%s”: open() failed: %s" msgstr "Nepavyko atverti failo „%s“: open() klaida: %s" @@ -4811,20 +4540,20 @@ msgstr "Klaida eilutėje %d simbolyje %d: " #: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545 #, c-format -#| msgid "Invalid UTF-8 encoded text in name - not valid '%s'" -msgid "Invalid UTF-8 encoded text in name — not valid “%s”" +#| msgid "Invalid UTF-8 encoded text in name — not valid “%s”" +msgid "Invalid UTF-8 encoded text in name - not valid '%s'" msgstr "Klaidingai koduotas UTF-8 tekstas varde – netinkamas „%s“" #: ../glib/gmarkup.c:473 #, c-format -#| msgid "'%s' is not a valid name" -msgid "“%s” is not a valid name" +#| msgid "“%s” is not a valid name" +msgid "'%s' is not a valid name" msgstr "„%s“ nėra tinkamas vardas" #: ../glib/gmarkup.c:489 #, c-format -#| msgid "'%s' is not a valid name: '%c'" -msgid "“%s” is not a valid name: “%c”" +#| msgid "“%s” is not a valid name: “%c”" +msgid "'%s' is not a valid name: '%c'" msgstr "„%s“ nėra tinkamas vardas: „%c“" #: ../glib/gmarkup.c:599 @@ -4835,11 +4564,11 @@ msgstr "Klaida eilutėje %d: %s" #: ../glib/gmarkup.c:676 #, c-format #| msgid "" -#| "Failed to parse '%-.*s', which should have been a digit inside a " -#| "character reference (ê for example) - perhaps the digit is too large" +#| "Failed to parse “%-.*s”, which should have been a digit inside a " +#| "character reference (ê for example) — perhaps the digit is too large" msgid "" -"Failed to parse “%-.*s”, which should have been a digit inside a character " -"reference (ê for example) — perhaps the digit is too large" +"Failed to parse '%-.*s', which should have been a digit inside a character " +"reference (ê for example) - perhaps the digit is too large" msgstr "" "Nepavyko perskaityti „%-.*s“, kuris galėjo turėti skaičius simbolio aprašyme " "(pvz., ê) - gal skaičius per didelis" @@ -4847,11 +4576,11 @@ msgstr "" #: ../glib/gmarkup.c:688 #| msgid "" #| "Character reference did not end with a semicolon; most likely you used an " -#| "ampersand character without intending to start an entity - escape " +#| "ampersand character without intending to start an entity — escape " #| "ampersand as &" msgid "" "Character reference did not end with a semicolon; most likely you used an " -"ampersand character without intending to start an entity — escape ampersand " +"ampersand character without intending to start an entity - escape ampersand " "as &" msgstr "" "Simbolio nuoroda nepasibaigė kabliataškiu; greičiausiai Jūs panaudojote " @@ -4860,32 +4589,32 @@ msgstr "" #: ../glib/gmarkup.c:714 #, c-format -#| msgid "Character reference '%-.*s' does not encode a permitted character" -msgid "Character reference “%-.*s” does not encode a permitted character" +#| msgid "Character reference “%-.*s” does not encode a permitted character" +msgid "Character reference '%-.*s' does not encode a permitted character" msgstr "Simbolio aprašymas „%-.*s“ neatitinka leistinų simbolių" #: ../glib/gmarkup.c:752 #| msgid "" -#| "Empty entity '&;' seen; valid entities are: & " < > '" +#| "Empty entity “&;” seen; valid entities are: & " < > '" msgid "" -"Empty entity “&;” seen; valid entities are: & " < > '" +"Empty entity '&;' seen; valid entities are: & " < > '" msgstr "" "Aptiktas tuščias elementas '&;'; galimi elementai yra: & " < " "> '" #: ../glib/gmarkup.c:760 #, c-format -#| msgid "Entity name '%-.*s' is not known" -msgid "Entity name “%-.*s” is not known" +#| msgid "Entity name “%-.*s” is not known" +msgid "Entity name '%-.*s' is not known" msgstr "Elemento vardas „%-.*s“ nežinomas" #: ../glib/gmarkup.c:765 #| msgid "" #| "Entity did not end with a semicolon; most likely you used an ampersand " -#| "character without intending to start an entity - escape ampersand as &" +#| "character without intending to start an entity — escape ampersand as &" msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " -"character without intending to start an entity — escape ampersand as &" +"character without intending to start an entity - escape ampersand as &" msgstr "" "Elementas nepasibaigė kabliataškiu; greičiausiai Jūs panaudojote ampersendo " "simbolį nepradėdami elemento įvedimo - pakeiskite ampersendą įvesdami &" @@ -4897,10 +4626,10 @@ msgstr "Dokumentas turėtų prasidėti elementu (pvz., <book>)" #: ../glib/gmarkup.c:1211 #, c-format #| msgid "" -#| "'%s' is not a valid character following a '<' character; it may not begin " +#| "“%s” is not a valid character following a “<” character; it may not begin " #| "an element name" msgid "" -"“%s” is not a valid character following a “<” character; it may not begin an " +"'%s' is not a valid character following a '<' character; it may not begin an " "element name" msgstr "" "„%s“ negali būti rašomas po „<“ simbolio; jis nepradeda jokio elemento vardo" @@ -4908,11 +4637,11 @@ msgstr "" #: ../glib/gmarkup.c:1253 #, c-format #| msgid "" -#| "Odd character '%s', expected a '>' character to end the empty-element tag " -#| "'%s'" +#| "Odd character “%s”, expected a “>” character to end the empty-element tag " +#| "“%s”" msgid "" -"Odd character “%s”, expected a “>” character to end the empty-element tag " -"“%s”" +"Odd character '%s', expected a '>' character to end the empty-element tag " +"'%s'" msgstr "" "Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ simbolio, užbaigiančio " "tuščią žymą „%s“" @@ -4920,10 +4649,10 @@ msgstr "" #: ../glib/gmarkup.c:1334 #, c-format #| msgid "" -#| "Odd character '%s', expected a '=' after attribute name '%s' of element " -#| "'%s'" +#| "Odd character “%s”, expected a “=” after attribute name “%s” of element " +#| "“%s”" msgid "" -"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" +"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'" msgstr "" "Neįprastas simbolis „%1$s“, tikėtasi sulaukti „=“ po elemento „%3$s“ " "atributo vardo „%2$s“" @@ -4931,12 +4660,12 @@ msgstr "" #: ../glib/gmarkup.c:1375 #, c-format #| msgid "" -#| "Odd character '%s', expected a '>' or '/' character to end the start tag " -#| "of element '%s', or optionally an attribute; perhaps you used an invalid " +#| "Odd character “%s”, expected a “>” or “/” character to end the start tag " +#| "of element “%s”, or optionally an attribute; perhaps you used an invalid " #| "character in an attribute name" msgid "" -"Odd character “%s”, expected a “>” or “/” character to end the start tag of " -"element “%s”, or optionally an attribute; perhaps you used an invalid " +"Odd character '%s', expected a '>' or '/' character to end the start tag of " +"element '%s', or optionally an attribute; perhaps you used an invalid " "character in an attribute name" msgstr "" "Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ arba „/“ simbolių, " @@ -4946,11 +4675,11 @@ msgstr "" #: ../glib/gmarkup.c:1419 #, c-format #| msgid "" -#| "Odd character '%s', expected an open quote mark after the equals sign " -#| "when giving value for attribute '%s' of element '%s'" +#| "Odd character “%s”, expected an open quote mark after the equals sign " +#| "when giving value for attribute “%s” of element “%s”" msgid "" -"Odd character “%s”, expected an open quote mark after the equals sign when " -"giving value for attribute “%s” of element “%s”" +"Odd character '%s', expected an open quote mark after the equals sign when " +"giving value for attribute '%s' of element '%s'" msgstr "" "Neįprastas simbolis „%1$s“, po lygybės tikėtasi sulaukti atidarančio " "citavimo simbolio pradedant „%3$s“ elemento „%2$s“ atributo reikšmę" @@ -4958,10 +4687,10 @@ msgstr "" #: ../glib/gmarkup.c:1552 #, c-format #| msgid "" -#| "'%s' is not a valid character following the characters '</'; '%s' may not " +#| "“%s” is not a valid character following the characters “</”; “%s” may not " #| "begin an element name" msgid "" -"“%s” is not a valid character following the characters “</”; “%s” may not " +"'%s' is not a valid character following the characters '</'; '%s' may not " "begin an element name" msgstr "" "„%s“ negali būti rašomas po simbolių „</“; „%s“ negali būti kokio nors " @@ -4970,27 +4699,27 @@ msgstr "" #: ../glib/gmarkup.c:1588 #, c-format #| msgid "" -#| "'%s' is not a valid character following the close element name '%s'; the " -#| "allowed character is '>'" +#| "“%s” is not a valid character following the close element name “%s”; the " +#| "allowed character is “>”" msgid "" -"“%s” is not a valid character following the close element name “%s”; the " -"allowed character is “>”" +"'%s' is not a valid character following the close element name '%s'; the " +"allowed character is '>'" msgstr "" "„%s“ negali būti rašomas po uždarančio elemento vardo „%s“; leistinas " "simbolis yra „>“" #: ../glib/gmarkup.c:1599 #, c-format -#| msgid "Element '%s' was closed, no element is currently open" -msgid "Element “%s” was closed, no element is currently open" +#| msgid "Element “%s” was closed, no element is currently open" +msgid "Element '%s' was closed, no element is currently open" msgstr "" "Elemento „%s“ uždarymo simbolis sutiktas anksčiau už elemento atidarymo " "simbolį" #: ../glib/gmarkup.c:1608 #, c-format -#| msgid "Element '%s' was closed, but the currently open element is '%s'" -msgid "Element “%s” was closed, but the currently open element is “%s”" +#| msgid "Element “%s” was closed, but the currently open element is “%s”" +msgid "Element '%s' was closed, but the currently open element is '%s'" msgstr "" "Sutiktas elemento „%s“ uždarymo simbolis, tačiau šiuo metu atidarytas kitas " "elementas „%s“" @@ -5000,17 +4729,17 @@ msgid "Document was empty or contained only whitespace" msgstr "Dokumentas tuščias arba susideda tik iš tarpų" #: ../glib/gmarkup.c:1775 -#| msgid "Document ended unexpectedly just after an open angle bracket '<'" -msgid "Document ended unexpectedly just after an open angle bracket “<”" +#| msgid "Document ended unexpectedly just after an open angle bracket “<”" +msgid "Document ended unexpectedly just after an open angle bracket '<'" msgstr "Dokumentas netikėtai pasibaigė tuoj po atidarančių skliaustų '<'" #: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828 #, c-format #| msgid "" -#| "Document ended unexpectedly with elements still open - '%s' was the last " +#| "Document ended unexpectedly with elements still open — “%s” was the last " #| "element opened" msgid "" -"Document ended unexpectedly with elements still open — “%s” was the last " +"Document ended unexpectedly with elements still open - '%s' was the last " "element opened" msgstr "" "Dokumentas netikėtai pasibaigė neuždarius dalies elementų - „%s“ yra " @@ -5051,8 +4780,8 @@ msgstr "Dokumentas netikėtai pasibaigė požymio verte" #: ../glib/gmarkup.c:1837 #, c-format -#| msgid "Document ended unexpectedly inside the close tag for element '%s'" -msgid "Document ended unexpectedly inside the close tag for element “%s”" +#| msgid "Document ended unexpectedly inside the close tag for element “%s”" +msgid "Document ended unexpectedly inside the close tag for element '%s'" msgstr "Dokumentas netikėtai pasibaigė žymos „%s“ uždarančiame simbolyje" #: ../glib/gmarkup.c:1843 @@ -5061,7 +4790,6 @@ msgstr "" "Dokumentas netikėtai pasibaigė komentaruose arba apdorojimo instrukcijose" #: ../glib/goption.c:861 -#| msgid "[OPTION...]" msgid "[OPTION…]" msgstr "[PARAMETRAS…]" @@ -5087,25 +4815,21 @@ msgstr "Parametrai:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -#| msgid "Cannot parse integer value '%s' for %s" msgid "Cannot parse integer value “%s” for %s" msgstr "Nepavyko perskaityti sveikosios reikšmės „%s“, reikalingos %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -#| msgid "Integer value '%s' for %s out of range" msgid "Integer value “%s” for %s out of range" msgstr "Sveikoji reikšmė „%s“, reikalinga %s, viršija ribas" #: ../glib/goption.c:1148 #, c-format -#| msgid "Cannot parse double value '%s' for %s" msgid "Cannot parse double value “%s” for %s" msgstr "Nepavyko apdoroti dvigubos reikšmės „%s“, reikalingos %s" #: ../glib/goption.c:1156 #, c-format -#| msgid "Double value '%s' for %s out of range" msgid "Double value “%s” for %s out of range" msgstr "Dviguboji reikšmė „%s“, reikalinga %s, viršija ribas" @@ -5452,7 +5176,6 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Klaida kompiliuojanti reguliarią išraišką %s ties simboliu %d: %s" #: ../glib/gregex.c:2413 -#| msgid "hexadecimal digit or '}' expected" msgid "hexadecimal digit or “}” expected" msgstr "laukta šešioliktainio skaitmens arba „}“" @@ -5461,7 +5184,6 @@ msgid "hexadecimal digit expected" msgstr "laukta šešioliktainio skaitmens" #: ../glib/gregex.c:2469 -#| msgid "missing '<' in symbolic reference" msgid "missing “<” in symbolic reference" msgstr "simbolinėje nuorodoje trūksta „<“" @@ -5482,7 +5204,6 @@ msgid "illegal symbolic reference" msgstr "neleistina simbolinė nuoroda" #: ../glib/gregex.c:2576 -#| msgid "stray final '\\'" msgid "stray final “\\”" msgstr "nevietoje galutinis „\\“" @@ -5492,12 +5213,10 @@ msgstr "nežinoma kaitos seka" #: ../glib/gregex.c:2590 #, c-format -#| msgid "Error while parsing replacement text \"%s\" at char %lu: %s" msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Klaida apdorojant pakeitimo tekstą „%s“ ties simboliu %lu: %s" #: ../glib/gshell.c:96 -#| msgid "Quoted text doesn't begin with a quotation mark" msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Cituojamas tekstas neprasideda citavimo ženklu" @@ -5509,14 +5228,11 @@ msgstr "" #: ../glib/gshell.c:582 #, c-format -#| msgid "Text ended just after a '\\' character. (The text was '%s')" msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "Tekstas pasibaigė tuoj po „\\“ simbolio. (Tekste buvo įrašyta „%s“)" #: ../glib/gshell.c:589 #, c-format -#| msgid "" -#| "Text ended before matching quote was found for %c. (The text was '%s')" msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Tekstas pasibaigė nesulaukus %c atitinkančio citatos ženklo. (Tekste buvo " @@ -5575,13 +5291,11 @@ msgstr "Nepavyko atskirti (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -#| msgid "Failed to change to directory '%s' (%s)" msgid "Failed to change to directory “%s” (%s)" msgstr "Nepavyko pereiti į aplanką „%s“ (%s)" #: ../glib/gspawn.c:1500 #, c-format -#| msgid "Failed to execute child process \"%s\" (%s)" msgid "Failed to execute child process “%s” (%s)" msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)" @@ -5597,7 +5311,6 @@ msgstr "Nepavyko atskirti antrinio proceso (%s)" #: ../glib/gspawn.c:1527 #, c-format -#| msgid "Unknown error executing child process \"%s\"" msgid "Unknown error executing child process “%s”" msgstr "Nežinoma klaida vykdant antrinį procesą „%s“" @@ -5762,6 +5475,10 @@ msgstr[2] "%s baitų" msgid "%.1f KB" msgstr "%.1f KB" +#~| msgid "No such interface '%s'" +#~ msgid "No such interface “%s”" +#~ msgstr "Nėra sąsajos „%s“" + #~ msgid "Error creating directory '%s': %s" #~ msgstr "Klaida kuriant katalogą „%s“: %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9e80b4d14..4f560d151 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,5 +1,5 @@ # Brazilian Portuguese translation of glib. -# Copyright (C) 2001-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # This file is distributed under the same license as the glib package. # Gustavo Noronha Silva <kov@debian.org>, 2001-2005 # Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2006-2009. @@ -14,15 +14,15 @@ # Jonh Wendell <jwendell@gnome.org>, 2009, 2010, 2012. # Felipe Braga <fbobraga@gmail.com>, 2015. # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016. -# Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2016. +# Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2016, 2017. # Enrico Nicoletto <liverig@gmail.com>, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: glib\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&ke" -"ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-10-06 20:10+0000\n" -"PO-Revision-Date: 2016-10-06 17:25-0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=glib&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-11-20 18:36+0000\n" +"PO-Revision-Date: 2017-01-05 08:05-0200\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" "Language: pt_BR\n" @@ -30,7 +30,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Virtaal 1.0.0-beta1\n" "X-Project-Style: gnome\n" #: ../gio/gapplication.c:493 @@ -39,7 +39,7 @@ msgstr "Opções do GApplication" #: ../gio/gapplication.c:493 msgid "Show GApplication options" -msgstr "Mostrar opções do GApplication" +msgstr "Mostra as opções do GApplication" #: ../gio/gapplication.c:538 msgid "Enter GApplication service mode (use from D-Bus service files)" @@ -48,8 +48,9 @@ msgstr "" "Bus)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" -msgstr "Substituir ID do aplicativo" +#| msgid "Override the application's ID" +msgid "Override the application’s ID" +msgstr "Substitui ID do aplicativo" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 #: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488 @@ -88,8 +89,9 @@ msgid "Launch the application (with optional files to open)" msgstr "Inicia o aplicativo (com arquivos opcionais a serem abertos)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" -msgstr "APPID [ARQUIVO...]" +#| msgid "APPID [FILE...]" +msgid "APPID [FILE…]" +msgstr "APPID [ARQUIVO…]" #: ../gio/gapplication-tool.c:59 msgid "Activate an action" @@ -129,8 +131,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" "Identificador do aplicativo em formato D-Bus (ex: org.exemplo.visualizador)" -#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622 -#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654 +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 msgid "FILE" msgstr "ARQUIVO" @@ -164,7 +166,7 @@ msgid "" "Unknown command %s\n" "\n" msgstr "" -"Comando \"%s\" desconhecido\n" +"Comando desconhecido %s\n" "\n" #: ../gio/gapplication-tool.c:101 @@ -176,9 +178,10 @@ msgstr "Uso:\n" msgid "Arguments:\n" msgstr "Argumentos:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" -msgstr "[ARGUMENTOS...]" +#: ../gio/gapplication-tool.c:133 +#| msgid "[ARGS...]" +msgid "[ARGS…]" +msgstr "[ARGUMENTOS…]" #: ../gio/gapplication-tool.c:134 #, c-format @@ -188,11 +191,14 @@ msgstr "Comandos:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. #: ../gio/gapplication-tool.c:146 #, c-format +#| msgid "" +#| "Use '%s help COMMAND' to get detailed help.\n" +#| "\n" msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Use \"%s help COMANDO\" para obter ajuda detalhada.\n" +"Use “%s help COMANDO” para obter ajuda detalhada.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -206,17 +212,21 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" -msgstr "id de aplicativo inválido: \"%s\"\n" +#| msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" +msgstr "id de aplicativo inválido: “%s”\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format +#| msgid "" +#| "'%s' takes no arguments\n" +#| "\n" msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" -"\"%s\" não leva argumentos\n" +"“%s” não leva argumentos\n" "\n" #: ../gio/gapplication-tool.c:266 @@ -236,13 +246,16 @@ msgstr "o nome da ação deve ser fornecido após o id do aplicativo\n" #: ../gio/gapplication-tool.c:325 #, c-format +#| msgid "" +#| "invalid action name: '%s'\n" +#| "action names must consist of only alphanumerics, '-' and '.'\n" msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" -"nome da ação inválido: \"%s\"\n" -"os nomes de ações devem consistir de apenas caracteres alfanuméricos, \"-\" " -"e \".\"\n" +"nome da ação inválido: “%s”\n" +"os nomes de ações devem consistir de apenas caracteres alfanuméricos, “-” e " +"“.”\n" #: ../gio/gapplication-tool.c:344 #, c-format @@ -339,14 +352,15 @@ msgstr "Sem suporte a inicialização cancelável" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" -msgstr "" -"Não há suporte à conversão do conjunto de caracteres \"%s\" para \"%s\"" +#| msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" +msgstr "Não há suporte à conversão do conjunto de caracteres “%s” para “%s”" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" -msgstr "Não foi possível abrir conversor de \"%s\" para \"%s\"" +#| msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" +msgstr "Não foi possível abrir conversor de “%s” para “%s”" #: ../gio/gcontenttype.c:335 #, c-format @@ -387,81 +401,100 @@ msgstr "Fim do fluxo inesperadamente prematuro" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" -msgstr "Não há suporte a chave \"%s\" na entrada de endereço \"%s\"" +#| msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" +msgstr "Não há suporte a chave “%s” na entrada de endereço “%s”" #: ../gio/gdbusaddress.c:180 #, c-format +#| msgid "" +#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract " +#| "keys)" msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -"O endereço \"%s\" é inválido (é necessário exatamente um dentre: caminho, " +"O endereço “%s” é inválido (é necessário exatamente um dentre: caminho, " "diretório temporário ou chaves abstratas)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" -msgstr "" -"Combinação de pares chave/valor sem sentido na entrada de endereço \"%s\"" +#| msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" +msgstr "Combinação de pares chave/valor sem sentido na entrada de endereço “%s”" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" -msgstr "Erro no endereço \"%s\" - o atributo porta está malformada" +#| msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" +msgstr "Erro no endereço “%s” — o atributo porta está malformada" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" -msgstr "Erro no endereço \"%s\" - o atributo família está malformada" +#| msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" +msgstr "Erro no endereço “%s” — o atributo família está malformada" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" -msgstr "O elemento endereço \"%s\" não contém um caractere de dois-pontos (:)" +#| msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" +msgstr "O elemento endereço “%s” não contém um caractere de dois-pontos (:)" #: ../gio/gdbusaddress.c:478 #, c-format +#| msgid "" +#| "Key/Value pair %d, '%s', in address element '%s' does not contain an " +#| "equal sign" msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" -"O par chave/valor %d, \"%s\", no elemento endereço \"%s\", não contém um " -"sinal de igual" +"O par chave/valor %d, “%s”, no elemento endereço “%s”, não contém um sinal " +"de igual" #: ../gio/gdbusaddress.c:492 #, c-format +#| msgid "" +#| "Error unescaping key or value in Key/Value pair %d, '%s', in address " +#| "element '%s'" msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" -"Erro ao distinguir a chave sem escape ou valor no par chave/valor %d, \"%s" -"\", no elemento endereço \"%s\"" +"Erro ao distinguir a chave sem escape ou valor no par chave/valor %d, “%s”, " +"no elemento endereço “%s”" #: ../gio/gdbusaddress.c:570 #, c-format +#| msgid "" +#| "Error in address '%s' - the unix transport requires exactly one of the " +#| "keys 'path' or 'abstract' to be set" msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" -"Erro no endereço \"%s\" - o transporte Unix requer exatamente uma das chaves " -"\"path\" ou \"abstract\" sejam definidas" +"Erro no endereço “%s” — o transporte Unix requer exatamente uma das chaves " +"“path” ou “abstract” sejam definidas" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" -msgstr "" -"Erro no endereço \"%s\" - o atributo servidor está faltando ou malformado" +#| msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" +msgstr "Erro no endereço “%s” — o atributo servidor está faltando ou malformado" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" -msgstr "Erro no endereço \"%s\" - o atributo porta está faltando ou malformado" +#| msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" +msgstr "Erro no endereço “%s” — o atributo porta está faltando ou malformado" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +#| msgid "" +#| "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -"Erro no endereço \"%s\" - o atributo do arquivo de valor de uso único está " +"Erro no endereço “%s” — o atributo do arquivo de valor de uso único está " "faltando ou malformado" #: ../gio/gdbusaddress.c:655 @@ -470,30 +503,35 @@ msgstr "Erro ao iniciar automaticamente: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" -msgstr "Transporte desconhecido ou sem suporte \"%s\" para o endereço \"%s\"" +#| msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" +msgstr "Transporte desconhecido ou sem suporte “%s” para o endereço “%s”" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" -msgstr "Erro ao abrir arquivo de valor de uso único \"%s\": %s" +#| msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" +msgstr "Erro ao abrir arquivo de valor de uso único “%s”: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" -msgstr "Erro ao ler arquivo de valor de uso único \"%s\": %s" +#| msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" +msgstr "Erro ao ler arquivo de valor de uso único “%s”: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" -"Erro ao ler o arquivo de valor de uso único \"%s\". Era esperado 16 bytes, " -"mas foi obtido %d" +"Erro ao ler o arquivo de valor de uso único “%s”; era esperado 16 bytes, mas " +"foi obtido %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" -msgstr "Erro ao gravar o arquivo de valor de uso único \"%s\" no fluxo:" +#| msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" +msgstr "Erro ao gravar o arquivo de valor de uso único “%s” no fluxo:" #: ../gio/gdbusaddress.c:951 msgid "The given address is empty" @@ -516,8 +554,9 @@ msgstr "Não foi possível iniciar automaticamente o D-Bus sem X11 $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " -msgstr "Erro ao chamar a linha de comandos \"%s\": " +#| msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " +msgstr "Erro ao chamar a linha de comandos “%s”: " #: ../gio/gdbusaddress.c:1337 #, c-format @@ -536,14 +575,17 @@ msgstr "" "Não foi possível determinar o endereço de barramento da sessão (sem " "implementação para este SO)" -#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusaddress.c:1635 #, c-format +#| msgid "" +#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " +#| "variable - unknown value '%s'" msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Não foi possível determinar o endereço de barramento da variável de ambiente " -"DBUS_STARTER_BUS_TYPE - valor desconhecido \"%s\"" +"DBUS_STARTER_BUS_TYPE — valor desconhecido “%s”" #: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 msgid "" @@ -580,82 +622,101 @@ msgstr "Cancelado via GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" -msgstr "Erro ao obter informação para o diretório \"%s\": %s" +#| msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" +msgstr "Erro ao obter informação para o diretório “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format +#| msgid "" +#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" -"As permissões no diretório \"%s\" estão malformadas. É esperado 0700, mas " -"foi obtido 0%o" +"As permissões no diretório “%s” estão malformadas. É esperado 0700, mas foi " +"obtido 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" -msgstr "Erro ao criar o diretório \"%s\": %s" +#| msgid "Error creating directory %s: %s" +msgid "Error creating directory “%s”: %s" +msgstr "Erro ao criar o diretório “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " -msgstr "Erro ao abrir o chaveiro \"%s\" para leitura: " +#| msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " +msgstr "Erro ao abrir o chaveiro “%s” para leitura: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" -msgstr "A linha %d do chaveiro em \"%s\" com o conteúdo \"%s\" está malformado" +#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" +msgstr "A linha %d do chaveiro em “%s” com o conteúdo “%s” está malformado" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format +#| msgid "" +#| "First token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"O primeiro símbolo da linha %d do chaveiro em \"%s\" com o conteúdo \"%s\" " -"está malformado" +"O primeiro símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está " +"malformado" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format +#| msgid "" +#| "Second token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"O segundo símbolo da linha %d do chaveiro em \"%s\" com o conteúdo \"%s\" " -"está malformado" +"O segundo símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está " +"malformado" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" -msgstr "Não foi possível localizar um anexo com o ID %d no chaveiro em \"%s\"" +#| msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" +msgstr "Não foi possível localizar um anexo com o ID %d no chaveiro em “%s”" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" -msgstr "Erro ao excluir o arquivo de bloqueio anterior \"%s\": %s" +#| msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" +msgstr "Erro ao excluir o arquivo de bloqueio anterior “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" -msgstr "Erro ao criar o arquivo de bloqueio \"%s\": %s" +#| msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" +msgstr "Erro ao criar o arquivo de bloqueio “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" -msgstr "Erro ao fechar o arquivo de bloqueio (desvinculado) \"%s\": %s" +#| msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" +msgstr "Erro ao fechar o arquivo de bloqueio (desvinculado) “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" -msgstr "Erro ao desvincular o arquivo de bloqueio \"%s\": %s" +#| msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" +msgstr "Erro ao desvincular o arquivo de bloqueio “%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " -msgstr "Erro ao abrir o chaveiro \"%s\" para escrita: " +#| msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " +msgstr "Erro ao abrir o chaveiro “%s” para escrita: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -msgstr "(Adicionalmente, liberar o bloqueio de \"%s\" também falhou: %s) " +#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " +msgstr "(Adicionalmente, liberar o bloqueio de “%s” também falhou: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 msgid "The connection is closed" @@ -677,34 +738,33 @@ msgstr "" msgid "" "No such interface 'org.freedesktop.DBus.Properties' on object at path %s" msgstr "" -"Nenhuma interface \"org.freedesktop.DBus.Properties\" no objeto no caminho %s" +"Nenhuma interface “org.freedesktop.DBus.Properties” no objeto no caminho %s" #: ../gio/gdbusconnection.c:4251 #, c-format msgid "No such property '%s'" -msgstr "Nenhuma propriedade \"%s\"" +msgstr "Nenhuma propriedade “%s”" #: ../gio/gdbusconnection.c:4263 #, c-format msgid "Property '%s' is not readable" -msgstr "A propriedade \"%s\" está sem leitura" +msgstr "A propriedade “%s” está sem leitura" #: ../gio/gdbusconnection.c:4274 #, c-format msgid "Property '%s' is not writable" -msgstr "A propriedade \"%s\" está sem escrita" +msgstr "A propriedade “%s” está sem escrita" #: ../gio/gdbusconnection.c:4294 #, c-format msgid "Error setting property '%s': Expected type '%s' but got '%s'" msgstr "" -"Erro ao definir a propriedade \"%s\": o tipo esperado é \"%s\", mas obteve " -"\"%s\"" +"Erro ao definir a propriedade “%s”: o tipo esperado é “%s”, mas obteve “%s”" #: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573 #, c-format msgid "No such interface '%s'" -msgstr "Nenhuma interface \"%s\"" +msgstr "Nenhuma interface “%s”" #: ../gio/gdbusconnection.c:4607 msgid "No such interface" @@ -713,17 +773,17 @@ msgstr "Nenhuma interface" #: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082 #, c-format msgid "No such interface '%s' on object at path %s" -msgstr "Nenhuma interface \"%s\" no objeto no caminho %s" +msgstr "Nenhuma interface “%s” no objeto no caminho %s" #: ../gio/gdbusconnection.c:4923 #, c-format msgid "No such method '%s'" -msgstr "Método \"%s\" inexistente" +msgstr "Método “%s” inexistente" #: ../gio/gdbusconnection.c:4954 #, c-format msgid "Type of message, '%s', does not match expected type '%s'" -msgstr "O tipo da mensagem, \"%s\", não equivale ao tipo esperado \"%s\"" +msgstr "O tipo da mensagem, “%s”, não equivale ao tipo esperado “%s”" #: ../gio/gdbusconnection.c:5152 #, c-format @@ -743,18 +803,27 @@ msgstr "Não foi possível definir a propriedade %s.%s" #: ../gio/gdbusconnection.c:5610 #, c-format msgid "Method '%s' returned type '%s', but expected '%s'" -msgstr "O método \"%s\" retornou o tipo \"%s\", mas é esperado \"%s\"" +msgstr "O método “%s” retornou o tipo “%s”, mas é esperado “%s”" #: ../gio/gdbusconnection.c:6684 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" -msgstr "O método \"%s\" na interface \"%s\" com a assinatura \"%s\" não existe" +msgstr "O método “%s” na interface “%s” com a assinatura “%s” não existe" #: ../gio/gdbusconnection.c:6805 #, c-format msgid "A subtree is already exported for %s" msgstr "Uma subárvore já foi exportada para %s" +#: ../gio/gdbusconnection.c:7133 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Não foi possível determinar o endereço de barramento da variável de ambiente " +"DBUS_STARTER_BUS_TYPE - valor desconhecido “%s”" + #: ../gio/gdbusmessage.c:1244 msgid "type is INVALID" msgstr "o tipo é INVALID" @@ -806,30 +875,37 @@ msgstr[1] "Ao tentar ler %lu bytes obteve-se %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +#| msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" -"Era esperado um byte NUL (nulo) após o texto \"%s\", mas foi localizado o " -"byte %d" +"Era esperado um byte NUL (nulo) após o texto “%s”, mas foi localizado o byte " +"%d" #: ../gio/gdbusmessage.c:1388 #, c-format +#| msgid "" +#| "Expected valid UTF-8 string but found invalid bytes at byte offset %d " +#| "(length of string is %d). The valid UTF-8 string up until that point was " +#| "'%s'" msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" "Era esperado um texto UTF-8 válido, mas foi localizado bytes inválidos na " "posição %d (tamanho do texto é %d). O texto UTF-8 válido até este ponto era " -"\"%s\"" +"“%s”" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" -msgstr "O valor \"%s\" analisado não é um objeto de caminho D-Bus válido" +#| msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" +msgstr "O valor “%s” analisado não é um objeto de caminho D-Bus válido" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" -msgstr "O valor \"%s\" analisado não é uma assinatura D-Bus válida" +#| msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" +msgstr "O valor “%s” analisado não é uma assinatura D-Bus válida" #: ../gio/gdbusmessage.c:1656 #, c-format @@ -846,36 +922,45 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format +#| msgid "" +#| "Encountered array of type 'a%c', expected to have a length a multiple of " +#| "%u bytes, but found to be %u bytes in length" msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" -"Foi encontrado um vetor de tipo 'a%c', esperava-se que tivesse um " +"Foi encontrado um vetor de tipo “a%c”, esperava-se que tivesse um " "comprimento múltiplo de %u bytes, porém foi localizado %u bytes em " "comprimento" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" -msgstr "" -"O valor \"%s\" analisado para variante não é uma assinatura D-Bus válida" +#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" +msgstr "O valor “%s” analisado para variante não é uma assinatura D-Bus válida" #: ../gio/gdbusmessage.c:1867 #, c-format +#| msgid "" +#| "Error deserializing GVariant with type string '%s' from the D-Bus wire " +#| "format" msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -"Erro ao desserializar GVariant com o texto de tipo \"%s\" do formato " +"Erro ao desserializar GVariant com o texto de tipo “%s” do formato " "delimitado pelo D-Bus" #: ../gio/gdbusmessage.c:2051 #, c-format +#| msgid "" +#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found " +#| "value 0x%02x" msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Valor identificador de endian inválido. Era esperado 0x6c ('l') ou 0x42 " -"('B'), mas foi localizado o valor 0x%02x" +"Valor identificador de endian inválido. Era esperado 0x6c (“l”) ou 0x42 (“B”)" +", mas foi localizado o valor 0x%02x" #: ../gio/gdbusmessage.c:2064 #, c-format @@ -886,16 +971,17 @@ msgstr "" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +#| msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" -"O cabeçalho de assinatura foi localizado com a assinatura \"%s\", mas o " -"corpo da mensagem está vazio" +"O cabeçalho de assinatura foi localizado com a assinatura “%s”, mas o corpo " +"da mensagem está vazio" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" -msgstr "" -"O valor \"%s\" analisado não é uma assinatura D-Bus válida (para o corpo)" +#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" +msgstr "O valor “%s” analisado não é uma assinatura D-Bus válida (para o corpo)" #: ../gio/gdbusmessage.c:2164 #, c-format @@ -914,10 +1000,12 @@ msgstr "Não foi possível desserializar a mensagem: " #: ../gio/gdbusmessage.c:2515 #, c-format +#| msgid "" +#| "Error serializing GVariant with type string '%s' to the D-Bus wire format" msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" -"Erro ao serializar GVariant com o texto de tipo \"%s\" para o formato " +"Erro ao serializar GVariant com o texto de tipo “%s” para o formato " "delimitado pelo D-Bus" #: ../gio/gdbusmessage.c:2652 @@ -935,31 +1023,37 @@ msgstr "Não foi possível serializar a mensagem: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +#| msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" -"O corpo da mensagem tem a assinatura \"%s\", mas não há um cabeçalho de " +"O corpo da mensagem tem a assinatura “%s”, mas não há um cabeçalho de " "assinatura" #: ../gio/gdbusmessage.c:2714 #, c-format +#| msgid "" +#| "Message body has type signature '%s' but signature in the header field is " +#| "'%s'" msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" -"O corpo da mensagem tem o tipo de assinatura \"%s\", mas a assinatura no " -"campo de cabeçalho é \"%s\"" +"O corpo da mensagem tem o tipo de assinatura “%s”, mas a assinatura no campo " +"de cabeçalho é “%s”" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +#| msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "O corpo da mensagem está vazio, mas a assinatura no campo de cabeçalho é " -"\"(%s)\"" +"“(%s)”" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" -msgstr "Retorno de erro com o corpo de tipo \"%s\"" +#| msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" +msgstr "Retorno de erro com o corpo de tipo “%s”" #: ../gio/gdbusmessage.c:3291 msgid "Error return with empty body" @@ -1006,21 +1100,33 @@ msgstr "" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" -msgstr "Erro ao gravar o arquivo de valor de uso único em \"%s\": %s" +#| msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" +msgstr "Erro ao gravar o arquivo de valor de uso único em “%s”: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" -msgstr "O texto \"%s\" não é válido para GUID D-Bus" +#| msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" +msgstr "O texto “%s” não é válido para GUID D-Bus" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" -msgstr "Não é possível escutar no transporte \"%s\" por falta de suporte" +#| msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%s”" +msgstr "Não é possível escutar no transporte “%s” por falta de suporte" #: ../gio/gdbus-tool.c:95 #, c-format +#| msgid "" +#| "Commands:\n" +#| " help Shows this information\n" +#| " introspect Introspect a remote object\n" +#| " monitor Monitor a remote object\n" +#| " call Invoke a method on a remote object\n" +#| " emit Emit a signal\n" +#| "\n" +#| "Use \"%s COMMAND --help\" to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -1029,7 +1135,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Comandos:\n" " help Mostra esta informação\n" @@ -1038,7 +1144,7 @@ msgstr "" " call Chama um método de um objeto remoto\n" " emit Emite um sinal\n" "\n" -"Use \"%s COMANDO --help\" para obter ajuda de cada comando.\n" +"Use “%s COMANDO --help” para obter ajuda de cada comando.\n" #: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298 #: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067 @@ -1089,19 +1195,24 @@ msgstr "Múltiplas conexões de ponto final especificadas" #: ../gio/gdbus-tool.c:471 #, c-format +#| msgid "" +#| "Warning: According to introspection data, interface '%s' does not exist\n" msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" -"Aviso: De acordo com os dados de introspecção a interface \"%s\" não existe\n" +"Aviso: De acordo com os dados de introspecção a interface “%s” não existe\n" #: ../gio/gdbus-tool.c:480 #, c-format +#| msgid "" +#| "Warning: According to introspection data, method '%s' does not exist on " +#| "interface '%s'\n" msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" -"Aviso: De acordo com os dados de introspecção o método \"%s\" não existe na " -"interface \"%s\"\n" +"Aviso: De acordo com os dados de introspecção o método “%s” não existe na " +"interface “%s”\n" #: ../gio/gdbus-tool.c:542 msgid "Optional destination for signal (unique name)" @@ -1214,13 +1325,15 @@ msgstr "Erro: O nome do método não foi especificado\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" -msgstr "Erro: O nome do método \"%s\" é inválido\n" +#| msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" +msgstr "Erro: O nome do método “%s” é inválido\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" -msgstr "Erro ao analisar o parâmetro %d do tipo \"%s\": %s\n" +#| msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" +msgstr "Erro ao analisar o parâmetro %d do tipo “%s”: %s\n" #: ../gio/gdbus-tool.c:1472 msgid "Destination name to introspect" @@ -1263,7 +1376,8 @@ msgid "Unnamed" msgstr "Sem nome" #: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +#| msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "O arquivo da área de trabalho não especifica o campo Exec" #: ../gio/gdesktopappinfo.c:2689 @@ -1272,13 +1386,15 @@ msgstr "Não é possível localizar o terminal requerido para o aplicativo" #: ../gio/gdesktopappinfo.c:3097 #, c-format -msgid "Can't create user application configuration folder %s: %s" +#| msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Não é possível criar pasta de configuração do aplicativo do usuário %s: %s" #: ../gio/gdesktopappinfo.c:3101 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +#| msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Não é possível criar pasta de configuração MIME do usuário %s: %s" #: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 @@ -1287,7 +1403,8 @@ msgstr "A informação do aplicativo carece de um identificador" #: ../gio/gdesktopappinfo.c:3599 #, c-format -msgid "Can't create user desktop file %s" +#| msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "Não é possível criar arquivo %s da área de trabalho do usuário" #: ../gio/gdesktopappinfo.c:3733 @@ -1296,26 +1413,31 @@ msgid "Custom definition for %s" msgstr "Definição personalizada para %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" +#| msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "a unidade não implementa ejetar" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" +#| msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "a unidade não implementa ejetar ou eject_with_operation" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +#| msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "a unidade não implementa verificação por mídia" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +#| msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "a unidade não implementa start" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +#| msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "a unidade não implementa stop" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1329,7 +1451,8 @@ msgstr "Suporte DTLS não disponível" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +#| msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Não é possível lidar com a versão %d da codificação GEmblem" #: ../gio/gemblem.c:333 @@ -1339,7 +1462,8 @@ msgstr "Número inválido de tokens (%d) na codificação GEmblem" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +#| msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Não é possível lidar com a versão %d da codificação GEmblemedIcon" #: ../gio/gemblemedicon.c:372 @@ -1371,12 +1495,14 @@ msgstr "Operação sem suporte" msgid "Containing mount does not exist" msgstr "Ponto de montagem contido não existe" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +#| msgid "Can't copy over directory" +msgid "Can’t copy over directory" msgstr "Não é possível copiar sobre diretório" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +#| msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Não é possível copiar diretório sobre diretório" #: ../gio/gfile.c:2583 @@ -1384,7 +1510,8 @@ msgid "Target file exists" msgstr "Arquivo alvo existe" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +#| msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Não é possível copiar o diretório recursivamente" #: ../gio/gfile.c:2884 @@ -1405,11 +1532,13 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Não há suporte a copiar (reflink/clone) ou é inválido" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +#| msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Não há suporte a copiar (reflink/clone) ou não funcionou" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +#| msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Não é possível copiar o arquivo especial" #: ../gio/gfile.c:3885 @@ -1422,11 +1551,13 @@ msgstr "Não há suporte para lixeira" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" -msgstr "Nomes de arquivo não podem conter \"%c\"" +#| msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" +msgstr "Nomes de arquivo não podem conter “%c”" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" +#| msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "volume não implementa montagem" #: ../gio/gfile.c:6713 @@ -1448,7 +1579,8 @@ msgstr "O enumerador do arquivo já está fechado" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +#| msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Não é possível lidar com a versão %d da codificação GFileIcon" #: ../gio/gfileicon.c:246 @@ -1458,7 +1590,8 @@ msgstr "Dados de entrada malformados para o GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +#| msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "Fluxo não tem suporte para query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1530,7 +1663,8 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "O tipo %s não implementa from_tokens() na interface GIcon" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +#| msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Não é possível lidar com a versão fornecida da codificação do ícone" #: ../gio/ginetaddressmask.c:182 @@ -1548,8 +1682,9 @@ msgstr "O endereço contém bits ativos além do tamanho do prefixo (máscara)" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" -msgstr "Não foi possível interpretar \"%s\" como uma máscara de endereço IP" +#| msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" +msgstr "Não foi possível interpretar “%s” como uma máscara de endereço IP" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 #: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 @@ -1561,7 +1696,8 @@ msgid "Unsupported socket address" msgstr "Endereço de soquete não suportado" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +#| msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "Fluxo de entrada não implementa leitura" #. Translators: This is an error you get if there is already an @@ -1584,8 +1720,9 @@ msgid "Keep with file when moved" msgstr "Manter com o arquivo quando movido" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" -msgstr "'version' não leva argumentos" +#| msgid "'version' takes no arguments" +msgid "“version” takes no arguments" +msgstr "“version” não leva argumentos" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 msgid "Usage:" @@ -1595,6 +1732,10 @@ msgstr "Uso:" msgid "Print version information and exit." msgstr "Exibe a informação da versão e sai." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGUMENTOS…]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Comandos:" @@ -1760,8 +1901,9 @@ msgstr "O destino %s não é um diretório" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " -msgstr "%s: sobrescrever \"%s\"? " +#| msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " +msgstr "%s: sobrescrever “%s”? " #: ../gio/gio-tool-info.c:34 msgid "List writable attributes" @@ -1780,7 +1922,8 @@ msgid "ATTRIBUTES" msgstr "ATRIBUTOS" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +#| msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "Não segue links simbólicos" #: ../gio/gio-tool-info.c:75 @@ -1845,19 +1988,25 @@ msgid "Show information about locations." msgstr "Mostra informações sobre locais." #: ../gio/gio-tool-info.c:285 +#| msgid "" +#| "gio info is similar to the traditional ls utility, but using GIO\n" +#| "locations instead of local files: for example, you can use something\n" +#| "like smb://server/resource/file.txt as location. File attributes can\n" +#| "be specified with their GIO name, e.g. standard::icon, or just by\n" +#| "namespace, e.g. unix, or by '*', which matches all attributes" msgid "" "gio info is similar to the traditional ls utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info é similar ao utilitário ls tradicional, mas usando locais\n" "GIO em vez de arquivos locais: por exemplo, você pode usar alguma\n" "coisa como smb://servidor/recurso/arquivo.txt como local. Atributos\n" "de arquivos podem ser especificados por meio de seus nome GIO\n" -"(ex.: standard::icon), ou apenas pelo namespace (ex.: unix), ou\n" -"por \"*\", que corresponde a todos atributos" +"(ex.: standard::icon), ou apenas pelo espaço de nome (ex.: unix),\n" +"ou por “*”, que corresponde a todos atributos" #: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74 msgid "No locations given" @@ -1921,13 +2070,15 @@ msgstr "Deve-se especificar um único tipo mime, e talvez um manipulado" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" -msgstr "Nenhum aplicativo padrão para \"%s\"\n" +#| msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" +msgstr "Nenhum aplicativo padrão para “%s”\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" -msgstr "Aplicativo padrão para \"%s\": %s\n" +#| msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" +msgstr "Aplicativo padrão para “%s”: %s\n" #: ../gio/gio-tool-mime.c:124 #, c-format @@ -1951,13 +2102,15 @@ msgstr "Nenhum aplicativo recomendado\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" -msgstr "Falha ao carregar informação para manipulador de \"%s\"\n" +#| msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" +msgstr "Falha ao carregar informação para manipulador de “%s”\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" -msgstr "Falha ao definir \"%s\" como o manipulador padrão para \"%s\": %s\n" +#| msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" +msgstr "Falha ao definir “%s” como o manipulador padrão para “%s”: %s\n" #: ../gio/gio-tool-mkdir.c:31 msgid "Create parent directories" @@ -1990,7 +2143,8 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Monitora um arquivo diretamente (note mudanças via links absolutos)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +#| msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Monitora um arquivo diretamente, mas não relata alterações" #: ../gio/gio-tool-monitor.c:45 @@ -2100,7 +2254,8 @@ msgid "Mount or unmount the locations." msgstr "Monta ou desmontar os locais." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +#| msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "Não usa reserva de cópia ou exclusão" #: ../gio/gio-tool-move.c:99 @@ -2287,18 +2442,21 @@ msgstr "O arquivo %s aparece várias vezes no recurso" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" -msgstr "Falha ao localizar \"%s\" em todos os diretórios fontes" +#| msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" +msgstr "Falha ao localizar “%s” em todos os diretórios fontes" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" -msgstr "Falha ao localizar \"%s\" no diretório atual" +#| msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" +msgstr "Falha ao localizar “%s” no diretório atual" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" -msgstr "Opção de processamento %s desconhecida" +#| msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" +msgstr "Opção de processamento “%s” desconhecida" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format @@ -2320,59 +2478,65 @@ msgstr "Ocorreu erro ao comprimir o arquivo %s" msgid "text may not appear inside <%s>" msgstr "texto não pode aparecer dentro de <%s>" -#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037 msgid "Show program version and exit" msgstr "Mostra a versão do programa e sai" -#: ../gio/glib-compile-resources.c:622 +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "Nome do arquivo de saída" -#: ../gio/glib-compile-resources.c:623 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" msgstr "Diretórios onde os arquivos serão lidos (o padrão é o diretório atual)" -#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038 #: ../gio/glib-compile-schemas.c:2067 msgid "DIRECTORY" msgstr "DIRETÓRIO" -#: ../gio/glib-compile-resources.c:624 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "Gera a saída no formato definido pela extensão do arquivo alvo" -#: ../gio/glib-compile-resources.c:625 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "Gera um cabeçalho" -#: ../gio/glib-compile-resources.c:626 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "Gera código fonte que vincula o recurso ao seu programa" -#: ../gio/glib-compile-resources.c:627 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "Gera uma lista de dependência" -#: ../gio/glib-compile-resources.c:628 +#: ../gio/glib-compile-resources.c:671 msgid "name of the dependency file to generate" msgstr "Nome do arquivo de dependências para gerar" -#: ../gio/glib-compile-resources.c:629 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "Inclui alvos falsos no arquivo de dependência gerado" + +#: ../gio/glib-compile-resources.c:673 +#| msgid "Don't automatically create and register resource" +msgid "Don’t automatically create and register resource" msgstr "Não cria e registra o recurso automaticamente" -#: ../gio/glib-compile-resources.c:630 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +#: ../gio/glib-compile-resources.c:674 +#| msgid "Don't export functions; declare them G_GNUC_INTERNAL" +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Não exporta funções; declara-as G_GNUC_INTERNAL" -#: ../gio/glib-compile-resources.c:631 +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "Nome do identificador C usado no código fonte gerado" -#: ../gio/glib-compile-resources.c:657 +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2382,7 +2546,7 @@ msgstr "" "Arquivos de especificação de recurso têm a extensão .gresource.xml,\n" "e um arquivo de recurso tem a extensão .gresource." -#: ../gio/glib-compile-resources.c:679 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "Você deve fornecer exatamente um arquivo\n" @@ -2394,7 +2558,7 @@ msgstr "nomes vazios não são permitidos" #: ../gio/glib-compile-schemas.c:794 #, c-format msgid "invalid name '%s': names must begin with a lowercase letter" -msgstr "nome \"%s\" inválido: nomes precisam começar com uma letra minúscula" +msgstr "nome “%s” inválido: nomes precisam começar com uma letra minúscula" #: ../gio/glib-compile-schemas.c:806 #, c-format @@ -2402,25 +2566,23 @@ msgid "" "invalid name '%s': invalid character '%c'; only lowercase letters, numbers " "and hyphen ('-') are permitted." msgstr "" -"nome \"%s\" inválido: caractere \"%c\" inválido, apenas é permitido letras " -"minúsculas, números e traços (\"-\")." +"nome “%s” inválido: caractere “%c” inválido, apenas é permitido letras " +"minúsculas, números e traços (”-”)." #: ../gio/glib-compile-schemas.c:815 #, c-format msgid "invalid name '%s': two successive hyphens ('--') are not permitted." -msgstr "" -"nome \"%s\" inválido: dois hifens (\"--\") consecutivos não são permitidos." +msgstr "nome “%s” inválido: dois hifens (”--”) consecutivos não são permitidos." #: ../gio/glib-compile-schemas.c:824 #, c-format msgid "invalid name '%s': the last character may not be a hyphen ('-')." -msgstr "" -"nome \"%s\" inválido: o último caractere não pode ser um hífen (\"-\")." +msgstr "nome “%s” inválido: o último caractere não pode ser um hífen (”-”)." #: ../gio/glib-compile-schemas.c:832 #, c-format msgid "invalid name '%s': maximum length is 1024" -msgstr "nome \"%s\" inválido: o tamanho máximo é 1024" +msgstr "nome “%s” inválido: o tamanho máximo é 1024" #: ../gio/glib-compile-schemas.c:901 #, c-format @@ -2429,7 +2591,7 @@ msgstr "<child name='%s'> já especificado" #: ../gio/glib-compile-schemas.c:927 msgid "cannot add keys to a 'list-of' schema" -msgstr "não é possível adicionar chaves ao esquema \"list-of\"" +msgstr "não é possível adicionar chaves ao esquema “list-of”" #: ../gio/glib-compile-schemas.c:938 #, c-format @@ -2451,7 +2613,7 @@ msgid "" "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute " "to <key>" msgstr "" -"apenas um entre \"type\", \"enum\" ou \"flags\" deve ser especificado como " +"apenas um entre “type”, “enum” ou “flags” deve ser especificado como " "atributo para <key>" #: ../gio/glib-compile-schemas.c:986 @@ -2462,7 +2624,7 @@ msgstr "<%s id='%s'> não está (ainda) definido." #: ../gio/glib-compile-schemas.c:1001 #, c-format msgid "invalid GVariant type string '%s'" -msgstr "tipo de texto GVariant \"%s\" é inválido" +msgstr "tipo de texto GVariant “%s” é inválido" #: ../gio/glib-compile-schemas.c:1031 msgid "<override> given but schema isn't extending anything" @@ -2516,8 +2678,8 @@ msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' " "does not extend '%s'" msgstr "" -"<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'>, mas \"%s" -"\" não estende \"%s\"" +"<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'>, mas “%s”" +" não estende “%s”" #: ../gio/glib-compile-schemas.c:1208 #, c-format @@ -2527,7 +2689,7 @@ msgstr "um caminho, se determinado, precisa começar e terminar com uma barra" #: ../gio/glib-compile-schemas.c:1215 #, c-format msgid "the path of a list must end with ':/'" -msgstr "o caminho de uma lista precisa terminar com \":/\"" +msgstr "o caminho de uma lista precisa terminar com “:/”" #: ../gio/glib-compile-schemas.c:1247 #, c-format @@ -2565,8 +2727,8 @@ msgstr "Ignorando este arquivo.\n" #, c-format msgid "No such key '%s' in schema '%s' as specified in override file '%s'" msgstr "" -"Nenhuma chave \"%s\" no esquema \"%s\" como especificado no arquivo de " -"sobrescrita \"%s\"" +"Nenhuma chave “%s” no esquema “%s” como especificado no arquivo de " +"sobrescrita “%s”" #: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965 #: ../gio/glib-compile-schemas.c:1993 @@ -2585,8 +2747,8 @@ msgstr " e --strict foi especificado; saindo.\n" msgid "" "error parsing key '%s' in schema '%s' as specified in override file '%s': %s." msgstr "" -"erro ao analisar chave \"%s\" no esquema \"%s\" como especificado no arquivo " -"de sobrescrita \"%s\": %s." +"erro ao analisar chave “%s” no esquema “%s” como especificado no arquivo de " +"sobrescrita “%s”: %s." #: ../gio/glib-compile-schemas.c:1937 #, c-format @@ -2599,8 +2761,8 @@ msgid "" "override for key '%s' in schema '%s' in override file '%s' is outside the " "range given in the schema" msgstr "" -"sobrescrita para chave \"%s\" no esquema \"%s\" no arquivo de sobrescrita " -"\"%s\" está fora dos limites dado pelo esquema" +"sobrescrita para chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” " +"está fora dos limites dado pelo esquema" #: ../gio/glib-compile-schemas.c:1983 #, c-format @@ -2608,8 +2770,8 @@ msgid "" "override for key '%s' in schema '%s' in override file '%s' is not in the " "list of valid choices" msgstr "" -"sobrescrita para a chave \"%s\" no esquema \"%s\" no arquivo de sobrescrita " -"\"%s\" não está na lista de escolhas válidas" +"sobrescrita para a chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” " +"não está na lista de escolhas válidas" #: ../gio/glib-compile-schemas.c:2038 msgid "where to store the gschemas.compiled file" @@ -2657,135 +2819,138 @@ msgstr "fazendo nada.\n" msgid "removed existing output file.\n" msgstr "arquivo de saída existente removido.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Nome de arquivo inválido: %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Erro ao obter informações do sistema de arquivos para %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Ponto de montagem contido para arquivo %s não existe" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +#| msgid "Can't rename root directory" +msgid "Can’t rename root directory" msgstr "Não é possível renomear o diretório root" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Erro ao renomear arquivo %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +#| msgid "Can't rename file, filename already exists" +msgid "Can’t rename file, filename already exists" msgstr "Não é possível renomear o arquivo, o nome do arquivo já existe" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Nome de arquivo inválido" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Erro ao abrir arquivo %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Erro ao remover arquivo %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Erro ao mover para a lixeira o arquivo %s: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Não é possível criar o diretório da lixeira %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Não é possível localizar diretório de nível superior para a lixeira %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Não é possível localizar ou criar o diretório da lixeira para %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Não é possível criar o arquivo de informações da lixeira para %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Não é possível mover para a lixeira o arquivo %s entre os limites de sistema " "de arquivos" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Não é possível mover para a lixeira o arquivo %s: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Não é possível mover para a lixeira o arquivo %s" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Erro ao criar o diretório %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "O sistema de arquivos não tem suporte a links simbólicos" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Erro ao criar link simbólico %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Não há suporte a links simbólicos" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Erro ao mover arquivo %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +#| msgid "Can't move directory over directory" +msgid "Can’t move directory over directory" msgstr "Não é possível mover diretório sobre diretório" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Falha ao criar arquivo de backup" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Erro ao remover arquivo alvo: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Não há suporte a mover entre montagens" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Não foi possível determinar a utilização de disco de %s: %s" @@ -2804,8 +2969,9 @@ msgstr "Nome de atributo estendido inválido" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" -msgstr "Erro ao definir atributo estendido \"%s\": %s" +#| msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" +msgstr "Erro ao definir atributo estendido “%s”: %s" #: ../gio/glocalfileinfo.c:1575 msgid " (invalid encoding)" @@ -2813,8 +2979,9 @@ msgstr " (codificação inválida)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" -msgstr "Erro ao obter informação para o arquivo \"%s\": %s" +#| msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" +msgstr "Erro ao obter informação para o arquivo “%s”: %s" #: ../gio/glocalfileinfo.c:2017 #, c-format @@ -2935,8 +3102,9 @@ msgstr "Erro ao truncar arquivo: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" -msgstr "Erro ao abrir arquivo \"%s\": %s" +#| msgid "Error opening file %s: %s" +msgid "Error opening file “%s”: %s" +msgstr "Erro ao abrir arquivo “%s”: %s" #: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" @@ -2995,58 +3163,64 @@ msgstr "Solicitada uma busca além do fim do fluxo" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" -msgstr "objeto de montagem não implementa \"umount\"" +#| msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" +msgstr "objeto de montagem não implementa “umount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" -msgstr "objeto de montagem não implementa \"eject\"" +#| msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" +msgstr "objeto de montagem não implementa “eject”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -msgstr "" -"objeto de montagem não implementa \"unmount\" ou \"unmount_with_operation\"" +#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" +msgstr "objeto de montagem não implementa “unmount” ou “unmount_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -msgstr "" -"objeto de montagem não implementa \"eject\" ou \"eject_with_operation\"" +#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" +msgstr "objeto de montagem não implementa “eject” ou “eject_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" -msgstr "objeto de montagem não implementa \"remount\"" +#| msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" +msgstr "objeto de montagem não implementa “remount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +#| msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "objeto de montagem não implementa estimativa de tipo de conteúdo" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +#| msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "" "objeto de montagem não implementa estimativa de tipo de conteúdo síncrono" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" -msgstr "Nome da máquina \"%s\" contém \"[\" mas não \"]\"" +#| msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" +msgstr "Nome da máquina “%s” contém “[” mas não “]”" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 msgid "Network unreachable" @@ -3076,39 +3250,45 @@ msgid "NetworkManager version too old" msgstr "A versão do NetworkManager é muito antiga" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +#| msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "Fluxo de saída não implementa escrita" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "A fonte do fluxo já está fechada" -#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" -msgstr "Erro ao resolver \"%s\": %s" +#| msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" +msgstr "Erro ao resolver “%s”: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 #: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" -msgstr "O recurso em \"%s\" não existe" +#| msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" +msgstr "O recurso em “%s” não existe" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" -msgstr "Falha ao descompactar o recurso em \"%s\"" +#| msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" +msgstr "Falha ao descompactar o recurso em “%s”" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" -msgstr "O recurso em \"%s\" não é um diretório" +#| msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" +msgstr "O recurso em “%s” não é um diretório" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +#| msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "Fluxo de entrada não implementa busca" #: ../gio/gresource-tool.c:494 @@ -3155,9 +3335,22 @@ msgid "FILE PATH" msgstr "ARQUIVO CAMINHO" #: ../gio/gresource-tool.c:534 +#| msgid "" +#| "Usage:\n" +#| " gresource [--section SECTION] COMMAND [ARGS...]\n" +#| "\n" +#| "Commands:\n" +#| " help Show this information\n" +#| " sections List resource sections\n" +#| " list List resources\n" +#| " details List resources with details\n" +#| " extract Extract a resource\n" +#| "\n" +#| "Use 'gresource help COMMAND' to get detailed help.\n" +#| "\n" msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3166,11 +3359,11 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" -" gresource [--section SEÇÃO] COMANDO [ARGUMENTOS...]\n" +" gresource [--section SEÇÃO] COMANDO [ARGUMENTOS…]\n" "\n" "Comandos:\n" " help Mostra esta ajuda\n" @@ -3179,7 +3372,7 @@ msgstr "" " details Lista os recursos com detalhes\n" " extract Extrai um recurso\n" "\n" -"Use 'gresource help COMANDO' para obter uma ajuda detalhada.\n" +"Use “gresource help COMANDO” para obter uma ajuda detalhada.\n" "\n" #: ../gio/gresource-tool.c:548 @@ -3223,7 +3416,7 @@ msgstr "[CAMINHO]" #: ../gio/gresource-tool.c:574 msgid " PATH An (optional) resource path (may be partial)\n" -msgstr " CAMINHO Um caminho do recurso (opcional, pode ser parcial)\n" +msgstr " CAMINHO Um caminho (opcional) do recurso (pode ser parcial)\n" #: ../gio/gresource-tool.c:575 msgid "PATH" @@ -3236,19 +3429,21 @@ msgstr " CAMINHO Um caminho do recurso\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" -msgstr "Nenhum esquema \"%s\"\n" +#| msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" +msgstr "Nenhum esquema “%s”\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" -msgstr "" -"Esquema \"%s\" não é recolocável (o caminho não deve ser especificado)\n" +#| msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" +msgstr "Esquema “%s” não é recolocável (o caminho não deve ser especificado)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" -msgstr "Esquema \"%s\" é recolocável (o caminho deve ser especificado)\n" +#| msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" +msgstr "Esquema “%s” é recolocável (o caminho deve ser especificado)\n" #: ../gio/gsettings-tool.c:92 #, c-format @@ -3366,10 +3561,33 @@ msgid "SCHEMA[:PATH] [KEY]" msgstr "ESQUEMA[:CAMINHO] [CHAVE]" #: ../gio/gsettings-tool.c:620 +#| msgid "" +#| "Usage:\n" +#| " gsettings --version\n" +#| " gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +#| "\n" +#| "Commands:\n" +#| " help Show this information\n" +#| " list-schemas List installed schemas\n" +#| " list-relocatable-schemas List relocatable schemas\n" +#| " list-keys List keys in a schema\n" +#| " list-children List children of a schema\n" +#| " list-recursively List keys and values, recursively\n" +#| " range Queries the range of a key\n" +#| " describe Queries the description of a key\n" +#| " get Get the value of a key\n" +#| " set Set the value of a key\n" +#| " reset Reset the value of a key\n" +#| " reset-recursively Reset all values in a given schema\n" +#| " writable Check if a key is writable\n" +#| " monitor Watch for changes\n" +#| "\n" +#| "Use 'gsettings help COMMAND' to get detailed help.\n" +#| "\n" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3387,12 +3605,12 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Uso:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMANDO [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMANDO [ARGS…]\n" "\n" "Comandos:\n" " help Mostra esta informação\n" @@ -3411,7 +3629,7 @@ msgstr "" " writable Verifica se uma chave é gravável\n" " monitor Monitora alterações\n" "\n" -"Use \"gsettings help COMANDO\" para obter ajuda detalhada.\n" +"Use “gsettings help COMANDO” para obter ajuda detalhada.\n" "\n" #: ../gio/gsettings-tool.c:644 @@ -3470,8 +3688,9 @@ msgstr "Nome de esquema vazio\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" -msgstr "Nenhuma chave \"%s\"\n" +#| msgid "No such key '%s'\n" +msgid "No such key “%s”\n" +msgstr "Nenhuma chave “%s”\n" #: ../gio/gsocket.c:364 msgid "Invalid socket, not initialized" @@ -3594,26 +3813,26 @@ msgstr "Erro ao fechar soquete: %s" msgid "Waiting for socket condition: %s" msgstr "Aguardando pela condição do soquete: %s" -#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 +#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619 #, c-format msgid "Error sending message: %s" msgstr "Erro ao enviar mensagem: %s" -#: ../gio/gsocket.c:4386 +#: ../gio/gsocket.c:4385 msgid "GSocketControlMessage not supported on Windows" msgstr "Não há suporte a GSocketControlMessage no Windows" -#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 +#: ../gio/gsocket.c:4838 ../gio/gsocket.c:4911 ../gio/gsocket.c:5138 #, c-format msgid "Error receiving message: %s" msgstr "Erro ao receber mensagem: %s" -#: ../gio/gsocket.c:5411 +#: ../gio/gsocket.c:5410 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Não é possível ler as credenciais do soquete: %s" -#: ../gio/gsocket.c:5420 +#: ../gio/gsocket.c:5419 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials não está implementado para este SO" @@ -3633,7 +3852,7 @@ msgstr "Não foi possível conectar: " #: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599 msgid "Unknown error on connect" -msgstr "erro desconhecido ao conectar" +msgstr "Erro desconhecido ao conectar" #: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535 msgid "Proxying over a non-TCP connection is not supported." @@ -3641,8 +3860,9 @@ msgstr "Não há suporte ao uso de proxy sobre uma conexão não TCP." #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." -msgstr "Não há suporte ao protocolo de proxy \"%s\"." +#| msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." +msgstr "Não há suporte ao protocolo de proxy “%s”." #: ../gio/gsocketlistener.c:218 msgid "Listener is already closed" @@ -3654,8 +3874,9 @@ msgstr "O soquete adicionado está fechado" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" -msgstr "Não há suporte ao endereço IPv6 \"%s\" pelo SOCKSv4" +#| msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" +msgstr "Não há suporte ao endereço IPv6 “%s” pelo SOCKSv4" #: ../gio/gsocks4aproxy.c:136 msgid "Username is too long for SOCKSv4 protocol" @@ -3663,8 +3884,9 @@ msgstr "O nome de usuário é muito longo para o protocolo SOCKSv4" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" -msgstr "O nome \"%s\" é muito longo para o protocolo SOCKSv4" +#| msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" +msgstr "O nome “%s” é muito longo para o protocolo SOCKSv4" #: ../gio/gsocks4aproxy.c:179 msgid "The server is not a SOCKSv4 proxy server." @@ -3701,8 +3923,9 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" -msgstr "O nome \"%s\" é muito longo para o protocolo SOCKSv5" +#| msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" +msgstr "O nome “%s” é muito longo para o protocolo SOCKSv5" #: ../gio/gsocks5proxy.c:348 msgid "The SOCKSv5 proxy server uses unknown address type." @@ -3729,8 +3952,9 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Conexão recusada por meio do proxy SOCKSv5." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." -msgstr "Proxy SOCKSv5 sem suporte ao comando \"connect\"." +#| msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." +msgstr "Proxy SOCKSv5 sem suporte ao comando “connect”." #: ../gio/gsocks5proxy.c:392 msgid "SOCKSv5 proxy does not support provided address type." @@ -3742,7 +3966,8 @@ msgstr "Erro de proxy SOCKSv5 desconhecido." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +#| msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Não é possível lidar com a versão %d da codificação GThemedIcon" #: ../gio/gthreadedresolver.c:118 @@ -3751,24 +3976,28 @@ msgstr "Nenhum endereço válido foi localizado" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" -msgstr "Erro ao resolver reversamente \"%s\": %s" +#| msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" +msgstr "Erro ao resolver reversamente “%s”: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" -msgstr "Nenhum registro DNS do tipo de requisição para \"%s\"" +#| msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" +msgstr "Nenhum registro DNS do tipo de requisição para “%s”" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" -msgstr "Temporariamente sem condições de resolver \"%s\"" +#| msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" +msgstr "Temporariamente sem condições de resolver “%s”" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" -msgstr "Erro ao resolver \"%s\"" +#| msgid "Error resolving '%s'" +msgid "Error resolving “%s”" +msgstr "Erro ao resolver “%s”" #: ../gio/gtlscertificate.c:250 msgid "Cannot decrypt PEM-encoded private key" @@ -3874,7 +4103,7 @@ msgstr "Erro ao ler do descritor de arquivo: %s" msgid "Error closing file descriptor: %s" msgstr "Erro ao fechar o descritor de arquivo: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 msgid "Filesystem root" msgstr "Sistema de arquivos root" @@ -3890,14 +4119,16 @@ msgstr "" "sistema" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +#| msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "volume não implementa ejetar" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" +#| msgid "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" msgstr "volume não implementa eject ou eject_with_operation" #: ../gio/gwin32inputstream.c:185 @@ -3959,26 +4190,30 @@ msgstr "Args. incorretos\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" -msgstr "Atributo \"%s\" inesperado para o elemento \"%s\"" +#| msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" +msgstr "Atributo “%s” inesperado para o elemento “%s”" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" -msgstr "Atributo \"%s\" do elemento \"%s\" não localizado" +#| msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" +msgstr "Atributo “%s” do elemento “%s” não localizado" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" -msgstr "Marca \"%s\" inesperada, esperava marca \"%s\"" +#| msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" +msgstr "Marca “%s” inesperada, esperava marca “%s”" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" -msgstr "Marca \"%s\" inesperada dentro de \"%s\"" +#| msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" +msgstr "Marca “%s” inesperada dentro de “%s”" #: ../glib/gbookmarkfile.c:1757 msgid "No valid bookmark file found in data dirs" @@ -3987,8 +4222,9 @@ msgstr "" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" -msgstr "Já existe um marcador para o URI \"%s\"" +#| msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s” already exists" +msgstr "Já existe um marcador para o URI “%s”" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 #: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327 @@ -4000,33 +4236,39 @@ msgstr "Já existe um marcador para o URI \"%s\"" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" -msgstr "Nenhum marcador localizado para o URI \"%s\"" +#| msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%s”" +msgstr "Nenhum marcador localizado para o URI “%s”" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" -msgstr "Não foi definido tipo MIME no marcador para o URI \"%s\"" +#| msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%s”" +msgstr "Não foi definido tipo MIME no marcador para o URI “%s”" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" -msgstr "Não foi definido sinal de particular no marcador para o URI \"%s\"" +#| msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%s”" +msgstr "Não foi definido sinal de particular no marcador para o URI “%s”" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" -msgstr "Não há grupos definidos no marcador para o URI \"%s\"" +#| msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%s”" +msgstr "Não há grupos definidos no marcador para o URI “%s”" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" -msgstr "Nenhum aplicativo chamado \"%s\" registrou um marcador para \"%s\"" +#| msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" +msgstr "Nenhum aplicativo chamado “%s” registrou um marcador para “%s”" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" -msgstr "Falha em expandir linha de execução \"%s\" com URI \"%s\"" +#| msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" +msgstr "Falha em expandir linha de execução “%s” com URI “%s”" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 #: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304 @@ -4035,39 +4277,45 @@ msgstr "Sequência de caracteres parcial no final da entrada" #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" -msgstr "" -"Não é possível converter a sequência \"%s\" para conjunto caracteres \"%s\"" +#| msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" +msgstr "Não é possível converter a sequência “%s” para conjunto caracteres “%s”" #: ../glib/gconvert.c:1567 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" -msgstr "O URI \"%s\" não é um URI absoluto que utilize o esquema \"file\"" +#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" +msgstr "O URI “%s” não é um URI absoluto que utilize o esquema “file”" #: ../glib/gconvert.c:1577 #, c-format -msgid "The local file URI '%s' may not include a '#'" -msgstr "O URI de arquivo local \"%s\" não pode incluir um \"#\"" +#| msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" +msgstr "O URI de arquivo local “%s” não pode incluir um “#”" #: ../glib/gconvert.c:1594 #, c-format -msgid "The URI '%s' is invalid" -msgstr "O URI \"%s\" é inválido" +#| msgid "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" +msgstr "O URI “%s” é inválido" #: ../glib/gconvert.c:1606 #, c-format -msgid "The hostname of the URI '%s' is invalid" -msgstr "O nome de servidor do URI \"%s\" é inválido" +#| msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" +msgstr "O nome de servidor do URI “%s” é inválido" #: ../glib/gconvert.c:1622 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" -msgstr "O URI \"%s\" contém caracteres com escape inválido" +#| msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" +msgstr "O URI “%s” contém caracteres com escape inválido" #: ../glib/gconvert.c:1717 #, c-format -msgid "The pathname '%s' is not an absolute path" -msgstr "O nome de caminho \"%s\" não é um caminho absoluto" +#| msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" +msgstr "O nome de caminho “%s” não é um caminho absoluto" #: ../glib/gconvert.c:1727 msgid "Invalid hostname" @@ -4292,7 +4540,7 @@ msgstr "sex" #: ../glib/gdatetime.c:339 msgctxt "abbreviated weekday name" msgid "Sat" -msgstr "sab" +msgstr "sáb" #: ../glib/gdatetime.c:341 msgctxt "abbreviated weekday name" @@ -4301,93 +4549,112 @@ msgstr "dom" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" -msgstr "Erro ao abrir o diretório \"%s\": %s" +#| msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" +msgstr "Erro ao abrir o diretório “%s”: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" -msgstr[0] "Não foi possível alocar %lu byte para ler arquivo \"%s\"" -msgstr[1] "Não foi possível alocar %lu bytes para ler arquivo \"%s\"" +#| msgid "Could not allocate %lu byte to read file \"%s\"" +#| msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" +msgstr[0] "Não foi possível alocar %lu byte para ler arquivo “%s”" +msgstr[1] "Não foi possível alocar %lu bytes para ler arquivo “%s”" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" -msgstr "Erro ao ler arquivo \"%s\": %s" +#| msgid "Error reading file %s: %s" +msgid "Error reading file “%s”: %s" +msgstr "Ocorreu erro ao ler arquivo “%s”: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" -msgstr "Arquivo \"%s\" é muito grande" +#| msgid "File \"%s\" is too large" +msgid "File “%s” is too large" +msgstr "Arquivo “%s” é muito grande" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" -msgstr "Falha ao ler do arquivo \"%s\": %s" +#| msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" +msgstr "Falha ao ler do arquivo “%s”: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" -msgstr "Falha ao abrir arquivo \"%s\": %s" +#| msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" +msgstr "Falha ao abrir arquivo “%s”: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" -msgstr "Falha ao obter atributos do arquivo \"%s\": fstat() falhou: %s" +#| msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" +msgstr "Falha ao obter atributos do arquivo “%s”: fstat() falhou: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" -msgstr "Falha ao abrir arquivo \"%s\": fdopen() falhou: %s" +#| msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" +msgstr "Falha ao abrir arquivo “%s”: fdopen() falhou: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" -msgstr "Falha ao renomear arquivo \"%s\" para \"%s\": g_rename() falhou: %s" +#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" +msgstr "Falha ao renomear arquivo “%s” para “%s”: g_rename() falhou: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" -msgstr "Falha ao criar arquivo \"%s\": %s" +#| msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" +msgstr "Falha ao criar arquivo “%s”: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" -msgstr "Falha ao gravar o arquivo \"%s\": write() falhou: %s" +#| msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" +msgstr "Falha ao gravar o arquivo “%s”: write() falhou: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" -msgstr "Falha ao gravar o arquivo \"%s\": fsync() falhou: %s" +#| msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" +msgstr "Falha ao gravar o arquivo “%s”: fsync() falhou: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" -msgstr "O arquivo \"%s\" não pôde ser removido: g_unlink() falhou: %s" +#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" +msgstr "O arquivo “%s” não pôde ser removido: g_unlink() falhou: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" -msgstr "Modelo \"%s\" inválido, não deveria conter um \"%s\"" +#| msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" +msgstr "Modelo “%s” inválido, não deveria conter um “%s”" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" -msgstr "Modelo \"%s\" não contém XXXXXX" +#| msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" +msgstr "Modelo “%s” não contém XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" -msgstr "Falha ao ler link simbólico \"%s\": %s" +#| msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" +msgstr "Falha ao ler link simbólico “%s”: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" -msgstr "Não foi possível abrir conversor de \"%s\" para \"%s\": %s" +#| msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" +msgstr "Não foi possível abrir conversor de “%s” para “%s”: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +#| msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "" "Não é possível fazer uma leitura em bruto em g_io_channel_read_line_string" @@ -4401,7 +4668,8 @@ msgid "Channel terminates in a partial character" msgstr "Canal termina em um caractere parcial" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +#| msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Não é possível fazer uma leitura em bruto de g_io_channel_read_to_end" #: ../glib/gkeyfile.c:737 @@ -4415,11 +4683,14 @@ msgstr "Não é um arquivo comum" #: ../glib/gkeyfile.c:1204 #, c-format +#| msgid "" +#| "Key file contains line '%s' which is not a key-value pair, group, or " +#| "comment" msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" -"Arquivo de chave contém a linha \"%s\" que não é um par chave-valor, grupo " -"ou comentário" +"Arquivo de chave contém a linha “%s” que não é um par chave-valor, grupo ou " +"comentário" #: ../glib/gkeyfile.c:1261 #, c-format @@ -4437,46 +4708,56 @@ msgstr "Nome de chave inválido: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" -msgstr "Arquivo de chave contém codificação \"%s\" sem suporte" +#| msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" +msgstr "Arquivo de chave contém codificação “%s” sem suporte" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" -msgstr "Arquivo de chave não tem grupo \"%s\"" +#| msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" +msgstr "Arquivo de chave não tem grupo “%s”" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" -msgstr "Arquivo de chave não tem chave \"%s\" no grupo \"%s\"" +#| msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" +msgstr "Arquivo de chave não tem chave “%s” no grupo “%s”" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" -msgstr "Arquivo de chave contém chave \"%s\" com valor \"%s\" que não é UTF-8" +#| msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" +msgstr "Arquivo de chave contém chave “%s” com valor “%s” que não é UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format +#| msgid "" +#| "Key file contains key '%s' which has a value that cannot be interpreted." msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" -"Arquivo de chave contém chave \"%s\" cujo valor não pode ser interpretado." +"Arquivo de chave contém chave “%s” cujo valor não pode ser interpretado." #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format +#| msgid "" +#| "Key file contains key '%s' in group '%s' which has a value that cannot be " +#| "interpreted." msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" -"Arquivo de chave contém chave \"%s\" no grupo \"%s\" que tem um valor que " -"não pode ser interpretado." +"Arquivo de chave contém chave “%s” no grupo “%s” que tem um valor que não " +"pode ser interpretado." #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" -msgstr "Chave \"%s\" no grupo \"%s\" tem o valor \"%s\" onde %s era esperado" +#| msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" +msgstr "Chave “%s” no grupo “%s” tem o valor “%s” onde %s era esperado" #: ../glib/gkeyfile.c:4133 msgid "Key file contains escape character at end of line" @@ -4484,43 +4765,50 @@ msgstr "Arquivo de chave contém caractere de escape no fim da linha" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" -msgstr "Arquivo de chave contém sequência de escape \"%s\" inválida" +#| msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" +msgstr "Arquivo de chave contém sequência de escape “%s” inválida" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." -msgstr "O valor \"%s\" não pode ser interpretado como um número." +#| msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." +msgstr "O valor “%s” não pode ser interpretado como um número." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" -msgstr "Valor inteiro \"%s\" fora dos limites" +#| msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" +msgstr "Valor inteiro “%s” fora dos limites" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." -msgstr "O valor \"%s\" não pode ser interpretado como ponto flutuante." +#| msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." +msgstr "O valor “%s” não pode ser interpretado como ponto flutuante." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." -msgstr "O valor \"%s\" não pode ser interpretado como um booleano." +#| msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." +msgstr "O valor “%s” não pode ser interpretado como um booleano." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" -msgstr "Falha ao obter atributos do arquivo \"%s%s%s%s\": fstat() falhou: %s" +#| msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" +msgstr "Falha ao obter atributos do arquivo “%s%s%s%s”: fstat() falhou: %s" #: ../glib/gmappedfile.c:195 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" -msgstr "Falha ao mapear arquivo \"%s%s%s%s\": mmap() falhou: %s" +msgstr "Falha ao mapear arquivo “%s%s%s%s”: mmap() falhou: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" -msgstr "Falha ao abrir arquivo \"%s\": open() falhou: %s" +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" +msgstr "Falha ao abrir arquivo “%s”: open() falhou: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 #, c-format @@ -4693,8 +4981,8 @@ msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" msgstr "" -"Documento terminou inesperadamente, esperava-se ver um sinal de maior (\">" -"\") para terminar a marca <%s/>" +"Documento terminou inesperadamente, esperava-se ver um sinal de maior (\">\")" +" para terminar a marca <%s/>" #: ../glib/gmarkup.c:1797 msgid "Document ended unexpectedly inside an element name" @@ -4736,8 +5024,9 @@ msgstr "" "processamento" #: ../glib/goption.c:861 -msgid "[OPTION...]" -msgstr "[OPÇÃO...]" +#| msgid "[OPTION...]" +msgid "[OPTION…]" +msgstr "[OPÇÃO…]" #: ../glib/goption.c:977 msgid "Help Options:" @@ -4761,24 +5050,28 @@ msgstr "Opções:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" -msgstr "Não é possível converter o valor inteiro \"%s\" para %s" +#| msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" +msgstr "Não é possível converter o valor inteiro “%s” para %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" -msgstr "Valor inteiro \"%s\" para %s fora dos limites" +#| msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" +msgstr "Valor inteiro “%s” para %s fora dos limites" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +#| msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "" -"Não é possível converter o ponto flutuante com dupla precisão \"%s\" para %s" +"Não é possível converter o ponto flutuante com dupla precisão “%s” para %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" -msgstr "Ponto flutuante com dupla precisão \"%s\" para %s fora dos limites" +#| msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" +msgstr "Ponto flutuante com dupla precisão “%s” para %s fora dos limites" #: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format @@ -4899,7 +5192,7 @@ msgstr "classes nomeadas POSIX têm suporte apenas dentro de uma classe" #: ../glib/gregex.c:367 msgid "missing terminating )" -msgstr "terminação ) em falta" +msgstr "faltando terminação )" #: ../glib/gregex.c:370 msgid "reference to non-existent subpattern" @@ -4907,7 +5200,7 @@ msgstr "referência a subpadrão não existente" #: ../glib/gregex.c:373 msgid "missing ) after comment" -msgstr "\")\" em falta após o comentário" +msgstr "faltando ) após o comentário" #: ../glib/gregex.c:376 msgid "regular expression is too large" @@ -4950,7 +5243,7 @@ msgstr "esperava-se declaração após (?(" #. #: ../glib/gregex.c:410 msgid "(?R or (?[+-]digits must be followed by )" -msgstr "\"(?R\" ou \"(?[+-]digitos\" devem ser seguidos por )" +msgstr "(?R ou (?[+-]dígitos devem ser seguidos por )" #: ../glib/gregex.c:413 msgid "unknown POSIX class name" @@ -5099,7 +5392,7 @@ msgstr "nome é muito cumprido em (*MARK), (*PRUNE), (*SKIP) ou (*THEN)" #: ../glib/gregex.c:523 msgid "character value in \\u.... sequence is too large" -msgstr "valor de caractere na sequência \\u... é grande demais" +msgstr "valor de caractere na sequência \\u.... é grande demais" #: ../glib/gregex.c:746 ../glib/gregex.c:1977 #, c-format @@ -5129,16 +5422,18 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Erro ao compilar expressão regular %s no caractere %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" -msgstr "esperava-se dígito hexadecimal ou \"}\"" +#| msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" +msgstr "esperava-se dígito hexadecimal ou “}”" #: ../glib/gregex.c:2429 msgid "hexadecimal digit expected" msgstr "esperava-se dígito hexadecimal" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" -msgstr "\"<\" em falta na referência simbólica" +#| msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" +msgstr "“<” em falta na referência simbólica" #: ../glib/gregex.c:2478 msgid "unfinished symbolic reference" @@ -5157,8 +5452,9 @@ msgid "illegal symbolic reference" msgstr "referência simbólica ilegal" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" -msgstr "\"\\\" final errado" +#| msgid "stray final '\\'" +msgid "stray final “\\”" +msgstr "“\\” final errado" #: ../glib/gregex.c:2580 msgid "unknown escape sequence" @@ -5166,11 +5462,13 @@ msgstr "sequência de escape desconhecida" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" -msgstr "Erro ao analisar texto de substituição \"%s\" no caractere %lu: %s" +#| msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" +msgstr "Erro ao analisar texto de substituição “%s” no caractere %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +#| msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Texto citado não começa com uma aspa" #: ../glib/gshell.c:186 @@ -5179,15 +5477,18 @@ msgstr "Aspa sem par na linha de comando ou outro texto de console" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" -msgstr "Texto terminou logo após um caractere \"\\\". (O texto era \"%s\")" +#| msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" +msgstr "Texto terminou logo após um caractere “\\”. (O texto era “%s”)" #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +#| msgid "" +#| "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Texto terminou antes da aspa equivalente ter sido localizada para %c. (texto " -"era \"%s\")" +"era “%s”)" #: ../glib/gshell.c:601 msgid "Text was empty (or contained only whitespace)" @@ -5240,13 +5541,15 @@ msgstr "Falha no fork (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" -msgstr "Falha ao ir para diretório \"%s\" (%s)" +#| msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" +msgstr "Falha ao ir para diretório “%s” (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" -msgstr "Falha ao executar processo filho \"%s\" (%s)" +#| msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" +msgstr "Falha ao executar processo filho “%s” (%s)" #: ../glib/gspawn.c:1510 #, c-format @@ -5260,8 +5563,9 @@ msgstr "Falha no fork de processo filho (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" -msgstr "Erro desconhecido ao executar processo filho \"%s\"" +#| msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" +msgstr "Erro desconhecido ao executar processo filho “%s”" #: ../glib/gspawn.c:1551 #, c-format @@ -5419,6 +5723,15 @@ msgstr[1] "%s bytes" msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Erro ao criar o diretório \"%s\": %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Erro ao abrir arquivo \"%s\": %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Erro ao ler arquivo \"%s\": %s" + #~ msgid "Error renaming file: %s" #~ msgstr "Erro ao renomear arquivo: %s" @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-10-06 20:10+0000\n" -"PO-Revision-Date: 2016-10-06 23:07+0200\n" +"POT-Creation-Date: 2016-10-12 19:31+0000\n" +"PO-Revision-Date: 2016-10-24 17:54+0200\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -34,7 +34,7 @@ msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "Gå in i GApplication-serviceläge (användning från D-Bus-servicefil)" #: ../gio/gapplication.c:550 -msgid "Override the application's ID" +msgid "Override the application’s ID" msgstr "Åsidosätt programmets ID" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 @@ -74,7 +74,7 @@ msgid "Launch the application (with optional files to open)" msgstr "Starta programmet (med frivilliga filer att öppna)" #: ../gio/gapplication-tool.c:57 -msgid "APPID [FILE...]" +msgid "APPID [FILE…]" msgstr "APPID [FIL…]" #: ../gio/gapplication-tool.c:59 @@ -159,8 +159,8 @@ msgstr "Användning:\n" msgid "Arguments:\n" msgstr "Argument:\n" -#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 -msgid "[ARGS...]" +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" msgstr "[ARGUMENT…]" #: ../gio/gapplication-tool.c:134 @@ -172,10 +172,10 @@ msgstr "Kommandon:\n" #: ../gio/gapplication-tool.c:146 #, c-format msgid "" -"Use '%s help COMMAND' to get detailed help.\n" +"Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Använd '%s help KOMMANDO' för att få detaljerad hjälp.\n" +"Använd ”%s help KOMMANDO” för att få detaljerad hjälp.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -189,14 +189,14 @@ msgstr "" #: ../gio/gapplication-tool.c:171 #, c-format -msgid "invalid application id: '%s'\n" +msgid "invalid application id: “%s”\n" msgstr "ogiltigt program-ID: ”%s”\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 #, c-format msgid "" -"'%s' takes no arguments\n" +"“%s” takes no arguments\n" "\n" msgstr "" "”%s” tar inga argument\n" @@ -220,8 +220,8 @@ msgstr "åtgärdsnamn måste ges efter program-ID\n" #: ../gio/gapplication-tool.c:325 #, c-format msgid "" -"invalid action name: '%s'\n" -"action names must consist of only alphanumerics, '-' and '.'\n" +"invalid action name: “%s”\n" +"action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" "ogiltigt åtgärdsnamn: ”%s”\n" "åtgärdsnamn måste bestå av enbart alfanumeriska, ”-” och ”.”\n" @@ -321,12 +321,12 @@ msgstr "Avbrytningsbar initiering stöds inte" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 #, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "Konvertering från teckentabellen ”%s” till ”%s” stöds inte" #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 #, c-format -msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s” to “%s”" msgstr "Kunde inte öppna konverteraren från ”%s” till ”%s”" #: ../gio/gcontenttype.c:335 @@ -366,41 +366,41 @@ msgstr "Oväntat tidig end-of-stream" #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 #: ../gio/gdbusaddress.c:322 #, c-format -msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nyckeln ”%s” stöds inte i adressposten ”%s”" #: ../gio/gdbusaddress.c:180 #, c-format msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" "Adressen ”%s” är ogiltig (behöver exakt en av sökväg, temporärkatalog eller " "abstrakta nycklar)" #: ../gio/gdbusaddress.c:193 #, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Betydelselös kombination av nyckel/värde-par i adressposten ”%s”" #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 #, c-format -msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s” — the port attribute is malformed" msgstr "Fel i adressen ”%s” — portattributet är felformulerat" #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 #, c-format -msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s” — the family attribute is malformed" msgstr "Fel i adressen ”%s” — familjeattributet är felformulerat" #: ../gio/gdbusaddress.c:457 #, c-format -msgid "Address element '%s' does not contain a colon (:)" +msgid "Address element “%s” does not contain a colon (:)" msgstr "Adresselementet ”%s” innehåller inte ett kolontecken (:)" #: ../gio/gdbusaddress.c:478 #, c-format msgid "" -"Key/Value pair %d, '%s', in address element '%s' does not contain an equal " +"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" "Nyckel/Värde-par %d, ”%s”, i adresselementet ”%s” innehåller inte ett " @@ -409,8 +409,8 @@ msgstr "" #: ../gio/gdbusaddress.c:492 #, c-format msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%s”, in address element " +"“%s”" msgstr "" "Fel vid borttagning av escape i nyckel eller värde i Nyckel/Värde-par %d, " "”%s”, i adresselementet ”%s”" @@ -418,25 +418,25 @@ msgstr "" #: ../gio/gdbusaddress.c:570 #, c-format msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s” — the unix transport requires exactly one of the keys " +"“path” or “abstract” to be set" msgstr "" "Fel i adressen ”%s” — unix-transporten kräver att exakt en av nycklarna " "”path” eller ”abstract” har ställts in" #: ../gio/gdbusaddress.c:606 #, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Fel i adressen ”%s” — värdattributet saknas eller är felformulerat" #: ../gio/gdbusaddress.c:620 #, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Fel i adressen ”%s” — portattributet saknas eller är felformulerat" #: ../gio/gdbusaddress.c:634 #, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Fel i adressen ”%s” — attributet noncefile saknas eller är felformulerat" @@ -446,27 +446,27 @@ msgstr "Fel vid automatisk körning: " #: ../gio/gdbusaddress.c:663 #, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transport ”%s” är okänd eller saknar stöd för adress ”%s”" #: ../gio/gdbusaddress.c:699 #, c-format -msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%s”: %s" msgstr "Fel vid öppning av nonce-filen ”%s”: %s" #: ../gio/gdbusaddress.c:717 #, c-format -msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%s”: %s" msgstr "Fel vid läsning från nonce-filen ”%s”: %s" #: ../gio/gdbusaddress.c:726 #, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Fel vid läsning från nonce-filen ”%s”, förväntade 16 byte, fick %d" #: ../gio/gdbusaddress.c:744 #, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Fel vid skrivning av innehåll i nonce-filen ”%s” till ström:" #: ../gio/gdbusaddress.c:951 @@ -489,7 +489,7 @@ msgstr "Kan inte starta D-Bus automatiskt utan X11-miljövariabeln $DISPLAY" #: ../gio/gdbusaddress.c:1120 #, c-format -msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%s”: " msgstr "Fel vid körning av kommandoraden ”%s”: " #: ../gio/gdbusaddress.c:1337 @@ -513,7 +513,7 @@ msgstr "" #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%s”" msgstr "" "Kan inte fastställa bussadressen från miljövariabeln DBUS_STARTER_BUS_TYPE — " "okänt värde ”%s”" @@ -553,36 +553,36 @@ msgstr "Avbröts via GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%s”: %s" msgstr "Fel vid hämtning av information för katalogen ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:273 #, c-format msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" -"Rättigheter på katalogen ”%s” är felformulerad. Förväntade rättigheten 0700, " -"fick 0%o" +"Rättigheter på katalogen ”%s” är felformulerade. Förväntade rättigheten " +"0700, fick 0%o" #: ../gio/gdbusauthmechanismsha1.c:294 #, c-format -msgid "Error creating directory '%s': %s" +msgid "Error creating directory “%s”: %s" msgstr "Fel vid skapandet av katalogen ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:377 #, c-format -msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s” for reading: " msgstr "Fel vid öppnandet av nyckelringen ”%s” för läsning: " #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 #, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Rad %d av nyckelringen vid ”%s” med innehåll ”%s” är felformulerad" #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 #, c-format msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "Första token på rad %d av nyckelringen i ”%s” med innehållet ”%s” är " "felformulerad" @@ -590,44 +590,44 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "Andra token på rad %d av nyckelringen i ”%s” med innehållet ”%s” är " "felformulerad" #: ../gio/gdbusauthmechanismsha1.c:454 #, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Hittade inte kaka med id %d i nyckelringen vid ”%s”" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%s”: %s" msgstr "Fel vid borttagning av gamla låsfilen ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%s”: %s" msgstr "Fel vid skapandet av låsfilen ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Fel vid stängning av (avlänkad) låsfil ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%s”: %s" msgstr "Fel vid avlänkning av låsfilen ”%s”: %s" #: ../gio/gdbusauthmechanismsha1.c:681 #, c-format -msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s” for writing: " msgstr "Fel vid öppning av nyckelringen ”%s” för skrivning: " #: ../gio/gdbusauthmechanismsha1.c:878 #, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(I tillägg misslyckades även upplåsningen för ”%s”: %s) " #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 @@ -648,35 +648,35 @@ msgstr "" #: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456 #, c-format msgid "" -"No such interface 'org.freedesktop.DBus.Properties' on object at path %s" +"No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Inget sådant gränssnitt ”org.freedesktop.DBus.Properties” på objekt med " "sökvägen %s" #: ../gio/gdbusconnection.c:4251 #, c-format -msgid "No such property '%s'" +msgid "No such property “%s”" msgstr "Ingen sådan egenskap ”%s”" #: ../gio/gdbusconnection.c:4263 #, c-format -msgid "Property '%s' is not readable" +msgid "Property “%s” is not readable" msgstr "Egenskapen ”%s” är inte läsbar" #: ../gio/gdbusconnection.c:4274 #, c-format -msgid "Property '%s' is not writable" +msgid "Property “%s” is not writable" msgstr "Egenskapen ”%s” är inte skrivbar" #: ../gio/gdbusconnection.c:4294 #, c-format -msgid "Error setting property '%s': Expected type '%s' but got '%s'" +msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Fel vid inställning av egenskapen ”%s”: Förväntade typen ”%s” men fick ”%s”" #: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573 #, c-format -msgid "No such interface '%s'" +msgid "No such interface “%s”" msgstr "Inget sådan gränssnitt ”%s”" #: ../gio/gdbusconnection.c:4607 @@ -685,17 +685,17 @@ msgstr "Inget sådant gränssnitt" #: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082 #, c-format -msgid "No such interface '%s' on object at path %s" +msgid "No such interface “%s” on object at path %s" msgstr "Inget sådant gränssnitt ”%s” på objekt med sökvägen %s" #: ../gio/gdbusconnection.c:4923 #, c-format -msgid "No such method '%s'" +msgid "No such method “%s”" msgstr "Ingen sådan metod ”%s”" #: ../gio/gdbusconnection.c:4954 #, c-format -msgid "Type of message, '%s', does not match expected type '%s'" +msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Typ av meddelande, ”%s”, matchar inte förväntade typen ”%s”" #: ../gio/gdbusconnection.c:5152 @@ -715,12 +715,12 @@ msgstr "Kunde inte sätta egenskap %s.%s" #: ../gio/gdbusconnection.c:5610 #, c-format -msgid "Method '%s' returned type '%s', but expected '%s'" +msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metoden ”%s” returnerade typen ”%s”, men förväntade ”%s”" #: ../gio/gdbusconnection.c:6684 #, c-format -msgid "Method '%s' on interface '%s' with signature '%s' does not exist" +msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metoden ”%s” på gränssnittet ”%s” med signaturen ”%s” finns inte" #: ../gio/gdbusconnection.c:6805 @@ -773,14 +773,14 @@ msgstr[1] "Ville läsa %lu byte men fick bara %lu" #: ../gio/gdbusmessage.c:1369 #, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Förväntade NUL byte efter strängen ”%s” men hittade byte %d" #: ../gio/gdbusmessage.c:1388 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%s”" msgstr "" "Förväntade giltig UTF-8-sträng men hittade ogiltiga byte vid byte-offset %d " "(längd av strängen är %d). Den giltiga UTF-8-strängen fram till den punkten " @@ -788,12 +788,12 @@ msgstr "" #: ../gio/gdbusmessage.c:1587 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-objektsökväg" #: ../gio/gdbusmessage.c:1609 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-signatur" #: ../gio/gdbusmessage.c:1656 @@ -810,7 +810,7 @@ msgstr[1] "" #: ../gio/gdbusmessage.c:1676 #, c-format msgid "" -"Encountered array of type 'a%c', expected to have a length a multiple of %u " +"Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" "Påträffade array av typ ”a%c”, förväntad att ha en längd som är en multipel " @@ -818,13 +818,13 @@ msgstr "" #: ../gio/gdbusmessage.c:1843 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Tolkat värde ”%s” för variant är inte en giltig D-Bus-signatur" #: ../gio/gdbusmessage.c:1867 #, c-format msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Fel vid deserialisering av GVariant med typsträngen ”%s” från D-Bus-" "transportformatet" @@ -832,10 +832,10 @@ msgstr "" #: ../gio/gdbusmessage.c:2051 #, c-format msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Ogiltigt värde för bitordning. Förväntade 0x6c ('l') eller 0x42 ('B') men " +"Ogiltigt värde för byteordning. Förväntade 0x6c (”l”) eller 0x42 (”B”) men " "hittade värdet 0x%02x" #: ../gio/gdbusmessage.c:2064 @@ -845,13 +845,13 @@ msgstr "Ogiltig större protokollversion. Förväntade 1 men hittade %d" #: ../gio/gdbusmessage.c:2120 #, c-format -msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s” found but message body is empty" msgstr "" -"Signaturrubrik med signaturen ”%s” hittades med meddelandekroppen är tom" +"Signaturrubrik med signaturen ”%s” hittades men meddelandekroppen är tom" #: ../gio/gdbusmessage.c:2134 #, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-signatur (för kropp)" #: ../gio/gdbusmessage.c:2164 @@ -868,7 +868,7 @@ msgstr "Kan inte deserialisera meddelande: " #: ../gio/gdbusmessage.c:2515 #, c-format msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Fel vid serialisering av GVariant med typsträngen ”%s” till D-Bus-" "transportformatet" @@ -886,27 +886,27 @@ msgstr "Kan inte serialisera meddelandet: " #: ../gio/gdbusmessage.c:2704 #, c-format -msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Meddelandekroppen har signaturen ”%s” men det finns ingen signaturrubrik" #: ../gio/gdbusmessage.c:2714 #, c-format msgid "" -"Message body has type signature '%s' but signature in the header field is " -"'%s'" +"Message body has type signature “%s” but signature in the header field is " +"“%s”" msgstr "" "Meddelandekroppen har typsignaturen ”%s” men signaturen i rubrikfältet är " "”%s”" #: ../gio/gdbusmessage.c:2730 #, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Meddelandekroppen är tom men signaturen i rubrikfältet är ”(%s)”" #: ../gio/gdbusmessage.c:3283 #, c-format -msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%s”" msgstr "Fel returnerades med kropp av typen ”%s”" #: ../gio/gdbusmessage.c:3291 @@ -950,18 +950,18 @@ msgstr "Kan inte ange nonce-filen när en server skapas" #: ../gio/gdbusserver.c:873 #, c-format -msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%s”: %s" msgstr "Fel vid skrivning av nonce-fil i ”%s”: %s" #: ../gio/gdbusserver.c:1044 #, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Strängen ”%s” är inte ett giltigt D-Bus GUID" #: ../gio/gdbusserver.c:1084 #, c-format -msgid "Cannot listen on unsupported transport '%s'" -msgstr "Kan inte lyssna på transport som inte stöds ”%s”" +msgid "Cannot listen on unsupported transport “%s”" +msgstr "Kan inte lyssna på transport ”%s” som inte stöds" #: ../gio/gdbus-tool.c:95 #, c-format @@ -973,7 +973,7 @@ msgid "" " call Invoke a method on a remote object\n" " emit Emit a signal\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help” to get help on each command.\n" msgstr "" "Kommandon:\n" " help Visar denna information\n" @@ -1034,14 +1034,14 @@ msgstr "Flera anslutningsändpunkter har angivits" #: ../gio/gdbus-tool.c:471 #, c-format msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Varning: Enligt introspektionsdata finns inte gränssnittet ”%s”\n" #: ../gio/gdbus-tool.c:480 #, c-format msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s” does not exist on " +"interface “%s”\n" msgstr "" "Varning: Enligt introspektionsdata finns inte metoden ”%s” på gränssnittet " "”%s”\n" @@ -1157,12 +1157,12 @@ msgstr "Fel: Metodnamnet är inte angivet\n" #: ../gio/gdbus-tool.c:950 #, c-format -msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s” is invalid\n" msgstr "Fel: Metodnamnet ”%s” är ogiltigt\n" #: ../gio/gdbus-tool.c:1028 #, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Fel vid tolkning av parameter %d av typen ”%s”: %s\n" #: ../gio/gdbus-tool.c:1472 @@ -1206,7 +1206,7 @@ msgid "Unnamed" msgstr "Namnlös" #: ../gio/gdesktopappinfo.c:2404 -msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "Skrivbordsfilen angav inget Exec-fält" #: ../gio/gdesktopappinfo.c:2689 @@ -1215,12 +1215,12 @@ msgstr "Kunde inte hitta terminal som krävs för programmet" #: ../gio/gdesktopappinfo.c:3097 #, c-format -msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "Kan inte skapa programkonfigurationsmapp för användare %s: %s" #: ../gio/gdesktopappinfo.c:3101 #, c-format -msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Kan inte skapa MIME-konfigurationsmapp för användare %s: %s" #: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 @@ -1229,7 +1229,7 @@ msgstr "Programinformation saknar en identifierare" #: ../gio/gdesktopappinfo.c:3599 #, c-format -msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "Kan inte skapa skrivbordsfil för användare %s" #: ../gio/gdesktopappinfo.c:3733 @@ -1238,26 +1238,26 @@ msgid "Custom definition for %s" msgstr "Anpassad definition för %s" #: ../gio/gdrive.c:417 -msgid "drive doesn't implement eject" -msgstr "enheten har inte implementerat utmatning" +msgid "drive doesn’t implement eject" +msgstr "enheten har inte implementerat eject" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "enheten har inte implementerat eject eller eject_with_operation" #: ../gio/gdrive.c:571 -msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "enheten har inte implementerat pollning av media" #: ../gio/gdrive.c:776 -msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "enheten har inte implementerat start" #: ../gio/gdrive.c:878 -msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "enheten har inte implementerat stop" #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 @@ -1271,7 +1271,7 @@ msgstr "DTLS-stöd finns inte tillgängligt" #: ../gio/gemblem.c:323 #, c-format -msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Kan inte hantera version %d av GEmblem-kodning" #: ../gio/gemblem.c:333 @@ -1281,7 +1281,7 @@ msgstr "Felformaterat antal token (%d) i GEmblem-kodning" #: ../gio/gemblemedicon.c:362 #, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Kan inte hantera version %d av GEmblemedIcon-kodning" #: ../gio/gemblemedicon.c:372 @@ -1313,12 +1313,12 @@ msgstr "Åtgärden stöds inte" msgid "Containing mount does not exist" msgstr "Innefattande montering finns inte" -#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +msgid "Can’t copy over directory" msgstr "Kan inte kopiera över katalog" #: ../gio/gfile.c:2575 -msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Kan inte kopiera katalog över katalog" #: ../gio/gfile.c:2583 @@ -1326,7 +1326,7 @@ msgid "Target file exists" msgstr "Målfilen finns" #: ../gio/gfile.c:2602 -msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Kan inte kopiera katalogen rekursivt" #: ../gio/gfile.c:2884 @@ -1347,11 +1347,11 @@ msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopiering (reflänk/klon) stöds inte eller är ogiltigt" #: ../gio/gfile.c:3028 -msgid "Copy (reflink/clone) is not supported or didn't work" +msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Kopiering (reflänk/klon) stöds inte eller fungerade inte" #: ../gio/gfile.c:3091 -msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Kan inte kopiera specialfil" #: ../gio/gfile.c:3885 @@ -1364,11 +1364,11 @@ msgstr "Papperskorgen stöds inte" #: ../gio/gfile.c:4158 #, c-format -msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%c”" msgstr "Filnamn får inte innehålla ”%c”" #: ../gio/gfile.c:6604 ../gio/gvolume.c:363 -msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "volymen har inte implementerat montering" #: ../gio/gfile.c:6713 @@ -1386,11 +1386,11 @@ msgstr "Filnumreraren har kvarstående åtgärd" #: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467 msgid "File enumerator is already closed" -msgstr "Filnumreraren är redan strängd" +msgstr "Filnumreraren är redan stängd" #: ../gio/gfileicon.c:236 #, c-format -msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Kan inte hantera version %d av GFileIcon-kodning" #: ../gio/gfileicon.c:246 @@ -1400,7 +1400,7 @@ msgstr "Felformaterad inmatningsdata för GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "Strömmen saknar stöd för query_info" #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 @@ -1472,7 +1472,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typen %s implementerar inte from_tokens() på GIcon-gränssnittet" #: ../gio/gicon.c:461 -msgid "Can't handle the supplied version of the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Kan inte hantera angiven version av ikonkodningen" #: ../gio/ginetaddressmask.c:182 @@ -1490,7 +1490,7 @@ msgstr "Adress har bitar inställda utanför prefixlängden" #: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s” as IP address mask" msgstr "Kunde inte tolka ”%s” som IP-adressmask" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 @@ -1503,7 +1503,7 @@ msgid "Unsupported socket address" msgstr "Uttagsadressen stöds inte" #: ../gio/ginputstream.c:188 -msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "Inmatningsströmmen har inte implementerat läsning" #. Translators: This is an error you get if there is already an @@ -1526,7 +1526,7 @@ msgid "Keep with file when moved" msgstr "Behåll med filen vid flyttning" #: ../gio/gio-tool.c:187 -msgid "'version' takes no arguments" +msgid "“version” takes no arguments" msgstr "”version” tar inga argument" #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 @@ -1537,6 +1537,10 @@ msgstr "Användning:" msgid "Print version information and exit." msgstr "Skriv ut versionsinformation och avsluta." +#: ../gio/gio-tool.c:206 +msgid "[ARGS...]" +msgstr "[ARGUMENT…]" + #: ../gio/gio-tool.c:208 msgid "Commands:" msgstr "Kommandon:" @@ -1702,7 +1706,7 @@ msgstr "Målet %s är inte en katalog" #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 #, c-format -msgid "%s: overwrite '%s'? " +msgid "%s: overwrite “%s”? " msgstr "%s: skriv över ”%s”? " #: ../gio/gio-tool-info.c:34 @@ -1722,7 +1726,7 @@ msgid "ATTRIBUTES" msgstr "ATTRIBUT" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -msgid "Don't follow symbolic links" +msgid "Don’t follow symbolic links" msgstr "Följ inte symboliska länkar" #: ../gio/gio-tool-info.c:75 @@ -1792,7 +1796,7 @@ msgid "" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location. File attributes can\n" "be specified with their GIO name, e.g. standard::icon, or just by\n" -"namespace, e.g. unix, or by '*', which matches all attributes" +"namespace, e.g. unix, or by “*”, which matches all attributes" msgstr "" "gio info liknar det traditionella ls-verktyget, men använder\n" "GIO-platser istället för lokala filer: exempelvis kan du använda något\n" @@ -1861,12 +1865,12 @@ msgstr "Måste ange en ensam mime-typ, och kanske en hanterare" #: ../gio/gio-tool-mime.c:113 #, c-format -msgid "No default applications for '%s'\n" +msgid "No default applications for “%s”\n" msgstr "Inga standardprogram för ”%s”\n" #: ../gio/gio-tool-mime.c:119 #, c-format -msgid "Default application for '%s': %s\n" +msgid "Default application for “%s”: %s\n" msgstr "Standardprogram för ”%s”: %s\n" #: ../gio/gio-tool-mime.c:124 @@ -1891,12 +1895,12 @@ msgstr "Inga rekommenderade program\n" #: ../gio/gio-tool-mime.c:159 #, c-format -msgid "Failed to load info for handler '%s'\n" +msgid "Failed to load info for handler “%s”\n" msgstr "Misslyckades med att läsa in information för hanteraren ”%s”\n" #: ../gio/gio-tool-mime.c:165 #, c-format -msgid "Failed to set '%s' as the default handler for '%s': %s\n" +msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" "Misslyckades med att ställa in ”%s” som standardhanterare för ”%s”: %s\n" @@ -1931,7 +1935,7 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Övervaka en fil direkt (upptäcker ändringar gjorda via hårda länkar)" #: ../gio/gio-tool-monitor.c:43 -msgid "Monitors a file directly, but doesn't report changes" +msgid "Monitors a file directly, but doesn’t report changes" msgstr "Övervakar en fil direkt men rapporterar inte ändringar" #: ../gio/gio-tool-monitor.c:45 @@ -2041,7 +2045,7 @@ msgid "Mount or unmount the locations." msgstr "Montera eller avmontera platserna." #: ../gio/gio-tool-move.c:42 -msgid "Don't use copy and delete fallback" +msgid "Don’t use copy and delete fallback" msgstr "Fall inte tillbaka på kopiera och ta bort" #: ../gio/gio-tool-move.c:99 @@ -2228,17 +2232,17 @@ msgstr "Filen %s finns på flera ställen i resursen" #: ../gio/glib-compile-resources.c:248 #, c-format -msgid "Failed to locate '%s' in any source directory" +msgid "Failed to locate “%s” in any source directory" msgstr "Misslyckades med att hitta ”%s” i någon källkatalog" #: ../gio/glib-compile-resources.c:259 #, c-format -msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s” in current directory" msgstr "Misslyckades med att hitta ”%s” i aktuell katalog" #: ../gio/glib-compile-resources.c:290 #, c-format -msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%s”" msgstr "Okänd behandlingsflagga ”%s”" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 @@ -2302,11 +2306,11 @@ msgid "name of the dependency file to generate" msgstr "namn på beroendefilen att generera" #: ../gio/glib-compile-resources.c:629 -msgid "Don't automatically create and register resource" +msgid "Don’t automatically create and register resource" msgstr "Skapa och registrera inte resursen automatiskt" #: ../gio/glib-compile-resources.c:630 -msgid "Don't export functions; declare them G_GNUC_INTERNAL" +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Exportera inte funktioner; deklarera dem som G_GNUC_INTERNAL" #: ../gio/glib-compile-resources.c:631 @@ -2334,31 +2338,31 @@ msgstr "tomma namn tillåts inte" #: ../gio/glib-compile-schemas.c:794 #, c-format -msgid "invalid name '%s': names must begin with a lowercase letter" +msgid "invalid name “%s”: names must begin with a lowercase letter" msgstr "ogiltigt namn ”%s”: namn måste börja med en liten bokstav" #: ../gio/glib-compile-schemas.c:806 #, c-format msgid "" -"invalid name '%s': invalid character '%c'; only lowercase letters, numbers " -"and hyphen ('-') are permitted." +"invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " +"and hyphen (“-”) are permitted." msgstr "" "ogiltigt namn ”%s”: ogiltigt tecken ”%c”; endast gemena bokstäver, siffror " "och bindestreck (”-”) tillåts." #: ../gio/glib-compile-schemas.c:815 #, c-format -msgid "invalid name '%s': two successive hyphens ('--') are not permitted." +msgid "invalid name “%s”: two successive hyphens (“--”) are not permitted." msgstr "ogiltigt namn ”%s”: två efterföljande bindestreck (”--”) tillåts inte." #: ../gio/glib-compile-schemas.c:824 #, c-format -msgid "invalid name '%s': the last character may not be a hyphen ('-')." +msgid "invalid name “%s”: the last character may not be a hyphen (“-”)." msgstr "ogiltigt namn ”%s”: sista tecknet får inte vara ett bindestreck (”-”)." #: ../gio/glib-compile-schemas.c:832 #, c-format -msgid "invalid name '%s': maximum length is 1024" +msgid "invalid name “%s”: maximum length is 1024" msgstr "ogiltigt namn ”%s”: maximal längd är 1024" #: ../gio/glib-compile-schemas.c:901 @@ -2367,7 +2371,7 @@ msgid "<child name='%s'> already specified" msgstr "<child name='%s'> redan angiven" #: ../gio/glib-compile-schemas.c:927 -msgid "cannot add keys to a 'list-of' schema" +msgid "cannot add keys to a “list-of” schema" msgstr "kan inte lägga till nycklar till ett ”list-of”-schema" #: ../gio/glib-compile-schemas.c:938 @@ -2387,7 +2391,7 @@ msgstr "" #: ../gio/glib-compile-schemas.c:967 #, c-format msgid "" -"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute " +"exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" msgstr "" "exakt en av ”type”, ”enum” eller ”flags” måste anges som ett attribut till " @@ -2400,11 +2404,11 @@ msgstr "<%s id='%s'> inte (ännu) angiven." #: ../gio/glib-compile-schemas.c:1001 #, c-format -msgid "invalid GVariant type string '%s'" +msgid "invalid GVariant type string “%s”" msgstr "ogiltig GVariant-typsträng ”%s”" #: ../gio/glib-compile-schemas.c:1031 -msgid "<override> given but schema isn't extending anything" +msgid "<override> given but schema isn’t extending anything" msgstr "<override> angavs men schemat utökar inte någonting" #: ../gio/glib-compile-schemas.c:1044 @@ -2424,12 +2428,12 @@ msgstr "<schema id='%s'> redan angiven" #: ../gio/glib-compile-schemas.c:1137 #, c-format -msgid "<schema id='%s'> extends not yet existing schema '%s'" +msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> utökar ännu inte befintliga schemat ”%s”" #: ../gio/glib-compile-schemas.c:1153 #, c-format -msgid "<schema id='%s'> is list of not yet existing schema '%s'" +msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> är listad av ännu inte befintliga schemat ”%s”" #: ../gio/glib-compile-schemas.c:1161 @@ -2453,8 +2457,8 @@ msgstr "" #: ../gio/glib-compile-schemas.c:1191 #, c-format msgid "" -"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' " -"does not extend '%s'" +"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " +"does not extend “%s”" msgstr "" "<schema id='%s' list-of='%s'> utökar <schema id='%s' list-of='%s'> men ”%s” " "utökar inte ”%s”" @@ -2466,7 +2470,7 @@ msgstr "en sökväg, om angiven, måste börja och sluta med ett snedstreck" #: ../gio/glib-compile-schemas.c:1215 #, c-format -msgid "the path of a list must end with ':/'" +msgid "the path of a list must end with “:/”" msgstr "sökvägen för en lista måste sluta med ”:/”" #: ../gio/glib-compile-schemas.c:1247 @@ -2503,7 +2507,7 @@ msgstr "Ignorerar denna fil.\n" #: ../gio/glib-compile-schemas.c:1901 #, c-format -msgid "No such key '%s' in schema '%s' as specified in override file '%s'" +msgid "No such key “%s” in schema “%s” as specified in override file “%s”" msgstr "" "Ingen sådan nyckel ”%s” i schemat ”%s” som angetts i åsidosättningsfilen ”%s”" @@ -2522,7 +2526,7 @@ msgstr " och --strict angavs; avslutar.\n" #: ../gio/glib-compile-schemas.c:1927 #, c-format msgid "" -"error parsing key '%s' in schema '%s' as specified in override file '%s': %s." +"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s." msgstr "" "fel vid tolkning av nyckeln ”%s” i schemat ”%s” som angetts i " "åsidosättningsfilen ”%s”: %s." @@ -2535,7 +2539,7 @@ msgstr "Ignorerar åsidosättning för denna nyckel.\n" #: ../gio/glib-compile-schemas.c:1955 #, c-format msgid "" -"override for key '%s' in schema '%s' in override file '%s' is outside the " +"override for key “%s” in schema “%s” in override file “%s” is outside the " "range given in the schema" msgstr "" "åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” är " @@ -2544,7 +2548,7 @@ msgstr "" #: ../gio/glib-compile-schemas.c:1983 #, c-format msgid "" -"override for key '%s' in schema '%s' in override file '%s' is not in the " +"override for key “%s” in schema “%s” in override file “%s” is not in the " "list of valid choices" msgstr "" "åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” " @@ -2596,133 +2600,133 @@ msgstr "gör ingenting.\n" msgid "removed existing output file.\n" msgstr "tog bort befintlig utmatningsfil.\n" -#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Ogiltigt filnamn %s" -#: ../gio/glocalfile.c:1036 +#: ../gio/glocalfile.c:1037 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Fel vid hämtning av filsystemsinformation för %s: %s" -#: ../gio/glocalfile.c:1175 +#: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" msgstr "Innefattande montering för filen %s hittades inte" -#: ../gio/glocalfile.c:1198 -msgid "Can't rename root directory" +#: ../gio/glocalfile.c:1199 +msgid "Can’t rename root directory" msgstr "Kan inte byta namn på rotkatalog" -#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 #, c-format msgid "Error renaming file %s: %s" msgstr "Fel vid namnbyte av filen %s: %s" -#: ../gio/glocalfile.c:1223 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +msgid "Can’t rename file, filename already exists" msgstr "Kan inte byta namn på filen, filnamnet finns redan" -#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 -#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 #, c-format msgid "Error opening file %s: %s" msgstr "Fel vid öppning av filen %s: %s" -#: ../gio/glocalfile.c:1543 +#: ../gio/glocalfile.c:1544 #, c-format msgid "Error removing file %s: %s" msgstr "Fel vid borttagning av filen %s: %s" -#: ../gio/glocalfile.c:1926 +#: ../gio/glocalfile.c:1927 #, c-format msgid "Error trashing file %s: %s" msgstr "Fel vid kastande av filen %s: %s" -#: ../gio/glocalfile.c:1949 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Kunde inte skapa papperskorgskatalogen %s: %s" -#: ../gio/glocalfile.c:1969 +#: ../gio/glocalfile.c:1970 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Kunde inte hitta toppnivåkatalog för att kasta %s" -#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 #, c-format msgid "Unable to find or create trash directory for %s" msgstr "Kunde inte hitta eller skapa papperskorgskatalog för %s" -#: ../gio/glocalfile.c:2102 +#: ../gio/glocalfile.c:2103 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Kunde inte skapa fil med information om vad som kastats för %s: %s" -#: ../gio/glocalfile.c:2161 +#: ../gio/glocalfile.c:2162 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Kunde inte kasta filen %s över filsystemsgränser" -#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format msgid "Unable to trash file %s: %s" msgstr "Kunde inte kasta filen %s: %s" -#: ../gio/glocalfile.c:2227 +#: ../gio/glocalfile.c:2228 #, c-format msgid "Unable to trash file %s" msgstr "Kunde inte kasta filen %s" -#: ../gio/glocalfile.c:2253 +#: ../gio/glocalfile.c:2254 #, c-format msgid "Error creating directory %s: %s" msgstr "Fel vid skapandet av katalogen %s: %s" -#: ../gio/glocalfile.c:2282 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filsystemet saknar stöd för symboliska länkar" -#: ../gio/glocalfile.c:2285 +#: ../gio/glocalfile.c:2286 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Fel vid skapande av symboliska länken %s: %s" -#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 msgid "Symbolic links not supported" msgstr "Symboliska länkar stöds inte" -#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format msgid "Error moving file %s: %s" msgstr "Fel vid flyttning av filen %s: %s" -#: ../gio/glocalfile.c:2369 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +msgid "Can’t move directory over directory" msgstr "Kan inte flytta katalog över katalog" -#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Misslyckades med att skapa säkerhetskopiefil" -#: ../gio/glocalfile.c:2414 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Fel vid borttagning av målfil: %s" -#: ../gio/glocalfile.c:2428 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Flyttning mellan monteringar stöds inte" -#: ../gio/glocalfile.c:2619 +#: ../gio/glocalfile.c:2620 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Kunde inte bestämma diskanvändningen för %s: %s" @@ -2741,7 +2745,7 @@ msgstr "Ogiltigt utökat attributnamn" #: ../gio/glocalfileinfo.c:775 #, c-format -msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%s”: %s" msgstr "Fel vid inställning av utökat attribut ”%s”: %s" #: ../gio/glocalfileinfo.c:1575 @@ -2750,7 +2754,7 @@ msgstr " (ogiltig kodning)" #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 #, c-format -msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%s”: %s" msgstr "Fel vid hämtning av information om filen ”%s”: %s" #: ../gio/glocalfileinfo.c:2017 @@ -2872,7 +2876,7 @@ msgstr "Fel vid kapning av fil: %s" #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 #, c-format -msgid "Error opening file '%s': %s" +msgid "Error opening file “%s”: %s" msgstr "Fel vid öppning av filen ”%s”: %s" #: ../gio/glocalfileoutputstream.c:816 @@ -2932,54 +2936,54 @@ msgstr "Begärde sökning bortom slutet av strömmen" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmount”" msgstr "mount har inte implementerat ”unmount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “eject”" msgstr "mount har inte implementerat ”eject”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "mount har inte implementerat ”unmount” eller ”unmount_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "mount har inte implementerat ”eject” eller ”eject_with_operation”" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remount”" msgstr "mount har inte implementerat ”remount”" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "mount har inte implementerat estimering av innehållstyp" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "mount har inte implementerat synkron estimering av innehållstyp" #: ../gio/gnetworkaddress.c:378 #, c-format -msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s” contains “[” but not “]”" msgstr "Värdnamnet ”%s” innehåller ”[” men inte ”]”" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 @@ -3010,7 +3014,7 @@ msgid "NetworkManager version too old" msgstr "Nätverkshanterare är för gammal" #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 -msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "Utmatningsström har inte implementerat skrivning" #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 @@ -3020,7 +3024,7 @@ msgstr "Källströmmen är redan stängd" #: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -msgid "Error resolving '%s': %s" +msgid "Error resolving “%s”: %s" msgstr "Fel vid uppslag av ”%s”: %s" #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 @@ -3028,21 +3032,21 @@ msgstr "Fel vid uppslag av ”%s”: %s" #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format -msgid "The resource at '%s' does not exist" +msgid "The resource at “%s” does not exist" msgstr "Resursen på ”%s” finns inte" #: ../gio/gresource.c:760 #, c-format -msgid "The resource at '%s' failed to decompress" +msgid "The resource at “%s” failed to decompress" msgstr "Resursen på ”%s” gick inte att dekomprimera" #: ../gio/gresourcefile.c:709 #, c-format -msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s” is not a directory" msgstr "Resursen på ”%s” är inte en katalog" #: ../gio/gresourcefile.c:917 -msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "Inmatningsströmmen har inte implementerat spolning" #: ../gio/gresource-tool.c:494 @@ -3091,7 +3095,7 @@ msgstr "FIL SÖKVÄG" #: ../gio/gresource-tool.c:534 msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3100,7 +3104,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND” to get detailed help.\n" "\n" msgstr "" "Användning:\n" @@ -3170,17 +3174,17 @@ msgstr " SÖKVÄG En resurssökväg\n" #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 #: ../gio/gsettings-tool.c:851 #, c-format -msgid "No such schema '%s'\n" +msgid "No such schema “%s”\n" msgstr "Inget sådant schema ”%s”\n" #: ../gio/gsettings-tool.c:57 #, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "Schemat ”%s” är inte flyttbart (sökvägen får inte anges)\n" #: ../gio/gsettings-tool.c:78 #, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "Schemat ”%s” är flyttbart (sökvägen måste anges)\n" #: ../gio/gsettings-tool.c:92 @@ -3302,7 +3306,7 @@ msgstr "SCHEMA[:SÖKVÄG] [NYCKEL]" msgid "" "Usage:\n" " gsettings --version\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -3320,7 +3324,7 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND” to get detailed help.\n" "\n" msgstr "" "Användning:\n" @@ -3402,7 +3406,7 @@ msgstr "Tomt schemanamn angavs\n" #: ../gio/gsettings-tool.c:864 #, c-format -msgid "No such key '%s'\n" +msgid "No such key “%s”\n" msgstr "Ingen sådan nyckel ”%s”\n" #: ../gio/gsocket.c:364 @@ -3571,7 +3575,7 @@ msgstr "Att skicka via proxy över en icke-TCP-anslutning stöds inte." #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 #, c-format -msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s” is not supported." msgstr "Proxyprotokollet ”%s” stöds inte." #: ../gio/gsocketlistener.c:218 @@ -3584,7 +3588,7 @@ msgstr "Tillagt uttag är stängt" #: ../gio/gsocks4aproxy.c:118 #, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 saknar stöd för IPv6-adressen ”%s”" #: ../gio/gsocks4aproxy.c:136 @@ -3593,7 +3597,7 @@ msgstr "Användarnamnet är för långt för SOCKSv4-protokollet" #: ../gio/gsocks4aproxy.c:153 #, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "Värdnamnet ”%s” är för långt för SOCKSv4-protokollet" #: ../gio/gsocks4aproxy.c:179 @@ -3631,7 +3635,7 @@ msgstr "" #: ../gio/gsocks5proxy.c:286 #, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "Värdnamnet ”%s” är för långt för SOCKSv5-protokollet" #: ../gio/gsocks5proxy.c:348 @@ -3659,7 +3663,7 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Anslutningen nekades genom SOCKSv5-proxyservern." #: ../gio/gsocks5proxy.c:386 -msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect” command." msgstr "SOCKSv5-proxyservern saknar stöd för kommandot ”connect”." #: ../gio/gsocks5proxy.c:392 @@ -3672,7 +3676,7 @@ msgstr "Okänt fel i SOCKSv5-proxyserver." #: ../gio/gthemedicon.c:518 #, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Kan inte hantera version %d av GThemedIcon-kodning" #: ../gio/gthreadedresolver.c:118 @@ -3681,23 +3685,23 @@ msgstr "Inga giltiga adresser hittades" #: ../gio/gthreadedresolver.c:213 #, c-format -msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%s”: %s" msgstr "Fel vid omvänt uppslag av ”%s”: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 #, c-format -msgid "No DNS record of the requested type for '%s'" +msgid "No DNS record of the requested type for “%s”" msgstr "Inga DNS-poster av den begärda typen för ”%s”" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format -msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%s”" msgstr "Kan för tillfället inte slå upp ”%s”" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -msgid "Error resolving '%s'" +msgid "Error resolving “%s”" msgstr "Fel vid uppslag av ”%s”" #: ../gio/gtlscertificate.c:250 @@ -3804,7 +3808,7 @@ msgstr "Fel vid läsning från filhandtag: %s" msgid "Error closing file descriptor: %s" msgstr "Fel vid stängning av filhandtag: %s" -#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 +#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 msgid "Filesystem root" msgstr "Filsystemsrot" @@ -3818,15 +3822,15 @@ msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "Abstrakta UNIX-domänuttagsadresser stöds inte på detta system" #: ../gio/gvolume.c:437 -msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "volymen har inte implementerat eject" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -msgid "volume doesn't implement eject or eject_with_operation" -msgstr "volume har inte implementerat eject eller eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" +msgstr "volymen har inte implementerat eject eller eject_with_operation" #: ../gio/gwin32inputstream.c:185 #, c-format @@ -3887,25 +3891,25 @@ msgstr "Fel argument\n" #: ../glib/gbookmarkfile.c:755 #, c-format -msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s” for element “%s”" msgstr "Oväntat attribut ”%s” för elementet ”%s”" #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 #, c-format -msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s” of element “%s” not found" msgstr "Attributet ”%s” för elementet ”%s” hittades inte" #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 #, c-format -msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Oväntad tagg ”%s”, taggen ”%s” förväntades" #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 #: ../glib/gbookmarkfile.c:1231 #, c-format -msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s” inside “%s”" msgstr "Oväntad tagg ”%s” inom ”%s”" #: ../glib/gbookmarkfile.c:1757 @@ -3914,8 +3918,8 @@ msgstr "Ingen giltig bokmärkesfil hittades i datakataloger" #: ../glib/gbookmarkfile.c:1958 #, c-format -msgid "A bookmark for URI '%s' already exists" -msgstr "Ett bokmärke för uri ”%s” finns redan" +msgid "A bookmark for URI “%s” already exists" +msgstr "Ett bokmärke för URI ”%s” finns redan" #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 #: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327 @@ -3927,32 +3931,32 @@ msgstr "Ett bokmärke för uri ”%s” finns redan" #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 #: ../glib/gbookmarkfile.c:3639 #, c-format -msgid "No bookmark found for URI '%s'" -msgstr "Inget bokmärke hittades för uri ”%s”" +msgid "No bookmark found for URI “%s”" +msgstr "Inget bokmärke hittades för URI ”%s”" #: ../glib/gbookmarkfile.c:2336 #, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" -msgstr "Ingen Mime-typ definierad i bokmärket för uri ”%s”" +msgid "No MIME type defined in the bookmark for URI “%s”" +msgstr "Ingen Mime-typ definierad i bokmärket för URI ”%s”" #: ../glib/gbookmarkfile.c:2421 #, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" -msgstr "Ingen privat flagga har definierats i bokmärket för uri ”%s”" +msgid "No private flag has been defined in bookmark for URI “%s”" +msgstr "Ingen privat flagga har definierats i bokmärket för URI ”%s”" #: ../glib/gbookmarkfile.c:2800 #, c-format -msgid "No groups set in bookmark for URI '%s'" -msgstr "Inga grupper inställda i bokmärket för uri ”%s”" +msgid "No groups set in bookmark for URI “%s”" +msgstr "Inga grupper inställda i bokmärket för URI ”%s”" #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 #, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Inget program med namnet ”%s” registrerade ett bokmärke för ”%s”" #: ../glib/gbookmarkfile.c:3378 #, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Misslyckades med att expandera exec-raden ”%s” med URI ”%s”" #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 @@ -3963,37 +3967,37 @@ msgstr "Ofullständig teckensekvens vid slutet av indata" # fallback syftar på en sträng #: ../glib/gconvert.c:742 #, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "Kan inte konvertera reservsträngen ”%s” till kodningen ”%s”" #: ../glib/gconvert.c:1567 #, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "URI:n ”%s” är ingen absolut URI som använder ”file”-schemat" #: ../glib/gconvert.c:1577 #, c-format -msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s” may not include a “#”" msgstr "Lokala fil-URI:n ”%s” får inte innehålla en ”#”" #: ../glib/gconvert.c:1594 #, c-format -msgid "The URI '%s' is invalid" +msgid "The URI “%s” is invalid" msgstr "URI:n ”%s” är ogiltig" #: ../glib/gconvert.c:1606 #, c-format -msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s” is invalid" msgstr "Värdnamnet i URI:n ”%s” är ogiltigt" #: ../glib/gconvert.c:1622 #, c-format -msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s” contains invalidly escaped characters" msgstr "URI:n ”%s” innehåller ogiltigt kodade tecken" #: ../glib/gconvert.c:1717 #, c-format -msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s” is not an absolute path" msgstr "Sökvägen ”%s” är ingen absolut sökväg" #: ../glib/gconvert.c:1727 @@ -4228,97 +4232,97 @@ msgstr "Sön" #: ../glib/gdir.c:155 #, c-format -msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%s”: %s" msgstr "Fel vid öppning av katalogen ”%s”: %s" #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 #, c-format -msgid "Could not allocate %lu byte to read file \"%s\"" -msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%s”" +msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr[0] "Kunde inte allokera %lu byte för att läsa filen ”%s”" msgstr[1] "Kunde inte allokera %lu byte för att läsa filen ”%s”" #: ../glib/gfileutils.c:718 #, c-format -msgid "Error reading file '%s': %s" +msgid "Error reading file “%s”: %s" msgstr "Fel vid läsning av filen ”%s”: %s" #: ../glib/gfileutils.c:754 #, c-format -msgid "File \"%s\" is too large" +msgid "File “%s” is too large" msgstr "Filen ”%s” är för stor" #: ../glib/gfileutils.c:818 #, c-format -msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%s”: %s" msgstr "Misslyckades med att läsa från filen ”%s”: %s" #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 #, c-format -msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%s”: %s" msgstr "Misslyckades med att öppna filen ”%s”: %s" #: ../glib/gfileutils.c:878 #, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Misslyckades med att få tag på attributen på filen ”%s”: fstat() " "misslyckades: %s" #: ../glib/gfileutils.c:908 #, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Misslyckades med att öppna filen ”%s”: fdopen() misslyckades: %s" #: ../glib/gfileutils.c:1007 #, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Misslyckades med att byta namn på filen ”%s” till ”%s”: g_rename() " "misslyckades: %s" #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 #, c-format -msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%s”: %s" msgstr "Misslyckades med att skapa filen ”%s”: %s" #: ../glib/gfileutils.c:1069 #, c-format -msgid "Failed to write file '%s': write() failed: %s" +msgid "Failed to write file “%s”: write() failed: %s" msgstr "Misslyckades med att skriva filen ”%s”: write() misslyckades: %s" #: ../glib/gfileutils.c:1112 #, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Misslyckades med att skriva filen ”%s”: fsync() misslyckades: %s" #: ../glib/gfileutils.c:1236 #, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Befintliga filen ”%s” kunde inte tas bort: g_unlink() misslyckades: %s" #: ../glib/gfileutils.c:1507 #, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Mallen ”%s” är ogiltig, den får inte innehålla ett ”%s”" #: ../glib/gfileutils.c:1520 #, c-format -msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Mallen ”%s” innehåller inte XXXXXX" #: ../glib/gfileutils.c:2045 #, c-format -msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%s”: %s" msgstr "Misslyckades med att läsa den symboliska länken ”%s”: %s" #: ../glib/giochannel.c:1388 #, c-format -msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Kunde inte öppna konverteraren från ”%s” till ”%s”: %s" #: ../glib/giochannel.c:1733 -msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Kan inte göra en rå läsning i g_io_channel_read_line_string" #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 @@ -4331,7 +4335,7 @@ msgid "Channel terminates in a partial character" msgstr "Kanalen slutar med ett ofullständigt tecken" #: ../glib/giochannel.c:1924 -msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Kan inte göra en rå läsning i g_io_channel_read_to_end" #: ../glib/gkeyfile.c:737 @@ -4345,7 +4349,7 @@ msgstr "Inte en vanlig fil" #: ../glib/gkeyfile.c:1204 #, c-format msgid "" -"Key file contains line '%s' which is not a key-value pair, group, or comment" +"Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "Nyckelfilen innehåller raden ”%s” som inte är ett nyckel-värde-par, grupp " "eller kommentar" @@ -4366,30 +4370,30 @@ msgstr "Ogiltigt nyckelnamn: %s" #: ../glib/gkeyfile.c:1336 #, c-format -msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%s”" msgstr "Nyckelfilen innehåller kodningen ”%s” som inte stöds" #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 #, c-format -msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%s”" msgstr "Nyckelfilen har inte gruppen ”%s”" #: ../glib/gkeyfile.c:1707 #, c-format -msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s” in group “%s”" msgstr "Nyckelfilen har inte nyckeln ”%s” i gruppen ”%s”" #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 #, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Nyckelfilen innehåller nyckeln ”%s” med värdet ”%s” som inte är UTF-8" #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 #, c-format msgid "" -"Key file contains key '%s' which has a value that cannot be interpreted." +"Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Nyckelfilen innehåller nyckeln ”%s” som innehåller ett värde som inte kan " "tolkas." @@ -4397,7 +4401,7 @@ msgstr "" #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 #, c-format msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." msgstr "" "Nyckelfilen innehåller nyckeln ”%s” i gruppen ”%s” vilken innehåller ett " @@ -4405,7 +4409,7 @@ msgstr "" #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Nyckeln ”%s” i gruppen ”%s” innehåller värdet ”%s” där %s förväntades" #: ../glib/gkeyfile.c:4133 @@ -4414,32 +4418,32 @@ msgstr "Nyckelfilen innehåller kontrolltecken i slutet på en rad" #: ../glib/gkeyfile.c:4155 #, c-format -msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%s”" msgstr "Nyckelfilen innehåller ogiltiga kontrollsekvensen ”%s”" #: ../glib/gkeyfile.c:4297 #, c-format -msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s” cannot be interpreted as a number." msgstr "Värdet ”%s” kan inte tolkas som ett tal." #: ../glib/gkeyfile.c:4311 #, c-format -msgid "Integer value '%s' out of range" +msgid "Integer value “%s” out of range" msgstr "Heltalsvärdet ”%s” är utanför intervallet" #: ../glib/gkeyfile.c:4344 #, c-format -msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s” cannot be interpreted as a float number." msgstr "Värdet ”%s” kan inte tolkas som ett flyttal." #: ../glib/gkeyfile.c:4383 #, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Värdet ”%s” kan inte tolkas som ett booleskt värde." #: ../glib/gmappedfile.c:129 #, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Misslyckades med att få attribut för filen ”%s%s%s%s”: fstat() misslyckades: " "%s" @@ -4451,7 +4455,7 @@ msgstr "Misslyckades med att mappa %s%s%s%s: mmap() misslyckades: %s" #: ../glib/gmappedfile.c:262 #, c-format -msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%s”: open() failed: %s" msgstr "Misslyckades med att öppna filen ”%s”: open() misslyckades: %s" #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 @@ -4461,17 +4465,17 @@ msgstr "Fel på rad %d tecken %d: " #: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545 #, c-format -msgid "Invalid UTF-8 encoded text in name - not valid '%s'" +msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Ogiltig UTF-8-kodad text i namnet — inte giltig ”%s”" #: ../glib/gmarkup.c:473 #, c-format -msgid "'%s' is not a valid name" +msgid "“%s” is not a valid name" msgstr "”%s” är inte ett giltigt namn" #: ../glib/gmarkup.c:489 #, c-format -msgid "'%s' is not a valid name: '%c'" +msgid "“%s” is not a valid name: “%c”" msgstr "”%s” är inte ett giltigt namn: ”%c”" #: ../glib/gmarkup.c:599 @@ -4482,8 +4486,8 @@ msgstr "Fel på rad %d: %s" #: ../glib/gmarkup.c:676 #, c-format msgid "" -"Failed to parse '%-.*s', which should have been a digit inside a character " -"reference (ê for example) - perhaps the digit is too large" +"Failed to parse “%-.*s”, which should have been a digit inside a character " +"reference (ê for example) — perhaps the digit is too large" msgstr "" "Misslyckades med att tolka ”%-.*s”, som skulle ha varit en siffra inuti en " "teckenreferens (ê till exempel). Siffran är kanske för stor" @@ -4491,7 +4495,7 @@ msgstr "" #: ../glib/gmarkup.c:688 msgid "" "Character reference did not end with a semicolon; most likely you used an " -"ampersand character without intending to start an entity - escape ampersand " +"ampersand character without intending to start an entity — escape ampersand " "as &" msgstr "" "Teckenreferensen slutade inte med ett semikolon. Troligtvis använde du ett &-" @@ -4499,25 +4503,25 @@ msgstr "" #: ../glib/gmarkup.c:714 #, c-format -msgid "Character reference '%-.*s' does not encode a permitted character" +msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Teckenreferensen ”%-.*s” kodar inte ett tillåtet tecken" #: ../glib/gmarkup.c:752 msgid "" -"Empty entity '&;' seen; valid entities are: & " < > '" +"Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Tom entitet ”&;” hittades, giltiga entiteter är: & " < > " "'" #: ../glib/gmarkup.c:760 #, c-format -msgid "Entity name '%-.*s' is not known" +msgid "Entity name “%-.*s” is not known" msgstr "Entitetsnamnet ”%-.*s” är okänt" #: ../glib/gmarkup.c:765 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " -"character without intending to start an entity - escape ampersand as &" +"character without intending to start an entity — escape ampersand as &" msgstr "" "Entiteten slutade inte med ett semikolon. Troligtvis använde du ett &-tecken " "utan att avse att starta en entitet. Skriv om &-tecknet som &" @@ -4529,7 +4533,7 @@ msgstr "Dokumentet måste börja med ett element (exempelvis <book>)" #: ../glib/gmarkup.c:1211 #, c-format msgid "" -"'%s' is not a valid character following a '<' character; it may not begin an " +"“%s” is not a valid character following a “<” character; it may not begin an " "element name" msgstr "" "”%s” är inte ett giltigt tecken efter ett ”<”-tecken. Det får inte inleda " @@ -4538,16 +4542,16 @@ msgstr "" #: ../glib/gmarkup.c:1253 #, c-format msgid "" -"Odd character '%s', expected a '>' character to end the empty-element tag " -"'%s'" +"Odd character “%s”, expected a “>” character to end the empty-element tag " +"“%s”" msgstr "" -"Konstigt tecken ”%s”, ett ”>”-tecken förväntades för att avsluta taggen " -"empty-element ”%s”" +"Konstigt tecken ”%s”, ett ”>”-tecken förväntades för att avsluta tomma " +"elementtaggen ”%s”" #: ../glib/gmarkup.c:1334 #, c-format msgid "" -"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'" +"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "Konstigt tecken ”%s”, ett ”=” förväntades efter attributnamnet ”%s” till " "elementet ”%s”" @@ -4555,8 +4559,8 @@ msgstr "" #: ../glib/gmarkup.c:1375 #, c-format msgid "" -"Odd character '%s', expected a '>' or '/' character to end the start tag of " -"element '%s', or optionally an attribute; perhaps you used an invalid " +"Odd character “%s”, expected a “>” or “/” character to end the start tag of " +"element “%s”, or optionally an attribute; perhaps you used an invalid " "character in an attribute name" msgstr "" "Konstigt tecken ”%s”, ett ”>”- eller ”/”-tecken förväntades för att avsluta " @@ -4566,8 +4570,8 @@ msgstr "" #: ../glib/gmarkup.c:1419 #, c-format msgid "" -"Odd character '%s', expected an open quote mark after the equals sign when " -"giving value for attribute '%s' of element '%s'" +"Odd character “%s”, expected an open quote mark after the equals sign when " +"giving value for attribute “%s” of element “%s”" msgstr "" "Konstigt tecken ”%s”, ett startcitationstecken förväntades efter " "likhetstecknet när värdet av attributet ”%s” till elementet ”%s” tilldelades" @@ -4575,7 +4579,7 @@ msgstr "" #: ../glib/gmarkup.c:1552 #, c-format msgid "" -"'%s' is not a valid character following the characters '</'; '%s' may not " +"“%s” is not a valid character following the characters “</”; “%s” may not " "begin an element name" msgstr "" "”%s” är inte ett giltigt tecken efter tecknen ”</”. ”%s” får inte inleda ett " @@ -4584,20 +4588,20 @@ msgstr "" #: ../glib/gmarkup.c:1588 #, c-format msgid "" -"'%s' is not a valid character following the close element name '%s'; the " -"allowed character is '>'" +"“%s” is not a valid character following the close element name “%s”; the " +"allowed character is “>”" msgstr "" "”%s” är inte ett giltigt tecken efter stängelementnamnet ”%s”. Det tillåtna " "tecknet är ”>”" #: ../glib/gmarkup.c:1599 #, c-format -msgid "Element '%s' was closed, no element is currently open" +msgid "Element “%s” was closed, no element is currently open" msgstr "Elementet ”%s” stängdes, inget element är öppet för tillfället" #: ../glib/gmarkup.c:1608 #, c-format -msgid "Element '%s' was closed, but the currently open element is '%s'" +msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Elementet ”%s” stängdes, men det element som är öppet för tillfället är ”%s”" @@ -4606,13 +4610,13 @@ msgid "Document was empty or contained only whitespace" msgstr "Dokumentet var tomt eller innehöll endast tomrum" #: ../glib/gmarkup.c:1775 -msgid "Document ended unexpectedly just after an open angle bracket '<'" +msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokumentet tog oväntat slut efter ett öppningsklammer ”<”" #: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828 #, c-format msgid "" -"Document ended unexpectedly with elements still open - '%s' was the last " +"Document ended unexpectedly with elements still open — “%s” was the last " "element opened" msgstr "" "Dokumentet tog oväntat slut då element fortfarande var öppna. ”%s” var det " @@ -4653,7 +4657,7 @@ msgstr "Dokumentet tog oväntat slut inuti ett attributvärde" #: ../glib/gmarkup.c:1837 #, c-format -msgid "Document ended unexpectedly inside the close tag for element '%s'" +msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumentet tog oväntat slut inuti stängningstaggen för elementet ”%s”" #: ../glib/gmarkup.c:1843 @@ -4662,7 +4666,7 @@ msgstr "" "Dokumentet tog oväntat slut inuti en kommentar eller behandlingsinstruktion" #: ../glib/goption.c:861 -msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[FLAGGA…]" #: ../glib/goption.c:977 @@ -4687,22 +4691,22 @@ msgstr "Flaggor:" #: ../glib/goption.c:1113 ../glib/goption.c:1183 #, c-format -msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s” for %s" msgstr "Kan inte tolka heltalsvärdet ”%s” för %s" #: ../glib/goption.c:1123 ../glib/goption.c:1191 #, c-format -msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s” for %s out of range" msgstr "Heltalsvärdet ”%s” för %s är utanför intervallet" #: ../glib/goption.c:1148 #, c-format -msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s” for %s" msgstr "Kan inte tolka dubbelvärdet ”%s” för %s" #: ../glib/goption.c:1156 #, c-format -msgid "Double value '%s' for %s out of range" +msgid "Double value “%s” for %s out of range" msgstr "Dubbelvärdet ”%s” för %s är utanför intervallet" #: ../glib/goption.c:1448 ../glib/goption.c:1527 @@ -5049,7 +5053,7 @@ msgid "Error while compiling regular expression %s at char %d: %s" msgstr "Fel vid kompilering av reguljära uttrycket %s vid tecknet %d: %s" #: ../glib/gregex.c:2413 -msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}” expected" msgstr "hexadecimal siffra eller ”}” förväntades" #: ../glib/gregex.c:2429 @@ -5057,7 +5061,7 @@ msgid "hexadecimal digit expected" msgstr "hexadecimal siffra förväntades" #: ../glib/gregex.c:2469 -msgid "missing '<' in symbolic reference" +msgid "missing “<” in symbolic reference" msgstr "saknar ”<” i symbolisk referens" #: ../glib/gregex.c:2478 @@ -5077,7 +5081,7 @@ msgid "illegal symbolic reference" msgstr "otillåten symbolisk referens" #: ../glib/gregex.c:2576 -msgid "stray final '\\'" +msgid "stray final “\\”" msgstr "felplacerad avslutande ”\\”" #: ../glib/gregex.c:2580 @@ -5086,11 +5090,11 @@ msgstr "okänd escape-sekvens" #: ../glib/gregex.c:2590 #, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Fel vid tolkning av ersättningstexten ”%s” vid tecknet %lu: %s" #: ../glib/gshell.c:96 -msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Citerad text börjar inte med citationstecken" #: ../glib/gshell.c:186 @@ -5099,12 +5103,12 @@ msgstr "Ensamt citationstecken på kommandoraden eller annan skalciterad text" #: ../glib/gshell.c:582 #, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "Texten slutade efter ett ”\\”-tecken (texten var ”%s”)." #: ../glib/gshell.c:589 #, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Texten slutade innan matchande citationstecken hittades för %c (texten var " "”%s”)." @@ -5160,12 +5164,12 @@ msgstr "Misslyckades med att grena (%s)" #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 #, c-format -msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s” (%s)" msgstr "Misslyckades med att byta till katalogen ”%s” (%s)" #: ../glib/gspawn.c:1500 #, c-format -msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s” (%s)" msgstr "Misslyckades med att köra barnprocessen ”%s” (%s)" #: ../glib/gspawn.c:1510 @@ -5181,7 +5185,7 @@ msgstr "Misslyckades med att skapa barnprocess (%s)" #: ../glib/gspawn.c:1527 #, c-format -msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%s”" msgstr "Okänt fel vid körning av barnprocessen ”%s”" #: ../glib/gspawn.c:1551 @@ -5342,6 +5346,15 @@ msgstr[1] "%s byte" msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Fel vid skapandet av katalogen ”%s”: %s" + +#~ msgid "Error opening file '%s': %s" +#~ msgstr "Fel vid öppning av filen ”%s”: %s" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Fel vid läsning av filen ”%s”: %s" + #~ msgid "Error renaming file: %s" #~ msgstr "Fel vid namnbyte av fil: %s" diff --git a/tests/datetime.c b/tests/datetime.c index 4f2779619..ae46bbaea 100644 --- a/tests/datetime.c +++ b/tests/datetime.c @@ -11,10 +11,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include <locale.h> diff --git a/tests/refcount/signals.c b/tests/refcount/signals.c index 2a637953b..d1a0447c9 100644 --- a/tests/refcount/signals.c +++ b/tests/refcount/signals.c @@ -12,7 +12,7 @@ #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) -static GRand *rand; +static GRand *grand; typedef struct _GTest GTest; typedef struct _GTestClass GTestClass; @@ -87,7 +87,7 @@ my_test_get_type (void) NULL }; - rand = g_rand_new(); + grand = g_rand_new(); test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", &test_info, 0); @@ -221,7 +221,7 @@ my_test_do_signal3 (GTest * test) static void my_test_do_prop (GTest * test) { - test->value = g_rand_int (rand); + test->value = g_rand_int (grand); g_object_notify (G_OBJECT (test), "test-prop"); } diff --git a/tests/type-test.c b/tests/type-test.c index e767f0f2a..2e91565c7 100644 --- a/tests/type-test.c +++ b/tests/type-test.c @@ -88,15 +88,15 @@ main (int argc, g_assert (gsz == 0); gs = G_MAXSHORT; - gs++; + gs = (gshort) (1 + (gushort) gs); g_assert (gs == G_MINSHORT); gi = G_MAXINT; - gi++; + gi = (gint) (1 + (guint) gi); g_assert (gi == G_MININT); gl = G_MAXLONG; - gl++; + gl = (glong) (1 + (gulong) gl); g_assert (gl == G_MINLONG); /* Test the G_G(U)?INT(16|32|64)_FORMAT macros */ diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am new file mode 100644 index 000000000..ecdf3b556 --- /dev/null +++ b/win32/Makefile-newvs.am @@ -0,0 +1,46 @@ +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on) +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi diff --git a/win32/Makefile.am b/win32/Makefile.am new file mode 100644 index 000000000..44a6345ff --- /dev/null +++ b/win32/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS = vs9 vs10 vs11 vs12 vs14 + +EXTRA_DIST = \ + glibpc.py \ + pc_base.py \ + replace.py diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj new file mode 100644 index 000000000..2e96e12bc --- /dev/null +++ b/win32/Makefile.msvcproj @@ -0,0 +1,153 @@ +# Author: Fan, Chun-wei +# Common Autotools file used to generate Visual Studio 2008+ +# Projects from their templates + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support. + +# * Input variables: +# +# MSVCPROJS - List of Projects that should be generated +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# include <this Makefile.msvcproj> +# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) +# YourProject_FILES = $(libyourlib_1_0_SOURCES) +# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none +# (the following 3 lines if headers need to be installed) +# YourProject_HEADERS_DIR = $(libyourlibincludedir) +# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) +# YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none> +# +# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) +# $(top_builddir)/win32/vs9/YourProject.vcproj \ +# $(top_builddir)/win32/vs9/YourProject.headers # if headers need to be installed +# +# --or, if Visual Studio 2013 or later is required-- +# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process) +# $(top_builddir)/win32/vs12/YourProject.vcxproj \ +# $(top_builddir)/win32/vs12/YourProject.vs12.headers # if headers need to be installed + +# Private functions + +## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable +## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 +_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) +_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) +_proj_path=$(subst /,\\,$(_proj_path_raw)) +_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) +_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) + +_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) +_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) +_proj_filters=$($(_proj_name)_EXCLUDES) + +_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) +_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) +_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) + +_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) +_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) + +# +# Creates Visual Studio 2008/2010 projects from items passed in from autotools files +# $(1) - Base Name of the MSVC project files (outputs) +# + +define msvcproj-builder + +$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj +$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj + +$(top_builddir)/win32/vs9/$(1).vcproj: Makefile + -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters + + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \ + echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \ + echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \ + ;; \ + esac; \ + done + + + $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters + $(RM) $(1).sourcefiles + $(RM) $(1).vs10.sourcefiles + $(RM) $(1).vs10.sourcefiles.filters + +$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers + +$(top_builddir)/win32/vs9/$(1).headers: Makefile + -$(RM) $(top_builddir)/win32/vs9/$(1).headers + -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'
' >>$(top_builddir)/win32/vs9/$(1).headers && \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \ + ;; \ + esac; \ + done + +$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj + +$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles && \ + echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \ + ;; \ + esac; \ + done + + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters + $(RM) $(1).vs12.sourcefiles + $(RM) $(1).vs12.sourcefiles.filters + +$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile + -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \ + ;; \ + esac; \ + done + +endef + +$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak index c23e444fe..c23e444fe 100644 --- a/build/win32/detectenv-msvc.mak +++ b/win32/detectenv-msvc.mak diff --git a/build/win32/glibpc.py b/win32/glibpc.py index 973db1a3f..b04dc2433 100644 --- a/build/win32/glibpc.py +++ b/win32/glibpc.py @@ -15,7 +15,7 @@ from pc_base import BasePCItems def main(argv): base_pc = BasePCItems() - + base_pc.setup(argv) pkg_replace_items = {'@G_THREAD_CFLAGS@': '', '@G_THREAD_LIBS@': '', @@ -73,6 +73,7 @@ def main(argv): '@ZLIB_LIBS@': '-lzlib1', '@NETWORK_LIBS@': '-lws2_32', '@SELINUX_LIBS@': '', + '@LIBMOUNT_LIBS@': '', 'glib-compile-schemas': '${exec_prefix}/bin/glib-compile-schemas', 'glib-compile-resources': '${exec_prefix}/bin/glib-compile-resources', 'gdbus-codegen': 'python ${exec_prefix}/bin/gdbus-codegen'} diff --git a/build/win32/pc_base.py b/win32/pc_base.py index 587ba83d1..285b6cdd8 100644 --- a/build/win32/pc_base.py +++ b/win32/pc_base.py @@ -23,7 +23,7 @@ class BasePCItems: self.libdir = '' self.prefix = '' self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..\\..' + self.top_srcdir = self.srcdir + '\\..' self.version = '' def setup(self, argv, parser=None): diff --git a/build/win32/replace.py b/win32/replace.py index a81bab942..a81bab942 100644 --- a/build/win32/replace.py +++ b/win32/replace.py diff --git a/build/win32/setup.py b/win32/setup.py index 749b880f9..f3cac2ea3 100644 --- a/build/win32/setup.py +++ b/win32/setup.py @@ -42,7 +42,7 @@ def get_srcroot(): else: path = __file__ dirname = os.path.dirname(path) - return os.path.abspath(os.path.join(dirname, '..', '..')) + return os.path.abspath(os.path.join(dirname, '..')) def process_include(src, dest, includes): RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"') @@ -82,15 +82,15 @@ def generate_libgio_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<File RelativePath="..\\..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<File RelativePath="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\gio\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -122,15 +122,15 @@ def generate_libglib_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<File RelativePath="..\\..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<File RelativePath="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\glib\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -146,15 +146,15 @@ def generate_libgobject_sourcefiles(srcroot, dest, stype): if stype == '9': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<File RelativePath="..\\..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<File RelativePath="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n') elif stype == '10f': with open(dest, 'w') as d: for i in sources: - d.write('\t\t\t<ClCompile Include="..\\..\\..\\gobject\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') + d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n') else: raise Exception("Must specify project type (9, 10 or 10f)") @@ -263,23 +263,23 @@ def main(argv): #------------ submodule gobject ------------------- generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libglib.sourcefiles'), '9') generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'), '10') generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'glib.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'glib.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters')) with open(os.path.join(srcroot, 'glib', 'gspawn-win32-helper-console.c'), 'w') as c: c.write('#define HELPER_CONSOLE\n') c.write('#include "gspawn-win32-helper.c"\n') @@ -318,45 +318,45 @@ def main(argv): os.chdir(cwd) generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9') generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'), '10') generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters')) #------------ end of submodule gobject ------------------- #------------ submodule gio ------------------- #depends on glib-mkenums generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles'), '9') + os.path.join(srcroot, 'win32', 'libgio.sourcefiles'), '9') generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles'), '10') + os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'), '10') generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters'), '10f') - process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxprojin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filtersin'), - os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filters'), - includes = [os.path.join(srcroot, 'build', 'win32')]) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles')) - os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters')) + os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'), '10f') + process_include(os.path.join(srcroot, 'win32', 'vs9', 'gio.vcprojin'), + os.path.join(srcroot, 'win32', 'vs9', 'gio.vcproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxprojin'), + os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj'), + includes = [os.path.join(srcroot, 'win32')]) + process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filtersin'), + os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filters'), + includes = [os.path.join(srcroot, 'win32')]) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles')) + os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters')) generate_libgio_enumtypes(srcroot, opt.perl) #------------ end of submodule gio ------------------- diff --git a/build/win32/vs10/.gitignore b/win32/vs10/.gitignore index 0bdbb5048..0bdbb5048 100644 --- a/build/win32/vs10/.gitignore +++ b/win32/vs10/.gitignore diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 078ee7da8..08912db30 100644 --- a/build/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -57,11 +57,11 @@ EXTRA_DIST = \ glib-gen-srcs.props \ $(GENERATED_ITEMS) -glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST) - -$(RM) $(top_builddir)/build/win32/vs11/glib-install.props - -$(RM) $(top_builddir)/build/win32/vs12/glib-install.props - -$(RM) $(top_builddir)/build/win32/vs14/glib-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@ +glib-install.props: $(top_srcdir)/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST) + -$(RM) $(top_builddir)/win32/vs11/glib-install.props + -$(RM) $(top_builddir)/win32/vs12/glib-install.props + -$(RM) $(top_builddir)/win32/vs14/glib-install.props + $(CPP) -P - <$(top_srcdir)/win32/vs10/glib-install.propsin >$@ rm $(MSVC10_HEADERS_LIST) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt index ba5878968..ba5878968 100644 --- a/build/win32/vs10/README.txt +++ b/win32/vs10/README.txt diff --git a/build/win32/vs10/gdbus.vcxproj b/win32/vs10/gdbus.vcxproj index 759143f2b..2c2cdf697 100644 --- a/build/win32/vs10/gdbus.vcxproj +++ b/win32/vs10/gdbus.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -137,7 +137,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -158,7 +158,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gdbus-tool.c" /> + <ClCompile Include="..\..\gio\gdbus-tool.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="gio.vcxproj"> @@ -177,4 +177,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gdbus.vcxproj.filters b/win32/vs10/gdbus.vcxproj.filters index ce37c1cce..1921c4967 100644 --- a/build/win32/vs10/gdbus.vcxproj.filters +++ b/win32/vs10/gdbus.vcxproj.filters @@ -7,8 +7,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gdbus-tool.c"> + <ClCompile Include="..\..\gio\gdbus-tool.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj index b33a1d186..41a6edd4b 100644 --- a/build/win32/vs10/gio-querymodules.vcxproj +++ b/win32/vs10/gio-querymodules.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -137,7 +137,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -158,7 +158,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gio-querymodules.c" /> + <ClCompile Include="..\..\gio\gio-querymodules.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="gio.vcxproj"> @@ -181,4 +181,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters index 79fbfa1fb..c39abf59a 100644 --- a/build/win32/vs10/gio-querymodules.vcxproj.filters +++ b/win32/vs10/gio-querymodules.vcxproj.filters @@ -7,8 +7,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gio-querymodules.c"> + <ClCompile Include="..\..\gio\gio-querymodules.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gio-tool.vcxproj.filtersin b/win32/vs10/gio-tool.vcxproj.filtersin index 42b9cdb75..42b9cdb75 100644 --- a/build/win32/vs10/gio-tool.vcxproj.filtersin +++ b/win32/vs10/gio-tool.vcxproj.filtersin diff --git a/build/win32/vs10/gio-tool.vcxprojin b/win32/vs10/gio-tool.vcxprojin index 4d7cf3921..60d662aa4 100644 --- a/build/win32/vs10/gio-tool.vcxprojin +++ b/win32/vs10/gio-tool.vcxprojin @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -96,7 +96,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -122,7 +122,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -143,7 +143,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/win32/vs10/gio.vcxproj.filtersin index 6c1abecd2..72a62016f 100644 --- a/build/win32/vs10/gio.vcxproj.filtersin +++ b/win32/vs10/gio.vcxproj.filtersin @@ -18,10 +18,10 @@ #include "gio.vs10.sourcefiles.filters" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gio\gio.rc"> + <ResourceCompile Include="..\..\gio\gio.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> diff --git a/build/win32/vs10/gio.vcxprojin b/win32/vs10/gio.vcxprojin index fecd2ca9f..2e61dee7a 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/win32/vs10/gio.vcxprojin @@ -74,7 +74,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -100,7 +100,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -127,7 +127,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -153,7 +153,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -181,23 +181,17 @@ #include "gio.vs10.sourcefiles" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gio\gnetworking.h.win32"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gnetworking.h from gnetworking.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGNetworkingH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gnetworking.h from gnetworking.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGNetworkingH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gnetworking.h from gnetworking.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGNetworkingH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gnetworking.h from gnetworking.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGNetworkingH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs> + <CustomBuild Include="..\..\gio\gnetworking.h.win32"> + <Message Condition="'$(Configuration)'=='Debug|Win32'">Copying gnetworking.h from gnetworking.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug|Win32'">$(GenGNetworkingH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug|Win32'">..\..\gio\gnetworking.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Copying gnetworking.h from gnetworking.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGNetworkingH)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gnetworking.h;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gio\gio.rc" /> + <ResourceCompile Include="..\..\gio\gio.rc" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> diff --git a/build/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props index 9634e5b33..6de6fec36 100644 --- a/build/win32/vs10/glib-build-defines.props +++ b/win32/vs10/glib-build-defines.props @@ -26,7 +26,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..;..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> <MultiProcessorCompilation>true</MultiProcessorCompilation> diff --git a/build/win32/vs10/glib-compile-resources.vcxproj.filtersin b/win32/vs10/glib-compile-resources.vcxproj.filtersin index 68e8a5d52..68e8a5d52 100644 --- a/build/win32/vs10/glib-compile-resources.vcxproj.filtersin +++ b/win32/vs10/glib-compile-resources.vcxproj.filtersin diff --git a/build/win32/vs10/glib-compile-resources.vcxprojin b/win32/vs10/glib-compile-resources.vcxprojin index e098347b6..f28e59d30 100644 --- a/build/win32/vs10/glib-compile-resources.vcxprojin +++ b/win32/vs10/glib-compile-resources.vcxprojin @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -137,7 +137,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin b/win32/vs10/glib-compile-schemas.vcxproj.filtersin index 645779daa..645779daa 100644 --- a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin +++ b/win32/vs10/glib-compile-schemas.vcxproj.filtersin diff --git a/build/win32/vs10/glib-compile-schemas.vcxprojin b/win32/vs10/glib-compile-schemas.vcxprojin index fff97fb42..ba4199aea 100644 --- a/build/win32/vs10/glib-compile-schemas.vcxprojin +++ b/win32/vs10/glib-compile-schemas.vcxprojin @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -137,7 +137,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> diff --git a/build/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props index 64a20eae9..a9fc09ad5 100644 --- a/build/win32/vs10/glib-gen-srcs.props +++ b/win32/vs10/glib-gen-srcs.props @@ -4,11 +4,11 @@ <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros"> - <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH> - <GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH> - <GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH> - <GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> + <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH> + <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> + <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> + <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> diff --git a/build/win32/vs10/glib-genmarshal.vcxproj b/win32/vs10/glib-genmarshal.vcxproj index 8f31f7b26..2ce4b2884 100644 --- a/build/win32/vs10/glib-genmarshal.vcxproj +++ b/win32/vs10/glib-genmarshal.vcxproj @@ -159,7 +159,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gobject\glib-genmarshal.c" /> + <ClCompile Include="..\..\gobject\glib-genmarshal.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -170,4 +170,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/glib-genmarshal.vcxproj.filters b/win32/vs10/glib-genmarshal.vcxproj.filters index 12b29afff..bcb3d4a49 100644 --- a/build/win32/vs10/glib-genmarshal.vcxproj.filters +++ b/win32/vs10/glib-genmarshal.vcxproj.filters @@ -15,8 +15,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gobject\glib-genmarshal.c"> + <ClCompile Include="..\..\gobject\glib-genmarshal.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin index e6b13a668..eeb2965f1 100644 --- a/build/win32/vs10/glib-install.propsin +++ b/win32/vs10/glib-install.propsin @@ -36,31 +36,31 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen -if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin +if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated -copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) -copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) #include "glib.vs10.headers" -copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject #include "gobject.vs10.headers" -copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject +copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio #include "gio.vs10.headers" mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio -copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include -copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include +copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib @@ -78,10 +78,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas -copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas +copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen -copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen +copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> diff --git a/build/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj index faa440490..cb13a848a 100644 --- a/build/win32/vs10/glib-install.vcxproj +++ b/win32/vs10/glib-install.vcxproj @@ -67,14 +67,10 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir> - <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir> + <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" /> + <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir> + <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" /> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </ItemDefinitionGroup> @@ -86,36 +82,22 @@ </ItemDefinitionGroup> <ItemGroup> <CustomBuild Include="..\glibpc.py"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibGenPC)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibPCFiles);%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibGenPC)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibPCFiles);%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibGenPC)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibPCFiles);%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibGenPC)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Debug'">Generating .pc files...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GlibGenPC)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating .pc files...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\..\config.h.win32"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibDoInstall)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibDoInstall)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibDoInstall)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibDoInstall)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs> + <CustomBuild Include="..\..\config.h.win32"> + <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> @@ -183,4 +165,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters index 18ffe5f13..2c5e00c4a 100644 --- a/build/win32/vs10/glib-install.vcxproj.filters +++ b/win32/vs10/glib-install.vcxproj.filters @@ -7,7 +7,7 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/build/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in index 693225262..468e558f5 100644 --- a/build/win32/vs10/glib-version-paths.props.in +++ b/win32/vs10/glib-version-paths.props.in @@ -4,7 +4,7 @@ <VSVer>10</VSVer> <GlibVersion>@GLIB_VERSION@</GlibVersion> <ApiVersion>2.0</ApiVersion> - <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> + <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> <GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix> <GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix> @@ -55,4 +55,4 @@ <Value>$(PythonPath)</Value> </BuildMacro> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/glib.sln b/win32/vs10/glib.sln index 848c2cffe..848c2cffe 100644 --- a/build/win32/vs10/glib.sln +++ b/win32/vs10/glib.sln diff --git a/win32/vs10/glib.vcxproj.filtersin b/win32/vs10/glib.vcxproj.filtersin new file mode 100644 index 000000000..7a5084c8e --- /dev/null +++ b/win32/vs10/glib.vcxproj.filtersin @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Source Files\libcharset"> + <UniqueIdentifier>{bb961775-fd45-4205-b1fd-901c3c8fd64c}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\gnulib"> + <UniqueIdentifier>{f630c518-4c58-4dfa-ab43-5fa0b0eb10f1}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\pcre"> + <UniqueIdentifier>{9fef0e23-cf71-48aa-979b-7eb84df56143}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> +#include "glib.vs10.sourcefiles.filters" + <ClCompile Include="..\..\glib\giowin32.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\glib\gspawn-win32.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\glib\gthread-win32.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\glib\gwin32.c"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\..\glib\libcharset\localcharset.c"><Filter>Source Files\libcharset</Filter></ClCompile> + <ClCompile Include="..\..\glib\gnulib\asnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile> + <ClCompile Include="..\..\glib\gnulib\printf-args.c"><Filter>Source Files\gnulib</Filter></ClCompile> + <ClCompile Include="..\..\glib\gnulib\printf-parse.c"><Filter>Source Files\gnulib</Filter></ClCompile> + <ClCompile Include="..\..\glib\gnulib\printf.c"><Filter>Source Files\gnulib</Filter></ClCompile> + <ClCompile Include="..\..\glib\gnulib\vasnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_chartables.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_compile.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_config.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_exec.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_get.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_globals.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_newline.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_study.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_tables.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_version.c"><Filter>Source Files\pcre</Filter></ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_xclass.c"><Filter>Source Files\pcre</Filter></ClCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\glib\glibconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\glib\glib.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> +</Project> diff --git a/win32/vs10/glib.vcxprojin b/win32/vs10/glib.vcxprojin new file mode 100644 index 000000000..3ee8f2b14 --- /dev/null +++ b/win32/vs10/glib.vcxprojin @@ -0,0 +1,533 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug_BundledPCRE|Win32"> + <Configuration>Debug_BundledPCRE</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug_BundledPCRE|x64"> + <Configuration>Debug_BundledPCRE</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release_BundledPCRE|Win32"> + <Configuration>Release_BundledPCRE</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release_BundledPCRE|x64"> + <Configuration>Release_BundledPCRE</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{12BCA020-EABF-429E-876A-A476BC9C10C0}</ProjectGuid> + <RootNamespace>glib</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="glib-gen-srcs.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <LinkIncremental Condition="'$(Configuration)'=='Debug_BundledPCRE'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)'=='Debug_BundledPCRE'">Debug\$(Platform)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release_BundledPCRE'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)'=='Release_BundledPCRE'">Release\$(Platform)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'"> + <ClCompile> + <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'"> + <ClCompile> + <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +#include "glib.vs10.sourcefiles" + <ClCompile Include="..\..\glib\giowin32.c" /> + <ClCompile Include="..\..\glib\gspawn-win32.c" /> + <ClCompile Include="..\..\glib\gthread-win32.c" /> + <ClCompile Include="..\..\glib\gwin32.c" /> + <ClCompile Include="..\..\glib\libcharset\localcharset.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="..\..\glib\gnulib\asnprintf.c" /> + <ClCompile Include="..\..\glib\gnulib\printf-args.c" /> + <ClCompile Include="..\..\glib\gnulib\printf-parse.c" /> + <ClCompile Include="..\..\glib\gnulib\printf.c" /> + <ClCompile Include="..\..\glib\gnulib\vasnprintf.c" /> + <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_chartables.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_compile.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_config.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_exec.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_get.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_globals.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_newline.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_study.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_tables.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_version.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\glib\pcre\pcre_xclass.c"> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild> + <PreprocessorDefinitions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> + <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\config.h.win32"> + <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying config.h from config.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying config.h from config.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\glib\glibconfig.h.win32"> + <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying glibconfig.h from glibconfig.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenGLibConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Debug'">Copying glibconfig.h from glibconfig.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\glib\glibconfig.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying glibconfig.h from glibconfig.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenGLibConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Copying glibconfig.h from glibconfig.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibConfigH)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\glib\glibconfig.h;%(Outputs)</Outputs> + </CustomBuild> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\glib\glib.rc" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/build/win32/vs10/gmodule.vcxproj b/win32/vs10/gmodule.vcxproj index d4f5070ec..7ed6e1c1d 100644 --- a/build/win32/vs10/gmodule.vcxproj +++ b/win32/vs10/gmodule.vcxproj @@ -67,10 +67,8 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -171,26 +169,20 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gmodule\gmodule.c" /> + <ClCompile Include="..\..\gmodule\gmodule.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGModuleConfH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGModuleConfH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGModuleConfH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGModuleConfH)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> + <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32"> + <Message Condition="'$(Configuration)'=='Debug'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGModuleConfH)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Copying gmoduleconf.h from gmoduleconf.h.win32...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGModuleConfH)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gmodule\gmodule.rc" /> + <ResourceCompile Include="..\..\gmodule\gmodule.rc" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -201,4 +193,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/win32/vs10/gmodule.vcxproj.filters index 968e8ac1d..df97a6b67 100644 --- a/build/win32/vs10/gmodule.vcxproj.filters +++ b/win32/vs10/gmodule.vcxproj.filters @@ -15,16 +15,16 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gmodule\gmodule.c"> + <ClCompile Include="..\..\gmodule\gmodule.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gmodule\gmodule.rc"> + <ResourceCompile Include="..\..\gmodule\gmodule.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin index 31748029e..b9f83075e 100644 --- a/build/win32/vs10/gobject.vcxproj.filtersin +++ b/win32/vs10/gobject.vcxproj.filtersin @@ -18,10 +18,10 @@ #include "gobject.vs10.sourcefiles.filters" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gobject\gobject.rc"> + <ResourceCompile Include="..\..\gobject\gobject.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> diff --git a/build/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin index b08bd5b99..c61ef8fd9 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/win32/vs10/gobject.vcxprojin @@ -67,10 +67,8 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -174,23 +172,17 @@ #include "gobject.vs10.sourcefiles" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gobject\gobject.rc" /> + <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> diff --git a/build/win32/vs10/gresource.vcxproj b/win32/vs10/gresource.vcxproj index f52b38acc..fb0faa2ad 100644 --- a/build/win32/vs10/gresource.vcxproj +++ b/win32/vs10/gresource.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -137,7 +137,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -158,7 +158,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gresource-tool.c" /> + <ClCompile Include="..\..\gio\gresource-tool.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="gio.vcxproj"> @@ -177,4 +177,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gresource.vcxproj.filters b/win32/vs10/gresource.vcxproj.filters index 91dd6dc66..2e373bb9f 100644 --- a/build/win32/vs10/gresource.vcxproj.filters +++ b/win32/vs10/gresource.vcxproj.filters @@ -7,8 +7,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gresource-tool.c"> + <ClCompile Include="..\..\gio\gresource-tool.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gsettings.vcxproj b/win32/vs10/gsettings.vcxproj index f74913b80..4b3a76c96 100644 --- a/build/win32/vs10/gsettings.vcxproj +++ b/win32/vs10/gsettings.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -94,7 +94,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -118,7 +118,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -138,7 +138,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -159,7 +159,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gsettings-tool.c" /> + <ClCompile Include="..\..\gio\gsettings-tool.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -178,4 +178,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gsettings.vcxproj.filters b/win32/vs10/gsettings.vcxproj.filters index 0c81fc601..843c0cb2b 100644 --- a/build/win32/vs10/gsettings.vcxproj.filters +++ b/win32/vs10/gsettings.vcxproj.filters @@ -7,8 +7,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gio\gsettings-tool.c"> + <ClCompile Include="..\..\gio\gsettings-tool.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj b/win32/vs10/gspawn-win32-helper-console.vcxproj index 6cbb67cd9..7cf4a63ca 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj +++ b/win32/vs10/gspawn-win32-helper-console.vcxproj @@ -163,7 +163,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\glib\gspawn-win32-helper-console.c" /> + <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -174,4 +174,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters index 5b9e6ef45..5b43689a1 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters +++ b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters @@ -15,8 +15,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\glib\gspawn-win32-helper-console.c"> + <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj b/win32/vs10/gspawn-win32-helper.vcxproj index 581515e9b..7b4fd4445 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj +++ b/win32/vs10/gspawn-win32-helper.vcxproj @@ -163,7 +163,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\glib\gspawn-win32-helper.c" /> + <ClCompile Include="..\..\glib\gspawn-win32-helper.c" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -174,4 +174,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters b/win32/vs10/gspawn-win32-helper.vcxproj.filters index 0a83fa2d9..85fd3f6f3 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters +++ b/win32/vs10/gspawn-win32-helper.vcxproj.filters @@ -15,8 +15,8 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\glib\gspawn-win32-helper.c"> + <ClCompile Include="..\..\glib\gspawn-win32-helper.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gthread.vcxproj b/win32/vs10/gthread.vcxproj index 118bcfc65..19363774e 100644 --- a/build/win32/vs10/gthread.vcxproj +++ b/win32/vs10/gthread.vcxproj @@ -171,10 +171,10 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\gthread\gthread-impl.c" /> + <ClCompile Include="..\..\gthread\gthread-impl.c" /> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gthread\gthread.rc" /> + <ResourceCompile Include="..\..\gthread\gthread.rc" /> </ItemGroup> <ItemGroup> <ProjectReference Include="glib.vcxproj"> @@ -185,4 +185,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/gthread.vcxproj.filters b/win32/vs10/gthread.vcxproj.filters index fb35c1ff3..82d30ab16 100644 --- a/build/win32/vs10/gthread.vcxproj.filters +++ b/win32/vs10/gthread.vcxproj.filters @@ -15,13 +15,9 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gthread\gthread-impl.c"> - <Filter>Source Files</Filter> - </ClCompile> + <ClCompile Include="..\..\gthread\gthread-impl.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\..\gthread\gthread.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gthread\gthread.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs11/.gitignore b/win32/vs11/.gitignore index a7e3d4a30..a7e3d4a30 100644 --- a/build/win32/vs11/.gitignore +++ b/win32/vs11/.gitignore diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index d98d1db2c..5ea5b3202 100644 --- a/build/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -40,8 +40,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 11 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2012 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs12/.gitignore b/win32/vs12/.gitignore index a7e3d4a30..a7e3d4a30 100644 --- a/build/win32/vs12/.gitignore +++ b/win32/vs12/.gitignore diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index b863236ab..370edbbf0 100644 --- a/build/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -40,8 +40,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 12 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2013 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index a17e93112..30eab9280 100644 --- a/build/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -40,8 +40,10 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/build/win32/vs9/.gitignore b/win32/vs9/.gitignore index c23b304ce..c23b304ce 100644 --- a/build/win32/vs9/.gitignore +++ b/win32/vs9/.gitignore diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index bbc88197e..e40d3509a 100644 --- a/build/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -35,8 +35,8 @@ EXTRA_DIST = \ glib-install.vspropsin \ $(GENERATED_ITEMS) -glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST) - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@ +glib-install.vsprops: $(top_srcdir)/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/win32/vs9/glib-install.vspropsin >$@ rm $(MSVC_HEADERS_LIST) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt index 158f14570..158f14570 100644 --- a/build/win32/vs9/README.txt +++ b/win32/vs9/README.txt diff --git a/build/win32/vs9/gdbus.vcproj b/win32/vs9/gdbus.vcproj index 5160e979f..6da34e358 100644 --- a/build/win32/vs9/gdbus.vcproj +++ b/win32/vs9/gdbus.vcproj @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -91,7 +91,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -118,7 +118,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gio\gdbus-tool.c" /> + <File RelativePath="..\..\gio\gdbus-tool.c" /> </Filter> </Files> <Globals> diff --git a/build/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj index 1aebb7ddb..4b00188b8 100644 --- a/build/win32/vs9/gio-querymodules.vcproj +++ b/win32/vs9/gio-querymodules.vcproj @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -91,7 +91,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="$(GioInBuildMacro)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -118,7 +118,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="$(GioInBuildMacro)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gio\gio-querymodules.c" /> + <File RelativePath="..\..\gio\gio-querymodules.c" /> </Filter> </Files> <Globals> diff --git a/build/win32/vs9/gio-tool.vcprojin b/win32/vs9/gio-tool.vcprojin index ffa91b292..267a44516 100644 --- a/build/win32/vs9/gio-tool.vcprojin +++ b/win32/vs9/gio-tool.vcprojin @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gio;..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -59,7 +59,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gio;..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -94,7 +94,7 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gio;..\..\gmodule" EnableIntrinsicFunctions="true" PreprocessorDefinitions="$(GioInBuildMacro)" RuntimeLibrary="2" @@ -125,7 +125,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GioInBuildMacro)" - AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gio;..\..\gmodule" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/build/win32/vs9/gio.vcprojin b/win32/vs9/gio.vcprojin index db551e77e..be1343835 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/win32/vs9/gio.vcprojin @@ -27,7 +27,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../gio,../../../gmodule" + AdditionalIncludeDirectories="..\..\gio,..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -59,7 +59,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../gio,../../../gmodule" + AdditionalIncludeDirectories="..\..\gio,..\..\gmodule" PreprocessorDefinitions="$(GioBuildDefines)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -91,7 +91,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../gio,../../../gmodule" + AdditionalIncludeDirectories="..\..\gio,..\..\gmodule" PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -123,7 +123,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../gio,../../../gmodule" + AdditionalIncludeDirectories="..\..\gio,..\..\gmodule" PreprocessorDefinitions="$(GioBuildDefines)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -168,13 +168,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\..\gio\gnetworking.h.win32"> + <File RelativePath="..\..\gio\gnetworking.h.win32"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -182,7 +182,7 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -190,7 +190,7 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -198,11 +198,11 @@ Name="VCCustomBuildTool" Description="Copying gnetworking.h from gnetworking.h.win32..." CommandLine="$(GenGNetworkingH)" - Outputs="..\..\..\gio\gnetworking.h" + Outputs="..\..\gio\gnetworking.h" /> </FileConfiguration> </File> - <File RelativePath="..\..\..\gio\gio.rc" /> + <File RelativePath="..\..\gio\gio.rc" /> </Filter> </Files> </VisualStudioProject> diff --git a/build/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops index cc36536a2..7e28cc5d0 100644 --- a/build/win32/vs9/glib-build-defines.vsprops +++ b/win32/vs9/glib-build-defines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include" + AdditionalIncludeDirectories="..\..;..\..\glib;$(GlibEtcInstallRoot)\include" PreprocessorDefinitions="HAVE_CONFIG_H" ForcedIncludeFiles="msvc_recommended_pragmas.h" AdditionalOptions="/MP" diff --git a/build/win32/vs9/glib-compile-resources.vcprojin b/win32/vs9/glib-compile-resources.vcprojin index 905026583..e83b1d662 100644 --- a/build/win32/vs9/glib-compile-resources.vcprojin +++ b/win32/vs9/glib-compile-resources.vcprojin @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" + AdditionalIncludeDirectories="..\..\gmodule;..\..\gio" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" + AdditionalIncludeDirectories="..\..\gmodule;..\..\gio" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -91,7 +91,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" + AdditionalIncludeDirectories="..\..\gmodule;..\..\gio" PreprocessorDefinitions="$(GioInBuildMacro)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -118,7 +118,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" + AdditionalIncludeDirectories="..\..\gmodule;..\..\gio" PreprocessorDefinitions="$(GioInBuildMacro)" RuntimeLibrary="2" UsePrecompiledHeader="0" diff --git a/build/win32/vs9/glib-compile-schemas.vcprojin b/win32/vs9/glib-compile-schemas.vcprojin index 2a750959e..00dc27e61 100644 --- a/build/win32/vs9/glib-compile-schemas.vcprojin +++ b/win32/vs9/glib-compile-schemas.vcprojin @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -90,7 +90,7 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" EnableIntrinsicFunctions="true" PreprocessorDefinitions="" RuntimeLibrary="2" @@ -118,7 +118,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" UsePrecompiledHeader="0" diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/win32/vs9/glib-gen-srcs.vsprops index a4cf9f86c..de0b1b965 100644 --- a/build/win32/vs9/glib-gen-srcs.vsprops +++ b/win32/vs9/glib-gen-srcs.vsprops @@ -7,22 +7,22 @@ > <UserMacro Name="GenConfigH" - Value="copy ..\..\..\config.h.win32 ..\..\..\config.h" + Value="copy ..\..\config.h.win32 ..\..\config.h" /> <UserMacro Name="GenGLibConfigH" - Value="copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h" + Value="copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h" /> <UserMacro Name="GenGModuleConfH" - Value="copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h" + Value="copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h" /> <UserMacro Name="GenGNetworkingH" - Value="copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h" + Value="copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h" /> <UserMacro Name="GenGLibMKEnums" - Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)" + Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)" /> </VisualStudioPropertySheet> diff --git a/build/win32/vs9/glib-genmarshal.vcproj b/win32/vs9/glib-genmarshal.vcproj index 6b0f481fc..b50be252b 100644 --- a/build/win32/vs9/glib-genmarshal.vcproj +++ b/win32/vs9/glib-genmarshal.vcproj @@ -141,7 +141,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\gobject\glib-genmarshal.c" + RelativePath="..\..\gobject\glib-genmarshal.c" > </File> </Filter> diff --git a/build/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj index 7324f0f72..7324f0f72 100644 --- a/build/win32/vs9/glib-install.vcproj +++ b/win32/vs9/glib-install.vcproj diff --git a/build/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin index a511ebbd9..dec524eca 100644 --- a/build/win32/vs9/glib-install.vspropsin +++ b/win32/vs9/glib-install.vspropsin @@ -38,29 +38,29 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin
 -copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
 -if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin
 +copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
 +if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
 mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 -copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
 -copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
 -copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
 -copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
 +copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
 +copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
 +copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
 +copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
 #include "glib.headers" mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
 #include "gobject.headers" -copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
 +copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
 mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
 #include "gio.headers" mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 -copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 -copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 +copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 +copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include
 -copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
 +copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-$(ApiVersion).lib $(CopyDir)\lib
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gthread-$(ApiVersion).lib $(CopyDir)\lib
 @@ -79,10 +79,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig
 copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig
 mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas
 -copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
 +copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
 mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
 -copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
 +copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
 " /> <UserMacro diff --git a/build/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in index f69da65bc..1b55c5c3c 100644 --- a/build/win32/vs9/glib-version-paths.vsprops.in +++ b/win32/vs9/glib-version-paths.vsprops.in @@ -18,7 +18,7 @@ /> <UserMacro Name="GlibEtcInstallRoot" - Value="..\..\..\..\vs$(VSVer)\$(PlatformName)" + Value="..\..\..\vs$(VSVer)\$(PlatformName)" /> <UserMacro Name="CopyDir" diff --git a/build/win32/vs9/glib.sln b/win32/vs9/glib.sln index 9b593cbaa..9b593cbaa 100644 --- a/build/win32/vs9/glib.sln +++ b/win32/vs9/glib.sln diff --git a/build/win32/vs9/glib.vcprojin b/win32/vs9/glib.vcprojin index 86e72e19b..0f65f8c76 100644 --- a/build/win32/vs9/glib.vcprojin +++ b/win32/vs9/glib.vcprojin @@ -281,14 +281,14 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > #include "glib.sourcefiles" - <File RelativePath="..\..\..\glib\giowin32.c" /> - <File RelativePath="..\..\..\glib\gspawn-win32.c" /> - <File RelativePath="..\..\..\glib\gthread-win32.c" /> - <File RelativePath="..\..\..\glib\gwin32.c" /> + <File RelativePath="..\..\glib\giowin32.c" /> + <File RelativePath="..\..\glib\gspawn-win32.c" /> + <File RelativePath="..\..\glib\gthread-win32.c" /> + <File RelativePath="..\..\glib\gwin32.c" /> <Filter Name="libcharset" > - <File RelativePath="..\..\..\glib\libcharset\localcharset.c"> + <File RelativePath="..\..\glib\libcharset\localcharset.c"> <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration> <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration> <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration> @@ -302,16 +302,16 @@ <Filter Name="gnulib" > - <File RelativePath="..\..\..\glib\gnulib\asnprintf.c" /> - <File RelativePath="..\..\..\glib\gnulib\printf-args.c" /> - <File RelativePath="..\..\..\glib\gnulib\printf-parse.c" /> - <File RelativePath="..\..\..\glib\gnulib\printf.c" /> - <File RelativePath="..\..\..\glib\gnulib\vasnprintf.c" /> + <File RelativePath="..\..\glib\gnulib\asnprintf.c" /> + <File RelativePath="..\..\glib\gnulib\printf-args.c" /> + <File RelativePath="..\..\glib\gnulib\printf-parse.c" /> + <File RelativePath="..\..\glib\gnulib\printf.c" /> + <File RelativePath="..\..\glib\gnulib\vasnprintf.c" /> </Filter> <Filter Name="pcre" > - <File RelativePath="..\..\..\glib\pcre\pcre_byte_order.c" > + <File RelativePath="..\..\glib\pcre\pcre_byte_order.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -321,7 +321,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_chartables.c" > + <File RelativePath="..\..\glib\pcre\pcre_chartables.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -331,7 +331,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_compile.c" > + <File RelativePath="..\..\glib\pcre\pcre_compile.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -341,7 +341,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_config.c" > + <File RelativePath="..\..\glib\pcre\pcre_config.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -351,7 +351,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c" > + <File RelativePath="..\..\glib\pcre\pcre_dfa_exec.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -361,7 +361,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_exec.c" > + <File RelativePath="..\..\glib\pcre\pcre_exec.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -371,7 +371,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c" > + <File RelativePath="..\..\glib\pcre\pcre_fullinfo.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -381,7 +381,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_get.c" > + <File RelativePath="..\..\glib\pcre\pcre_get.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -391,7 +391,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_globals.c" > + <File RelativePath="..\..\glib\pcre\pcre_globals.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -401,7 +401,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_jit_compile.c" > + <File RelativePath="..\..\glib\pcre\pcre_jit_compile.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -411,7 +411,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_newline.c" > + <File RelativePath="..\..\glib\pcre\pcre_newline.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -421,7 +421,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c" > + <File RelativePath="..\..\glib\pcre\pcre_ord2utf8.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -431,7 +431,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_string_utils.c" > + <File RelativePath="..\..\glib\pcre\pcre_string_utils.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -441,7 +441,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_study.c" > + <File RelativePath="..\..\glib\pcre\pcre_study.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -451,7 +451,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_tables.c" > + <File RelativePath="..\..\glib\pcre\pcre_tables.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -461,7 +461,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c" > + <File RelativePath="..\..\glib\pcre\pcre_valid_utf8.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -471,7 +471,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_version.c" > + <File RelativePath="..\..\glib\pcre\pcre_version.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -481,7 +481,7 @@ <FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> </File> - <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" > + <File RelativePath="..\..\glib\pcre\pcre_xclass.c" > <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> @@ -504,13 +504,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\..\config.h.win32"> + <File RelativePath="..\..\config.h.win32"> <FileConfiguration Name="Debug_BundledPCRE|Win32"> <Tool Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> @@ -518,7 +518,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"> @@ -526,7 +526,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -534,7 +534,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Debug_BundledPCRE|x64"> @@ -542,7 +542,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -550,7 +550,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|x64"> @@ -558,7 +558,7 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -566,17 +566,17 @@ Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(GenConfigH)" - Outputs="..\..\..\config.h" + Outputs="..\..\config.h" /> </FileConfiguration> </File> - <File RelativePath="..\..\..\glib\glibconfig.h.win32"> + <File RelativePath="..\..\glib\glibconfig.h.win32"> <FileConfiguration Name="Debug_BundledPCRE|Win32"> <Tool Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> @@ -584,7 +584,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|Win32"> @@ -592,7 +592,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -600,7 +600,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Debug_BundledPCRE|x64"> @@ -608,7 +608,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -616,7 +616,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Release_BundledPCRE|x64"> @@ -624,7 +624,7 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -632,11 +632,11 @@ Name="VCCustomBuildTool" Description="Copying glibconfig.h from glibconfig.h.win32..." CommandLine="$(GenGLibConfigH)" - Outputs="..\..\..\glib\glibconfig.h" + Outputs="..\..\glib\glibconfig.h" /> </FileConfiguration> </File> - <File RelativePath="..\..\..\glib\glib.rc" /> + <File RelativePath="..\..\glib\glib.rc" /> </Filter> </Files> </VisualStudioProject> diff --git a/build/win32/vs9/gmodule.vcproj b/win32/vs9/gmodule.vcproj index 03e991804..8df2f4c95 100644 --- a/build/win32/vs9/gmodule.vcproj +++ b/win32/vs9/gmodule.vcproj @@ -148,7 +148,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gmodule\gmodule.c" /> + <File RelativePath="..\..\gmodule\gmodule.c" /> </Filter> <Filter Name="Header Files" @@ -161,13 +161,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\..\gmodule\gmoduleconf.h.win32"> + <File RelativePath="..\..\gmodule\gmoduleconf.h.win32"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -175,7 +175,7 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -183,7 +183,7 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -191,11 +191,11 @@ Name="VCCustomBuildTool" Description="Copying gmoduleconf.h from gmoduleconf.h.win32..." CommandLine="$(GenGModuleConfH)" - Outputs="..\..\..\gmodule\gmoduleconf.h" + Outputs="..\..\gmodule\gmoduleconf.h" /> </FileConfiguration> </File> - <File RelativePath="..\..\..\gmodule\gmodule.rc" /> + <File RelativePath="..\..\gmodule\gmodule.rc" /> </Filter> </Files> </VisualStudioProject> diff --git a/build/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin index 82609ccf0..bc6ce88df 100644 --- a/build/win32/vs9/gobject.vcprojin +++ b/win32/vs9/gobject.vcprojin @@ -161,13 +161,13 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\..\gobject\glib-mkenums.in"> + <File RelativePath="..\..\gobject\glib-mkenums.in"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -175,7 +175,7 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> </FileConfiguration> <FileConfiguration Name="Debug|x64"> @@ -183,7 +183,7 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> </FileConfiguration> <FileConfiguration Name="Release|x64"> @@ -191,11 +191,11 @@ Name="VCCustomBuildTool" Description="Generating glib-mkenums..." CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\..\gobject\glib-mkenums" + Outputs="..\..\gobject\glib-mkenums" /> </FileConfiguration> </File> - <File RelativePath="..\..\..\gobject\gobject.rc" /> + <File RelativePath="..\..\gobject\gobject.rc" /> </Filter> </Files> </VisualStudioProject> diff --git a/build/win32/vs9/gresource.vcproj b/win32/vs9/gresource.vcproj index 982f10d65..32b78fcd1 100644 --- a/build/win32/vs9/gresource.vcproj +++ b/win32/vs9/gresource.vcproj @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -91,7 +91,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -118,7 +118,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -147,7 +147,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gio\gresource-tool.c" /> + <File RelativePath="..\..\gio\gresource-tool.c" /> </Filter> </Files> <Globals> diff --git a/build/win32/vs9/gsettings.vcproj b/win32/vs9/gsettings.vcproj index 48045811a..ea15c423e 100644 --- a/build/win32/vs9/gsettings.vcproj +++ b/win32/vs9/gsettings.vcproj @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -57,7 +57,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -91,7 +91,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -119,7 +119,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\gmodule" + AdditionalIncludeDirectories="..\..\gmodule" PreprocessorDefinitions="" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -148,7 +148,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gio\gsettings-tool.c" /> + <File RelativePath="..\..\gio\gsettings-tool.c" /> </Filter> </Files> <Globals> diff --git a/build/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj index 180252dbc..58fa6361d 100644 --- a/build/win32/vs9/gspawn-win32-helper-console.vcproj +++ b/win32/vs9/gspawn-win32-helper-console.vcproj @@ -143,7 +143,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\glib\gspawn-win32-helper-console.c" + RelativePath="..\..\glib\gspawn-win32-helper-console.c" > </File> </Filter> diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/win32/vs9/gspawn-win32-helper.vcproj index 5417f7db3..1918e3bc0 100644 --- a/build/win32/vs9/gspawn-win32-helper.vcproj +++ b/win32/vs9/gspawn-win32-helper.vcproj @@ -142,7 +142,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\glib\gspawn-win32-helper.c" /> + <File RelativePath="..\..\glib\gspawn-win32-helper.c" /> </Filter> <Filter Name="Header Files" diff --git a/build/win32/vs9/gthread.vcproj b/win32/vs9/gthread.vcproj index 59360cff7..3bbe92c37 100644 --- a/build/win32/vs9/gthread.vcproj +++ b/win32/vs9/gthread.vcproj @@ -148,7 +148,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath="..\..\..\gthread\gthread-impl.c" /> + <File RelativePath="..\..\gthread\gthread-impl.c" /> </Filter> <Filter Name="Header Files" @@ -161,7 +161,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\..\gthread\gthread.rc" /> + <File RelativePath="..\..\gthread\gthread.rc" /> </Filter> </Files> </VisualStudioProject> |